feat: update modern version to canary

caohuilin · caohuilin · commit a77e2947a5a0 · 2025-11-19T14:52:52.000+08:00
diff --git a/apps/modern-component-data-fetch/host/package.json b/apps/modern-component-data-fetch/host/package.json
@@ -27,17 +27,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@modern-js/runtime": "0.0.0-next-20251119053303",
+    "@modern-js/runtime": "0.0.0-canary-20251119023553",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "0.0.0-next-20251119053303",
+    "@modern-js/app-tools": "0.0.0-canary-20251119023553",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "0.0.0-next-20251119053303",
+    "@modern-js/tsconfig": "0.0.0-canary-20251119023553",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",
diff --git a/apps/modern-component-data-fetch/provider/package.json b/apps/modern-component-data-fetch/provider/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@modern-js/runtime": "0.0.0-next-20251119053303",
+    "@modern-js/runtime": "0.0.0-canary-20251119023553",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "0.0.0-next-20251119053303",
+    "@modern-js/app-tools": "0.0.0-canary-20251119023553",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "0.0.0-next-20251119053303",
+    "@modern-js/tsconfig": "0.0.0-canary-20251119023553",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",
diff --git a/apps/modernjs-ssr/dynamic-nested-remote/package.json b/apps/modernjs-ssr/dynamic-nested-remote/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@modern-js/runtime": "0.0.0-next-20251119053303",
+    "@modern-js/runtime": "0.0.0-canary-20251119023553",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "0.0.0-next-20251119053303",
+    "@modern-js/app-tools": "0.0.0-canary-20251119023553",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "0.0.0-next-20251119053303",
+    "@modern-js/tsconfig": "0.0.0-canary-20251119023553",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",
diff --git a/apps/modernjs-ssr/dynamic-remote-new-version/package.json b/apps/modernjs-ssr/dynamic-remote-new-version/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@modern-js/runtime": "0.0.0-next-20251119053303",
+    "@modern-js/runtime": "0.0.0-canary-20251119023553",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "0.0.0-next-20251119053303",
+    "@modern-js/app-tools": "0.0.0-canary-20251119023553",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "0.0.0-next-20251119053303",
+    "@modern-js/tsconfig": "0.0.0-canary-20251119023553",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",
diff --git a/apps/modernjs-ssr/host/package.json b/apps/modernjs-ssr/host/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@modern-js/runtime": "0.0.0-next-20251119053303",
+    "@modern-js/runtime": "0.0.0-canary-20251119023553",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "0.0.0-next-20251119053303",
+    "@modern-js/app-tools": "0.0.0-canary-20251119023553",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "0.0.0-next-20251119053303",
+    "@modern-js/tsconfig": "0.0.0-canary-20251119023553",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",
diff --git a/apps/modernjs-ssr/nested-remote/package.json b/apps/modernjs-ssr/nested-remote/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@modern-js/runtime": "0.0.0-next-20251119053303",
+    "@modern-js/runtime": "0.0.0-canary-20251119023553",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "0.0.0-next-20251119053303",
+    "@modern-js/app-tools": "0.0.0-canary-20251119023553",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "0.0.0-next-20251119053303",
+    "@modern-js/tsconfig": "0.0.0-canary-20251119023553",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",
diff --git a/apps/modernjs-ssr/remote-new-version/package.json b/apps/modernjs-ssr/remote-new-version/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@modern-js/runtime": "0.0.0-next-20251119053303",
+    "@modern-js/runtime": "0.0.0-canary-20251119023553",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "0.0.0-next-20251119053303",
+    "@modern-js/app-tools": "0.0.0-canary-20251119023553",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "0.0.0-next-20251119053303",
+    "@modern-js/tsconfig": "0.0.0-canary-20251119023553",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",
diff --git a/apps/modernjs-ssr/remote/package.json b/apps/modernjs-ssr/remote/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@modern-js/runtime": "0.0.0-next-20251119053303",
+    "@modern-js/runtime": "0.0.0-canary-20251119023553",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "0.0.0-next-20251119053303",
+    "@modern-js/app-tools": "0.0.0-canary-20251119023553",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "0.0.0-next-20251119053303",
+    "@modern-js/tsconfig": "0.0.0-canary-20251119023553",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",
diff --git a/apps/modernjs/modern.config.ts b/apps/modernjs/modern.config.ts
@@ -2,7 +2,7 @@ import { appTools, defineConfig } from '@modern-js/app-tools';
 import { ModuleFederationPlugin } from '@module-federation/enhanced';
 // https://modernjs.dev/en/configure/app/usage
 export default defineConfig({
-  dev: {
+  server: {
     port: 4001,
   },
   runtime: {
diff --git a/apps/modernjs/package.json b/apps/modernjs/package.json
@@ -26,16 +26,16 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@modern-js/runtime": "0.0.0-next-20251119053303",
+    "@modern-js/runtime": "0.0.0-canary-20251119023553",
     "@module-federation/enhanced": "workspace:*",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "0.0.0-next-20251119053303",
+    "@modern-js/app-tools": "0.0.0-canary-20251119023553",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "0.0.0-next-20251119053303",
+    "@modern-js/tsconfig": "0.0.0-canary-20251119023553",
     "@types/jest": "~29.5.0",
     "@types/node": "~20.12.12",
     "@types/react": "~18.2.0",
diff --git a/apps/modernjs/src/components/react-component.tsx b/apps/modernjs/src/components/react-component.tsx
@@ -14,7 +14,7 @@ const reFetchParams = {
 };
 
 const ReactComponent = () => {
-  const [prefetchResult, reFetchUserInfo] = usePrefetch<UserInfo>({
+  const [prefetchResult, reFetchUserInfo] = usePrefetch<{ data: UserInfo }>({
     id: 'app1/react-component',
     // Optional parameters, required after using defer
     deferId: 'userInfo',
diff --git a/packages/chrome-devtools/package.json b/packages/chrome-devtools/package.json
@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "@arco-design/web-react": "^2.64.1",
-    "@modern-js/runtime": "0.0.0-next-20251119053303",
+    "@modern-js/runtime": "0.0.0-canary-20251119023553",
     "@module-federation/sdk": "workspace:*",
     "ahooks": "^3.7.10",
     "dagre": "^0.8.5",
@@ -65,11 +65,11 @@
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "0.0.0-next-20251119053303",
+    "@modern-js/app-tools": "0.0.0-canary-20251119023553",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/module-tools": "0.0.0-next-20251119053303",
-    "@modern-js/storybook": "0.0.0-next-20251119053303",
-    "@modern-js/tsconfig": "0.0.0-next-20251119053303",
+    "@modern-js/module-tools": "2.68.20",
+    "@modern-js/storybook": "2.68.20",
+    "@modern-js/tsconfig": "0.0.0-canary-20251119023553",
     "@module-federation/runtime": "workspace:*",
     "@playwright/test": "1.49.1",
     "@types/chrome": "^0.0.272",
diff --git a/packages/modernjs/package.json b/packages/modernjs/package.json
@@ -136,8 +136,8 @@
   "author": "hanric <hanric.zhang@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "@modern-js/utils": "0.0.0-next-20251119053303",
-    "@modern-js/node-bundle-require": "0.0.0-next-20251119053303",
+    "@modern-js/utils": "0.0.0-canary-20251119023553",
+    "@modern-js/node-bundle-require": "0.0.0-canary-20251119023553",
     "@module-federation/rsbuild-plugin": "workspace:*",
     "@module-federation/bridge-react": "workspace:*",
     "fs-extra": "11.3.0",
@@ -153,13 +153,12 @@
   },
   "devDependencies": {
     "@module-federation/manifest": "workspace:*",
-    "@modern-js/core": "0.0.0-next-20251119053303",
-    "@rsbuild/core": "1.3.21",
-    "@modern-js/app-tools": "0.0.0-next-20251119053303",
-    "@modern-js/server-runtime": "0.0.0-next-20251119053303",
-    "@modern-js/module-tools": "0.0.0-next-20251119053303",
-    "@modern-js/runtime": "0.0.0-next-20251119053303",
-    "@modern-js/tsconfig": "0.0.0-next-20251119053303",
+    "@rsbuild/core": "^1.6.7",
+    "@modern-js/app-tools": "0.0.0-canary-20251119023553",
+    "@modern-js/server-runtime": "0.0.0-canary-20251119023553",
+    "@modern-js/module-tools": "2.68.20",
+    "@modern-js/runtime": "0.0.0-canary-20251119023553",
+    "@modern-js/tsconfig": "0.0.0-canary-20251119023553",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.0"
   },
diff --git a/packages/modernjs/src/cli/configPlugin.ts b/packages/modernjs/src/cli/configPlugin.ts
@@ -15,21 +15,15 @@ import { isDev } from './utils';
 import type { InternalModernPluginOptions } from '../types';
 import type {
   AppTools,
-  webpack,
-  UserConfig,
+  AppUserConfig,
   Rspack,
-  CliPluginFuture,
-  Bundler,
+  CliPlugin,
 } from '@modern-js/app-tools';
 import type { BundlerChainConfig } from '../interfaces/bundler';
 
 const defaultPath = path.resolve(process.cwd(), 'module-federation.config.ts');
 
-export type ConfigType<T> = T extends 'webpack'
-  ? webpack.Configuration
-  : T extends 'rspack'
-    ? Rspack.Configuration
-    : never;
+export type ConfigType = Rspack.Configuration;
 
 type RuntimePluginEntry = NonNullable<
   moduleFederationPlugin.ModuleFederationPluginOptions['runtimePlugins']
@@ -242,7 +236,7 @@ export const patchMFConfig = (
   return mfConfig;
 };
 
-function patchIgnoreWarning<T extends Bundler>(chain: BundlerChainConfig) {
+function patchIgnoreWarning(chain: BundlerChainConfig) {
   const ignoreWarnings = chain.get('ignoreWarnings') || [];
   const ignoredMsgs = [
     'external script',
@@ -264,7 +258,7 @@ export function addMyTypes2Ignored(
 ) {
   const watchOptions = chain.get(
     'watchOptions',
-  ) as webpack.Configuration['watchOptions'];
+  ) as Rspack.Configuration['watchOptions'];
   if (!watchOptions || !watchOptions.ignored) {
     chain.watchOptions({
       ignored: /[\\/](?:\.git|node_modules|@mf-types)[\\/]/,
@@ -313,7 +307,7 @@ export function addMyTypes2Ignored(
 export function patchBundlerConfig(options: {
   chain: BundlerChainConfig;
   isServer: boolean;
-  modernjsConfig: UserConfig<AppTools>;
+  modernjsConfig: AppUserConfig;
   mfConfig: moduleFederationPlugin.ModuleFederationPluginOptions;
   enableSSR: boolean;
 }) {
@@ -351,8 +345,7 @@ export function patchBundlerConfig(options: {
 
   if (isDev() && chain.output.get('publicPath') === 'auto') {
     // TODO: only in dev temp
-    const port =
-      modernjsConfig.dev?.port || modernjsConfig.server?.port || 8080;
+    const port = modernjsConfig.server?.port || 8080;
     const publicPath = `http://localhost:${port}/`;
     chain.output.publicPath(publicPath);
   }
@@ -387,7 +380,7 @@ export function patchBundlerConfig(options: {
 
 export const moduleFederationConfigPlugin = (
   userConfig: InternalModernPluginOptions,
-): CliPluginFuture<AppTools> => ({
+): CliPlugin<AppTools> => ({
   name: '@modern-js/plugin-module-federation-config',
   pre: ['@modern-js/plugin-initialize'],
   post: ['@modern-js/plugin-module-federation'],
@@ -432,8 +425,7 @@ export const moduleFederationConfigPlugin = (
         chain.output.get('path') || path.resolve(process.cwd(), 'dist');
     });
     api.config(() => {
-      const bundlerType =
-        api.getAppContext().bundlerType === 'rspack' ? 'rspack' : 'webpack';
+      const bundlerType = 'rspack';
       const ipv4 = getIPV4();
 
       if (userConfig.remoteIpStrategy === undefined) {
diff --git a/packages/modernjs/src/cli/index.ts b/packages/modernjs/src/cli/index.ts
@@ -1,4 +1,4 @@
-import type { CliPluginFuture, AppTools } from '@modern-js/app-tools';
+import type { CliPlugin, AppTools } from '@modern-js/app-tools';
 import {
   ModuleFederationPlugin as WebpackModuleFederationPlugin,
   AsyncBoundaryPlugin,
@@ -12,7 +12,7 @@ import { isWebTarget } from './utils';
 
 export const moduleFederationPlugin = (
   userConfig: PluginOptions = {},
-): CliPluginFuture<AppTools> => {
+): CliPlugin<AppTools> => {
   const internalModernPluginOptions: InternalModernPluginOptions = {
     csrConfig: undefined,
     ssrConfig: undefined,
diff --git a/packages/modernjs/src/cli/ssrPlugin.ts b/packages/modernjs/src/cli/ssrPlugin.ts
diff --git a/packages/modernjs/src/cli/utils.ts b/packages/modernjs/src/cli/utils.ts
diff --git a/packages/modernjs/src/interfaces/bundler.ts b/packages/modernjs/src/interfaces/bundler.ts
diff --git a/packages/modernjs/src/ssr-runtime/devPlugin.tsx b/packages/modernjs/src/ssr-runtime/devPlugin.tsx
diff --git a/packages/modernjs/src/ssr-runtime/injectDataFetchFunctionPlugin.tsx b/packages/modernjs/src/ssr-runtime/injectDataFetchFunctionPlugin.tsx
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
