@modern-js/app-tools 2.30.1-alpha.0 → 2.31.0

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # @modern-js/app-tools
 
+## 2.31.0
+
+### Patch Changes
+
+- 71bcc55: fix: inline the route manifests into the html
+  fix: 内联路由信息到 html 中
+- 2361ce8: feat: support partials html in Document
+  feat: 支持 partials html 在 Document 中也生效
+- 30be1ad: fix(app-tools): inject nonce attr to route manifest script
+
+  fix(app-tools): 向 route manifest 脚本注入 nonce 属性
+
+- 4c03d9a: fix(core): remove testing config type and schema
+
+  fix(core): 移除 testing 配置类型和 schema
+
+- 1882366: chore(deps): bump build dependencies
+
+  chore(deps): 升级构建相关依赖
+
+- Updated dependencies [0f09d7c]
+- Updated dependencies [bfdf7b4]
+- Updated dependencies [56eaa0b]
+- Updated dependencies [2361ce8]
+- Updated dependencies [8ab3e2a]
+- Updated dependencies [4c03d9a]
+- Updated dependencies [1eece3e]
+- Updated dependencies [fa8e948]
+- Updated dependencies [83bf560]
+- Updated dependencies [d9cc4d8]
+- Updated dependencies [1882366]
+  - @modern-js/builder-rspack-provider@2.31.0
+  - @modern-js/builder-webpack-provider@2.31.0
+  - @modern-js/builder-shared@2.31.0
+  - @modern-js/prod-server@2.31.0
+  - @modern-js/core@2.31.0
+  - @modern-js/builder@2.31.0
+  - @modern-js/utils@2.31.0
+  - @modern-js/builder-plugin-node-polyfill@2.31.0
+  - @modern-js/builder-plugin-esbuild@2.31.0
+  - @modern-js/server@2.31.0
+  - @modern-js/plugin-data-loader@2.31.0
+  - @modern-js/plugin-lint@2.31.0
+  - @modern-js/plugin-i18n@2.31.0
+  - @modern-js/new-action@2.31.0
+  - @modern-js/server-core@2.31.0
+  - @modern-js/node-bundle-require@2.31.0
+  - @modern-js/plugin@2.31.0
+  - @modern-js/upgrade@2.31.0
+  - @modern-js/types@2.31.0
+
 ## 2.30.0
 
 ### Patch Changes

package/dist/cjs/analyze/getHtmlTemplate.js

@@ -38,6 +38,7 @@ const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
   const { source: { configDir } } = config;
   const htmlDir = _path.default.resolve(appDirectory, configDir || "", _constants.HTML_PARTIALS_FOLDER);
   const htmlTemplates = {};
+  const partialsByEntrypoint = {};
   for (const entrypoint of entrypoints) {
     const { entryName, isMainEntry } = entrypoint;
     const name = entrypoints.length === 1 && isMainEntry ? "" : entryName;
@@ -67,11 +68,16 @@ const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
       const templatePath = _path.default.resolve(internalDirectory, entryName, "index.html");
       _utils.fs.outputFileSync(templatePath, _templates.html(partials), "utf8");
       htmlTemplates[entryName] = templatePath;
+      partialsByEntrypoint[entryName] = partials;
       const bottomTemplate = findPartials(htmlDir, name, PartialPosition.BOTTOM);
       if (bottomTemplate) {
         htmlTemplates[`__${entryName}-bottom__`] = bottomTemplate.content;
       }
     }
   }
+  api.setAppContext({
+    ...api.useAppContext(),
+    partialsByEntrypoint
+  });
   return htmlTemplates;
 };

package/dist/cjs/analyze/nestedRoutes.js

@@ -66,8 +66,7 @@ const optimizeRoute = (routeTree) => {
     ];
   }
   const { children } = routeTree;
-  const hasPage = children.some((child) => child.index);
-  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !hasPage) {
+  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config) {
     const newRoutes = children.map((child) => {
       const routePath = `${routeTree.path ? routeTree.path : ""}${child.path ? `/${child.path}` : ""}`;
       const newRoute = {

package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js

@@ -31,7 +31,7 @@ const builderPluginAdapterSSR = (options) => ({
     api.modifyBundlerChain(async (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
       const builderConfig = api.getNormalizedConfig();
       const { normalizedConfig: normalizedConfig2 } = options;
-      applyRouterPlugin(chain, options);
+      applyRouterPlugin(chain, options, HtmlBundlerPlugin);
       if ((0, _utils.isSSR)(normalizedConfig2)) {
         await applySSRLoaderEntry(chain, options, isServer);
         applySSRDataLoader(chain, options);
@@ -80,7 +80,7 @@ function applyAsyncChunkHtmlPlugin({ chain, modernConfig, CHAIN_ID, HtmlBundlerP
     ]);
   }
 }
-function applyRouterPlugin(chain, options) {
+function applyRouterPlugin(chain, options, HtmlBundlerPlugin) {
   var _normalizedConfig_runtime, _normalizedConfig, _routerConfig, _normalizedConfig_deploy_worker;
   const { appContext, normalizedConfig } = options;
   const { entrypoints } = appContext;
@@ -89,7 +89,17 @@ function applyRouterPlugin(chain, options) {
   const routerManifest = Boolean((_routerConfig = routerConfig) === null || _routerConfig === void 0 ? void 0 : _routerConfig.manifest);
   const workerSSR = Boolean((_normalizedConfig_deploy_worker = normalizedConfig.deploy.worker) === null || _normalizedConfig_deploy_worker === void 0 ? void 0 : _normalizedConfig_deploy_worker.ssr);
   if (existNestedRoutes || routerManifest || workerSSR) {
-    chain.plugin("route-plugin").use(_bundlerPlugins.RouterPlugin);
+    var _normalizedConfig_output_distPath, _normalizedConfig_output, _normalizedConfig_output1, _normalizedConfig_html, _normalizedConfig_security;
+    chain.plugin("route-plugin").use(_bundlerPlugins.RouterPlugin, [
+      {
+        HtmlBundlerPlugin,
+        enableInlineRouteManifests: normalizedConfig.output.enableInlineRouteManifests,
+        staticJsDir: (_normalizedConfig_output = normalizedConfig.output) === null || _normalizedConfig_output === void 0 ? void 0 : (_normalizedConfig_output_distPath = _normalizedConfig_output.distPath) === null || _normalizedConfig_output_distPath === void 0 ? void 0 : _normalizedConfig_output_distPath.js,
+        disableFilenameHash: (_normalizedConfig_output1 = normalizedConfig.output) === null || _normalizedConfig_output1 === void 0 ? void 0 : _normalizedConfig_output1.disableFilenameHash,
+        scriptLoading: (_normalizedConfig_html = normalizedConfig.html) === null || _normalizedConfig_html === void 0 ? void 0 : _normalizedConfig_html.scriptLoading,
+        nonce: (_normalizedConfig_security = normalizedConfig.security) === null || _normalizedConfig_security === void 0 ? void 0 : _normalizedConfig_security.nonce
+      }
+    ]);
   }
 }
 function applyFilterEntriesBySSRConfig({ isProd, chain, appNormalizedConfig }) {

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

@@ -8,13 +8,15 @@ Object.defineProperty(exports, "RouterPlugin", {
     return RouterPlugin;
   }
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+const _define_property = require("@swc/helpers/_/_define_property");
+const _crypto = require("crypto");
 const _lodash = require("@modern-js/utils/lodash");
 const _utils = require("@modern-js/utils");
 const _constants = require("@modern-js/utils/universal/constants");
-const _esbuild = require("esbuild");
 const PLUGIN_NAME = "ModernjsRoutePlugin";
+const generateContentHash = (content) => {
+  return (0, _crypto.createHash)("md5").update(content).digest("hex").slice(0, 8);
+};
 class RouterPlugin {
   isTargetNodeOrWebWorker(target) {
     if (target === "node" || Array.isArray(target) && target.includes("node")) {
@@ -48,76 +50,23 @@ class RouterPlugin {
     }
     const { webpack } = compiler;
     const { Compilation, sources } = webpack;
-    const { RawSource, SourceMapSource } = sources;
+    const { RawSource } = sources;
     const normalizePath = (path) => {
       if (!path.endsWith("/")) {
         return `${path}/`;
       }
       return path;
     };
-    const chunkToSource = /* @__PURE__ */ new Map();
-    const chunkToMap = /* @__PURE__ */ new Map();
-    const { minimize } = compiler.options.optimization;
+    const chunksToHtmlName = /* @__PURE__ */ new Map();
+    const ROUTE_MANIFEST_HOLDER = `route-manifest`;
+    const placeholder = `<!--<?- ${ROUTE_MANIFEST_HOLDER} ?>-->`;
     compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
-      compilation.hooks.processAssets.tapPromise({
-        name: PLUGIN_NAME,
-        stage: Compilation.PROCESS_ASSETS_STAGE_DEV_TOOLING
-      }, async () => {
-        const stats = compilation.getStats().toJson({
-          all: false,
-          chunkGroups: true,
-          chunks: true,
-          ids: true
-        });
-        const { chunks = [], namedChunkGroups } = stats;
-        if (!namedChunkGroups) {
-          return;
-        }
-        const entryChunks = this.getEntryChunks(compilation, chunks);
-        const entryChunkFiles = entryChunks.map((chunk) => [
-          ...chunk.files || []
-        ].find((fname) => fname.includes(".js")));
-        const entryChunkFileIds = entryChunks.map((chunk) => chunk.id);
-        for (let i = 0; i <= entryChunkFiles.length - 1; i++) {
-          const file = entryChunkFiles[i];
-          const chunkId = entryChunkFileIds[i];
-          const asset = compilation.assets[file];
-          if (!asset) {
-            continue;
-          }
-          const { map } = asset.sourceAndMap();
-          chunkToMap.set(chunkId, map);
-        }
-      });
-      compilation.hooks.processAssets.tapPromise({
-        name: PLUGIN_NAME,
-        stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER
-      }, async () => {
-        const stats = compilation.getStats().toJson({
-          all: false,
-          chunkGroups: true,
-          chunks: true,
-          ids: true
-        });
-        const { chunks = [], namedChunkGroups } = stats;
-        if (!namedChunkGroups) {
-          return;
-        }
-        const entryChunks = this.getEntryChunks(compilation, chunks);
-        const entryChunkFiles = entryChunks.map((chunk) => [
-          ...chunk.files || []
-        ].find((fname) => fname.includes(".js")));
-        const entryChunkFileIds = entryChunks.map((chunk) => chunk.id);
-        for (let i = 0; i <= entryChunkFiles.length - 1; i++) {
-          const file = entryChunkFiles[i];
-          const chunkId = entryChunkFileIds[i];
-          const asset = compilation.assets[file];
-          if (!asset) {
-            continue;
-          }
-          const { source } = asset.sourceAndMap();
-          chunkToSource.set(chunkId, source);
-        }
+      this.HtmlBundlerPlugin.getHooks(compilation).beforeEmit.tapAsync("RouterManifestPlugin", (data, callback) => {
+        const { outputName } = data;
+        const { chunks } = data.plugin.options;
+        chunksToHtmlName.set(chunks, outputName);
+        data.html = data.html.replace("</script>", `</script>${placeholder}`);
+        callback(null, data);
       });
       compilation.hooks.processAssets.tapPromise({
         name: PLUGIN_NAME,
@@ -164,11 +113,12 @@ class RouterPlugin {
         const manifest = {
           routeAssets
         };
+        const entryNames = Array.from(compilation.entrypoints.keys());
         const entryChunks = this.getEntryChunks(compilation, chunks);
         const entryChunkFiles = this.getEntryChunkFiles(entryChunks);
         const entryChunkFileIds = entryChunks.map((chunk) => chunk.id);
         for (let i = 0; i < entryChunkFiles.length; i++) {
-          var _source, _source1;
+          const entryName = entryNames[i];
           const file = entryChunkFiles[i];
           const chunkNames = entryChunks[i].names;
           const chunkId = entryChunkFileIds[i];
@@ -204,21 +154,39 @@ class RouterPlugin {
           })};
             })();
           `;
-          const source = chunkToSource.get(chunkId);
-          const map = chunkToMap.get(chunkId);
-          const newContent = `${injectedContent}${(_source = source) === null || _source === void 0 ? void 0 : _source.toString()}`;
-          const result = await (0, _esbuild.transform)(newContent, {
-            loader: _path.default.extname(file).slice(1),
-            sourcemap: true,
-            minify: minimize
-          });
-          const newSource = new SourceMapSource(result.code, file, result.map, (_source1 = source) === null || _source1 === void 0 ? void 0 : _source1.toString(), map);
-          compilation.updateAsset(
-            file,
-            newSource,
-            // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
-            void 0
-          );
+          let htmlName;
+          for (const [chunks2, name] of chunksToHtmlName.entries()) {
+            if (Array.isArray(chunkNames) && Array.isArray(chunks2) && chunkNames.every((value, index) => value === chunks2[index])) {
+              htmlName = name;
+              break;
+            }
+          }
+          const oldHtml = compilation.assets[htmlName];
+          const { enableInlineRouteManifests, disableFilenameHash, staticJsDir, scriptLoading, nonce } = this;
+          const nonceAttr = nonce ? `nonce="${nonce}"` : "";
+          if (enableInlineRouteManifests) {
+            compilation.updateAsset(
+              htmlName,
+              new RawSource(oldHtml.source().toString().replace(placeholder, `<script ${nonceAttr}>${injectedContent}</script>`)),
+              // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
+              void 0
+            );
+          } else {
+            const scriptPath = `${staticJsDir}/${ROUTE_MANIFEST_HOLDER}-${entryName}${disableFilenameHash ? ".js" : `.${generateContentHash(injectedContent)}.js`}`;
+            const scriptUrl = `${publicPath}${scriptPath}`;
+            const scriptLoadingAttr = (
+              // eslint-disable-next-line no-nested-ternary
+              scriptLoading === "defer" ? scriptLoading : scriptLoading === "module" ? `type="module"` : ""
+            );
+            const script = `<script ${scriptLoadingAttr} ${nonceAttr} src="${scriptUrl}"></script>`;
+            compilation.updateAsset(
+              htmlName,
+              new RawSource(oldHtml.source().toString().replace(placeholder, script)),
+              // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
+              void 0
+            );
+            compilation.emitAsset(scriptPath, new RawSource(injectedContent));
+          }
         }
         if (prevManifestAsset) {
           compilation.updateAsset(
@@ -233,4 +201,18 @@ class RouterPlugin {
       });
     });
   }
+  constructor({ staticJsDir = "static/js", HtmlBundlerPlugin, enableInlineRouteManifests, disableFilenameHash = false, scriptLoading = "defer", nonce }) {
+    _define_property._(this, "HtmlBundlerPlugin", void 0);
+    _define_property._(this, "enableInlineRouteManifests", void 0);
+    _define_property._(this, "staticJsDir", void 0);
+    _define_property._(this, "disableFilenameHash", void 0);
+    _define_property._(this, "scriptLoading", void 0);
+    _define_property._(this, "nonce", void 0);
+    this.HtmlBundlerPlugin = HtmlBundlerPlugin;
+    this.enableInlineRouteManifests = enableInlineRouteManifests;
+    this.staticJsDir = staticJsDir;
+    this.disableFilenameHash = disableFilenameHash;
+    this.scriptLoading = scriptLoading;
+    this.nonce = nonce;
+  }
 }

package/dist/cjs/config/default.js

@@ -30,7 +30,8 @@ function createDefaultConfig(appContext, bundler) {
   };
   const output = {
     ...defaultBuilderConfig.output,
-    disableNodePolyfill: true
+    disableNodePolyfill: true,
+    enableInlineRouteManifests: true
   };
   const source = {
     ...defaultBuilderConfig.source,

package/dist/cjs/schema/index.js

@@ -108,6 +108,9 @@ const output = {
   },
   disableNodePolyfill: {
     type: "boolean"
+  },
+  enableInlineRouteManifests: {
+    type: "boolean"
   }
 };
 const dev = {};

package/dist/cjs/types/config/testing.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/types/legacyConfig/testing.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/esm/analyze/getHtmlTemplate.js

@@ -1,4 +1,6 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { _ as _ts_values } from "@swc/helpers/_/_ts_values";
 import path from "path";
@@ -30,7 +32,7 @@ var findPartials = function(dir, entryName, position) {
 };
 export var getHtmlTemplate = function() {
   var _ref = _async_to_generator(function(entrypoints, api, param) {
-    var appContext, config, appDirectory, internalDirectory, configDir, htmlDir, htmlTemplates, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step, err;
+    var appContext, config, appDirectory, internalDirectory, configDir, htmlDir, htmlTemplates, partialsByEntrypoint, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step, err;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -39,6 +41,7 @@ export var getHtmlTemplate = function() {
           configDir = config.source.configDir;
           htmlDir = path.resolve(appDirectory, configDir || "", HTML_PARTIALS_FOLDER);
           htmlTemplates = {};
+          partialsByEntrypoint = {};
           _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
           _state.label = 1;
         case 1:
@@ -95,6 +98,7 @@ export var getHtmlTemplate = function() {
                   templatePath = path.resolve(internalDirectory, entryName, "index.html");
                   fs.outputFileSync(templatePath, templates.html(partials), "utf8");
                   htmlTemplates[entryName] = templatePath;
+                  partialsByEntrypoint[entryName] = partials;
                   bottomTemplate = findPartials(htmlDir, name, PartialPosition.BOTTOM);
                   if (bottomTemplate) {
                     htmlTemplates["__".concat(entryName, "-bottom__")] = bottomTemplate.content;
@@ -155,6 +159,9 @@ export var getHtmlTemplate = function() {
             7
           ];
         case 8:
+          api.setAppContext(_object_spread_props(_object_spread({}, api.useAppContext()), {
+            partialsByEntrypoint: partialsByEntrypoint
+          }));
           return [
             2,
             htmlTemplates

package/dist/esm/analyze/nestedRoutes.js

@@ -45,10 +45,7 @@ export var optimizeRoute = function(routeTree) {
     ];
   }
   var children = routeTree.children;
-  var hasPage = children.some(function(child) {
-    return child.index;
-  });
-  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !hasPage) {
+  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config) {
     var newRoutes = children.map(function(child) {
       var routePath = "".concat(routeTree.path ? routeTree.path : "").concat(child.path ? "/".concat(child.path) : "");
       var newRoute = _object_spread_props(_object_spread({}, child), {

package/dist/esm/builder/shared/builderPlugins/adapterSSR.js

@@ -29,7 +29,7 @@ export var builderPluginAdapterSSR = function(options) {
                 target = param.target, CHAIN_ID = param.CHAIN_ID, isProd = param.isProd, HtmlBundlerPlugin = param.HtmlPlugin, isServer = param.isServer;
                 builderConfig = api.getNormalizedConfig();
                 normalizedConfig2 = options.normalizedConfig;
-                applyRouterPlugin(chain, options);
+                applyRouterPlugin(chain, options, HtmlBundlerPlugin);
                 if (!isSSR(normalizedConfig2))
                   return [
                     3,
@@ -118,7 +118,7 @@ function applyAsyncChunkHtmlPlugin(param) {
     ]);
   }
 }
-function applyRouterPlugin(chain, options) {
+function applyRouterPlugin(chain, options, HtmlBundlerPlugin) {
   var _normalizedConfig_runtime, _normalizedConfig, _routerConfig, _normalizedConfig_deploy_worker;
   var appContext = options.appContext, normalizedConfig = options.normalizedConfig;
   var entrypoints = appContext.entrypoints;
@@ -129,7 +129,17 @@ function applyRouterPlugin(chain, options) {
   var routerManifest = Boolean((_routerConfig = routerConfig) === null || _routerConfig === void 0 ? void 0 : _routerConfig.manifest);
   var workerSSR = Boolean((_normalizedConfig_deploy_worker = normalizedConfig.deploy.worker) === null || _normalizedConfig_deploy_worker === void 0 ? void 0 : _normalizedConfig_deploy_worker.ssr);
   if (existNestedRoutes || routerManifest || workerSSR) {
-    chain.plugin("route-plugin").use(RouterPlugin);
+    var _normalizedConfig_output_distPath, _normalizedConfig_output, _normalizedConfig_output1, _normalizedConfig_html, _normalizedConfig_security;
+    chain.plugin("route-plugin").use(RouterPlugin, [
+      {
+        HtmlBundlerPlugin: HtmlBundlerPlugin,
+        enableInlineRouteManifests: normalizedConfig.output.enableInlineRouteManifests,
+        staticJsDir: (_normalizedConfig_output = normalizedConfig.output) === null || _normalizedConfig_output === void 0 ? void 0 : (_normalizedConfig_output_distPath = _normalizedConfig_output.distPath) === null || _normalizedConfig_output_distPath === void 0 ? void 0 : _normalizedConfig_output_distPath.js,
+        disableFilenameHash: (_normalizedConfig_output1 = normalizedConfig.output) === null || _normalizedConfig_output1 === void 0 ? void 0 : _normalizedConfig_output1.disableFilenameHash,
+        scriptLoading: (_normalizedConfig_html = normalizedConfig.html) === null || _normalizedConfig_html === void 0 ? void 0 : _normalizedConfig_html.scriptLoading,
+        nonce: (_normalizedConfig_security = normalizedConfig.security) === null || _normalizedConfig_security === void 0 ? void 0 : _normalizedConfig_security.nonce
+      }
+    ]);
   }
 }
 function applyFilterEntriesBySSRConfig(param) {