Merge branch 'master' of github.com:mokinzhao/h5-Dooring

# Conflicts:
#	packages/editor/src/pages/editor/Container.tsx
#	packages/ui/src/ui-component/ShopComponents/CardLabel/index.less
#	packages/ui/src/ui-component/ShopComponents/CardLabel/index.tsx
#	packages/ui/src/ui-component/ShopComponents/CardLabel/schema.ts
#	packages/ui/src/ui-component/ShopComponents/CardLabel/template.ts
#	packages/ui/src/ui-component/ShopComponents/Coupons/index.less
#	packages/ui/src/ui-component/ShopComponents/Coupons/index.tsx
#	packages/ui/src/ui-component/ShopComponents/Coupons/schema.ts
#	packages/ui/src/ui-component/ShopComponents/Coupons/template.ts
#	packages/ui/src/ui-component/ShopComponents/List/index.less
#	packages/ui/src/ui-component/ShopComponents/List/index.tsx
#	packages/ui/src/ui-component/ShopComponents/List/schema.ts
#	packages/ui/src/ui-component/ShopComponents/Tab/index.less
#	packages/ui/src/ui-component/ShopComponents/Tab/index.tsx
#	packages/ui/src/ui-component/ShopComponents/Tab/schema.ts
#	packages/ui/src/ui-component/ShopComponents/ZhuanLan/index.less
#	packages/ui/src/ui-component/ShopComponents/ZhuanLan/index.tsx
#	packages/ui/src/ui-component/ShopComponents/ZhuanLan/schema.ts
#	packages/ui/src/ui-component/ShopComponents/ZhuanLan/template.ts
#	packages/ui/src/ui-component/ShopComponents/schema.ts
#	packages/ui/src/ui-component/ShopComponents/template.ts
This commit is contained in:
mokinzhao 2021-09-30 16:38:57 +08:00
commit 9d4db3aa47

View File

@ -34,17 +34,7 @@
"test:coverage": "umi-test --coverage",
"nocompress": "cross-env RM_TMPDIR=none COMPRESS=none umi build"
},
"gitHooks": {
"pre-commit": "lint-staged"
},
"lint-staged": {
"*.{js,jsx,less,md,json}": [
"prettier --write"
],
"*.ts?(x)": [
"prettier --parser=typescript --write"
]
},
"homepage": "http://h5.dooring.cn",
"repository": {
"type": "git",