@modern-js/app-tools 2.3.1-alpha.1 → 2.4.0

package/dist/js/node/builder/{loaders/routerLoader.js → generator/getBuilderTargets.js}

@@ -15,24 +15,21 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var routerLoader_exports = {};
-__export(routerLoader_exports, {
-  default: () => routerLoader_default
+var getBuilderTargets_exports = {};
+__export(getBuilderTargets_exports, {
+  getBuilderTargets: () => getBuilderTargets
 });
-module.exports = __toCommonJS(routerLoader_exports);
+module.exports = __toCommonJS(getBuilderTargets_exports);
 var import_utils = require("@modern-js/utils");
-function loader(source) {
-  this.cacheable();
-  const { target } = this._compiler.options;
-  if (target === "node" || Array.isArray(target) && target.includes("node")) {
-    return source;
+function getBuilderTargets(normalizedConfig) {
+  const targets = ["web"];
+  const useNodeTarget = (0, import_utils.isProd)() ? (0, import_utils.isUseSSRBundle)(normalizedConfig) : (0, import_utils.isSSR)(normalizedConfig);
+  if (useNodeTarget) {
+    targets.push("node");
   }
-  const { resourcePath } = this;
-  const code = `
-    export { default } from "${(0, import_utils.slash)(resourcePath)}";
-  `;
-  return code;
+  return targets;
 }
-var routerLoader_default = loader;
 // Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+0 && (module.exports = {
+  getBuilderTargets
+});

package/dist/js/node/builder/generator/index.js

@@ -0,0 +1,82 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+var generator_exports = {};
+__export(generator_exports, {
+  generateBuilder: () => generateBuilder
+});
+module.exports = __toCommonJS(generator_exports);
+var import_builder = require("@modern-js/builder");
+var import_createBuilderProviderConfig = require("./createBuilderProviderConfig");
+var import_getBuilderTargets = require("./getBuilderTargets");
+var import_createBuilderOptions = require("./createBuilderOptions");
+function generateBuilder(options, generateProvider, utils) {
+  return __async(this, null, function* () {
+    const { normalizedConfig, appContext } = options;
+    const { modifyBuilderConfig, modifyBuilderInstance } = utils || {};
+    const builderConfig = (0, import_createBuilderProviderConfig.createBuilderProviderConfig)(
+      normalizedConfig,
+      appContext,
+      modifyBuilderConfig
+    );
+    const provider = generateProvider({
+      builderConfig
+    });
+    const target = (0, import_getBuilderTargets.getBuilderTargets)(normalizedConfig);
+    const builderOptions = (0, import_createBuilderOptions.createBuilderOptions)(target, appContext);
+    const builder = yield (0, import_builder.createBuilder)(provider, builderOptions);
+    yield applyBuilderPlugins(builder, options);
+    yield modifyBuilderInstance == null ? void 0 : modifyBuilderInstance(builder);
+    return builder;
+  });
+}
+function applyBuilderPlugins(builder, options) {
+  return __async(this, null, function* () {
+    const { builderPluginAdapterModern } = yield Promise.resolve().then(() => __toESM(require("../shared/builderPlugins/adapterModern")));
+    builder.addPlugins([builderPluginAdapterModern(options)]);
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  generateBuilder
+});

package/dist/js/node/builder/index.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -60,118 +43,26 @@ var __async = (__this, __arguments, generator) => {
 };
 var builder_exports = {};
 __export(builder_exports, {
-  createBuilderForModern: () => createBuilderForModern,
-  createBuilderOptions: () => createBuilderOptions,
-  createBuilderProviderConfig: () => createBuilderProviderConfig
+  createBuilderGenerator: () => createBuilderGenerator
 });
 module.exports = __toCommonJS(builder_exports);
-var import_builder = require("@modern-js/builder");
-var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
-var import_utils = require("@modern-js/utils");
-var import_compatModern = require("./builderPlugins/compatModern");
-var import_share = require("./share");
-function getBuilderTargets(normalizedConfig) {
-  const targets = ["web"];
-  const useNodeTarget = (0, import_utils.isProd)() ? (0, import_utils.isUseSSRBundle)(normalizedConfig) : (0, import_utils.isSSR)(normalizedConfig);
-  if (useNodeTarget) {
-    targets.push("node");
-  }
-  return targets;
-}
-function createBuilderForModern(_0) {
-  return __async(this, arguments, function* ({
-    normalizedConfig,
-    appContext,
-    compatPluginConfig
-  }) {
-    const builderConfig = createBuilderProviderConfig(
-      normalizedConfig,
-      appContext
-    );
-    const webpackProvider = (0, import_builder_webpack_provider.builderWebpackProvider)({
-      builderConfig
-    });
-    const target = getBuilderTargets(normalizedConfig);
-    const builderOptions = createBuilderOptions(target, appContext);
-    const builder = yield (0, import_builder.createBuilder)(webpackProvider, builderOptions);
-    yield applyBuilderPlugins(
-      builder,
-      normalizedConfig,
-      appContext,
-      compatPluginConfig
-    );
-    return builder;
-  });
-}
-function createBuilderProviderConfig(normalizedConfig, appContext) {
-  const output = createOutputConfig(normalizedConfig, appContext);
-  const htmlConfig = __spreadValues({}, normalizedConfig.html);
-  if (!htmlConfig.template) {
-    htmlConfig.templateByEntries = __spreadValues(__spreadValues({}, htmlConfig.templateByEntries), appContext.htmlTemplates);
-  }
-  return __spreadProps(__spreadValues({}, normalizedConfig), {
-    output,
-    dev: __spreadProps(__spreadValues({}, normalizedConfig.dev), {
-      port: appContext.port
-    }),
-    html: htmlConfig
-  });
-  function createOutputConfig(config, appContext2) {
-    const defaultCopyPattern = (0, import_share.createCopyPattern)(appContext2, config, "upload");
-    const { copy } = config.output;
-    const copyOptions = Array.isArray(copy) ? copy : copy == null ? void 0 : copy.patterns;
-    const builderCopy = [...copyOptions || [], defaultCopyPattern];
-    return __spreadProps(__spreadValues({}, config.output), {
-      copy: builderCopy,
-      cleanDistPath: false
-    });
-  }
-}
-function createBuilderOptions(target, appContext) {
-  const entries = {};
-  const { entrypoints = [], checkedEntries } = appContext;
-  for (const { entryName, entry } of entrypoints) {
-    if (checkedEntries && !checkedEntries.includes(entryName)) {
-      continue;
-    }
-    if (entryName in entries) {
-      entries[entryName].push(entry);
-    } else {
-      entries[entryName] = [entry];
-    }
-  }
-  return {
-    cwd: appContext.appDirectory,
-    target,
-    configPath: appContext.configFile || void 0,
-    entry: entries,
-    framework: appContext.metaName
-  };
-}
-function applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig) {
+function createBuilderGenerator(bundler) {
   return __async(this, null, function* () {
-    if (!normalizedConfig.output.disableNodePolyfill) {
-      const { builderPluginNodePolyfill } = yield Promise.resolve().then(() => __toESM(require("@modern-js/builder-plugin-node-polyfill")));
-      builder.addPlugins([builderPluginNodePolyfill()]);
-    }
-    if (normalizedConfig.tools.esbuild) {
-      const { esbuild: esbuildOptions } = normalizedConfig.tools;
-      const { builderPluginEsbuild } = yield Promise.resolve().then(() => __toESM(require("@modern-js/builder-plugin-esbuild")));
-      builder.addPlugins([
-        builderPluginEsbuild({
-          loader: false,
-          minimize: (0, import_utils.applyOptionsChain)({}, esbuildOptions)
-        })
-      ]);
+    if (bundler === "rspack") {
+      try {
+        const { createRspackBuilderForModern } = yield Promise.resolve().then(() => __toESM(require("./builder-rspack")));
+        return createRspackBuilderForModern;
+      } catch (_) {
+        throw new Error(
+          "Failed to use rspack, please check if you have `@modern-js/builder-rspack-provider` installed"
+        );
+      }
     }
-    builder.addPlugins([
-      (0, import_compatModern.PluginCompatModern)(appContext, normalizedConfig, compatPluginConfig)
-    ]);
+    const { createWebpackBuilderForModern } = yield Promise.resolve().then(() => __toESM(require("./builder-webpack")));
+    return createWebpackBuilderForModern;
   });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createBuilderForModern,
-  createBuilderOptions,
-  createBuilderProviderConfig
+  createBuilderGenerator
 });

package/dist/js/node/builder/{builderPlugins/compatModern.js → shared/builderPlugins/adapterModern.js}

@@ -38,25 +38,39 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var compatModern_exports = {};
-__export(compatModern_exports, {
-  PluginCompatModern: () => PluginCompatModern
+var adapterModern_exports = {};
+__export(adapterModern_exports, {
+  applyCallbacks: () => applyCallbacks,
+  builderPluginAdapterModern: () => builderPluginAdapterModern
 });
-module.exports = __toCommonJS(compatModern_exports);
-var import_path = require("path");
+module.exports = __toCommonJS(adapterModern_exports);
 var import_builder_shared = require("@modern-js/builder-shared");
-var import_lodash = require("@modern-js/utils/lodash");
-var import_html_webpack_plugin = __toESM(require("@modern-js/builder-webpack-provider/html-webpack-plugin"));
 var import_utils = require("@modern-js/utils");
-var import_htmlBottomTemplate = require("../webpackPlugins/htmlBottomTemplate");
-var import_htmlAsyncChunkPlugin = require("../webpackPlugins/htmlAsyncChunkPlugin");
-var import_share = require("../share");
-var import_routerPlugin = __toESM(require("../webpackPlugins/routerPlugin"));
-const PluginCompatModern = (appContext, modernConfig, options) => ({
-  name: "builder-plugin-compat-modern",
+var import_html_webpack_plugin = __toESM(require("@modern-js/builder-webpack-provider/html-webpack-plugin"));
+var import_lodash = require("@modern-js/utils/lodash");
+var import_HtmlAsyncChunkPlugin = require("../bundlerPlugins/HtmlAsyncChunkPlugin");
+var import_HtmlBottomTemplate = require("../bundlerPlugins/HtmlBottomTemplate");
+const isStreamingSSR = (userConfig) => {
+  const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
+  const { server } = userConfig;
+  if (isStreaming(server.ssr)) {
+    return true;
+  }
+  if ((server == null ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
+    for (const name of Object.keys(server.ssrByEntries)) {
+      if (isStreaming(server.ssrByEntries[name])) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
+const builderPluginAdapterModern = (options) => ({
+  name: "builder-plugin-adapter-modern",
   setup(api) {
+    const { normalizedConfig, appContext } = options;
     api.modifyBuilderConfig((config) => {
-      if (isStreamingSSR(modernConfig)) {
+      if (isStreamingSSR(normalizedConfig)) {
         return (0, import_builder_shared.mergeBuilderConfig)(config, {
           html: {
             inject: "body"
@@ -65,9 +79,8 @@ const PluginCompatModern = (appContext, modernConfig, options) => ({
       }
       return config;
     });
-    api.modifyWebpackChain((chain, { target, CHAIN_ID, isProd }) => {
-      var _a;
-      const builderNormalizedConfig = api.getNormalizedConfig();
+    api.modifyBundlerChain((chain, { target, CHAIN_ID, isProd }) => {
+      const builderConfig = api.getNormalizedConfig();
       if (target === "node") {
         chain.name("server");
       } else if (target === "modern-web") {
@@ -75,61 +88,33 @@ const PluginCompatModern = (appContext, modernConfig, options) => ({
       } else {
         chain.name("client");
       }
-      chain.resolve.modules.add("node_modules").add((0, import_path.join)(api.context.rootPath, "node_modules"));
       if (target === "node") {
-        applyNodeCompat(chain, modernConfig, isProd);
+        applyNodeCompat(chain, normalizedConfig, isProd);
       }
-      if (isHtmlEnabled(builderNormalizedConfig, target)) {
-        applyBottomHtmlWebpackPlugin({
+      if (isHtmlEnabled(builderConfig, target)) {
+        applyBottomHtmlPlugin({
           api,
           chain,
-          CHAIN_ID,
+          modernConfig: normalizedConfig,
           appContext,
-          modernConfig
+          CHAIN_ID
         });
         applyAsyncChunkHtmlPlugin({
           chain,
-          CHAIN_ID,
-          modernConfig
+          modernConfig: normalizedConfig,
+          CHAIN_ID
         });
       }
-      if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
-        const defaultCopyPattern = (0, import_share.createCopyPattern)(
-          appContext,
-          modernConfig,
-          "public",
-          chain
-        );
-        chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
-          var _a2;
-          return [
-            {
-              patterns: [...((_a2 = args[0]) == null ? void 0 : _a2.patterns) || [], defaultCopyPattern]
-            }
-          ];
-        });
-      }
-      const { entrypoints } = appContext;
-      const existNestedRoutes = entrypoints.some(
-        (entrypoint) => entrypoint.nestedRoutesEntry
-      );
-      const routerConfig = (_a = modernConfig == null ? void 0 : modernConfig.runtime) == null ? void 0 : _a.router;
-      const routerManifest = Boolean(routerConfig == null ? void 0 : routerConfig.manifest);
-      if (existNestedRoutes || routerManifest) {
-        chain.plugin("route-plugin").use(import_routerPlugin.default);
-      }
       if (target !== "node") {
         const bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
         chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
         chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));
       }
-      function isHtmlEnabled(config, target2) {
-        var _a2;
-        return ((_a2 = config.tools) == null ? void 0 : _a2.htmlPlugin) !== false && target2 !== "node" && target2 !== "web-worker";
-      }
     });
-    if (options) {
-      applyCallbacks(api, options);
+    applyCallbacks(api, options);
+    function isHtmlEnabled(config, target) {
+      var _a;
+      return ((_a = config.tools) == null ? void 0 : _a.htmlPlugin) !== false && target !== "node" && target !== "web-worker";
     }
   }
 });
@@ -143,6 +128,49 @@ function applyCallbacks(api, options) {
   options.onDevCompileDone && api.onDevCompileDone(options.onDevCompileDone);
   options.onExit && api.onExit(options.onExit);
 }
+function applyBottomHtmlPlugin({
+  api,
+  chain,
+  modernConfig,
+  appContext,
+  CHAIN_ID
+}) {
+  for (const entryName of Object.keys(api.context.entry)) {
+    const baseTemplateParams = __spreadValues({
+      entryName,
+      title: (0, import_utils.getEntryOptions)(
+        entryName,
+        modernConfig.html.title,
+        modernConfig.html.titleByEntries,
+        appContext.packageName
+      ),
+      mountId: modernConfig.html.mountId
+    }, (0, import_utils.getEntryOptions)(
+      entryName,
+      modernConfig.html.templateParameters,
+      modernConfig.html.templateParametersByEntries,
+      appContext.packageName
+    ));
+    chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap((args) => [
+      __spreadProps(__spreadValues({}, args[0] || {}), {
+        __internal__: true,
+        bottomTemplate: appContext.htmlTemplates[`__${entryName}-bottom__`] && (0, import_lodash.template)(appContext.htmlTemplates[`__${entryName}-bottom__`])(
+          baseTemplateParams
+        )
+      })
+    ]);
+  }
+  chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(import_HtmlBottomTemplate.BottomTemplatePlugin, [import_html_webpack_plugin.default]);
+}
+function applyAsyncChunkHtmlPlugin({
+  chain,
+  modernConfig,
+  CHAIN_ID
+}) {
+  if (isStreamingSSR(modernConfig)) {
+    chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(import_HtmlAsyncChunkPlugin.HtmlAsyncChunkPlugin, [import_html_webpack_plugin.default]);
+  }
+}
 function applyNodeCompat(chain, modernConfig, isProd) {
   for (const ext of [
     ".node.js",
@@ -194,65 +222,8 @@ function applyNodeCompat(chain, modernConfig, isProd) {
     });
   }
 }
-function applyBottomHtmlWebpackPlugin({
-  api,
-  chain,
-  modernConfig,
-  appContext,
-  CHAIN_ID
-}) {
-  for (const entryName of Object.keys(api.context.entry)) {
-    const baseTemplateParams = __spreadValues({
-      entryName,
-      title: (0, import_utils.getEntryOptions)(
-        entryName,
-        modernConfig.html.title,
-        modernConfig.html.titleByEntries,
-        appContext.packageName
-      ),
-      mountId: modernConfig.html.mountId
-    }, (0, import_utils.getEntryOptions)(
-      entryName,
-      modernConfig.html.templateParameters,
-      modernConfig.html.templateParametersByEntries,
-      appContext.packageName
-    ));
-    chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap((args) => [
-      __spreadProps(__spreadValues({}, args[0] || {}), {
-        __internal__: true,
-        bottomTemplate: appContext.htmlTemplates[`__${entryName}-bottom__`] && (0, import_lodash.template)(appContext.htmlTemplates[`__${entryName}-bottom__`])(
-          baseTemplateParams
-        )
-      })
-    ]);
-  }
-  chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(import_htmlBottomTemplate.BottomTemplatePlugin, [import_html_webpack_plugin.default]);
-}
-const isStreamingSSR = (userConfig) => {
-  const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
-  const { server } = userConfig;
-  if (isStreaming(server.ssr)) {
-    return true;
-  }
-  if ((server == null ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
-    for (const name of Object.keys(server.ssrByEntries)) {
-      if (isStreaming(server.ssrByEntries[name])) {
-        return true;
-      }
-    }
-  }
-  return false;
-};
-function applyAsyncChunkHtmlPlugin({
-  chain,
-  modernConfig,
-  CHAIN_ID
-}) {
-  if (isStreamingSSR(modernConfig)) {
-    chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(import_htmlAsyncChunkPlugin.HtmlAsyncChunkPlugin, [import_html_webpack_plugin.default]);
-  }
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  PluginCompatModern
+  applyCallbacks,
+  builderPluginAdapterModern
 });

package/dist/js/node/builder/{webpackPlugins/htmlAsyncChunkPlugin.js → shared/bundlerPlugins/HtmlAsyncChunkPlugin.js}

@@ -15,36 +15,33 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var htmlAsyncChunkPlugin_exports = {};
-__export(htmlAsyncChunkPlugin_exports, {
+var HtmlAsyncChunkPlugin_exports = {};
+__export(HtmlAsyncChunkPlugin_exports, {
   HtmlAsyncChunkPlugin: () => HtmlAsyncChunkPlugin
 });
-module.exports = __toCommonJS(htmlAsyncChunkPlugin_exports);
+module.exports = __toCommonJS(HtmlAsyncChunkPlugin_exports);
 class HtmlAsyncChunkPlugin {
   constructor(htmlWebpackPlugin) {
     this.name = "HtmlAsyncChunkPlugin";
     this.htmlWebpackPlugin = htmlWebpackPlugin;
   }
   apply(compiler) {
-    compiler.hooks.compilation.tap(
-      this.name,
-      (compilation) => {
-        const hooks = this.htmlWebpackPlugin.getHooks(compilation);
-        hooks.alterAssetTagGroups.tap(this.name, (assets) => {
-          const tags = [...assets.headTags, ...assets.bodyTags];
-          for (const tag of tags) {
-            if (tag.tagName === "script") {
-              const { attributes } = tag;
-              if (attributes && attributes.defer === true) {
-                attributes.async = true;
-                delete attributes.defer;
-              }
+    compiler.hooks.compilation.tap(this.name, (compilation) => {
+      const hooks = this.htmlWebpackPlugin.getHooks(compilation);
+      hooks.alterAssetTagGroups.tap(this.name, (assets) => {
+        const tags = [...assets.headTags, ...assets.bodyTags];
+        for (const tag of tags) {
+          if (tag.tagName === "script") {
+            const { attributes } = tag;
+            if (attributes && attributes.defer === true) {
+              attributes.async = true;
+              delete attributes.defer;
             }
           }
-          return assets;
-        });
-      }
-    );
+        }
+        return assets;
+      });
+    });
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/js/node/builder/{webpackPlugins/htmlBottomTemplate.js → shared/bundlerPlugins/HtmlBottomTemplate.js}

@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var htmlBottomTemplate_exports = {};
-__export(htmlBottomTemplate_exports, {
+var HtmlBottomTemplate_exports = {};
+__export(HtmlBottomTemplate_exports, {
   BottomTemplatePlugin: () => BottomTemplatePlugin
 });
-module.exports = __toCommonJS(htmlBottomTemplate_exports);
+module.exports = __toCommonJS(HtmlBottomTemplate_exports);
 class BottomTemplatePlugin {
   constructor(htmlWebpackPlugin) {
     this.bottomTemplateReg = /<!--<\?-\s*bottomTemplate\s*\?>-->/;
@@ -28,30 +28,27 @@ class BottomTemplatePlugin {
     this.name = "bottom-template";
   }
   apply(compiler) {
-    compiler.hooks.compilation.tap(
-      this.name,
-      (compilation) => {
-        this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(this.name, (data) => {
-          var _a;
-          if (!((_a = data.plugin.options) == null ? void 0 : _a.__internal__)) {
-            return data;
-          }
-          if (this.bottomTemplateReg.test(data.html)) {
-            data.html = data.html.replace(this.bottomTemplateReg, "");
-            const { bottomTemplate } = data.plugin.options;
-            if (bottomTemplate) {
-              data.html = data.html.replace(
-                this.bodyRegExp,
-                (match) => `
+    compiler.hooks.compilation.tap(this.name, (compilation) => {
+      this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(this.name, (data) => {
+        var _a;
+        if (!((_a = data.plugin.options) == null ? void 0 : _a.__internal__)) {
+          return data;
+        }
+        if (this.bottomTemplateReg.test(data.html)) {
+          data.html = data.html.replace(this.bottomTemplateReg, "");
+          const { bottomTemplate } = data.plugin.options;
+          if (bottomTemplate) {
+            data.html = data.html.replace(
+              this.bodyRegExp,
+              (match) => `
 ${bottomTemplate}
 ${match}`
-              );
-            }
+            );
           }
-          return data;
-        });
-      }
-    );
+        }
+        return data;
+      });
+    });
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/js/node/builder/{share.js → shared/createCopyPattern.js}

@@ -21,11 +21,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var share_exports = {};
-__export(share_exports, {
+var createCopyPattern_exports = {};
+__export(createCopyPattern_exports, {
   createCopyPattern: () => createCopyPattern
 });
-module.exports = __toCommonJS(share_exports);
+module.exports = __toCommonJS(createCopyPattern_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 function createCopyPattern(appContext, config, patternsType, chain) {