@modern-js/app-tools 2.3.1-alpha.2 → 2.5.0

package/dist/{js/node → cjs}/commands/dev.js

@@ -1,24 +1,7 @@
 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 __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 });
@@ -32,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 dev_exports = {};
 __export(dev_exports, {
   dev: () => dev
@@ -63,7 +26,7 @@ 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 dev = (api, options) => __async(void 0, null, function* () {
+const dev = async (api, options) => {
   var _a;
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
@@ -71,10 +34,10 @@ const dev = (api, options) => __async(void 0, null, function* () {
   let normalizedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  normalizedConfig = __spreadProps(__spreadValues({}, normalizedConfig), { cliOptions: options });
+  normalizedConfig = { ...normalizedConfig, cliOptions: options };
   import_core.ResolvedConfigContext.set(normalizedConfig);
   const { appDirectory, distDirectory, port, apiOnly, serverConfigFile } = appContext;
-  yield (0, import_config.buildServerConfig)({
+  await (0, import_config.buildServerConfig)({
     appDirectory,
     distDirectory,
     configFile: serverConfigFile,
@@ -84,42 +47,44 @@ const dev = (api, options) => __async(void 0, null, function* () {
       }
     }
   });
-  yield hookRunners.beforeDev();
+  await hookRunners.beforeDev();
   if (!appContext.builder && !apiOnly) {
     throw new Error(
       "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
     );
   }
-  yield (0, import_routes.generateRoutes)(appContext);
-  const serverInternalPlugins = yield (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
+  await (0, import_routes.generateRoutes)(appContext);
+  const serverInternalPlugins = await (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
   const serverOptions = {
-    dev: __spreadValues({
+    dev: {
       port,
-      https: normalizedConfig.dev.https
-    }, (_a = normalizedConfig.tools) == null ? void 0 : _a.devServer),
+      https: normalizedConfig.dev.https,
+      ...(_a = normalizedConfig.tools) == null ? void 0 : _a.devServer
+    },
     pwd: appDirectory,
     config: normalizedConfig,
     serverConfigFile,
     internalPlugins: (0, import_createServer.injectDataLoaderPlugin)(serverInternalPlugins)
   };
   if (apiOnly) {
-    const app = yield (0, import_createServer.createServer)(__spreadProps(__spreadValues({}, serverOptions), {
+    const app = await (0, import_createServer.createServer)({
+      ...serverOptions,
       compiler: null
-    }));
-    app.listen(port, (err) => __async(void 0, null, function* () {
+    });
+    app.listen(port, async (err) => {
       if (err) {
         throw err;
       }
       (0, import_printInstructions.printInstructions)(hookRunners, appContext, normalizedConfig);
-    }));
+    });
   } else {
-    const { server } = yield appContext.builder.startDevServer({
+    const { server } = await appContext.builder.startDevServer({
       printURLs: false,
       serverOptions
     });
     (0, import_createServer.setServer)(server);
   }
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   dev

package/dist/{js/node → cjs}/commands/inspect.js

@@ -15,33 +15,13 @@ 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 inspect_exports = {};
 __export(inspect_exports, {
   inspect: () => inspect
 });
 module.exports = __toCommonJS(inspect_exports);
 var import_path = require("path");
-const inspect = (api, options) => __async(void 0, null, function* () {
+const inspect = async (api, options) => {
   const appContext = api.useAppContext();
   if (!appContext.builder) {
     throw new Error(
@@ -54,7 +34,7 @@ const inspect = (api, options) => __async(void 0, null, function* () {
     outputPath: (0, import_path.join)(appContext == null ? 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/{js/node → cjs}/commands/serve.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 serve_exports = {};
 __export(serve_exports, {
   start: () => start
@@ -51,32 +31,32 @@ 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");
-const start = (api) => __async(void 0, null, function* () {
+const start = async (api) => {
   var _a;
   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 = yield (0, import_utils.isApiOnly)(
+  const apiOnly = await (0, import_utils.isApiOnly)(
     appContext.appDirectory,
     (_a = userConfig == null ? void 0 : userConfig.source) == null ? void 0 : _a.entriesDir
   );
-  const serverInternalPlugins = yield (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
-  const app = yield (0, import_prod_server.default)({
+  const serverInternalPlugins = await (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
+  const app = await (0, import_prod_server.default)({
     pwd: appDirectory,
     config: userConfig,
     serverConfigFile,
     internalPlugins: (0, import_createServer.injectDataLoaderPlugin)(serverInternalPlugins),
     apiOnly
   });
-  app.listen(port, (err) => __async(void 0, null, function* () {
+  app.listen(port, async (err) => {
     if (err) {
       throw err;
     }
-    yield (0, import_printInstructions.printInstructions)(hookRunners, appContext, userConfig);
-  }));
-});
+    await (0, import_printInstructions.printInstructions)(hookRunners, appContext, userConfig);
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   start

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

@@ -1,24 +1,7 @@
 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 __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 });
@@ -39,16 +22,18 @@ __export(default_exports, {
 });
 module.exports = __toCommonJS(default_exports);
 var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
-function createDefaultConfig(appContext) {
+function createDefaultConfig(appContext, bundler) {
   const defaultBuilderConfig = (0, import_builder_webpack_provider.createDefaultConfig)();
-  const dev = __spreadProps(__spreadValues({}, defaultBuilderConfig.dev), {
+  const dev = {
+    ...defaultBuilderConfig.dev,
     port: void 0
-  });
-  const tools = __spreadValues({}, defaultBuilderConfig.tools);
-  const output = __spreadProps(__spreadValues({}, defaultBuilderConfig.output), {
+  };
+  const output = {
+    ...defaultBuilderConfig.output,
     disableNodePolyfill: true
-  });
-  const source = __spreadProps(__spreadValues({}, defaultBuilderConfig.source), {
+  };
+  const source = {
+    ...defaultBuilderConfig.source,
     entries: void 0,
     enableAsyncEntry: false,
     disableDefaultEntries: false,
@@ -60,8 +45,9 @@ function createDefaultConfig(appContext) {
       "@": appContext.srcDirectory,
       "@shared": appContext.sharedDirectory
     }
-  });
-  const html = __spreadProps(__spreadValues({}, defaultBuilderConfig.html), {
+  };
+  const html = {
+    ...defaultBuilderConfig.html,
     title: "",
     meta: {
       charset: { charset: "utf-8" },
@@ -73,7 +59,7 @@ function createDefaultConfig(appContext) {
       "wap-font-scale": "no",
       "format-detection": "telephone=no"
     }
-  });
+  };
   const server = {
     routes: void 0,
     publicRoutes: void 0,
@@ -82,6 +68,9 @@ function createDefaultConfig(appContext) {
     baseUrl: "/",
     port: 8080
   };
+  const tools = bundler === "webpack" ? {
+    ...defaultBuilderConfig.tools
+  } : void 0;
   return {
     source,
     output,

package/dist/cjs/config/index.js

@@ -0,0 +1,19 @@
+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);

package/dist/cjs/config/initialize/index.js

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

package/dist/{js/node/config/initial → cjs/config/initialize}/inits.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 });
@@ -81,14 +64,16 @@ function initHtmlConfig(config, appContext) {
     return favicon || defaultFavicon || void 0;
   }
 }
-function initSourceConfig(config, appContext) {
+function initSourceConfig(config, appContext, bundler) {
   config.source.include = createBuilderInclude(config, appContext);
-  config.source.moduleScopes = createBuilderModuleScope(config);
   config.source.globalVars = createBuilderGlobalVars(config, appContext);
+  if (bundler === "webpack") {
+    config.source.moduleScopes = createBuilderModuleScope(config);
+  }
   function createBuilderGlobalVars(config2, appContext2) {
     const { globalVars = {} } = config2.source;
     const publicEnv = (0, import_env.getAutoInjectEnv)(appContext2);
-    return __spreadValues(__spreadValues({}, globalVars), publicEnv);
+    return { ...globalVars, ...publicEnv };
   }
   function createBuilderInclude(config2, appContext2) {
     const { include } = config2.source;
@@ -158,10 +143,11 @@ function initToolsConfig(config) {
   config.tools.tsChecker = (0, import_utils.applyOptionsChain)(defaultTsChecker, tsChecker);
   tsLoader && (config.tools.tsLoader = (tsLoaderConfig, utils) => {
     (0, import_utils.applyOptionsChain)(
-      __spreadProps(__spreadValues({}, tsLoaderConfig), {
+      {
+        ...tsLoaderConfig,
         transpileOnly: false,
         allowTsInNodeModules: true
-      }),
+      },
       tsLoader || {},
       utils
     );

package/dist/{js/node/config/initial/transformNormalizedConfig.js → cjs/config/legacy/index.js}

@@ -15,11 +15,12 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var transformNormalizedConfig_exports = {};
-__export(transformNormalizedConfig_exports, {
+var legacy_exports = {};
+__export(legacy_exports, {
+  checkIsLegacyConfig: () => checkIsLegacyConfig,
   transformNormalizedConfig: () => transformNormalizedConfig
 });
-module.exports = __toCommonJS(transformNormalizedConfig_exports);
+module.exports = __toCommonJS(legacy_exports);
 var import_createToolsConfig = require("./createToolsConfig");
 var import_createSourceConfig = require("./createSourceConfig");
 var import_createOutputConfig = require("./createOutputConfig");
@@ -64,7 +65,11 @@ function transformNormalizedConfig(config) {
     }
   };
 }
+function checkIsLegacyConfig(config) {
+  return Boolean(config.legacy);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  checkIsLegacyConfig,
   transformNormalizedConfig
 });

package/dist/cjs/defineConfig.js

@@ -0,0 +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 defineConfig_exports = {};
+__export(defineConfig_exports, {
+  defineConfig: () => defineConfig,
+  defineLegacyConfig: () => defineLegacyConfig
+});
+module.exports = __toCommonJS(defineConfig_exports);
+const defineConfig = (config) => config;
+const defineLegacyConfig = (config) => ({
+  ...config,
+  legacy: true
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  defineConfig,
+  defineLegacyConfig
+});