@modern-js/app-tools 2.3.1-alpha.2 → 2.5.0-alpha.0

package/dist/js/modern/builder/index.js

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-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 __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -37,123 +18,22 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import {
-  createBuilder
-} from "@modern-js/builder";
-import {
-  builderWebpackProvider
-} from "@modern-js/builder-webpack-provider";
-import {
-  applyOptionsChain,
-  isProd,
-  isSSR,
-  isUseSSRBundle
-} from "@modern-js/utils";
-import {
-  PluginCompatModern
-} from "./builderPlugins/compatModern";
-import { createCopyPattern } from "./share";
-function getBuilderTargets(normalizedConfig) {
-  const targets = ["web"];
-  const useNodeTarget = isProd() ? isUseSSRBundle(normalizedConfig) : 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 = builderWebpackProvider({
-      builderConfig
-    });
-    const target = getBuilderTargets(normalizedConfig);
-    const builderOptions = createBuilderOptions(target, appContext);
-    const builder = yield 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 = 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 import("@modern-js/builder-plugin-node-polyfill");
-      builder.addPlugins([builderPluginNodePolyfill()]);
-    }
-    if (normalizedConfig.tools.esbuild) {
-      const { esbuild: esbuildOptions } = normalizedConfig.tools;
-      const { builderPluginEsbuild } = yield import("@modern-js/builder-plugin-esbuild");
-      builder.addPlugins([
-        builderPluginEsbuild({
-          loader: false,
-          minimize: applyOptionsChain({}, esbuildOptions)
-        })
-      ]);
+    if (bundler === "rspack") {
+      try {
+        const { createRspackBuilderForModern } = yield import("./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([
-      PluginCompatModern(appContext, normalizedConfig, compatPluginConfig)
-    ]);
+    const { createWebpackBuilderForModern } = yield import("./builder-webpack");
+    return createWebpackBuilderForModern;
   });
 }
 export {
-  createBuilderForModern,
-  createBuilderOptions,
-  createBuilderProviderConfig
+  createBuilderGenerator
 };

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

@@ -17,22 +17,35 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { join } from "path";
 import {
   mergeBuilderConfig
 } from "@modern-js/builder-shared";
-import { template as lodashTemplate } from "@modern-js/utils/lodash";
-import HtmlWebpackPlugin from "@modern-js/builder-webpack-provider/html-webpack-plugin";
 import { getEntryOptions } from "@modern-js/utils";
-import { BottomTemplatePlugin } from "../webpackPlugins/htmlBottomTemplate";
-import { HtmlAsyncChunkPlugin } from "../webpackPlugins/htmlAsyncChunkPlugin";
-import { createCopyPattern } from "../share";
-import RouterPlugin from "../webpackPlugins/routerPlugin";
-const PluginCompatModern = (appContext, modernConfig, options) => ({
-  name: "builder-plugin-compat-modern",
+import HtmlWebpackPlugin from "@modern-js/builder-webpack-provider/html-webpack-plugin";
+import { template as lodashTemplate } from "@modern-js/utils/lodash";
+import { HtmlAsyncChunkPlugin } from "../bundlerPlugins/HtmlAsyncChunkPlugin";
+import { BottomTemplatePlugin } from "../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 mergeBuilderConfig(config, {
           html: {
             inject: "body"
@@ -41,9 +54,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") {
@@ -51,61 +63,33 @@ const PluginCompatModern = (appContext, modernConfig, options) => ({
       } else {
         chain.name("client");
       }
-      chain.resolve.modules.add("node_modules").add(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 = 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(RouterPlugin);
-      }
       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";
     }
   }
 });
@@ -119,6 +103,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: getEntryOptions(
+        entryName,
+        modernConfig.html.title,
+        modernConfig.html.titleByEntries,
+        appContext.packageName
+      ),
+      mountId: modernConfig.html.mountId
+    }, 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__`] && lodashTemplate(appContext.htmlTemplates[`__${entryName}-bottom__`])(
+          baseTemplateParams
+        )
+      })
+    ]);
+  }
+  chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(BottomTemplatePlugin, [HtmlWebpackPlugin]);
+}
+function applyAsyncChunkHtmlPlugin({
+  chain,
+  modernConfig,
+  CHAIN_ID
+}) {
+  if (isStreamingSSR(modernConfig)) {
+    chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(HtmlAsyncChunkPlugin, [HtmlWebpackPlugin]);
+  }
+}
 function applyNodeCompat(chain, modernConfig, isProd) {
   for (const ext of [
     ".node.js",
@@ -170,64 +197,7 @@ 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: getEntryOptions(
-        entryName,
-        modernConfig.html.title,
-        modernConfig.html.titleByEntries,
-        appContext.packageName
-      ),
-      mountId: modernConfig.html.mountId
-    }, 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__`] && lodashTemplate(appContext.htmlTemplates[`__${entryName}-bottom__`])(
-          baseTemplateParams
-        )
-      })
-    ]);
-  }
-  chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(BottomTemplatePlugin, [HtmlWebpackPlugin]);
-}
-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(HtmlAsyncChunkPlugin, [HtmlWebpackPlugin]);
-  }
-}
 export {
-  PluginCompatModern
+  applyCallbacks,
+  builderPluginAdapterModern
 };

package/dist/js/modern/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js

@@ -0,0 +1,27 @@
+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;
+            }
+          }
+        }
+        return assets;
+      });
+    });
+  }
+}
+export {
+  HtmlAsyncChunkPlugin
+};

package/dist/js/modern/builder/shared/bundlerPlugins/HtmlBottomTemplate.js

@@ -0,0 +1,34 @@
+class BottomTemplatePlugin {
+  constructor(htmlWebpackPlugin) {
+    this.bottomTemplateReg = /<!--<\?-\s*bottomTemplate\s*\?>-->/;
+    this.bodyRegExp = /(<\/\s*body\s*>)/i;
+    this.htmlWebpackPlugin = htmlWebpackPlugin;
+    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) => `
+${bottomTemplate}
+${match}`
+            );
+          }
+        }
+        return data;
+      });
+    });
+  }
+}
+export {
+  BottomTemplatePlugin
+};

package/dist/js/modern/builder/shared/createCopyPattern.js

@@ -0,0 +1,46 @@
+import path from "path";
+import { removeTailSlash } from "@modern-js/utils";
+function createCopyPattern(appContext, config, patternsType, chain) {
+  const configDir = path.resolve(
+    appContext.appDirectory,
+    config.source.configDir || "./config"
+  );
+  const uploadDir = path.posix.join(configDir.replace(/\\/g, "/"), "upload");
+  const publicDir = path.posix.join(configDir.replace(/\\/g, "/"), "public");
+  const minifiedJsRexExp = /\.min\.js/;
+  const info = (file) => ({
+    minimized: minifiedJsRexExp.test(file.sourceFilename)
+  });
+  if (patternsType === "public") {
+    if (!chain) {
+      throw new Error("expect get a webpackChain, but receive 'undefined'");
+    }
+    return {
+      info,
+      from: "**/*",
+      to: "public",
+      context: publicDir,
+      noErrorOnMissing: true,
+      transform: (content, absoluteFrom) => {
+        if (!/\.html?$/.test(absoluteFrom)) {
+          return content;
+        }
+        return content.toString("utf8").replace(
+          /<%=\s*assetPrefix\s*%>/g,
+          removeTailSlash(chain.output.get("publicPath"))
+        );
+      }
+    };
+  } else {
+    return {
+      info,
+      from: "**/*",
+      to: "upload",
+      context: uploadDir,
+      noErrorOnMissing: true
+    };
+  }
+}
+export {
+  createCopyPattern
+};

package/dist/js/modern/builder/shared/index.js

@@ -0,0 +1,3 @@
+export * from "./createCopyPattern";
+export * from "./types";
+export * from "./builderPlugins/adapterModern";

package/dist/js/modern/builder/shared/loaders/serverModuleLoader.js

@@ -0,0 +1,7 @@
+function loader() {
+  return `module.exports = {}`;
+}
+var serverModuleLoader_default = loader;
+export {
+  serverModuleLoader_default as default
+};

package/dist/js/modern/config/default.js

@@ -18,12 +18,11 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { createDefaultConfig as createDefaultBuilderConfig } from "@modern-js/builder-webpack-provider";
-function createDefaultConfig(appContext) {
+function createDefaultConfig(appContext, bundler) {
   const defaultBuilderConfig = createDefaultBuilderConfig();
   const dev = __spreadProps(__spreadValues({}, defaultBuilderConfig.dev), {
     port: void 0
   });
-  const tools = __spreadValues({}, defaultBuilderConfig.tools);
   const output = __spreadProps(__spreadValues({}, defaultBuilderConfig.output), {
     disableNodePolyfill: true
   });
@@ -61,6 +60,7 @@ function createDefaultConfig(appContext) {
     baseUrl: "/",
     port: 8080
   };
+  const tools = bundler === "webpack" ? __spreadValues({}, defaultBuilderConfig.tools) : void 0;
   return {
     source,
     output,

package/dist/js/modern/config/index.js

@@ -1,8 +1,3 @@
-import { createDefaultConfig, createLegacyDefaultConfig } from "./default";
-import { initialNormalizedConfig, checkIsLegacyConfig } from "./initial";
-export {
-  checkIsLegacyConfig,
-  createDefaultConfig,
-  createLegacyDefaultConfig,
-  initialNormalizedConfig
-};
+export * from "./legacy";
+export * from "./initialize";
+export * from "./default";

package/dist/js/modern/config/initialize/index.js

@@ -0,0 +1,12 @@
+import { initHtmlConfig, initSourceConfig, initToolsConfig } from "./inits";
+function initialNormalizedConfig(config, appContext, bundler) {
+  initHtmlConfig(config, appContext);
+  initSourceConfig(config, appContext, bundler);
+  if (bundler === "webpack") {
+    initToolsConfig(config);
+  }
+  return config;
+}
+export {
+  initialNormalizedConfig
+};

package/dist/js/modern/config/{initial → initialize}/inits.js

@@ -59,10 +59,12 @@ function initHtmlConfig(config, appContext) {
     return favicon || defaultFavicon || void 0;
   }
 }
-function initSourceConfig(config, appContext) {
+function initSourceConfig(config, appContext, bundler) {
   config.source.include = createBuilderInclude(config, appContext);
-  config.source.moduleScopes = createBuilderModuleScope(config);
   config.source.globalVars = createBuilderGlobalVars(config, appContext);
+  if (bundler === "webpack") {
+    config.source.moduleScopes = createBuilderModuleScope(config);
+  }
   function createBuilderGlobalVars(config2, appContext2) {
     const { globalVars = {} } = config2.source;
     const publicEnv = getAutoInjectEnv(appContext2);

package/dist/js/modern/config/legacy/createHtmlConfig.js

@@ -0,0 +1,35 @@
+function createHtmlConfig(config) {
+  const {
+    disableHtmlFolder,
+    favicon,
+    faviconByEntries,
+    inject,
+    injectByEntries,
+    meta,
+    metaByEntries,
+    mountId,
+    title,
+    titleByEntries,
+    templateParameters,
+    templateParametersByEntries,
+    crossorigin
+  } = config.output;
+  return {
+    disableHtmlFolder,
+    favicon,
+    faviconByEntries,
+    inject,
+    injectByEntries,
+    meta,
+    metaByEntries,
+    mountId,
+    title,
+    titleByEntries,
+    crossorigin,
+    templateParameters,
+    templateParametersByEntries
+  };
+}
+export {
+  createHtmlConfig
+};