From 5ac89fa67ccca6f28be15227fbf026f7fdd8b30f Mon Sep 17 00:00:00 2001 From: DBSDs <379712747@qq.com> Date: Fri, 17 Nov 2023 00:38:32 +0800 Subject: [PATCH 1/2] chore: bump father@4.x.x --- .fatherrc.js | 9 --------- .fatherrc.ts | 5 +++++ .github/workflows/react-component-ci.yml | 14 +++++++------- .gitignore | 11 ++--------- package.json | 5 +++-- 5 files changed, 17 insertions(+), 27 deletions(-) delete mode 100644 .fatherrc.js create mode 100644 .fatherrc.ts diff --git a/.fatherrc.js b/.fatherrc.js deleted file mode 100644 index 9d8c16b..0000000 --- a/.fatherrc.js +++ /dev/null @@ -1,9 +0,0 @@ -export default { - cjs: "babel", - esm: { type: "babel", importLibToEs: true }, - preCommit: { - eslint: true, - prettier: true, - }, - runtimeHelpers: true, -}; diff --git a/.fatherrc.ts b/.fatherrc.ts new file mode 100644 index 0000000..96268ae --- /dev/null +++ b/.fatherrc.ts @@ -0,0 +1,5 @@ +import { defineConfig } from 'father'; + +export default defineConfig({ + plugins: ['@rc-component/father-plugin'], +}); diff --git a/.github/workflows/react-component-ci.yml b/.github/workflows/react-component-ci.yml index 432a3fb..6bfd63e 100644 --- a/.github/workflows/react-component-ci.yml +++ b/.github/workflows/react-component-ci.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [ master ] + branches: [master] pull_request: - branches: [ master ] + branches: [master] jobs: setup: @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-node@v1 with: - node-version: '12' + node-version: '18' - name: cache package-lock.json uses: actions/cache@v2 @@ -24,7 +24,7 @@ jobs: key: lock-${{ github.sha }} - name: create package-lock.json - run: npm i --package-lock-only + run: npm i --package-lock-only --ignore-scripts - name: hack for singe file run: | @@ -43,7 +43,7 @@ jobs: - name: install if: steps.node_modules_cache_id.outputs.cache-hit != 'true' run: npm ci - + lint: runs-on: ubuntu-latest steps: @@ -66,7 +66,7 @@ jobs: run: npm run lint needs: setup - + compile: runs-on: ubuntu-latest steps: @@ -89,7 +89,7 @@ jobs: run: npm run compile needs: setup - + coverage: runs-on: ubuntu-latest steps: diff --git a/.gitignore b/.gitignore index bf31cb5..05f96da 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -.storybook *.iml *.log .idea @@ -29,14 +28,8 @@ yarn.lock package-lock.json .doc/ -# umi -.umi -.umi-production -.umi-test -.env.local - - -# dumi .doc +# dumi .dumi/tmp +.dumi/tmp-test .dumi/tmp-production diff --git a/package.json b/package.json index efebd64..98bd690 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "docs:build": "dumi build", "docs:deploy": "gh-pages -d .doc", "compile": "father build && lessc assets/index.less assets/index.css", + "prepare": "dumi setup", "prepublishOnly": "npm run compile && np --yolo --no-publish", "postpublish": "npm run docs:build && npm run docs:deploy", "lint": "eslint src/ --ext .ts,.tsx,.jsx,.js,.md", @@ -46,6 +47,7 @@ "rc-util": "^5.0.1" }, "devDependencies": { + "@rc-component/father-plugin": "^1.0.0", "@types/classnames": "^2.2.9", "@types/jest": "^29.5.1", "@types/react": "^17.0.15", @@ -57,8 +59,7 @@ "enzyme-adapter-react-16": "^1.0.1", "enzyme-to-json": "^3.1.2", "eslint": "^7.1.0", - "father": "^2.22.0", - "father-build": "^1.18.6", + "father": "^4.0.0", "gh-pages": "^3.1.0", "less": "^3.0.0", "np": "^7.0.0", From 20fb622c781756addbddb67ab2e2e32240ffbcd3 Mon Sep 17 00:00:00 2001 From: DBSDs <379712747@qq.com> Date: Wed, 22 Nov 2023 23:45:28 +0800 Subject: [PATCH 2/2] chore: use rc-test --- package.json | 7 ++++--- tsconfig.json | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 98bd690..af91610 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "postpublish": "npm run docs:build && npm run docs:deploy", "lint": "eslint src/ --ext .ts,.tsx,.jsx,.js,.md", "prettier": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"", - "test": "father test", - "coverage": "father test --coverage", + "test": "rc-test", + "coverage": "rc-test --coverage", "now-build": "npm run docs:build" }, "dependencies": { @@ -56,13 +56,14 @@ "cross-env": "^7.0.0", "dumi": "^2.1.2", "enzyme": "^3.1.1", - "enzyme-adapter-react-16": "^1.0.1", + "enzyme-adapter-react-16": "^1.15.6", "enzyme-to-json": "^3.1.2", "eslint": "^7.1.0", "father": "^4.0.0", "gh-pages": "^3.1.0", "less": "^3.0.0", "np": "^7.0.0", + "rc-test": "^7.0.15", "rc-tooltip": "^5.0.1", "react": "^16.0.0", "react-dom": "^16.0.0", diff --git a/tsconfig.json b/tsconfig.json index e2b649c..305af76 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,7 @@ "target": "esnext", "moduleResolution": "node", "baseUrl": "./", - "jsx": "preserve", + "jsx": "react", "declaration": true, "skipLibCheck": true, "esModuleInterop": true,