@modern-js/app-tools 2.4.0 → 2.5.0

package/dist/cjs/initialize/index.js

@@ -0,0 +1,102 @@
+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, {
+  default: () => initialize_default
+});
+module.exports = __toCommonJS(initialize_exports);
+var import_utils = require("@modern-js/utils");
+var import_schema = require("../schema");
+var import_config = require("../config");
+var initialize_default = ({
+  bundler
+}) => ({
+  name: "@modern-js/plugin-initialize",
+  setup(api) {
+    const config = () => {
+      const appContext = api.useAppContext();
+      const userConfig = api.useConfigContext();
+      return (0, import_config.checkIsLegacyConfig)(userConfig) ? (0, import_config.createLegacyDefaultConfig)(appContext) : (0, import_config.createDefaultConfig)(appContext, bundler);
+    };
+    const validateSchema = () => {
+      const userConfig = api.useConfigContext();
+      const schemas = (0, import_config.checkIsLegacyConfig)(userConfig) ? import_schema.legacySchema : import_schema.schema;
+      return schemas.generate();
+    };
+    return {
+      config,
+      validateSchema,
+      async resolvedConfig({ resolved }) {
+        var _a;
+        let appContext = api.useAppContext();
+        const userConfig = api.useConfigContext();
+        const port = await getServerPort(resolved);
+        appContext = {
+          ...appContext,
+          port,
+          distDirectory: (0, import_utils.ensureAbsolutePath)(
+            appContext.distDirectory,
+            ((_a = resolved.output.distPath) == null ? void 0 : _a.root) || "dist"
+          )
+        };
+        api.setAppContext(appContext);
+        const normalizedConfig = (0, import_config.checkIsLegacyConfig)(resolved) ? (0, import_config.transformNormalizedConfig)(resolved) : resolved;
+        resolved._raw = userConfig;
+        resolved.server = {
+          ...normalizedConfig.server || {},
+          port
+        };
+        resolved.autoLoadPlugins = normalizedConfig.autoLoadPlugins || false;
+        stabilizeConfig(resolved, normalizedConfig, [
+          "source",
+          "bff",
+          "dev",
+          "html",
+          "output",
+          "tools",
+          "testing",
+          "plugins",
+          "builderPlugins",
+          "runtime",
+          "runtimeByEntries",
+          "deploy",
+          "performance"
+        ]);
+        if (bundler === "webpack") {
+          resolved.security = normalizedConfig.security || {};
+          resolved.experiments = normalizedConfig.experiments;
+        }
+        return { resolved };
+      }
+    };
+  }
+});
+function stabilizeConfig(resolve, config, keys) {
+  keys.forEach((key) => {
+    resolve[key] = config[key] || {};
+  });
+}
+async function getServerPort(config) {
+  const prodPort = config.server.port || 8080;
+  if ((0, import_utils.isDev)() && (0, import_utils.isDevCommand)()) {
+    return (0, import_utils.getPort)(config.dev.port || prodPort);
+  }
+  return prodPort;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/{js/node → cjs}/utils/config.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -38,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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());
-  });
-};
 var config_exports = {};
 __export(config_exports, {
   buildServerConfig: () => buildServerConfig,
@@ -70,22 +33,20 @@ var path = __toESM(require("path"));
 var import_node_bundle_require = require("@modern-js/node-bundle-require");
 var import_utils = require("@modern-js/utils");
 const defineServerConfig = (config) => config;
-const buildServerConfig = (_0) => __async(void 0, [_0], function* ({
+const buildServerConfig = async ({
   appDirectory,
   distDirectory,
   configFile,
   options
-}) {
-  const configFilePath = yield (0, import_utils.getServerConfig)(appDirectory, configFile);
-  const getOutputFile = (filepath) => __async(void 0, null, function* () {
-    return path.resolve(
-      distDirectory,
-      `${filepath.replace(
-        new RegExp(import_utils.CONFIG_FILE_EXTENSIONS.join("|")),
-        ""
-      )}.js`
-    );
-  });
+}) => {
+  const configFilePath = await (0, import_utils.getServerConfig)(appDirectory, configFile);
+  const getOutputFile = async (filepath) => path.resolve(
+    distDirectory,
+    `${filepath.replace(
+      new RegExp(import_utils.CONFIG_FILE_EXTENSIONS.join("|")),
+      ""
+    )}.js`
+  );
   if (configFilePath) {
     const configHelperFilePath = path.normalize(
       path.join(distDirectory, "./config-helper.js")
@@ -93,9 +54,10 @@ const buildServerConfig = (_0) => __async(void 0, [_0], function* ({
     const helperCode = `
       export const defineConfig = (config) => config;
     `;
-    yield import_utils.fs.ensureDir(distDirectory);
-    yield import_utils.fs.writeFile(configHelperFilePath, helperCode);
-    yield (0, import_node_bundle_require.bundle)(configFilePath, __spreadProps(__spreadValues({}, options), {
+    await import_utils.fs.ensureDir(distDirectory);
+    await import_utils.fs.writeFile(configHelperFilePath, helperCode);
+    await (0, import_node_bundle_require.bundle)(configFilePath, {
+      ...options,
       getOutputFile,
       esbuildPlugins: [
         {
@@ -114,9 +76,9 @@ const buildServerConfig = (_0) => __async(void 0, [_0], function* ({
           }
         }
       ]
-    }));
+    });
   }
-});
+};
 const safeReplacer = () => {
   const cache = [];
   const keyCache = [];
@@ -132,18 +94,18 @@ const safeReplacer = () => {
     return value;
   };
 };
-const emitResolvedConfig = (appDirectory, resolvedConfig) => __async(void 0, null, function* () {
+const emitResolvedConfig = async (appDirectory, resolvedConfig) => {
   var _a;
   const outputPath = path.join(
     appDirectory,
     ((_a = resolvedConfig.output.distPath) == null ? void 0 : _a.root) || "./dist",
     import_utils.OUTPUT_CONFIG_FILE
   );
-  yield import_utils.fs.writeJSON(outputPath, resolvedConfig, {
+  await import_utils.fs.writeJSON(outputPath, resolvedConfig, {
     spaces: 2,
     replacer: safeReplacer()
   });
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildServerConfig,

package/dist/{js/node → cjs}/utils/createServer.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -38,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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());
-  });
-};
 var createServer_exports = {};
 __export(createServer_exports, {
   closeServer: () => closeServer,
@@ -73,28 +36,29 @@ const getServer = () => server;
 const setServer = (newServer) => {
   server = newServer;
 };
-const closeServer = () => __async(void 0, null, function* () {
+const closeServer = async () => {
   if (server) {
-    yield server.close();
+    await server.close();
     server = null;
   }
-});
-const createServer = (options) => __async(void 0, null, function* () {
+};
+const createServer = async (options) => {
   if (server) {
-    yield server.close();
+    await server.close();
   }
   server = new import_server.Server(options);
-  const app = yield server.init();
+  const app = await server.init();
   return app;
-});
+};
 const injectDataLoaderPlugin = (internalPlugins) => {
   const DataLoaderPlugin = require.resolve("@modern-js/plugin-data-loader/server");
-  return __spreadProps(__spreadValues({}, internalPlugins), {
+  return {
+    ...internalPlugins,
     "@modern-js/plugin-data-loader": {
       path: DataLoaderPlugin,
       forced: true
     }
-  });
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/{js/node → cjs}/utils/generateWatchFiles.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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());
-  });
-};
 var generateWatchFiles_exports = {};
 __export(generateWatchFiles_exports, {
   addServerConfigToDeps: () => addServerConfigToDeps,
@@ -56,27 +36,25 @@ const getPackageConfig = (appDirectory, packageJsonConfig) => {
   );
   return json[packageJsonConfig != null ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
 };
-const addServerConfigToDeps = (dependencies, appDirectory, serverConfigFile) => __async(void 0, null, function* () {
-  const serverConfig = yield (0, import_utils.getServerConfig)(appDirectory, serverConfigFile);
+const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
+  const serverConfig = await (0, import_utils.getServerConfig)(appDirectory, serverConfigFile);
   if (serverConfig) {
     dependencies.push(serverConfig);
   }
-});
-function generateWatchFiles(appContext, configDir) {
-  return __async(this, null, function* () {
-    const { appDirectory, configFile } = appContext;
-    const configPath = import_path.default.join(appDirectory, configDir || "");
-    const dependencies = getPackageConfig(
-      appContext.appDirectory,
-      appContext.packageName
-    ) ? [import_path.default.resolve(appDirectory, "./package.json")] : [];
-    yield addServerConfigToDeps(
-      dependencies,
-      appContext.appDirectory,
-      appContext.serverConfigFile
-    );
-    return [`${configPath}/html`, configFile || "./config", ...dependencies];
-  });
+};
+async function generateWatchFiles(appContext, configDir) {
+  const { appDirectory, configFile } = appContext;
+  const configPath = import_path.default.join(appDirectory, configDir || "");
+  const dependencies = getPackageConfig(
+    appContext.appDirectory,
+    appContext.packageName
+  ) ? [import_path.default.resolve(appDirectory, "./package.json")] : [];
+  await addServerConfigToDeps(
+    dependencies,
+    appContext.appDirectory,
+    appContext.serverConfigFile
+  );
+  return [`${configPath}/html`, configFile || "./config", ...dependencies];
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/{js/node → cjs}/utils/getSelectedEntries.js

@@ -15,26 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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());
-  });
-};
 var getSelectedEntries_exports = {};
 __export(getSelectedEntries_exports, {
   getSelectedEntries: () => getSelectedEntries
@@ -42,13 +22,13 @@ __export(getSelectedEntries_exports, {
 module.exports = __toCommonJS(getSelectedEntries_exports);
 var import_utils = require("@modern-js/utils");
 var import_locale = require("../locale");
-const getSelectedEntries = (entry, entrypoints) => __async(void 0, null, function* () {
+const getSelectedEntries = async (entry, entrypoints) => {
   const entryNames = entrypoints.map((e) => e.entryName);
   if (!entry) {
     return entryNames;
   }
   if (typeof entry === "boolean") {
-    const { selected } = yield import_utils.inquirer.prompt([
+    const { selected } = await import_utils.inquirer.prompt([
       {
         type: "checkbox",
         name: "selected",
@@ -74,7 +54,7 @@ const getSelectedEntries = (entry, entrypoints) => __async(void 0, null, functio
     }
   });
   return entry;
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getSelectedEntries

package/dist/cjs/utils/getServerInternalPlugins.js

@@ -0,0 +1,41 @@
+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 getServerInternalPlugins_exports = {};
+__export(getServerInternalPlugins_exports, {
+  getServerInternalPlugins: () => getServerInternalPlugins
+});
+module.exports = __toCommonJS(getServerInternalPlugins_exports);
+async function getServerInternalPlugins(api) {
+  const hookRunners = api.useHookRunners();
+  const { plugins: serverPlugins } = await hookRunners.collectServerPlugins({
+    plugins: []
+  });
+  const serverInternalPlugins = serverPlugins.reduce(
+    (result, plugin) => Object.assign(result, plugin),
+    {}
+  );
+  api.setAppContext({
+    ...api.useAppContext(),
+    serverInternalPlugins
+  });
+  return serverInternalPlugins;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getServerInternalPlugins
+});

package/dist/{js/node → cjs}/utils/printInstructions.js

@@ -15,39 +15,19 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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());
-  });
-};
 var printInstructions_exports = {};
 __export(printInstructions_exports, {
   printInstructions: () => printInstructions
 });
 module.exports = __toCommonJS(printInstructions_exports);
 var import_utils = require("@modern-js/utils");
-const printInstructions = (hookRunners, appContext, config) => __async(void 0, null, function* () {
+const printInstructions = async (hookRunners, appContext, config) => {
   const message = (0, import_utils.prettyInstructions)(appContext, config);
-  const { instructions } = yield hookRunners.beforePrintInstructions({
+  const { instructions } = await hookRunners.beforePrintInstructions({
     instructions: message
   });
   import_utils.logger.info(instructions);
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   printInstructions

package/dist/cjs/utils/restart.js

@@ -0,0 +1,45 @@
+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 restart_exports = {};
+__export(restart_exports, {
+  restart: () => restart
+});
+module.exports = __toCommonJS(restart_exports);
+var import_core = require("@modern-js/core");
+var import_utils = require("@modern-js/utils");
+async function restart(hooksRunner, filename) {
+  (0, import_utils.clearConsole)();
+  import_utils.logger.info(`Restart because ${import_utils.chalk.yellow(filename)} is changed...
+`);
+  let hasGetError = false;
+  await hooksRunner.beforeRestart();
+  try {
+    await import_core.cli.init(import_core.cli.getPrevInitOptions());
+  } catch (err) {
+    console.error(err);
+    hasGetError = true;
+  } finally {
+    if (!hasGetError) {
+      import_utils.program.parse(process.argv);
+    }
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  restart
+});