diff --git a/.dumirc.ts b/.dumirc.ts index ff078b3..ae66bd4 100644 --- a/.dumirc.ts +++ b/.dumirc.ts @@ -16,7 +16,6 @@ export default defineConfig({ logo: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4', }, outputPath: '.doc', - exportStatic: {}, base: basePath, publicPath, }); diff --git a/.github/workflows/react-component-ci.yml b/.github/workflows/react-component-ci.yml index 5ffd207..d4519f3 100644 --- a/.github/workflows/react-component-ci.yml +++ b/.github/workflows/react-component-ci.yml @@ -1,30 +1,26 @@ name: CI -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] +on: ['push', 'pull_request'] jobs: setup: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@master + uses: actions/checkout@v4 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: - node-version: '12' + node-version: '20' - name: cache package-lock.json - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: package-temp-dir key: lock-${{ github.sha }} - name: create package-lock.json - run: npm i --package-lock-only + run: npm i --package-lock-only --ignore-scripts --legacy-peer-deps - name: hack for singe file run: | @@ -35,30 +31,29 @@ jobs: - name: cache node_modules id: node_modules_cache_id - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} - name: install if: steps.node_modules_cache_id.outputs.cache-hit != 'true' - run: npm ci - + run: npm ci --legacy-peer-deps + lint: runs-on: ubuntu-latest - needs: setup steps: - name: checkout - uses: actions/checkout@master + uses: actions/checkout@v4 - name: restore cache from package-lock.json - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: package-temp-dir key: lock-${{ github.sha }} - name: restore cache from node_modules - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} @@ -66,47 +61,55 @@ jobs: - name: lint run: npm run lint - + needs: setup + compile: runs-on: ubuntu-latest - needs: setup steps: - name: checkout - uses: actions/checkout@master + uses: actions/checkout@v4 - name: restore cache from package-lock.json - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: package-temp-dir key: lock-${{ github.sha }} - name: restore cache from node_modules - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} - name: compile run: npm run compile - + + needs: setup + coverage: runs-on: ubuntu-latest - needs: setup steps: - name: checkout - uses: actions/checkout@master + uses: actions/checkout@v4 - name: restore cache from package-lock.json - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: package-temp-dir key: lock-${{ github.sha }} - name: restore cache from node_modules - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} - name: coverage - run: npm run coverage && bash <(curl -s https://codecov.io/bash) + run: npm test -- --coverage + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} + + needs: setup diff --git a/package.json b/package.json index 1f83716..d6b25d2 100644 --- a/package.json +++ b/package.json @@ -55,13 +55,13 @@ "@types/jest": "^29.4.0", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", - "@umijs/fabric": "^3.0.0", + "@umijs/fabric": "^4.0.0", "dumi": "^2.1.1", "eslint": "^8.55.0", "eslint-plugin-jest": "^27.6.0", "eslint-plugin-unicorn": "^49.0.0", "father": "^4.1.3", - "husky": "^8.0.3", + "husky": "^9.0.0", "jest": "^29.1.2", "less": "^4.2.0", "lint-staged": "^15.0.2",