Merge branch 'main' into feat/remove-devtools-config

web-infra-dev · Dec 5, 2024 · de2313a · de2313a
2 parents d4a0d5c + 5fc95f7
commit de2313a
Show file tree

Hide file tree

Showing 336 changed files with 10,184 additions and 3,069 deletions.
diff --git a/.changeset/afraid-socks-jam.md b/.changeset/afraid-socks-jam.md
@@ -0,0 +1,7 @@
+---
+'@modern-js/app-tools': patch
+'@modern-js/uni-builder': patch
+'@modern-js/utils': patch
+---
+
+feat(app-tools): enable Rsbuild CLI shortcuts
diff --git a/.changeset/quick-cows-reply.md b/.changeset/quick-cows-reply.md
@@ -0,0 +1,8 @@
+---
+'@modern-js/plugin-server': patch
+'@modern-js/types': patch
+'@modern-js/server-core': patch
+---
+
+feat: add route info into unstable_middleware context
+feat: 添加路由信息到 unstable_middleware 上下文中
diff --git a/.changeset/shiny-hairs-wink.md b/.changeset/shiny-hairs-wink.md
@@ -0,0 +1,5 @@
+---
+'@modern-js/uni-builder': patch
+---
+
+feat(uni-builder): support environment tools.babel config
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -89,6 +89,13 @@
       "groupName": "actions",
       "groupSlug": "actions",
     },
+    {
+      "matchPackageNames": [
+        "@modern-js/**",
+      ],
+      "groupName": "modern",
+      "groupSlug": "modern",
+    },
   ],
   "ignoreDeps": [
     // manually update some packages

diff --git a/biome.json b/biome.json
@@ -16,7 +16,8 @@
       "packages/generator/sandpack-react/src/templates/**",
       "tests/integration/swc/fixtures/minify-css/src/bootstrap.css",
       "tests/integration/swc/fixtures/config-function/src/bootstrap.css",
-      "packages/runtime/plugin-garfish/type.d.ts"
+      "packages/runtime/plugin-garfish/type.d.ts",
+      "packages/runtime/plugin-runtime/static/**"
     ]
   },
   "css": {
@@ -112,7 +113,8 @@
       "tests/integration/ssr/fixtures/preload/**/*",
       "tests/integration/swc/fixtures/transform-fail/src/App.jsx",
       "tests/integration/module/plugins/vue/**/*",
-      "packages/module/plugin-module-node-polyfill/src/globals.js"
+      "packages/module/plugin-module-node-polyfill/src/globals.js",
+      "packages/runtime/plugin-runtime/static/**"
     ]
   }
 }
diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "cross-env": "^7.0.3",
     "esbuild": "0.17.19",
     "husky": "^8.0.0",
-    "lint-staged": "~13.1.0",
+    "lint-staged": "~13.3.0",
     "nx": "^17.0.1",
     "rimraf": "^6.0.1",
     "vitest": "0.33.0"

diff --git a/packages/cli/babel-preset/package.json b/packages/cli/babel-preset/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/babel-preset",
-  "version": "2.61.0",
+  "version": "2.63.1",
   "description": "The babel config of Modern.js.",
   "repository": {
     "type": "git",
@@ -61,7 +61,7 @@
     "@babel/preset-typescript": "^7.26.0",
     "@babel/runtime": "^7.26.0",
     "@babel/types": "^7.26.0",
-    "@rsbuild/plugin-babel": "~1.0.1",
+    "@rsbuild/plugin-babel": "1.0.3",
     "@swc/helpers": "0.5.13",
     "@types/babel__core": "^7.20.5",
     "babel-plugin-dynamic-import-node": "2.3.3",

diff --git a/packages/cli/core/CHANGELOG.md b/packages/cli/core/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @modern-js/core
 
+## 2.63.1
+
+### Patch Changes
+
+- @modern-js/node-bundle-require@2.63.1
+- @modern-js/plugin@2.63.1
+- @modern-js/utils@2.63.1
+
+## 2.63.0
+
+### Patch Changes
+
+- @modern-js/node-bundle-require@2.63.0
+- @modern-js/plugin@2.63.0
+- @modern-js/utils@2.63.0
+
+## 2.62.1
+
+### Patch Changes
+
+- @modern-js/node-bundle-require@2.62.1
+- @modern-js/plugin@2.62.1
+- @modern-js/utils@2.62.1
+
+## 2.62.0
+
+### Patch Changes
+
+- @modern-js/node-bundle-require@2.62.0
+- @modern-js/plugin@2.62.0
+- @modern-js/utils@2.62.0
+
 ## 2.61.0
 
 ### Patch Changes

diff --git a/packages/cli/core/package.json b/packages/cli/core/package.json
@@ -14,7 +14,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.61.0",
+  "version": "2.63.1",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/index.js",

diff --git a/packages/cli/plugin-bff/CHANGELOG.md b/packages/cli/plugin-bff/CHANGELOG.md
@@ -1,5 +1,45 @@
 # @modern-js/plugin-bff
 
+## 2.63.1
+
+### Patch Changes
+
+- @modern-js/bff-core@2.63.1
+- @modern-js/server-core@2.63.1
+- @modern-js/create-request@2.63.1
+- @modern-js/server-utils@2.63.1
+- @modern-js/utils@2.63.1
+
+## 2.63.0
+
+### Patch Changes
+
+- @modern-js/bff-core@2.63.0
+- @modern-js/server-core@2.63.0
+- @modern-js/create-request@2.63.0
+- @modern-js/server-utils@2.63.0
+- @modern-js/utils@2.63.0
+
+## 2.62.1
+
+### Patch Changes
+
+- @modern-js/bff-core@2.62.1
+- @modern-js/server-core@2.62.1
+- @modern-js/create-request@2.62.1
+- @modern-js/server-utils@2.62.1
+- @modern-js/utils@2.62.1
+
+## 2.62.0
+
+### Patch Changes
+
+- @modern-js/bff-core@2.62.0
+- @modern-js/server-core@2.62.0
+- @modern-js/create-request@2.62.0
+- @modern-js/server-utils@2.62.0
+- @modern-js/utils@2.62.0
+
 ## 2.61.0
 
 ### Patch Changes

diff --git a/packages/cli/plugin-bff/package.json b/packages/cli/plugin-bff/package.json
@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.61.0",
+  "version": "2.63.1",
   "jsnext:source": "./src/cli.ts",
   "types": "./src/cli.ts",
   "main": "./dist/cjs/cli.js",

diff --git a/packages/cli/plugin-changeset/CHANGELOG.md b/packages/cli/plugin-changeset/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @modern-js/plugin-changeset
 
+## 2.63.1
+
+### Patch Changes
+
+- @modern-js/plugin-i18n@2.63.1
+- @modern-js/utils@2.63.1
+
+## 2.63.0
+
+### Patch Changes
+
+- @modern-js/plugin-i18n@2.63.0
+- @modern-js/utils@2.63.0
+
+## 2.62.1
+
+### Patch Changes
+
+- @modern-js/plugin-i18n@2.62.1
+- @modern-js/utils@2.62.1
+
+## 2.62.0
+
+### Patch Changes
+
+- @modern-js/plugin-i18n@2.62.0
+- @modern-js/utils@2.62.0
+
 ## 2.61.0
 
 ### Patch Changes

diff --git a/packages/cli/plugin-changeset/package.json b/packages/cli/plugin-changeset/package.json
@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.61.0",
+  "version": "2.63.1",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/cjs/index.js",

diff --git a/packages/cli/plugin-data-loader/CHANGELOG.md b/packages/cli/plugin-data-loader/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @modern-js/plugin-data-loader
 
+## 2.63.1
+
+### Patch Changes
+
+- @modern-js/runtime-utils@2.63.1
+- @modern-js/utils@2.63.1
+
+## 2.63.0
+
+### Patch Changes
+
+- @modern-js/runtime-utils@2.63.0
+- @modern-js/utils@2.63.0
+
+## 2.62.1
+
+### Patch Changes
+
+- 86213ae: chore: add a server directory for universal server utils
+  chore: 添加一个 server 目录用于存放通用的服务端工具函数
+- Updated dependencies [86213ae]
+  - @modern-js/runtime-utils@2.62.1
+  - @modern-js/utils@2.62.1
+
+## 2.62.0
+
+### Patch Changes
+
+- @modern-js/runtime-utils@2.62.0
+- @modern-js/utils@2.62.0
+
 ## 2.61.0
 
 ### Patch Changes

diff --git a/packages/cli/plugin-data-loader/package.json b/packages/cli/plugin-data-loader/package.json
@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.61.0",
+  "version": "2.63.1",
   "engines": {
     "node": ">=16.2.0"
   },

diff --git a/packages/cli/plugin-data-loader/src/runtime/index.ts b/packages/cli/plugin-data-loader/src/runtime/index.ts
@@ -1,7 +1,6 @@
 import { transformNestedRoutes } from '@modern-js/runtime-utils/browser';
 import {
   createRequestContext,
-  matchEntry,
   reporterCtx,
 } from '@modern-js/runtime-utils/node';
 import {
@@ -11,6 +10,7 @@ import {
   isRouteErrorResponse,
   json,
 } from '@modern-js/runtime-utils/remix-router';
+import { matchEntry } from '@modern-js/runtime-utils/server';
 import { time } from '@modern-js/runtime-utils/time';
 import type { NestedRoute, Reporter, ServerRoute } from '@modern-js/types';
 import { isPlainObject } from '@modern-js/utils/lodash';

diff --git a/packages/cli/plugin-i18n/CHANGELOG.md b/packages/cli/plugin-i18n/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @modern-js/plugin-i18n
 
+## 2.63.1
+
+### Patch Changes
+
+- @modern-js/utils@2.63.1
+
+## 2.63.0
+
+### Patch Changes
+
+- @modern-js/utils@2.63.0
+
+## 2.62.1
+
+### Patch Changes
+
+- @modern-js/utils@2.62.1
+
+## 2.62.0
+
+### Patch Changes
+
+- @modern-js/utils@2.62.0
+
 ## 2.61.0
 
 ### Patch Changes

diff --git a/packages/cli/plugin-i18n/package.json b/packages/cli/plugin-i18n/package.json
@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.61.0",
+  "version": "2.63.1",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/cjs/index.js",

diff --git a/packages/cli/plugin-proxy/CHANGELOG.md b/packages/cli/plugin-proxy/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @modern-js/plugin-proxy
 
+## 2.63.1
+
+### Patch Changes
+
+- @modern-js/utils@2.63.1
+
+## 2.63.0
+
+### Patch Changes
+
+- @modern-js/utils@2.63.0
+
+## 2.62.1
+
+### Patch Changes
+
+- @modern-js/utils@2.62.1
+
+## 2.62.0
+
+### Patch Changes
+
+- @modern-js/utils@2.62.0
+
 ## 2.61.0
 
 ### Patch Changes

diff --git a/packages/cli/plugin-proxy/package.json b/packages/cli/plugin-proxy/package.json
@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.61.0",
+  "version": "2.63.1",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/cjs/index.js",