diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41b95a642788..82342a86f536 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,9 +38,22 @@ jobs: if: ${{ matrix.node-version != '14.x' }} uses: pnpm/action-setup@v2.2.4 + - name: Get pnpm version (node 14) + if: ${{ matrix.node-version == '14.x' }} + uses: actions/github-script@v7 + id: pnpm-version + with: + result-encoding: string + script: | + const packageJson = require('./package.json') + const pnpmVersion = packageJson.packageManager.split('@')[1] + console.log(`Use pnpm ${pnpmVersion}`) + return pnpmVersion + - name: Install pnpm (node 14) if: ${{ matrix.node-version == '14.x' }} - run: npm install -g @pnpm/exe@8.6.2 + run: | + npm install -g @pnpm/exe@${{ steps.pnpm-version.outputs.result }} - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 diff --git a/package.json b/package.json index c7325f2bc70b..97c7a40ceb5d 100644 --- a/package.json +++ b/package.json @@ -110,19 +110,22 @@ "ts-node": "^10.7.0", "tsx": "^3.12.2", "tunnel": "^0.0.6", - "turbo": "^1.9.3", + "turbo": "^1.11.2", "typescript": "^4.9.4", "uglify-js": "^3.17.4", "umi": "workspace:*", "umi-scripts": "workspace:*", "zx": "^7.1.1" }, - "packageManager": "pnpm@8.6.2", + "packageManager": "pnpm@8.12.1", "engines": { "node": ">=14", - "pnpm": "^8.6.2" + "pnpm": "^8.12.1" + }, + "//": { + "why-overrides-parcel-watcher": "https://github.com/parcel-bundler/watcher/issues/156", + "why-overrides-browserslist": "See scripts/bundleDeps.ts" }, - "//why-overrides-browserslist": "See scripts/bundleDeps.ts", "pnpm": { "peerDependencyRules": { "ignoreMissing": [ @@ -138,7 +141,8 @@ ] }, "overrides": { - "browserslist": "$browserslist" + "browserslist": "$browserslist", + "@parcel/watcher": "2.1.0" } }, "_local": "This flag is used to check if the development in local, Please do not delete." diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9a722314e2c2..5ee48c833b42 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,6 +6,7 @@ settings: overrides: browserslist: 4.21.5 + '@parcel/watcher': 2.1.0 importers: @@ -171,8 +172,8 @@ importers: specifier: ^0.0.6 version: 0.0.6 turbo: - specifier: ^1.9.3 - version: 1.9.3 + specifier: ^1.11.2 + version: 1.11.2 typescript: specifier: ^4.9.4 version: 4.9.4 @@ -14583,11 +14584,13 @@ packages: '@parcel/css-win32-x64-msvc': 1.9.0 dev: true - /@parcel/watcher@2.0.4: - resolution: {integrity: sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==} + /@parcel/watcher@2.1.0: + resolution: {integrity: sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==} engines: {node: '>= 10.0.0'} requiresBuild: true dependencies: + is-glob: 4.0.3 + micromatch: 4.0.5 node-addon-api: 3.2.1 node-gyp-build: 4.6.0 dev: true @@ -33892,6 +33895,7 @@ packages: /node-gyp-build@4.6.0: resolution: {integrity: sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==} + hasBin: true dev: true /node-gyp@9.3.1: @@ -34252,7 +34256,7 @@ packages: dependencies: '@nrwl/cli': 15.7.2 '@nrwl/tao': 15.7.2 - '@parcel/watcher': 2.0.4 + '@parcel/watcher': 2.1.0 '@yarnpkg/lockfile': 1.1.0 '@yarnpkg/parsers': 3.0.0-rc.35 '@zkochan/js-yaml': 0.0.6 @@ -46464,65 +46468,64 @@ packages: engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'} dev: true - /turbo-darwin-64@1.9.3: - resolution: {integrity: sha512-0dFc2cWXl82kRE4Z+QqPHhbEFEpUZho1msHXHWbz5+PqLxn8FY0lEVOHkq5tgKNNEd5KnGyj33gC/bHhpZOk5g==} + /turbo-darwin-64@1.11.2: + resolution: {integrity: sha512-toFmRG/adriZY3hOps7nYCfqHAS+Ci6xqgX3fbo82kkLpC6OBzcXnleSwuPqjHVAaRNhVoB83L5njcE9Qwi2og==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.9.3: - resolution: {integrity: sha512-1cYbjqLBA2zYE1nbf/qVnEkrHa4PkJJbLo7hnuMuGM0bPzh4+AnTNe98gELhqI1mkTWBu/XAEeF5u6dgz0jLNA==} + /turbo-darwin-arm64@1.11.2: + resolution: {integrity: sha512-FCsEDZ8BUSFYEOSC3rrARQrj7x2VOrmVcfrMUIhexTxproRh4QyMxLfr6LALk4ymx6jbDCxWa6Szal8ckldFbA==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.9.3: - resolution: {integrity: sha512-UuBPFefawEwpuxh5pM9Jqq3q4C8M0vYxVYlB3qea/nHQ80pxYq7ZcaLGEpb10SGnr3oMUUs1zZvkXWDNKCJb8Q==} + /turbo-linux-64@1.11.2: + resolution: {integrity: sha512-Vzda/o/QyEske5CxLf0wcu7UUS+7zB90GgHZV4tyN+WZtoouTvbwuvZ3V6b5Wgd3OJ/JwWR0CXDK7Sf4VEMr7A==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.9.3: - resolution: {integrity: sha512-vUrNGa3hyDtRh9W0MkO+l1dzP8Co2gKnOVmlJQW0hdpOlWlIh22nHNGGlICg+xFa2f9j4PbQlWTsc22c019s8Q==} + /turbo-linux-arm64@1.11.2: + resolution: {integrity: sha512-bRLwovQRz0yxDZrM4tQEAYV0fBHEaTzUF0JZ8RG1UmZt/CqtpnUrJpYb1VK8hj1z46z9YehARpYCwQ2K0qU4yw==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.9.3: - resolution: {integrity: sha512-0BZ7YaHs6r+K4ksqWus1GKK3W45DuDqlmfjm/yuUbTEVc8szmMCs12vugU2Zi5GdrdJSYfoKfEJ/PeegSLIQGQ==} + /turbo-windows-64@1.11.2: + resolution: {integrity: sha512-LgTWqkHAKgyVuLYcEPxZVGPInTjjeCnN5KQMdJ4uQZ+xMDROvMFS2rM93iQl4ieDJgidwHCxxCxaU9u8c3d/Kg==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.9.3: - resolution: {integrity: sha512-QJUYLSsxdXOsR1TquiOmLdAgtYcQ/RuSRpScGvnZb1hY0oLc7JWU0llkYB81wVtWs469y8H9O0cxbKwCZGR4RQ==} + /turbo-windows-arm64@1.11.2: + resolution: {integrity: sha512-829aVBU7IX0c/B4G7g1VI8KniAGutHhIupkYMgF6xPkYVev2G3MYe6DMS/vsLt9GGM9ulDtdWxWrH5P2ngK8IQ==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.9.3: - resolution: {integrity: sha512-ID7mxmaLUPKG/hVkp+h0VuucB1U99RPCJD9cEuSEOdIPoSIuomcIClEJtKamUsdPLhLCud+BvapBNnhgh58Nzw==} + /turbo@1.11.2: + resolution: {integrity: sha512-jPC7LVQJzebs5gWf8FmEvsvXGNyKbN+O9qpvv98xpNaM59aS0/Irhd0H0KbcqnXfsz7ETlzOC3R+xFWthC4Z8A==} hasBin: true - requiresBuild: true optionalDependencies: - turbo-darwin-64: 1.9.3 - turbo-darwin-arm64: 1.9.3 - turbo-linux-64: 1.9.3 - turbo-linux-arm64: 1.9.3 - turbo-windows-64: 1.9.3 - turbo-windows-arm64: 1.9.3 + turbo-darwin-64: 1.11.2 + turbo-darwin-arm64: 1.11.2 + turbo-linux-64: 1.11.2 + turbo-linux-arm64: 1.11.2 + turbo-windows-64: 1.11.2 + turbo-windows-arm64: 1.11.2 dev: true /tweetnacl@0.14.5: diff --git a/turbo.json b/turbo.json index ccf58c28098f..417885e78f32 100644 --- a/turbo.json +++ b/turbo.json @@ -10,7 +10,8 @@ "cache": false }, "dev": { - "cache": false + "cache": false, + "persistent": true }, "test": { "outputs": [".jest-cache/**"]