@modern-js/app-tools 2.15.0 → 2.16.0

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

@@ -1,48 +1,64 @@
-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(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var adapterSSR_exports = {};
-__export(adapterSSR_exports, {
-  builderPluginAdapterSSR: () => builderPluginAdapterSSR
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(adapterSSR_exports);
-var path = __toESM(require("path"));
-var import_builder_shared = require("@modern-js/builder-shared");
-var import_utils = require("@modern-js/utils");
-var import_bundlerPlugins = require("../bundlerPlugins");
-var import_utils2 = require("../../../analyze/utils");
-var import_adapterHtml = require("./adapterHtml");
+Object.defineProperty(exports, "builderPluginAdapterSSR", {
+  enumerable: true,
+  get: () => builderPluginAdapterSSR
+});
+const _path = /* @__PURE__ */ _interop_require_wildcard(require("path"));
+const _buildershared = require("@modern-js/builder-shared");
+const _utils = require("@modern-js/utils");
+const _bundlerPlugins = require("../bundlerPlugins");
+const _utils1 = require("../../../analyze/utils");
+const _adapterHtml = require("./adapterHtml");
+function _getRequireWildcardCache(nodeInterop) {
+  if (typeof WeakMap !== "function")
+    return null;
+  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
+  return (_getRequireWildcardCache = function(nodeInterop2) {
+    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
+  })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+  if (!nodeInterop && obj && obj.__esModule) {
+    return obj;
+  }
+  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+    return {
+      default: obj
+    };
+  }
+  var cache = _getRequireWildcardCache(nodeInterop);
+  if (cache && cache.has(obj)) {
+    return cache.get(obj);
+  }
+  var newObj = {};
+  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+  for (var key in obj) {
+    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+      if (desc && (desc.get || desc.set)) {
+        Object.defineProperty(newObj, key, desc);
+      } else {
+        newObj[key] = obj[key];
+      }
+    }
+  }
+  newObj.default = obj;
+  if (cache) {
+    cache.set(obj, newObj);
+  }
+  return newObj;
+}
 const builderPluginAdapterSSR = (options) => ({
   name: "builder-plugin-adapter-modern-ssr",
   setup(api) {
     const { normalizedConfig } = options;
     api.modifyBuilderConfig((config) => {
       if (isStreamingSSR(normalizedConfig)) {
-        return (0, import_builder_shared.mergeBuilderConfig)(config, {
+        return (0, _buildershared.mergeBuilderConfig)(config, {
           html: {
             inject: "body"
           }
@@ -50,32 +66,33 @@ const builderPluginAdapterSSR = (options) => ({
       }
       return config;
     });
-    api.modifyBundlerChain(
-      async (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
-        const builderConfig = api.getNormalizedConfig();
-        const { normalizedConfig: normalizedConfig2 } = options;
-        applyRouterPlugin(chain, options);
-        if ((0, import_utils.isSSR)(normalizedConfig2)) {
-          await applySSRLoaderEntry(chain, options, isServer);
-          applySSRDataLoader(chain, options);
-        }
-        if (["node", "service-worker"].includes(target)) {
-          applyFilterEntriesBySSRConfig({
-            isProd,
-            chain,
-            appNormalizedConfig: normalizedConfig2
-          });
-        }
-        if ((0, import_adapterHtml.isHtmlEnabled)(builderConfig, target)) {
-          applyAsyncChunkHtmlPlugin({
-            chain,
-            modernConfig: options.normalizedConfig,
-            CHAIN_ID,
-            HtmlBundlerPlugin
-          });
-        }
+    api.modifyBundlerChain(async (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
+      const builderConfig = api.getNormalizedConfig();
+      const { normalizedConfig: normalizedConfig2 } = options;
+      applyRouterPlugin(chain, options);
+      if ((0, _utils.isSSR)(normalizedConfig2)) {
+        await applySSRLoaderEntry(chain, options, isServer);
+        applySSRDataLoader(chain, options);
+      }
+      if ([
+        "node",
+        "service-worker"
+      ].includes(target)) {
+        applyFilterEntriesBySSRConfig({
+          isProd,
+          chain,
+          appNormalizedConfig: normalizedConfig2
+        });
       }
-    );
+      if ((0, _adapterHtml.isHtmlEnabled)(builderConfig, target)) {
+        applyAsyncChunkHtmlPlugin({
+          chain,
+          modernConfig: options.normalizedConfig,
+          CHAIN_ID,
+          HtmlBundlerPlugin
+        });
+      }
+    });
   }
 });
 const isStreamingSSR = (userConfig) => {
@@ -84,7 +101,7 @@ const isStreamingSSR = (userConfig) => {
   if (isStreaming(server.ssr)) {
     return true;
   }
-  if ((server == null ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
+  if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
     for (const name of Object.keys(server.ssrByEntries)) {
       if (isStreaming(server.ssrByEntries[name])) {
         return true;
@@ -93,51 +110,40 @@ const isStreamingSSR = (userConfig) => {
   }
   return false;
 };
-function applyAsyncChunkHtmlPlugin({
-  chain,
-  modernConfig,
-  CHAIN_ID,
-  HtmlBundlerPlugin
-}) {
+function applyAsyncChunkHtmlPlugin({ chain, modernConfig, CHAIN_ID, HtmlBundlerPlugin }) {
   if (isStreamingSSR(modernConfig)) {
-    chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(import_bundlerPlugins.HtmlAsyncChunkPlugin, [HtmlBundlerPlugin]);
+    chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(_bundlerPlugins.HtmlAsyncChunkPlugin, [
+      HtmlBundlerPlugin
+    ]);
   }
 }
 function applyRouterPlugin(chain, options) {
-  var _a;
+  var _normalizedConfig_runtime;
   const { appContext, normalizedConfig } = options;
   const { entrypoints } = appContext;
-  const existNestedRoutes = entrypoints.some(
-    (entrypoint) => entrypoint.nestedRoutesEntry
-  );
-  const routerConfig = (_a = normalizedConfig == null ? void 0 : normalizedConfig.runtime) == null ? void 0 : _a.router;
-  const routerManifest = Boolean(routerConfig == null ? void 0 : routerConfig.manifest);
+  const existNestedRoutes = entrypoints.some((entrypoint) => entrypoint.nestedRoutesEntry);
+  const routerConfig = normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_runtime = normalizedConfig.runtime) === null || _normalizedConfig_runtime === void 0 ? void 0 : _normalizedConfig_runtime.router;
+  const routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
   if (existNestedRoutes || routerManifest) {
-    chain.plugin("route-plugin").use(import_bundlerPlugins.RouterPlugin);
+    chain.plugin("route-plugin").use(_bundlerPlugins.RouterPlugin);
   }
 }
-function applyFilterEntriesBySSRConfig({
-  isProd,
-  chain,
-  appNormalizedConfig
-}) {
-  var _a;
+function applyFilterEntriesBySSRConfig({ isProd, chain, appNormalizedConfig }) {
+  var _ref;
   const { server: serverConfig, output: outputConfig } = appNormalizedConfig;
   const entries = chain.entryPoints.entries();
-  if (isProd && ((outputConfig == null ? void 0 : outputConfig.ssg) === true || typeof ((_a = outputConfig == null ? void 0 : outputConfig.ssg) == null ? void 0 : _a[0]) === "function")) {
+  if (isProd && ((outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg) === true || typeof ((_ref = outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg) === null || _ref === void 0 ? void 0 : _ref[0]) === "function")) {
     return;
   }
   if (typeof entries === "undefined") {
-    throw new Error(
-      "No entry found, one of src/routes/layout.tsx, src/App.tsx, src/index.tsx is required"
-    );
+    throw new Error("No entry found, one of src/routes/layout.tsx, src/App.tsx, src/index.tsx is required");
   }
   const entryNames = Object.keys(entries);
-  if (isProd && entryNames.length === 1 && (outputConfig == null ? void 0 : outputConfig.ssg)) {
+  if (isProd && entryNames.length === 1 && (outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg)) {
     return;
   }
   const ssgEntries = [];
-  if (isProd && (outputConfig == null ? void 0 : outputConfig.ssg)) {
+  if (isProd && (outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg)) {
     const { ssg } = outputConfig;
     entryNames.forEach((name) => {
       if (ssg[name]) {
@@ -147,7 +153,7 @@ function applyFilterEntriesBySSRConfig({
   }
   const { ssr, ssrByEntries } = serverConfig || {};
   entryNames.forEach((name) => {
-    if (!ssgEntries.includes(name) && (ssr && (ssrByEntries == null ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries == null ? void 0 : ssrByEntries[name]))) {
+    if (!ssgEntries.includes(name) && (ssr && (ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]))) {
       chain.entryPoints.delete(name);
     }
   });
@@ -156,32 +162,23 @@ async function applySSRLoaderEntry(chain, optinos, isServer) {
   const { appContext } = optinos;
   const { internalDirectory } = appContext;
   const { entrypoints } = appContext;
-  await Promise.all(
-    entrypoints.map(async (entrypoint) => {
-      const { entryName } = entrypoint;
-      const serverLoadersFile = (0, import_utils2.getServerCombinedModueFile)(
-        internalDirectory,
-        entryName
-      );
-      if (isServer) {
-        try {
-          await import_utils.fs.access(serverLoadersFile, import_utils.fs.constants.F_OK);
-          chain.entry(`${entryName}-server-loaders`).add(serverLoadersFile);
-        } catch (err) {
-        }
+  await Promise.all(entrypoints.map(async (entrypoint) => {
+    const { entryName } = entrypoint;
+    const serverLoadersFile = (0, _utils1.getServerCombinedModueFile)(internalDirectory, entryName);
+    if (isServer) {
+      try {
+        await _utils.fs.access(serverLoadersFile, _utils.fs.constants.F_OK);
+        chain.entry(`${entryName}-server-loaders`).add(serverLoadersFile);
+      } catch (err) {
       }
-    })
-  );
+    }
+  }));
 }
 function applySSRDataLoader(chain, options) {
   const { normalizedConfig, appContext } = options;
   const { appDirectory } = appContext;
   const { entriesDir = "./src" } = normalizedConfig.source;
-  const absolutePath = path.resolve(appDirectory, entriesDir).split(path.sep).join("(\\\\|/)");
+  const absolutePath = _path.resolve(appDirectory, entriesDir).split(_path.sep).join("(\\\\|/)");
   const reg = new RegExp(`${absolutePath}.*\\.loader\\.[t|j]s$`);
   chain.module.rule("ssr-data-loader").test(reg).use("data-loader").loader(require.resolve("@modern-js/plugin-data-loader/loader")).end();
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  builderPluginAdapterSSR
-});

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

@@ -1,19 +1,20 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var builderPlugins_exports = {};
-module.exports = __toCommonJS(builderPlugins_exports);
-__reExport(builderPlugins_exports, require("./adapterBasic"), module.exports);
-__reExport(builderPlugins_exports, require("./adapterHtml"), module.exports);
-__reExport(builderPlugins_exports, require("./adapterSSR"), module.exports);
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+_export_star(require("./adapterBasic"), exports);
+_export_star(require("./adapterHtml"), exports);
+_export_star(require("./adapterSSR"), exports);
+function _export_star(from, to) {
+  Object.keys(from).forEach(function(k) {
+    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+      Object.defineProperty(to, k, {
+        enumerable: true,
+        get: function() {
+          return from[k];
+        }
+      });
+    }
+  });
+  return from;
+}

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

@@ -1,35 +1,33 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var HtmlAsyncChunkPlugin_exports = {};
-__export(HtmlAsyncChunkPlugin_exports, {
-  HtmlAsyncChunkPlugin: () => HtmlAsyncChunkPlugin
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(HtmlAsyncChunkPlugin_exports);
-class HtmlAsyncChunkPlugin {
-  constructor(htmlWebpackPlugin) {
-    this.name = "HtmlAsyncChunkPlugin";
-    this.htmlWebpackPlugin = htmlWebpackPlugin;
+Object.defineProperty(exports, "HtmlAsyncChunkPlugin", {
+  enumerable: true,
+  get: () => HtmlAsyncChunkPlugin
+});
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
   }
+  return obj;
+}
+class HtmlAsyncChunkPlugin {
   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];
+        const tags = [
+          ...assets.headTags,
+          ...assets.bodyTags
+        ];
         for (const tag of tags) {
           if (tag.tagName === "script") {
             const { attributes } = tag;
@@ -43,8 +41,10 @@ class HtmlAsyncChunkPlugin {
       });
     });
   }
+  constructor(htmlWebpackPlugin) {
+    _define_property(this, "name", void 0);
+    _define_property(this, "htmlWebpackPlugin", void 0);
+    this.name = "HtmlAsyncChunkPlugin";
+    this.htmlWebpackPlugin = htmlWebpackPlugin;
+  }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  HtmlAsyncChunkPlugin
-});

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

@@ -1,57 +1,51 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var HtmlBottomTemplate_exports = {};
-__export(HtmlBottomTemplate_exports, {
-  BottomTemplatePlugin: () => BottomTemplatePlugin
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(HtmlBottomTemplate_exports);
-class BottomTemplatePlugin {
-  constructor(htmlWebpackPlugin) {
-    this.bottomTemplateReg = /<!--<\?-\s*bottomTemplate\s*\?>-->/;
-    this.bodyRegExp = /(<\/\s*body\s*>)/i;
-    this.htmlWebpackPlugin = htmlWebpackPlugin;
-    this.name = "bottom-template";
+Object.defineProperty(exports, "BottomTemplatePlugin", {
+  enumerable: true,
+  get: () => BottomTemplatePlugin
+});
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
   }
+  return obj;
+}
+class BottomTemplatePlugin {
   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__)) {
+        var _data_plugin_options;
+        if (!((_data_plugin_options = data.plugin.options) === null || _data_plugin_options === void 0 ? void 0 : _data_plugin_options.__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) => `
+            data.html = data.html.replace(this.bodyRegExp, (match) => `
 ${bottomTemplate}
-${match}`
-            );
+${match}`);
           }
         }
         return data;
       });
     });
   }
+  constructor(htmlWebpackPlugin) {
+    _define_property(this, "htmlWebpackPlugin", void 0);
+    _define_property(this, "bottomTemplateReg", /<!--<\?-\s*bottomTemplate\s*\?>-->/);
+    _define_property(this, "bodyRegExp", /(<\/\s*body\s*>)/i);
+    _define_property(this, "name", void 0);
+    this.htmlWebpackPlugin = htmlWebpackPlugin;
+    this.name = "bottom-template";
+  }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BottomTemplatePlugin
-});