@modern-js/app-tools 2.6.0 → 2.7.1-alpha.0

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

@@ -1,32 +1,38 @@
+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));
+import { join } from "path";
 import {
   mergeBuilderConfig
 } from "@modern-js/builder-shared";
-import { getEntryOptions } from "@modern-js/utils";
-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",
+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",
   setup(api) {
-    const { normalizedConfig, appContext } = options;
     api.modifyBuilderConfig((config) => {
-      if (isStreamingSSR(normalizedConfig)) {
+      if (isStreamingSSR(modernConfig)) {
         return mergeBuilderConfig(config, {
           html: {
             inject: "body"
@@ -35,46 +41,71 @@ const builderPluginAdapterModern = (options) => ({
       }
       return config;
     });
-    api.modifyBundlerChain((chain, { target, CHAIN_ID, isProd }) => {
-      const builderConfig = api.getNormalizedConfig();
+    api.modifyWebpackChain((chain, { target, CHAIN_ID, isProd }) => {
+      var _a;
+      const builderNormalizedConfig = api.getNormalizedConfig();
       if (target === "node") {
         chain.name("server");
-      } else if (target === "service-worker") {
-        chain.name("service-worker");
-      } else if (target === "web-worker") {
-        chain.name("worker");
       } else if (target === "modern-web") {
         chain.name("modern");
       } else {
         chain.name("client");
       }
-      if (target === "node" || target === "service-worker") {
-        applyNodeCompat(target, chain, normalizedConfig, isProd);
+      chain.resolve.modules.add("node_modules").add(join(api.context.rootPath, "node_modules"));
+      if (target === "node") {
+        applyNodeCompat(chain, modernConfig, isProd);
       }
-      if (isHtmlEnabled(builderConfig, target)) {
-        applyBottomHtmlPlugin({
+      if (isHtmlEnabled(builderNormalizedConfig, target)) {
+        applyBottomHtmlWebpackPlugin({
           api,
           chain,
-          modernConfig: normalizedConfig,
+          CHAIN_ID,
           appContext,
-          CHAIN_ID
+          modernConfig
         });
         applyAsyncChunkHtmlPlugin({
           chain,
-          modernConfig: normalizedConfig,
-          CHAIN_ID
+          CHAIN_ID,
+          modernConfig
+        });
+      }
+      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]
+            }
+          ];
         });
       }
-      if (target !== "node" && target !== "web-worker" && target !== "service-worker") {
+      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";
+      }
     });
-    applyCallbacks(api, options);
-    function isHtmlEnabled(config, target) {
-      var _a;
-      return ((_a = config.tools) == null ? void 0 : _a.htmlPlugin) !== false && target !== "node" && target !== "service-worker" && target !== "web-worker";
+    if (options) {
+      applyCallbacks(api, options);
     }
   }
 });
@@ -88,53 +119,8 @@ 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 = {
-      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) => [
-      {
-        ...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(target, chain, modernConfig, isProd) {
-  const nodeExts = [
+function applyNodeCompat(chain, modernConfig, isProd) {
+  for (const ext of [
     ".node.js",
     ".node.jsx",
     ".node.ts",
@@ -143,21 +129,9 @@ function applyNodeCompat(target, chain, modernConfig, isProd) {
     ".server.ts",
     ".server.ts",
     ".server.tsx"
-  ];
-  const webWorkerExts = [
-    ".worker.js",
-    ".worker.jsx",
-    ".worker.ts",
-    ".worker.tsx"
-  ];
-  for (const ext of nodeExts) {
+  ]) {
     chain.resolve.extensions.prepend(ext);
   }
-  if (target === "service-worker") {
-    for (const ext of webWorkerExts) {
-      chain.resolve.extensions.prepend(ext);
-    }
-  }
   filterEntriesBySSRConfig(
     isProd,
     chain,
@@ -196,7 +170,64 @@ function applyNodeCompat(target, 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 {
-  applyCallbacks,
-  builderPluginAdapterModern
+  PluginCompatModern
 };

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

@@ -0,0 +1,159 @@
+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) => {
+      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());
+  });
+};
+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) {
+  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)
+        })
+      ]);
+    }
+    builder.addPlugins([
+      PluginCompatModern(appContext, normalizedConfig, compatPluginConfig)
+    ]);
+  });
+}
+export {
+  createBuilderForModern,
+  createBuilderOptions,
+  createBuilderProviderConfig
+};

package/dist/js/modern/builder/loaders/routerLoader.js

@@ -0,0 +1,17 @@
+import { slash } from "@modern-js/utils";
+function loader(source) {
+  this.cacheable();
+  const { target } = this._compiler.options;
+  if (target === "node" || Array.isArray(target) && target.includes("node")) {
+    return source;
+  }
+  const { resourcePath } = this;
+  const code = `
+    export { default } from "${slash(resourcePath)}";
+  `;
+  return code;
+}
+var routerLoader_default = loader;
+export {
+  routerLoader_default as default
+};

package/dist/js/modern/builder/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/builder/share.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/webpackPlugins/htmlAsyncChunkPlugin.js

@@ -0,0 +1,30 @@
+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/webpackPlugins/htmlBottomTemplate.js

@@ -0,0 +1,37 @@
+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
+};