@modern-js/app-tools 2.25.2 → 2.26.1-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,47 @@
 # @modern-js/app-tools
 
+## 2.26.0
+
+### Patch Changes
+
+- 05480f1: fix: @modern-js/server-core should be a dependencies of @modern-js/app-tools
+  fix: @modern-js/server-core 应该是 @modern-js/app-tools 的 dependencies
+- fbcac63: perf(cli): improve upgrade command load performance
+
+  perf(cli): 优化 upgrade 命令加载性能
+
+- Updated dependencies [150ddb1]
+- Updated dependencies [786c195]
+- Updated dependencies [e26b05e]
+- Updated dependencies [b36ece4]
+- Updated dependencies [e26b05e]
+- Updated dependencies [15ad760]
+- Updated dependencies [fac4ee0]
+- Updated dependencies [786c195]
+- Updated dependencies [ad7139b]
+- Updated dependencies [cdf5b6b]
+- Updated dependencies [786c195]
+- Updated dependencies [fbcac63]
+  - @modern-js/builder-webpack-provider@2.26.0
+  - @modern-js/builder-rspack-provider@2.26.0
+  - @modern-js/builder-shared@2.26.0
+  - @modern-js/builder@2.26.0
+  - @modern-js/upgrade@2.26.0
+  - @modern-js/builder-plugin-esbuild@2.26.0
+  - @modern-js/builder-plugin-node-polyfill@2.26.0
+  - @modern-js/core@2.26.0
+  - @modern-js/server@2.26.0
+  - @modern-js/new-action@2.26.0
+  - @modern-js/plugin-data-loader@2.26.0
+  - @modern-js/plugin-i18n@2.26.0
+  - @modern-js/plugin-lint@2.26.0
+  - @modern-js/server-core@2.26.0
+  - @modern-js/prod-server@2.26.0
+  - @modern-js/node-bundle-require@2.26.0
+  - @modern-js/plugin@2.26.0
+  - @modern-js/types@2.26.0
+  - @modern-js/utils@2.26.0
+
 ## 2.25.2
 
 ### Patch Changes

package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -119,18 +119,6 @@ class RouterPlugin {
         const manifest = {
           routeAssets
         };
-        const injectedContent = `
-            ;(function(){
-              window.${_constants.ROUTE_MANIFEST} = ${JSON.stringify(manifest, (k, v) => {
-          if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
-            return v.map((item) => {
-              return item.replace(publicPath, "");
-            });
-          }
-          return v;
-        })};
-            })();
-          `;
         const entrypointsArray = Array.from(compilation.entrypoints.entries());
         const entryChunkIds = entrypointsArray.map((entrypoint) => entrypoint[0]);
         const entryChunks = [
@@ -150,6 +138,27 @@ class RouterPlugin {
           if (!asset) {
             continue;
           }
+          const relatedAssets = {};
+          Object.keys(routeAssets).forEach((routeId) => {
+            if (routeId.startsWith(`${chunkId}_`)) {
+              relatedAssets[routeId] = routeAssets[routeId];
+            }
+          });
+          const manifest2 = {
+            routeAssets: relatedAssets
+          };
+          const injectedContent = `
+            ;(function(){
+              window.${_constants.ROUTE_MANIFEST} = ${JSON.stringify(manifest2, (k, v) => {
+            if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
+              return v.map((item) => {
+                return item.replace(publicPath, "");
+              });
+            }
+            return v;
+          })};
+            })();
+          `;
           const { source } = asset.sourceAndMap();
           const map = chunkToSourceMap.get(chunkId);
           const newContent = `${injectedContent}${source.toString()}`;

package/dist/cjs/index.js

@@ -43,7 +43,6 @@ const _generateWatchFiles = require("./utils/generateWatchFiles");
 const _core = require("@modern-js/core");
 _export_star._(require("./defineConfig"), exports);
 _export_star._(require("./types"), exports);
-const upgradeModel = _utils.Import.lazy("@modern-js/upgrade", require);
 const devCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const devToolMetas = await runner.registerDev();
@@ -162,7 +161,8 @@ const appTools = (options = {
             const { inspect } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/inspect")));
             inspect(api, options2);
           });
-          upgradeModel.defineCommand(program.command("upgrade").option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)));
+          const { defineCommand } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/upgrade")));
+          defineCommand(program.command("upgrade").option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)));
         },
         async prepare() {
           const command = (0, _utils.getCommand)();

package/dist/esm/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -98,8 +98,43 @@ export var RouterPlugin = /* @__PURE__ */ function() {
             name: PLUGIN_NAME,
             stage: Compilation.PROCESS_ASSETS_STAGE_REPORT
           }, /* @__PURE__ */ _async_to_generator(function() {
-            var stats, publicPath, _stats_chunks, chunks, namedChunkGroups, routeAssets, prevManifestAsset, prevManifestStr, prevManifest, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, chunkGroup, assets, referenceCssAssets, manifest, injectedContent, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, entryChunkFileIds, i, file, chunkId, asset, source, map, newContent, newSource;
+            var _loop, stats, publicPath, _stats_chunks, chunks, namedChunkGroups, routeAssets, prevManifestAsset, prevManifestStr, prevManifest, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, chunkGroup, assets, referenceCssAssets, manifest, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, entryChunkFileIds, i;
             return _ts_generator(this, function(_state) {
+              _loop = function(i2) {
+                var file = entryChunkFiles[i2];
+                var chunkId = entryChunkFileIds[i2];
+                var asset = compilation.assets[file];
+                if (!asset) {
+                  return "continue";
+                }
+                var relatedAssets = {};
+                Object.keys(routeAssets).forEach(function(routeId) {
+                  if (routeId.startsWith("".concat(chunkId, "_"))) {
+                    relatedAssets[routeId] = routeAssets[routeId];
+                  }
+                });
+                var manifest2 = {
+                  routeAssets: relatedAssets
+                };
+                var injectedContent = "\n            ;(function(){\n              window.".concat(ROUTE_MANIFEST, " = ").concat(JSON.stringify(manifest2, function(k, v) {
+                  if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
+                    return v.map(function(item) {
+                      return item.replace(publicPath, "");
+                    });
+                  }
+                  return v;
+                }), ";\n            })();\n          ");
+                var source = asset.sourceAndMap().source;
+                var map = chunkToSourceMap.get(chunkId);
+                var newContent = "".concat(injectedContent).concat(source.toString());
+                var newSource = new SourceMapSource(newContent, file, map, source.toString(), map);
+                compilation.updateAsset(
+                  file,
+                  newSource,
+                  // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
+                  void 0
+                );
+              };
               stats = compilation.getStats().toJson({
                 all: false,
                 publicPath: true,
@@ -124,12 +159,12 @@ export var RouterPlugin = /* @__PURE__ */ function() {
               try {
                 for (_iterator = Object.entries(namedChunkGroups)[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
                   _step_value = _sliced_to_array(_step.value, 2), name = _step_value[0], chunkGroup = _step_value[1];
-                  assets = chunkGroup.assets.map(function(asset2) {
-                    var filename = asset2.name;
+                  assets = chunkGroup.assets.map(function(asset) {
+                    var filename = asset.name;
                     return publicPath ? normalizePath(publicPath) + filename : filename;
                   });
-                  referenceCssAssets = assets.filter(function(asset2) {
-                    return /\.css$/.test(asset2);
+                  referenceCssAssets = assets.filter(function(asset) {
+                    return /\.css$/.test(asset);
                   });
                   routeAssets[name] = {
                     chunkIds: chunkGroup.chunks,
@@ -137,11 +172,11 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                     referenceCssAssets: referenceCssAssets
                   };
                   if (prevManifest.routeAssets[name]) {
-                    mergeWith(routeAssets[name], prevManifest.routeAssets[name], function(obj, source2) {
+                    mergeWith(routeAssets[name], prevManifest.routeAssets[name], function(obj, source) {
                       if (Array.isArray(obj)) {
-                        return obj.concat(source2);
+                        return obj.concat(source);
                       }
-                      return Object.assign(source2, obj);
+                      return Object.assign(source, obj);
                     });
                   }
                 }
@@ -162,14 +197,6 @@ export var RouterPlugin = /* @__PURE__ */ function() {
               manifest = {
                 routeAssets: routeAssets
               };
-              injectedContent = "\n            ;(function(){\n              window.".concat(ROUTE_MANIFEST, " = ").concat(JSON.stringify(manifest, function(k, v) {
-                if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
-                  return v.map(function(item) {
-                    return item.replace(publicPath, "");
-                  });
-                }
-                return v;
-              }), ";\n            })();\n          ");
               entrypointsArray = Array.from(compilation.entrypoints.entries());
               entryChunkIds = entrypointsArray.map(function(entrypoint) {
                 return entrypoint[0];
@@ -188,24 +215,8 @@ export var RouterPlugin = /* @__PURE__ */ function() {
               entryChunkFileIds = entryChunks.map(function(chunk) {
                 return chunk.id;
               });
-              for (i = 0; i <= entryChunkFiles.length - 1; i++) {
-                file = entryChunkFiles[i];
-                chunkId = entryChunkFileIds[i];
-                asset = compilation.assets[file];
-                if (!asset) {
-                  continue;
-                }
-                source = asset.sourceAndMap().source;
-                map = chunkToSourceMap.get(chunkId);
-                newContent = "".concat(injectedContent).concat(source.toString());
-                newSource = new SourceMapSource(newContent, file, map, source.toString(), map);
-                compilation.updateAsset(
-                  file,
-                  newSource,
-                  // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
-                  void 0
-                );
-              }
+              for (i = 0; i <= entryChunkFiles.length - 1; i++)
+                _loop(i);
               if (prevManifestAsset) {
                 compilation.updateAsset(
                   ROUTE_MANIFEST_FILE,

package/dist/esm/index.js

@@ -4,7 +4,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { lintPlugin } from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, Import, getCommand, getArgv } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, getCommand, getArgv } from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import analyzePlugin from "./analyze";
@@ -16,7 +16,6 @@ import { generateWatchFiles } from "./utils/generateWatchFiles";
 export { mergeConfig } from "@modern-js/core";
 export * from "./defineConfig";
 export * from "./types";
-var upgradeModel = Import.lazy("@modern-js/upgrade", require);
 export var devCommand = function() {
   var _ref = _async_to_generator(function(program, api) {
     var runner, devToolMetas, devProgram, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, meta, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, subCmd;
@@ -325,6 +324,7 @@ export var appTools = function() {
         commands: function commands(param) {
           var program = param.program;
           return _async_to_generator(function() {
+            var defineCommand;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -464,7 +464,13 @@ export var appTools = function() {
                       return _ref.apply(this, arguments);
                     };
                   }());
-                  upgradeModel.defineCommand(program.command("upgrade").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)));
+                  return [
+                    4,
+                    import("@modern-js/upgrade")
+                  ];
+                case 3:
+                  defineCommand = _state.sent().defineCommand;
+                  defineCommand(program.command("upgrade").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)));
                   return [
                     2
                   ];

package/dist/esm-node/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -109,18 +109,6 @@ export class RouterPlugin {
         const manifest = {
           routeAssets
         };
-        const injectedContent = `
-            ;(function(){
-              window.${ROUTE_MANIFEST} = ${JSON.stringify(manifest, (k, v) => {
-          if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
-            return v.map((item) => {
-              return item.replace(publicPath, "");
-            });
-          }
-          return v;
-        })};
-            })();
-          `;
         const entrypointsArray = Array.from(compilation.entrypoints.entries());
         const entryChunkIds = entrypointsArray.map((entrypoint) => entrypoint[0]);
         const entryChunks = [
@@ -140,6 +128,27 @@ export class RouterPlugin {
           if (!asset) {
             continue;
           }
+          const relatedAssets = {};
+          Object.keys(routeAssets).forEach((routeId) => {
+            if (routeId.startsWith(`${chunkId}_`)) {
+              relatedAssets[routeId] = routeAssets[routeId];
+            }
+          });
+          const manifest2 = {
+            routeAssets: relatedAssets
+          };
+          const injectedContent = `
+            ;(function(){
+              window.${ROUTE_MANIFEST} = ${JSON.stringify(manifest2, (k, v) => {
+            if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
+              return v.map((item) => {
+                return item.replace(publicPath, "");
+              });
+            }
+            return v;
+          })};
+            })();
+          `;
           const { source } = asset.sourceAndMap();
           const map = chunkToSourceMap.get(chunkId);
           const newContent = `${injectedContent}${source.toString()}`;

package/dist/esm-node/index.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { lintPlugin } from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, Import, getCommand, getArgv } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, getCommand, getArgv } from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import analyzePlugin from "./analyze";
@@ -12,7 +12,6 @@ import { generateWatchFiles } from "./utils/generateWatchFiles";
 export { mergeConfig } from "@modern-js/core";
 export * from "./defineConfig";
 export * from "./types";
-const upgradeModel = Import.lazy("@modern-js/upgrade", require);
 export const devCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const devToolMetas = await runner.registerDev();
@@ -131,7 +130,8 @@ export const appTools = (options = {
             const { inspect } = await import("./commands/inspect");
             inspect(api, options2);
           });
-          upgradeModel.defineCommand(program.command("upgrade").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)));
+          const { defineCommand } = await import("@modern-js/upgrade");
+          defineCommand(program.command("upgrade").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)));
         },
         async prepare() {
           const command = getCommand();

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.25.2",
+  "version": "2.26.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -73,23 +73,24 @@
     "esbuild": "0.17.19",
     "rspack-plugin-virtual-module": "0.1.0",
     "@swc/helpers": "0.5.1",
-    "@modern-js/builder": "2.25.2",
-    "@modern-js/builder-plugin-esbuild": "2.25.2",
-    "@modern-js/builder-plugin-node-polyfill": "2.25.2",
-    "@modern-js/builder-shared": "2.25.2",
-    "@modern-js/builder-webpack-provider": "2.25.2",
-    "@modern-js/core": "2.25.2",
-    "@modern-js/new-action": "2.25.2",
-    "@modern-js/node-bundle-require": "2.25.2",
-    "@modern-js/plugin": "2.25.2",
-    "@modern-js/plugin-data-loader": "2.25.2",
-    "@modern-js/plugin-i18n": "2.25.2",
-    "@modern-js/plugin-lint": "2.25.2",
-    "@modern-js/prod-server": "2.25.2",
-    "@modern-js/server": "2.25.2",
-    "@modern-js/types": "2.25.2",
-    "@modern-js/upgrade": "2.25.2",
-    "@modern-js/utils": "2.25.2"
+    "@modern-js/builder": "2.26.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.26.0",
+    "@modern-js/builder-plugin-esbuild": "2.26.0",
+    "@modern-js/core": "2.26.0",
+    "@modern-js/builder-shared": "2.26.0",
+    "@modern-js/builder-webpack-provider": "2.26.0",
+    "@modern-js/new-action": "2.26.0",
+    "@modern-js/node-bundle-require": "2.26.0",
+    "@modern-js/plugin": "2.26.0",
+    "@modern-js/plugin-lint": "2.26.0",
+    "@modern-js/prod-server": "2.26.0",
+    "@modern-js/plugin-i18n": "2.26.0",
+    "@modern-js/server": "2.26.0",
+    "@modern-js/types": "2.26.0",
+    "@modern-js/utils": "2.26.0",
+    "@modern-js/server-core": "2.26.0",
+    "@modern-js/upgrade": "2.26.0",
+    "@modern-js/plugin-data-loader": "2.26.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -98,14 +99,13 @@
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/builder-plugin-swc": "2.25.2",
-    "@modern-js/builder-rspack-provider": "2.25.2",
-    "@modern-js/server-core": "2.25.2",
-    "@scripts/jest-config": "2.25.2",
-    "@scripts/build": "2.25.2"
+    "@modern-js/builder-rspack-provider": "2.26.0",
+    "@modern-js/builder-plugin-swc": "2.26.0",
+    "@scripts/build": "2.26.0",
+    "@scripts/jest-config": "2.26.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.25.2"
+    "@modern-js/builder-rspack-provider": "^2.26.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {