Merge branch 'main' into fix/resolve-react-devtools

web-infra-dev · Dec 27, 2023 · 673b591 · 673b591
2 parents 16d42ba + e364925
commit 673b591
Show file tree

Hide file tree

Showing 64 changed files with 1,307 additions and 691 deletions.
diff --git a/.changeset/breezy-falcons-jog.md b/.changeset/breezy-falcons-jog.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/runtime': patch
+---
+
+fix(ssr): support stream ssr inline asserts
+fix(ssr): 支持 stream ssr 内链静态文件
diff --git a/.changeset/cuddly-owls-dream.md b/.changeset/cuddly-owls-dream.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/generator-plugin': patch
+---
+
+feat(generator-plugin): `addManyFiles` supports config to include dotfiles
+feat(generator-plugin): `addManyFiles` 支持配置允许包含 dotfiles
diff --git a/.changeset/famous-mayflies-hug.md b/.changeset/famous-mayflies-hug.md
@@ -0,0 +1,10 @@
+---
+'ssr-base-test': patch
+'@modern-js/runtime-utils': patch
+'@modern-js/prod-server': patch
+'@modern-js/main-doc': patch
+'@modern-js/types': patch
+---
+
+fix: SSR cache container spell
+fix: SSR 缓存相关 container 拼写修正
diff --git a/.changeset/hungry-donkeys-complain.md b/.changeset/hungry-donkeys-complain.md
@@ -0,0 +1,7 @@
+---
+'@modern-js/plugin-server': patch
+'@modern-js/app-tools': patch
+---
+
+fix: server dir compile only server/cache exsits
+fix: 只有存在 server/cache 才默认编译
diff --git a/.changeset/mighty-fireants-tan.md b/.changeset/mighty-fireants-tan.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/module-tools': patch
+---
+
+fix(module-tools): When dealing with dts file alias, explicitly declare the extension when calling matchPath to avoid the problem of not being able to find the module.
+fix(module-tools): 处理类型描述文件别名过程中，在调用 matchPath 时显式声明后缀名，避免无法找到模块的问题
diff --git a/.changeset/sharp-drinks-yawn.md b/.changeset/sharp-drinks-yawn.md
@@ -0,0 +1,8 @@
+---
+'@modern-js/module-tools': patch
+'@modern-js/builder': patch
+---
+
+chore(module-tools): bump SVGR to v8.1.0
+
+chore(module-tools): 升级 SVGR 到 v8.1.0
diff --git a/.changeset/slow-snakes-work.md b/.changeset/slow-snakes-work.md
@@ -0,0 +1,8 @@
+---
+'@modern-js/builder-webpack-provider': patch
+'@modern-js/builder-rspack-provider': patch
+---
+
+chore(deps): bump rspack to 0.4.5 and bump rsbuild to 0.2.11
+
+chore(deps): 升级 rspack 到 0.4.5 & 升级 rsbuild 到 0.2.11
diff --git a/.changeset/ten-goats-bow.md b/.changeset/ten-goats-bow.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/server': patch
+---
+
+fix(hmr-client): make hmr-client isomorphic
+fix(hmr-client): hmr-client 支持跨环境
diff --git a/.github/workflows/build-builder-website.yml b/.github/workflows/build-builder-website.yml
@@ -31,7 +31,7 @@ jobs:
         id: nx-cache
         uses: actions/cache@v3
         with:
-          path: .nx-cache
+          path: .nx/cache
           key: nx-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
             nx-${{ github.ref_name }}-

diff --git a/.github/workflows/build-main-website.yml b/.github/workflows/build-main-website.yml
@@ -32,7 +32,7 @@ jobs:
         id: nx-cache
         uses: actions/cache@v3
         with:
-          path: .nx-cache
+          path: .nx/cache
           key: nx-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
             nx-${{ github.ref_name }}-

diff --git a/.github/workflows/build-module-website.yml b/.github/workflows/build-module-website.yml
@@ -31,7 +31,7 @@ jobs:
         id: nx-cache
         uses: actions/cache@v3
         with:
-          path: .nx-cache
+          path: .nx/cache
           key: nx-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
             nx-${{ github.ref_name }}-

diff --git a/.github/workflows/integration-test-Linux.yml b/.github/workflows/integration-test-Linux.yml
@@ -47,7 +47,7 @@ jobs:
         id: nx-cache
         uses: actions/cache@v3
         with:
-          path: .nx-cache
+          path: .nx/cache
           key: nx-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
             nx-${{ github.ref_name }}-

diff --git a/.github/workflows/integration-test-Windows.yml b/.github/workflows/integration-test-Windows.yml
@@ -53,7 +53,7 @@ jobs:
         id: nx-cache
         uses: actions/cache@v3
         with:
-          path: .nx-cache
+          path: .nx/cache
           key: nx-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
             nx-${{ github.ref_name }}-

diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml
@@ -36,7 +36,7 @@ jobs:
         id: nx-cache
         uses: actions/cache@v3
         with:
-          path: .nx-cache
+          path: .nx/cache
           key: nx-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
             nx-${{ github.ref_name }}-

diff --git a/.github/workflows/release-pull-request.yml b/.github/workflows/release-pull-request.yml
@@ -41,7 +41,7 @@ jobs:
         id: nx-cache
         uses: actions/cache@v3
         with:
-          path: .nx-cache
+          path: .nx/cache
           key: nx-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
             nx-${{ github.ref_name }}-

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
         id: nx-cache
         uses: actions/cache@v3
         with:
-          path: .nx-cache
+          path: .nx/cache
           key: nx-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
             nx-${{ github.ref_name }}-
@@ -101,7 +101,7 @@ jobs:
         id: nx-cache
         uses: actions/cache@v3
         with:
-          path: .nx-cache
+          path: .nx/cache
           key: nx-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
             nx-${{ github.ref_name }}-

diff --git a/.github/workflows/test-builder-e2e.yml b/.github/workflows/test-builder-e2e.yml
@@ -20,7 +20,7 @@ jobs:
         id: nx-cache
         uses: actions/cache@v3
         with:
-          path: .nx-cache
+          path: .nx/cache
           key: nx-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
             nx-${{ github.ref_name }}-

diff --git a/.github/workflows/test-garfish-e2e.yml b/.github/workflows/test-garfish-e2e.yml
@@ -20,7 +20,7 @@ jobs:
         id: nx-cache
         uses: actions/cache@v3
         with:
-          path: .nx-cache
+          path: .nx/cache
           key: nx-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
             nx-${{ github.ref_name }}-

diff --git a/.github/workflows/type-check.yml b/.github/workflows/type-check.yml
@@ -44,7 +44,7 @@ jobs:
         if: ${{steps.skip-ci.outputs.RESULT != 'true'}}
         uses: actions/cache@v3
         with:
-          path: .nx-cache
+          path: .nx/cache
           key: nx-${{ github.base_ref }}-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
             nx-${{ github.base_ref }}-${{ github.ref_name }}-

diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ website/**/.temp
 
 .wireit/
 .nx-cache/
+.nx/
 playground/
 
 # Local Netlify folder

diff --git a/nx.json b/nx.json
@@ -2,6 +2,7 @@
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "targetDefaults": {
     "build": {
+      "cache": true,
       "dependsOn": [
         "^build"
       ],
@@ -14,18 +15,6 @@
       ]
     }
   },
-  "tasksRunnerOptions": {
-    "default": {
-      "runner": "nx-cloud",
-      "options": {
-        "cacheableOperations": [
-          "build"
-        ],
-        "cacheDirectory": ".nx-cache",
-        "accessToken": "MGQ1ZmJlYmItNDg2YS00YzhjLTllOWMtYTgxYTVjN2M5NjdhfHJlYWQtd3JpdGU="
-      }
-    }
-  },
   "affected": {
     "defaultBase": "main"
   }

diff --git a/package.json b/package.json
@@ -42,8 +42,7 @@
     "check-dependencies": "check-dependency-version-consistency .",
     "update-codesmith": "cd ./scripts/update-codesmith && pnpm start",
     "update-rspress": "cd ./scripts/update-rspress && pnpm start",
-    "update-rsbuild": "cd ./scripts/update-rsbuild && pnpm start",
-    "update-nx-cache": "cross-env NX_DAEMON=false nx reset && npm run prepare-build"
+    "update-rsbuild": "cd ./scripts/update-rsbuild && pnpm start"
   },
   "engines": {
     "node": ">=14.17.6",
@@ -86,8 +85,7 @@
     "eslint": "^8.28.0",
     "husky": "^8.0.0",
     "lint-staged": "~13.1.0",
-    "nx": "16.5.1",
-    "nx-cloud": "^16.5.2",
+    "nx": "^17.0.1",
     "vitest": "0.33.0"
   },
   "pnpm": {

diff --git a/packages/builder/builder-rspack-provider/package.json b/packages/builder/builder-rspack-provider/package.json
@@ -56,9 +56,9 @@
     "@modern-js/types": "workspace:*",
     "@modern-js/utils": "workspace:*",
     "@babel/preset-typescript": "^7.22.15",
-    "@rspack/core": "0.4.4",
-    "@rspack/plugin-react-refresh": "0.4.4",
-    "@rspack/plugin-html": "0.4.4",
+    "@rspack/core": "0.4.5",
+    "@rspack/plugin-react-refresh": "0.4.5",
+    "@rspack/plugin-html": "0.4.5",
     "@swc/helpers": "0.5.3",
     "rspack-manifest-plugin": "5.0.0-alpha0",
     "caniuse-lite": "^1.0.30001520",

diff --git a/packages/builder/builder-rspack-provider/tests/plugins/__snapshots__/default.test.ts.snap b/packages/builder/builder-rspack-provider/tests/plugins/__snapshots__/default.test.ts.snap
@@ -691,7 +691,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly 1`] = `
         "process.env.ASSET_PREFIX": "\\"\\"",
         "process.env.NODE_ENV": "\\"development\\"",
       },
-      "affectedHooks": undefined,
+      "affectedHooks": "compilation",
       "name": "DefinePlugin",
     },
     ProgressPlugin {
@@ -1461,7 +1461,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when prod
         "process.env.ASSET_PREFIX": "\\"\\"",
         "process.env.NODE_ENV": "\\"production\\"",
       },
-      "affectedHooks": undefined,
+      "affectedHooks": "compilation",
       "name": "DefinePlugin",
     },
     RemoveCssSourcemapPlugin {
@@ -1946,7 +1946,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctyly when targ
         "process.env.ASSET_PREFIX": "\\"\\"",
         "process.env.NODE_ENV": "\\"test\\"",
       },
-      "affectedHooks": undefined,
+      "affectedHooks": "compilation",
       "name": "DefinePlugin",
     },
     ProgressPlugin {
@@ -2679,7 +2679,7 @@ exports[`tools.rspack > should match snapshot 1`] = `
         "process.env.ASSET_PREFIX": "\\"\\"",
         "process.env.NODE_ENV": "\\"development\\"",
       },
-      "affectedHooks": undefined,
+      "affectedHooks": "compilation",
       "name": "DefinePlugin",
     },
     ProgressPlugin {

diff --git a/packages/builder/builder-webpack-provider/package.json b/packages/builder/builder-webpack-provider/package.json
@@ -96,7 +96,7 @@
     "@modern-js/types": "workspace:*",
     "@modern-js/utils": "workspace:*",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/babel-preset": "0.2.8",
+    "@rsbuild/babel-preset": "0.2.11",
     "@swc/helpers": "0.5.3",
     "babel-plugin-import": "1.13.5",
     "babel-plugin-styled-components": "1.13.3",

diff --git a/packages/builder/builder/package.json b/packages/builder/builder/package.json
@@ -62,8 +62,8 @@
   "dependencies": {
     "@modern-js/builder-shared": "workspace:*",
     "@modern-js/utils": "workspace:*",
-    "@rsbuild/monorepo-utils": "0.2.8",
-    "@svgr/webpack": "8.0.1",
+    "@rsbuild/monorepo-utils": "0.2.11",
+    "@svgr/webpack": "8.1.0",
     "@swc/helpers": "0.5.3",
     "deepmerge": "^4.3.1",
     "jiti": "^1.20.0"

diff --git a/packages/builder/uni-builder/package.json b/packages/builder/uni-builder/package.json
@@ -34,21 +34,21 @@
     "@modern-js/server": "workspace:*",
     "@modern-js/prod-server": "workspace:*",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/babel-preset": "0.2.8",
-    "@rsbuild/core": "0.2.8",
-    "@rsbuild/plugin-assets-retry": "0.2.8",
-    "@rsbuild/plugin-babel": "0.2.8",
-    "@rsbuild/plugin-check-syntax": "0.2.8",
-    "@rsbuild/plugin-css-minimizer": "0.2.8",
-    "@rsbuild/plugin-pug": "0.2.8",
-    "@rsbuild/plugin-react": "0.2.8",
-    "@rsbuild/plugin-rem": "0.2.8",
-    "@rsbuild/plugin-source-build": "0.2.8",
-    "@rsbuild/plugin-styled-components": "0.2.8",
-    "@rsbuild/plugin-svgr": "0.2.8",
-    "@rsbuild/plugin-type-check": "0.2.8",
-    "@rsbuild/shared": "0.2.8",
-    "@rsbuild/webpack": "0.2.8",
+    "@rsbuild/babel-preset": "0.2.11",
+    "@rsbuild/core": "0.2.11",
+    "@rsbuild/plugin-assets-retry": "0.2.11",
+    "@rsbuild/plugin-babel": "0.2.11",
+    "@rsbuild/plugin-check-syntax": "0.2.11",
+    "@rsbuild/plugin-css-minimizer": "0.2.11",
+    "@rsbuild/plugin-pug": "0.2.11",
+    "@rsbuild/plugin-react": "0.2.11",
+    "@rsbuild/plugin-rem": "0.2.11",
+    "@rsbuild/plugin-source-build": "0.2.11",
+    "@rsbuild/plugin-styled-components": "0.2.11",
+    "@rsbuild/plugin-svgr": "0.2.11",
+    "@rsbuild/plugin-type-check": "0.2.11",
+    "@rsbuild/shared": "0.2.11",
+    "@rsbuild/webpack": "0.2.11",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -72,7 +72,7 @@
     "webpack-subresource-integrity": "5.1.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.2.8",
+    "@rsbuild/plugin-swc": "0.2.11",
     "@scripts/build": "workspace:*",
     "@scripts/vitest-config": "workspace:*",
     "@types/lodash": "^4.14.202",