@modern-js/app-tools 2.14.0 → 2.16.0

package/dist/cjs/commands/dev.js

@@ -1,44 +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 dev_exports = {};
-__export(dev_exports, {
-  dev: () => dev
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "dev", {
+  enumerable: true,
+  get: () => dev
 });
-module.exports = __toCommonJS(dev_exports);
-var import_core = require("@modern-js/core");
-var import_utils = require("@modern-js/utils");
-var import_printInstructions = require("../utils/printInstructions");
-var import_createServer = require("../utils/createServer");
-var import_routes = require("../utils/routes");
-var import_config = require("../utils/config");
-var import_getServerInternalPlugins = require("../utils/getServerInternalPlugins");
+const _core = require("@modern-js/core");
+const _utils = require("@modern-js/utils");
+const _printInstructions = require("../utils/printInstructions");
+const _createServer = require("../utils/createServer");
+const _routes = require("../utils/routes");
+const _config = require("../utils/config");
+const _getServerInternalPlugins = require("../utils/getServerInternalPlugins");
 const dev = async (api, options) => {
-  var _a, _b;
+  var _normalizedConfig_tools;
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
   let normalizedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  normalizedConfig = { ...normalizedConfig, cliOptions: options };
-  import_core.ResolvedConfigContext.set(normalizedConfig);
+  normalizedConfig = {
+    ...normalizedConfig,
+    cliOptions: options
+  };
+  _core.ResolvedConfigContext.set(normalizedConfig);
   const { appDirectory, distDirectory, port, apiOnly, serverConfigFile } = appContext;
-  await (0, import_config.buildServerConfig)({
+  await (0, _config.buildServerConfig)({
     appDirectory,
     distDirectory,
     configFile: serverConfigFile,
@@ -50,18 +39,16 @@ const dev = async (api, options) => {
   });
   await hookRunners.beforeDev();
   if (!appContext.builder && !apiOnly) {
-    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 (0, import_routes.generateRoutes)(appContext);
-  const serverInternalPlugins = await (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
+  await (0, _routes.generateRoutes)(appContext);
+  const serverInternalPlugins = await (0, _getServerInternalPlugins.getServerInternalPlugins)(api);
   const serverOptions = {
     dev: {
       port,
       https: normalizedConfig.dev.https,
       host: normalizedConfig.dev.host,
-      ...(_a = normalizedConfig.tools) == null ? void 0 : _a.devServer
+      ...(_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer
     },
     appContext: {
       appDirectory: appContext.appDirectory,
@@ -72,35 +59,29 @@ const dev = async (api, options) => {
     pwd: appDirectory,
     config: normalizedConfig,
     serverConfigFile,
-    internalPlugins: (0, import_createServer.injectDataLoaderPlugin)(serverInternalPlugins)
+    internalPlugins: (0, _createServer.injectDataLoaderPlugin)(serverInternalPlugins)
   };
   if (apiOnly) {
-    const app = await (0, import_createServer.createServer)({
+    var _normalizedConfig_dev;
+    const app = await (0, _createServer.createServer)({
       ...serverOptions,
       compiler: null
     });
-    const host = ((_b = normalizedConfig.dev) == null ? void 0 : _b.host) || import_utils.DEFAULT_DEV_HOST;
-    app.listen(
-      {
-        port,
-        host
-      },
-      async (err) => {
-        if (err) {
-          throw err;
-        }
-        (0, import_printInstructions.printInstructions)(hookRunners, appContext, normalizedConfig);
+    const host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || _utils.DEFAULT_DEV_HOST;
+    app.listen({
+      port,
+      host
+    }, async (err) => {
+      if (err) {
+        throw err;
       }
-    );
+      (0, _printInstructions.printInstructions)(hookRunners, appContext, normalizedConfig);
+    });
   } else {
     const { server } = await appContext.builder.startDevServer({
       printURLs: false,
       serverOptions
     });
-    (0, import_createServer.setServer)(server);
+    (0, _createServer.setServer)(server);
   }
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  dev
-});

package/dist/cjs/commands/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 commands_exports = {};
-module.exports = __toCommonJS(commands_exports);
-__reExport(commands_exports, require("./dev"), module.exports);
-__reExport(commands_exports, require("./build"), module.exports);
-__reExport(commands_exports, require("./serve"), module.exports);
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+_export_star(require("./dev"), exports);
+_export_star(require("./build"), exports);
+_export_star(require("./serve"), 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/commands/inspect.js

@@ -1,41 +1,21 @@
-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 inspect_exports = {};
-__export(inspect_exports, {
-  inspect: () => inspect
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(inspect_exports);
-var import_path = require("path");
+Object.defineProperty(exports, "inspect", {
+  enumerable: true,
+  get: () => inspect
+});
+const _path = require("path");
 const inspect = async (api, options) => {
   const appContext = api.useAppContext();
   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`");
   }
   return appContext.builder.inspectConfig({
     env: options.env,
     verbose: options.verbose,
-    outputPath: (0, import_path.join)(appContext == null ? void 0 : appContext.builder.context.distPath, options.output),
+    outputPath: (0, _path.join)(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
     writeToDisk: true
   });
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  inspect
-});

package/dist/cjs/commands/serve.js

@@ -1,91 +1,53 @@
-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 serve_exports = {};
-__export(serve_exports, {
-  start: () => start
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(serve_exports);
-var import_utils = require("@modern-js/utils");
-var import_prod_server = __toESM(require("@modern-js/prod-server"));
-var import_printInstructions = require("../utils/printInstructions");
-var import_createServer = require("../utils/createServer");
-var import_getServerInternalPlugins = require("../utils/getServerInternalPlugins");
+Object.defineProperty(exports, "start", {
+  enumerable: true,
+  get: () => start
+});
+const _utils = require("@modern-js/utils");
+const _prodserver = /* @__PURE__ */ _interop_require_default(require("@modern-js/prod-server"));
+const _printInstructions = require("../utils/printInstructions");
+const _createServer = require("../utils/createServer");
+const _getServerInternalPlugins = require("../utils/getServerInternalPlugins");
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
 const start = async (api) => {
-  var _a, _b;
+  var _userConfig_source, _userConfig_output_distPath;
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
   const { appDirectory, port, serverConfigFile } = appContext;
-  import_utils.logger.log(import_utils.chalk.cyan(`Starting the modern server...`));
-  const apiOnly = await (0, import_utils.isApiOnly)(
-    appContext.appDirectory,
-    (_a = userConfig == null ? void 0 : userConfig.source) == null ? void 0 : _a.entriesDir
-  );
-  const serverInternalPlugins = await (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
-  const app = await (0, import_prod_server.default)({
+  _utils.logger.log(_utils.chalk.cyan(`Starting the modern server...`));
+  const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir);
+  const serverInternalPlugins = await (0, _getServerInternalPlugins.getServerInternalPlugins)(api);
+  const app = await (0, _prodserver.default)({
     pwd: appDirectory,
     config: {
       ...userConfig,
       dev: userConfig.dev,
       output: {
-        path: (_b = userConfig.output.distPath) == null ? void 0 : _b.root,
+        path: (_userConfig_output_distPath = userConfig.output.distPath) === null || _userConfig_output_distPath === void 0 ? void 0 : _userConfig_output_distPath.root,
         ...userConfig.output || {}
       }
     },
     appContext: {
-      sharedDirectory: (0, import_utils.getTargetDir)(
-        appContext.sharedDirectory,
-        appContext.appDirectory,
-        appContext.distDirectory
-      ),
-      apiDirectory: (0, import_utils.getTargetDir)(
-        appContext.apiDirectory,
-        appContext.appDirectory,
-        appContext.distDirectory
-      ),
-      lambdaDirectory: (0, import_utils.getTargetDir)(
-        appContext.lambdaDirectory,
-        appContext.appDirectory,
-        appContext.distDirectory
-      )
+      sharedDirectory: (0, _utils.getTargetDir)(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
+      apiDirectory: (0, _utils.getTargetDir)(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
+      lambdaDirectory: (0, _utils.getTargetDir)(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
     },
     serverConfigFile,
-    internalPlugins: (0, import_createServer.injectDataLoaderPlugin)(serverInternalPlugins),
+    internalPlugins: (0, _createServer.injectDataLoaderPlugin)(serverInternalPlugins),
     apiOnly
   });
   app.listen(port, async (err) => {
     if (err) {
       throw err;
     }
-    await (0, import_printInstructions.printInstructions)(hookRunners, appContext, userConfig);
+    await (0, _printInstructions.printInstructions)(hookRunners, appContext, userConfig);
   });
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  start
-});

package/dist/cjs/config/default.js

@@ -1,30 +1,22 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _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 default_exports = {};
-__export(default_exports, {
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
   createDefaultConfig: () => createDefaultConfig,
   createLegacyDefaultConfig: () => createLegacyDefaultConfig
 });
-module.exports = __toCommonJS(default_exports);
-var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
-var import_env = require("../utils/env");
+const _builderwebpackprovider = require("@modern-js/builder-webpack-provider");
+const _env = require("../utils/env");
 function createDefaultConfig(appContext, bundler) {
-  const defaultBuilderConfig = (0, import_builder_webpack_provider.createDefaultConfig)();
+  const defaultBuilderConfig = (0, _builderwebpackprovider.createDefaultConfig)();
   const dev = {
     ...defaultBuilderConfig.dev,
     // `dev.port` should not have a default value
@@ -42,7 +34,7 @@ function createDefaultConfig(appContext, bundler) {
     disableDefaultEntries: false,
     entriesDir: "./src",
     configDir: "./config",
-    globalVars: (0, import_env.getAutoInjectEnv)(appContext),
+    globalVars: (0, _env.getAutoInjectEnv)(appContext),
     alias: {
       [appContext.internalDirAlias]: appContext.internalDirectory,
       [appContext.internalSrcAlias]: appContext.srcDirectory,
@@ -54,9 +46,14 @@ function createDefaultConfig(appContext, bundler) {
     ...defaultBuilderConfig.html,
     title: "",
     meta: {
-      charset: { charset: "utf-8" },
+      charset: {
+        charset: "utf-8"
+      },
       viewport: "width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no",
-      "http-equiv": { "http-equiv": "x-ua-compatible", content: "ie=edge" },
+      "http-equiv": {
+        "http-equiv": "x-ua-compatible",
+        content: "ie=edge"
+      },
       renderer: "webkit",
       layoutmode: "standard",
       imagemode: "force",
@@ -103,7 +100,7 @@ function createLegacyDefaultConfig(appContext) {
     configDir: "./config",
     apiDir: "./api",
     envVars: [],
-    globalVars: (0, import_env.getAutoInjectEnv)(appContext),
+    globalVars: (0, _env.getAutoInjectEnv)(appContext),
     alias: defaultAlias,
     moduleScopes: void 0,
     include: []
@@ -118,9 +115,14 @@ function createLegacyDefaultConfig(appContext) {
     title: "",
     titleByEntries: void 0,
     meta: {
-      charset: { charset: "utf-8" },
+      charset: {
+        charset: "utf-8"
+      },
       viewport: "width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no",
-      "http-equiv": { "http-equiv": "x-ua-compatible", content: "ie=edge" },
+      "http-equiv": {
+        "http-equiv": "x-ua-compatible",
+        content: "ie=edge"
+      },
       renderer: "webkit",
       layoutmode: "standard",
       imagemode: "force",
@@ -161,7 +163,10 @@ function createLegacyDefaultConfig(appContext) {
     baseUrl: "/",
     port: 8080
   };
-  const devDefaults = { assetPrefix: false, https: false };
+  const devDefaults = {
+    assetPrefix: false,
+    https: false
+  };
   const toolsDefaults = {
     webpack: void 0,
     babel: void 0,
@@ -183,8 +188,3 @@ function createLegacyDefaultConfig(appContext) {
     runtimeByEntries: {}
   };
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createDefaultConfig,
-  createLegacyDefaultConfig
-});

package/dist/cjs/config/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 config_exports = {};
-module.exports = __toCommonJS(config_exports);
-__reExport(config_exports, require("./legacy"), module.exports);
-__reExport(config_exports, require("./initialize"), module.exports);
-__reExport(config_exports, require("./default"), module.exports);
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+_export_star(require("./legacy"), exports);
+_export_star(require("./initialize"), exports);
+_export_star(require("./default"), 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/config/initialize/index.js

@@ -1,35 +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 initialize_exports = {};
-__export(initialize_exports, {
-  initialNormalizedConfig: () => initialNormalizedConfig
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "initialNormalizedConfig", {
+  enumerable: true,
+  get: () => initialNormalizedConfig
 });
-module.exports = __toCommonJS(initialize_exports);
-var import_inits = require("./inits");
+const _inits = require("./inits");
 function initialNormalizedConfig(config, appContext, bundler) {
-  (0, import_inits.initHtmlConfig)(config, appContext);
-  (0, import_inits.initSourceConfig)(config, appContext, bundler);
+  (0, _inits.initHtmlConfig)(config, appContext);
+  (0, _inits.initSourceConfig)(config, appContext, bundler);
   if (bundler === "webpack") {
-    (0, import_inits.initToolsConfig)(config);
+    (0, _inits.initToolsConfig)(config);
   }
   return config;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  initialNormalizedConfig
-});