@modern-js/app-tools 2.15.0 → 2.17.0

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

@@ -1,39 +1,20 @@
-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 RouterPlugin_exports = {};
-__export(RouterPlugin_exports, {
-  RouterPlugin: () => RouterPlugin
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "RouterPlugin", {
+  enumerable: true,
+  get: () => RouterPlugin
 });
-module.exports = __toCommonJS(RouterPlugin_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_constants = require("@modern-js/utils/constants");
-var import_constants2 = require("@modern-js/utils/universal/constants");
+const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _utils = require("@modern-js/utils");
+const _constants = require("@modern-js/utils/constants");
+const _constants1 = require("@modern-js/utils/universal/constants");
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
 const PLUGIN_NAME = "ModernjsRoutePlugin";
 class RouterPlugin {
   apply(compiler) {
@@ -50,97 +31,86 @@ class RouterPlugin {
     const { PROCESS_ASSETS_STAGE_REPORT } = Compilation;
     const outputPath = compiler.options.output.path;
     const newAssetsMap = /* @__PURE__ */ new Map();
-    const normalizePath = (path2) => {
-      if (!path2.endsWith("/")) {
-        return `${path2}/`;
+    const normalizePath = (path) => {
+      if (!path.endsWith("/")) {
+        return `${path}/`;
       }
-      return path2;
+      return path;
     };
     compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
-      compilation.hooks.processAssets.tapPromise(
-        {
-          name: PLUGIN_NAME,
-          stage: PROCESS_ASSETS_STAGE_REPORT
-        },
-        async () => {
-          const stats = compilation.getStats().toJson({
-            all: false,
-            publicPath: true,
-            assets: true,
-            chunkGroups: true,
-            chunks: true,
-            ids: true
+      compilation.hooks.processAssets.tapPromise({
+        name: PLUGIN_NAME,
+        stage: PROCESS_ASSETS_STAGE_REPORT
+      }, async () => {
+        const stats = compilation.getStats().toJson({
+          all: false,
+          publicPath: true,
+          assets: true,
+          chunkGroups: true,
+          chunks: true,
+          ids: true
+        });
+        const { publicPath, chunks = [], namedChunkGroups } = stats;
+        const routeAssets = {};
+        if (!namedChunkGroups) {
+          return;
+        }
+        for (const [name, chunkGroup] of Object.entries(namedChunkGroups)) {
+          const assets = chunkGroup.assets.map((asset) => {
+            const filename2 = asset.name;
+            return publicPath ? normalizePath(publicPath) + filename2 : filename2;
           });
-          const { publicPath, chunks = [], namedChunkGroups } = stats;
-          const routeAssets = {};
-          if (!namedChunkGroups) {
-            return;
-          }
-          for (const [name, chunkGroup] of Object.entries(namedChunkGroups)) {
-            const assets = chunkGroup.assets.map((asset) => {
-              const filename2 = asset.name;
-              return publicPath ? normalizePath(publicPath) + filename2 : filename2;
-            });
-            const referenceCssAssets = assets.filter(
-              (asset) => /\.css$/.test(asset)
-            );
-            routeAssets[name] = {
-              chunkIds: chunkGroup.chunks,
-              assets,
-              referenceCssAssets
-            };
-          }
-          const manifest = {
-            routeAssets
+          const referenceCssAssets = assets.filter((asset) => /\.css$/.test(asset));
+          routeAssets[name] = {
+            chunkIds: chunkGroup.chunks,
+            assets,
+            referenceCssAssets
           };
-          const injectedContent = `
+        }
+        const manifest = {
+          routeAssets
+        };
+        const injectedContent = `
             ;(function(){
-              window.${import_constants2.ROUTE_MANIFEST} = ${JSON.stringify(manifest, (k, v) => {
-            if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
-              return v.map((item) => {
-                return item.replace(publicPath, "");
-              });
-            }
-            return v;
-          })};
+              window.${_constants1.ROUTE_MANIFEST} = ${JSON.stringify(manifest, (k, v) => {
+          if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
+            return v.map((item) => {
+              return item.replace(publicPath, "");
+            });
+          }
+          return v;
+        })};
             })();
           `;
-          const entrypointsArray = Array.from(
-            compilation.entrypoints.entries()
-          );
-          const entryChunkIds = entrypointsArray.map(
-            (entrypoint) => entrypoint[0]
-          );
-          const entryChunks = [...chunks].filter((chunk) => {
-            var _a;
-            return (_a = chunk.names) == null ? void 0 : _a.some((name) => entryChunkIds.includes(name));
-          });
-          const entryChunkFiles = entryChunks.map(
-            (chunk) => [...chunk.files || []].find((fname) => fname.includes(".js"))
-          );
-          for (const file of entryChunkFiles) {
-            const asset = compilation.assets[file];
-            if (!asset) {
-              continue;
-            }
-            const newContent = `${injectedContent}${asset.source().toString()}`;
-            newAssetsMap.set(import_path.default.join(outputPath, file), newContent);
-            compilation.updateAsset(
-              file,
-              new RawSource(newContent),
-              // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
-              void 0
-            );
+        const entrypointsArray = Array.from(compilation.entrypoints.entries());
+        const entryChunkIds = entrypointsArray.map((entrypoint) => entrypoint[0]);
+        const entryChunks = [
+          ...chunks
+        ].filter((chunk) => {
+          var _chunk_names;
+          return (_chunk_names = chunk.names) === null || _chunk_names === void 0 ? void 0 : _chunk_names.some((name) => entryChunkIds.includes(name));
+        });
+        const entryChunkFiles = entryChunks.map((chunk) => [
+          ...chunk.files || []
+        ].find((fname) => fname.includes(".js")));
+        for (const file of entryChunkFiles) {
+          const asset = compilation.assets[file];
+          if (!asset) {
+            continue;
           }
-          const filename = import_path.default.join(outputPath, import_constants.ROUTE_MANIFEST_FILE);
-          await import_utils.fs.ensureFile(filename);
-          await import_utils.fs.writeFile(filename, JSON.stringify(manifest, null, 2));
+          const newContent = `${injectedContent}${asset.source().toString()}`;
+          newAssetsMap.set(_path.default.join(outputPath, file), newContent);
+          compilation.updateAsset(
+            file,
+            new RawSource(newContent),
+            // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
+            void 0
+          );
         }
-      );
+        const filename = _path.default.join(outputPath, _constants.ROUTE_MANIFEST_FILE);
+        await _utils.fs.ensureFile(filename);
+        await _utils.fs.writeFile(filename, JSON.stringify(manifest, null, 2));
+      });
     });
   }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  RouterPlugin
-});

package/dist/cjs/builder/shared/bundlerPlugins/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 bundlerPlugins_exports = {};
-module.exports = __toCommonJS(bundlerPlugins_exports);
-__reExport(bundlerPlugins_exports, require("./HtmlAsyncChunkPlugin"), module.exports);
-__reExport(bundlerPlugins_exports, require("./HtmlBottomTemplate"), module.exports);
-__reExport(bundlerPlugins_exports, require("./RouterPlugin"), module.exports);
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+_export_star(require("./HtmlAsyncChunkPlugin"), exports);
+_export_star(require("./HtmlBottomTemplate"), exports);
+_export_star(require("./RouterPlugin"), 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/createCopyInfo.js

@@ -1,50 +1,24 @@
-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 createCopyInfo_exports = {};
-__export(createCopyInfo_exports, {
-  createCopyInfo: () => createCopyInfo
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(createCopyInfo_exports);
-var import_path = __toESM(require("path"));
+Object.defineProperty(exports, "createCopyInfo", {
+  enumerable: true,
+  get: () => createCopyInfo
+});
+const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
 function createCopyInfo(appContext, config) {
-  const configDir = import_path.default.resolve(
-    appContext.appDirectory,
-    config.source.configDir || "./config"
-  );
-  const uploadDir = import_path.default.posix.join(configDir.replace(/\\/g, "/"), "upload");
-  const publicDir = import_path.default.posix.join(configDir.replace(/\\/g, "/"), "public");
+  const configDir = _path.default.resolve(appContext.appDirectory, config.source.configDir || "./config");
+  const uploadDir = _path.default.posix.join(configDir.replace(/\\/g, "/"), "upload");
+  const publicDir = _path.default.posix.join(configDir.replace(/\\/g, "/"), "public");
   return {
     configDir,
     uploadDir,
     publicDir
   };
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createCopyInfo
-});

package/dist/cjs/builder/shared/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 shared_exports = {};
-module.exports = __toCommonJS(shared_exports);
-__reExport(shared_exports, require("./types"), module.exports);
-__reExport(shared_exports, require("./builderPlugins"), module.exports);
-__reExport(shared_exports, require("./createCopyInfo"), module.exports);
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+_export_star(require("./types"), exports);
+_export_star(require("./builderPlugins"), exports);
+_export_star(require("./createCopyInfo"), 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/loaders/serverModuleLoader.js

@@ -1,28 +1,12 @@
-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 serverModuleLoader_exports = {};
-__export(serverModuleLoader_exports, {
-  default: () => serverModuleLoader_default
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: () => _default
 });
-module.exports = __toCommonJS(serverModuleLoader_exports);
 function loader() {
   return `module.exports = {}`;
 }
-var serverModuleLoader_default = loader;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+const _default = loader;

package/dist/cjs/builder/shared/types.js

@@ -1,15 +1,4 @@
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var types_exports = {};
-module.exports = __toCommonJS(types_exports);
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/commands/build.js

@@ -1,31 +1,17 @@
-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 build_exports = {};
-__export(build_exports, {
-  build: () => build
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(build_exports);
-var import_core = require("@modern-js/core");
-var import_utils = require("@modern-js/utils");
-var import_routes = require("../utils/routes");
-var import_config = require("../utils/config");
+Object.defineProperty(exports, "build", {
+  enumerable: true,
+  get: () => build
+});
+const _core = require("@modern-js/core");
+const _utils = require("@modern-js/utils");
+const _routes = require("../utils/routes");
+const _config = require("../utils/config");
 const build = async (api, options) => {
-  if (options == null ? void 0 : options.analyze) {
+  if (options === null || options === void 0 ? void 0 : options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
   let resolvedConfig = api.useResolvedConfigContext();
@@ -38,40 +24,37 @@ const build = async (api, options) => {
       // "null" bundlerConfigs
       bundlerConfigs: void 0
     });
-    await (0, import_config.buildServerConfig)({
+    await (0, _config.buildServerConfig)({
       appDirectory: appDirectory2,
       distDirectory: distDirectory2,
       configFile: serverConfigFile2
     });
-    await (0, import_routes.generateRoutes)(appContext);
+    await (0, _routes.generateRoutes)(appContext);
     await hookRunners.afterBuild({
       // "null" stats
       stats: void 0
     });
     return;
   }
-  resolvedConfig = { ...resolvedConfig, cliOptions: options };
-  import_core.ResolvedConfigContext.set(resolvedConfig);
+  resolvedConfig = {
+    ...resolvedConfig,
+    cliOptions: options
+  };
+  _core.ResolvedConfigContext.set(resolvedConfig);
   const { distDirectory, appDirectory, serverConfigFile } = appContext;
-  await (0, import_config.buildServerConfig)({
+  await (0, _config.buildServerConfig)({
     appDirectory,
     distDirectory,
     configFile: serverConfigFile
   });
   try {
-    import_utils.logger.info("Create a production build...\n");
+    _utils.logger.info("Create a production build...\n");
     if (!appContext.builder) {
-      throw new Error(
-        "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
-      );
+      throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
     }
     await appContext.builder.build();
   } catch (error) {
-    (0, import_utils.printBuildError)(error);
+    (0, _utils.printBuildError)(error);
     process.exit(1);
   }
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  build
-});

package/dist/cjs/commands/deploy.js

@@ -1,31 +1,13 @@
-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 deploy_exports = {};
-__export(deploy_exports, {
-  deploy: () => deploy
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "deploy", {
+  enumerable: true,
+  get: () => deploy
 });
-module.exports = __toCommonJS(deploy_exports);
 const deploy = async (api, options) => {
   const hookRunners = api.useHookRunners();
   await hookRunners.beforeDeploy(options);
   await hookRunners.afterDeploy(options);
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  deploy
-});