fix: site config

ZhongAnTech · Aug 18, 2023 · ee6ca02 · ee6ca02
1 parent bc62eab
commit ee6ca02
Show file tree

Hide file tree

Showing 14 changed files with 7,515 additions and 5,748 deletions.
diff --git a/.fatherrc.base.ts b/.fatherrc.base.ts
@@ -0,0 +1,11 @@
+import { defineConfig } from 'father';
+
+export default defineConfig({
+  cjs: {
+    output: 'dist',
+  },
+  targets: {
+    chrome: 84,
+    safari: 13,
+  },
+});
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
     "dep:update": "pnpm up --interactive --latest --recursive",
     "deploy": "pnpm --filter site gh-pages -d dist",
     "deploy:build": "pnpm --filter site build",
+    "deps:update": "pnpm up --interactive --latest --recursive",
     "dev": "pnpm --filter site start",
     "dev:h5": "pnpm --filter mini-demo dev:h5",
     "dev:next": "pnpm --filter dumi-theme-zarm dev",
@@ -39,33 +40,34 @@
     ]
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.16.3",
-    "@babel/eslint-plugin": "^7.14.5",
-    "@commitlint/cli": "^17.3.0",
-    "@commitlint/config-conventional": "^17.3.0",
-    "@types/jest": "^26.0.22",
-    "@typescript-eslint/eslint-plugin": "^5.3.1",
-    "@typescript-eslint/parser": "^5.3.1",
-    "browserslist": "^4.16.4",
-    "concurrently": "^6.0.2",
-    "eslint": "^7.10.0",
+    "@babel/eslint-parser": "^7.22.10",
+    "@babel/eslint-plugin": "^7.22.10",
+    "@commitlint/cli": "^17.7.1",
+    "@commitlint/config-conventional": "^17.7.0",
+    "@types/jest": "^26.0.24",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
+    "browserslist": "^4.21.10",
+    "concurrently": "^6.5.1",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "8.1.0",
-    "eslint-config-za": "^2.4.0-alpha.3",
+    "eslint-config-za": "2.4.0-alpha.4",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jsx-a11y": "6.4.1",
     "eslint-plugin-react": "7.21.5",
     "eslint-plugin-react-hooks": "4.1.2",
-    "husky": "^8.0.2",
-    "jest": "^26.5.3",
-    "lint-staged": "^13.1.0",
+    "father": "^4.3.1",
+    "husky": "^8.0.3",
+    "jest": "^26.6.3",
+    "lint-staged": "^13.3.0",
     "only-allow": "^1.1.1",
-    "prettier": "^2.8.0",
-    "prettier-plugin-organize-imports": "^3.2.1",
-    "prettier-plugin-packagejson": "^2.3.0",
+    "prettier": "^2.8.8",
+    "prettier-plugin-organize-imports": "^3.2.3",
+    "prettier-plugin-packagejson": "^2.4.5",
     "rimraf": "^3.0.2",
     "stylelint": "13.8.0",
     "stylelint-config-za": "0.3.0",
-    "stylelint-scss": "^3.18.0",
+    "stylelint-scss": "^3.21.0",
     "typescript": "~5.1.6"
   }
 }
diff --git a/packages/bem/.fatherrc.ts b/packages/bem/.fatherrc.ts
@@ -0,0 +1,5 @@
+import { defineConfig } from 'father';
+
+export default defineConfig({
+  extends: '../../.fatherrc.base.ts',
+});
diff --git a/packages/bem/package.json b/packages/bem/package.json
@@ -17,37 +17,35 @@
   "license": "MIT",
   "author": "JeromeLin <jerome.lin@zhongan.com>",
   "exports": {
-    ".": "./lib/index.js",
-    "./sass": "./lib/sass/index.scss",
+    ".": "./dist/index.js",
+    "./sass": "./dist/sass/index.scss",
     "./*": [
       "./*",
       "./*.d.ts"
     ]
   },
-  "main": "lib/index.js",
-  "module": "es/index.js",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "typesVersions": {
     "*": {
       "*": [
-        "./lib/*",
-        "./es/*",
+        "./dist/*",
         "./*"
       ]
     }
   },
-  "typings": "lib/index.d.ts",
+  "typings": "dist/index.d.ts",
   "directories": {
-    "lib": "lib",
+    "dist": "dist",
     "test": "__tests__"
   },
   "files": [
-    "lib"
+    "dist"
   ],
   "scripts": {
-    "build": "pnpm build:lib && pnpm build:es",
-    "build:es": "rimraf es && tsc --outDir es && zarm build --mode es --path src --out-dir es --copy-files",
-    "build:lib": "rimraf lib && tsc --outDir lib && zarm build --mode lib --path src --out-dir lib --copy-files",
-    "clean": "rimraf lib es dist coverage",
+    "build": "father build",
+    "dev": "father dev",
+    "clean": "rimraf dist coverage",
     "test": "jest --passWithNoTests"
   },
   "devDependencies": {

diff --git a/packages/zarm-icons/.fatherrc.ts b/packages/zarm-icons/.fatherrc.ts
@@ -0,0 +1,5 @@
+import { defineConfig } from 'father';
+
+export default defineConfig({
+  extends: '../../.fatherrc.base.ts',
+});
diff --git a/packages/zarm-icons/package.json b/packages/zarm-icons/package.json
@@ -5,25 +5,22 @@
   "license": "MIT",
   "author": "jerome.lin@zhongan.com",
   "exports": {
-    ".": "./lib/index.js",
-    "./style": "./lib/style/index.scss",
-    "./style/font": "./lib/font/style/icon.scss"
+    ".": "./dist/index.js",
+    "./style": "./dist/style/index.scss",
+    "./style/font": "./dist/font/style/icon.scss"
   },
-  "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "files": [
-    "es",
-    "lib",
-    "types"
+    "dist"
   ],
   "scripts": {
-    "build": "pnpm build:lib && pnpm build:es",
-    "build:es": "rimraf es && tsc --outDir es && zarm build --mode es --path src --out-dir es --copy-files --build-css",
+    "build": "father build",
+    "dev": "father dev",
     "build:font": "npx webFontsHelper --src ./svg --fontName zaicon --fontPath src/font --className za-icon",
-    "build:lib": "rimraf lib && tsc --outDir lib && zarm build --mode lib --path src --out-dir lib --copy-files --build-css",
     "build:react": "rimraf src/react && svgr ./svg --out-dir ./src/react",
     "build:svg": "rimraf svg && node ./scripts/exportSVG.js",
-    "clean": "rimraf lib es coverage svg",
+    "clean": "rimraf dist coverage svg",
     "coverage": "rimraf coverage && pnpm test -c",
     "test": "zarm test -s scripts/jest/setup.js"
   },

diff --git a/packages/zarm/.fatherrc.ts b/packages/zarm/.fatherrc.ts
@@ -0,0 +1,21 @@
+import { defineConfig } from 'father';
+
+export default defineConfig({
+  extends: '../../.fatherrc.base.ts',
+  esm: {
+    output: 'es',
+  },
+  cjs: {
+    output: 'lib',
+  },
+  umd: {
+    entry: {
+      'src/index': {
+        output: { filename: 'zarm.js' },
+      },
+      'src/style': {
+        output: { filename: 'zarm.css' },
+      },
+    },
+  },
+});
diff --git a/packages/zarm/package.json b/packages/zarm/package.json
@@ -48,10 +48,14 @@
     "!**/demo/*"
   ],
   "scripts": {
+    "build:next": "father build",
+    "dev:next": "father dev",
+
     "build": "pnpm build:lib && pnpm build:es && pnpm build:umd",
     "build:es": "rimraf es && tsc --outDir es && zarm build --mode es --path src --out-dir es --copy-files --build-css",
     "build:lib": "rimraf lib && tsc --outDir lib && zarm build --mode lib --path src --out-dir lib --copy-files --build-css",
     "build:umd": "rimraf dist && zarm build --mode umd --path src/style/entry.ts,src/index.ts --out-dir dist --library-name zarm && zarm build --mode umd-ugly --path src/style/entry.ts,src/index.ts --out-dir dist --library-name zarm",
+
     "bundlesize": "npx bundlesize",
     "clean": "rimraf lib es dist coverage",
     "coverage": "rimraf coverage && pnpm run test -c",

diff --git a/packages/zarm/src/button/demo/basic.mini.tsx b/packages/zarm/src/button/demo/basic.mini.tsx
@@ -1,5 +1,3 @@
-import '@zarm-design/icons/style';
-import '@zarm-design/icons/style/font';
 import * as React from 'react';
 import { Button, Panel } from 'zarm/mini';
 

diff --git a/packages/zarm/src/button/demo/block.mini.tsx b/packages/zarm/src/button/demo/block.mini.tsx
@@ -1,5 +1,3 @@
-import '@zarm-design/icons/style';
-import '@zarm-design/icons/style/font';
 import * as React from 'react';
 import { Button, Panel } from 'zarm/mini';