@modern-js/app-tools 2.0.0-beta.3 → 2.0.0-beta.6

package/dist/js/node/commands/index.js

@@ -1,38 +1,19 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _dev = require("./dev");
-Object.keys(_dev).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _dev[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _dev[key];
-    }
-  });
-});
-var _build = require("./build");
-Object.keys(_build).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _build[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _build[key];
-    }
-  });
-});
-var _start = require("./start");
-Object.keys(_start).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _start[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _start[key];
-    }
-  });
-});
+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);

package/dist/js/node/commands/inspect.js

@@ -1,20 +1,61 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 __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
 });
-exports.inspect = void 0;
-var _path = require("path");
-const inspect = async (api, options) => {
+module.exports = __toCommonJS(inspect_exports);
+var import_path = require("path");
+const inspect = (api, options) => __async(void 0, null, function* () {
   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, _path.join)(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
+    outputPath: (0, import_path.join)(appContext == null ? void 0 : appContext.builder.context.distPath, options.output),
     writeToDisk: true
   });
-};
-exports.inspect = inspect;
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  inspect
+});

package/dist/js/node/commands/serve.js

@@ -0,0 +1,83 @@
+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(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  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
+});
+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");
+const start = (api) => __async(void 0, null, function* () {
+  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)(
+    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)({
+    pwd: appDirectory,
+    config: userConfig,
+    serverConfigFile,
+    internalPlugins: (0, import_createServer.injectDataLoaderPlugin)(serverInternalPlugins),
+    apiOnly
+  });
+  app.listen(port, (err) => __async(void 0, null, function* () {
+    if (err) {
+      throw err;
+    }
+    yield (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/config/default.js

@@ -1,100 +1,85 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 });
+};
+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, {
+  createDefaultConfig: () => createDefaultConfig,
+  createLegacyDefaultConfig: () => createLegacyDefaultConfig
 });
-exports.createDefaultConfig = createDefaultConfig;
-exports.createLegacyDefaultConfig = createLegacyDefaultConfig;
+module.exports = __toCommonJS(default_exports);
+var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
 function createDefaultConfig(appContext) {
-  const defaultAlias = appContext ? {
-    [appContext.internalDirAlias]: appContext.internalDirectory,
-    [appContext.internalSrcAlias]: appContext.srcDirectory,
-    '@': appContext.srcDirectory,
-    '@shared': appContext.sharedDirectory
-  } : {};
-  const source = {
-    entries: undefined,
+  const defaultBuilderConfig = (0, import_builder_webpack_provider.createDefaultConfig)();
+  const dev = __spreadValues({}, defaultBuilderConfig.dev);
+  const tools = __spreadValues({}, defaultBuilderConfig.tools);
+  const output = __spreadProps(__spreadValues({}, defaultBuilderConfig.output), {
+    disableNodePolyfill: true
+  });
+  const source = __spreadProps(__spreadValues({}, defaultBuilderConfig.source), {
+    entries: void 0,
     enableAsyncEntry: false,
     disableDefaultEntries: false,
-    entriesDir: './src',
-    configDir: './config',
-    globalVars: undefined,
-    moduleScopes: undefined,
-    include: [],
-    alias: defaultAlias
-  };
-  const output = {
-    assetPrefix: '/',
-    distPath: {
-      html: 'html',
-      js: 'static/js',
-      css: 'static/css',
-      media: 'static/media',
-      root: 'dist'
-    },
-    copy: undefined,
-    disableCssModuleExtension: false,
-    enableCssModuleTSDeclaration: false,
-    disableMinimize: false,
-    enableInlineStyles: false,
-    enableInlineScripts: false,
-    disableSourceMap: false,
-    disableInlineRuntimeChunk: false,
-    disableFilenameHash: false,
-    enableLatestDecorators: false,
-    polyfill: 'entry',
-    cssModuleLocalIdentName: undefined
-  };
-  const html = {
-    title: '',
-    titleByEntries: undefined,
+    entriesDir: "./src",
+    configDir: "./config",
+    alias: {
+      [appContext.internalDirAlias]: appContext.internalDirectory,
+      [appContext.internalSrcAlias]: appContext.srcDirectory,
+      "@": appContext.srcDirectory,
+      "@shared": appContext.sharedDirectory
+    }
+  });
+  const html = __spreadProps(__spreadValues({}, defaultBuilderConfig.html), {
+    title: "",
     meta: {
-      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'
-      },
-      renderer: 'webkit',
-      layoutmode: 'standard',
-      imagemode: 'force',
-      'wap-font-scale': 'no',
-      'format-detection': 'telephone=no'
-    },
-    metaByEntries: undefined,
-    inject: 'head',
-    injectByEntries: undefined,
-    mountId: 'root',
-    favicon: '',
-    faviconByEntries: undefined,
-    disableHtmlFolder: false,
-    templateParameters: {},
-    templateParametersByEntries: undefined
-  };
+      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" },
+      renderer: "webkit",
+      layoutmode: "standard",
+      imagemode: "force",
+      "wap-font-scale": "no",
+      "format-detection": "telephone=no"
+    }
+  });
   const server = {
-    routes: undefined,
-    publicRoutes: undefined,
-    ssr: undefined,
-    ssrByEntries: undefined,
-    baseUrl: '/',
+    routes: void 0,
+    publicRoutes: void 0,
+    ssr: void 0,
+    ssrByEntries: void 0,
+    baseUrl: "/",
     port: 8080
   };
-  const dev = {
-    assetPrefix: false,
-    https: false
-  };
-  const tools = {
-    webpack: undefined,
-    babel: undefined,
-    postcss: undefined,
-    autoprefixer: undefined,
-    devServer: undefined,
-    tsLoader: undefined,
-    terser: undefined,
-    minifyCss: undefined
-  };
   return {
     source,
     output,
@@ -103,6 +88,7 @@ function createDefaultConfig(appContext) {
     html,
     tools,
     plugins: [],
+    builderPlugins: [],
     runtime: {},
     runtimeByEntries: {}
   };
@@ -111,53 +97,48 @@ function createLegacyDefaultConfig(appContext) {
   const defaultAlias = appContext ? {
     [appContext.internalDirAlias]: appContext.internalDirectory,
     [appContext.internalSrcAlias]: appContext.srcDirectory,
-    '@': appContext.srcDirectory,
-    '@shared': appContext.sharedDirectory
+    "@": appContext.srcDirectory,
+    "@shared": appContext.sharedDirectory
   } : {};
   const sourceDefaults = {
-    entries: undefined,
+    entries: void 0,
     enableAsyncEntry: false,
     disableDefaultEntries: false,
-    entriesDir: './src',
-    configDir: './config',
-    apiDir: './api',
+    entriesDir: "./src",
+    configDir: "./config",
+    apiDir: "./api",
     envVars: [],
-    globalVars: undefined,
+    globalVars: void 0,
     alias: defaultAlias,
-    moduleScopes: undefined,
+    moduleScopes: void 0,
     include: []
   };
   const outputDefaults = {
-    assetPrefix: '/',
-    htmlPath: 'html',
-    jsPath: 'static/js',
-    cssPath: 'static/css',
-    mediaPath: 'static/media',
-    path: 'dist',
-    title: '',
-    titleByEntries: undefined,
+    assetPrefix: "/",
+    htmlPath: "html",
+    jsPath: "static/js",
+    cssPath: "static/css",
+    mediaPath: "static/media",
+    path: "dist",
+    title: "",
+    titleByEntries: void 0,
     meta: {
-      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'
-      },
-      renderer: 'webkit',
-      layoutmode: 'standard',
-      imagemode: 'force',
-      'wap-font-scale': 'no',
-      'format-detection': 'telephone=no'
+      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" },
+      renderer: "webkit",
+      layoutmode: "standard",
+      imagemode: "force",
+      "wap-font-scale": "no",
+      "format-detection": "telephone=no"
     },
-    metaByEntries: undefined,
-    inject: 'head',
-    injectByEntries: undefined,
-    mountId: 'root',
-    favicon: '',
-    faviconByEntries: undefined,
-    copy: undefined,
+    metaByEntries: void 0,
+    inject: "head",
+    injectByEntries: void 0,
+    mountId: "root",
+    favicon: "",
+    faviconByEntries: void 0,
+    copy: void 0,
     disableHtmlFolder: false,
     disableCssModuleExtension: false,
     disableCssExtract: false,
@@ -169,37 +150,33 @@ function createLegacyDefaultConfig(appContext) {
     disableInlineRuntimeChunk: false,
     disableAssetsCache: false,
     enableLatestDecorators: false,
-    polyfill: 'entry',
-    dataUriLimit: 10000,
+    polyfill: "entry",
+    dataUriLimit: 1e4,
     templateParameters: {},
-    templateParametersByEntries: undefined,
-    cssModuleLocalIdentName: undefined,
-    enableModernMode: false,
+    templateParametersByEntries: void 0,
+    cssModuleLocalIdentName: void 0,
     disableNodePolyfill: false,
     enableTsLoader: false
   };
   const serverDefaults = {
-    routes: undefined,
-    publicRoutes: undefined,
-    ssr: undefined,
-    ssrByEntries: undefined,
-    baseUrl: '/',
+    routes: void 0,
+    publicRoutes: void 0,
+    ssr: void 0,
+    ssrByEntries: void 0,
+    baseUrl: "/",
     port: 8080
   };
-  const devDefaults = {
-    assetPrefix: false,
-    https: false
-  };
+  const devDefaults = { assetPrefix: false, https: false };
   const toolsDefaults = {
-    webpack: undefined,
-    babel: undefined,
-    postcss: undefined,
-    autoprefixer: undefined,
-    lodash: undefined,
-    devServer: undefined,
-    tsLoader: undefined,
-    terser: undefined,
-    minifyCss: undefined
+    webpack: void 0,
+    babel: void 0,
+    postcss: void 0,
+    autoprefixer: void 0,
+    lodash: void 0,
+    devServer: void 0,
+    tsLoader: void 0,
+    terser: void 0,
+    minifyCss: void 0
   };
   return {
     source: sourceDefaults,
@@ -210,4 +187,9 @@ function createLegacyDefaultConfig(appContext) {
     runtime: {},
     runtimeByEntries: {}
   };
-}
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createDefaultConfig,
+  createLegacyDefaultConfig
+});

package/dist/js/node/config/index.js

@@ -1,31 +1,34 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "checkIsLegacyConfig", {
-  enumerable: true,
-  get: function () {
-    return _initial.checkIsLegacyConfig;
-  }
-});
-Object.defineProperty(exports, "createDefaultConfig", {
-  enumerable: true,
-  get: function () {
-    return _default.createDefaultConfig;
+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 config_exports = {};
+__export(config_exports, {
+  checkIsLegacyConfig: () => import_initial.checkIsLegacyConfig,
+  createDefaultConfig: () => import_default.createDefaultConfig,
+  createLegacyDefaultConfig: () => import_default.createLegacyDefaultConfig,
+  initialNormalizedConfig: () => import_initial.initialNormalizedConfig
 });
-Object.defineProperty(exports, "createLegacyDefaultConfig", {
-  enumerable: true,
-  get: function () {
-    return _default.createLegacyDefaultConfig;
-  }
-});
-Object.defineProperty(exports, "initialNormalizedConfig", {
-  enumerable: true,
-  get: function () {
-    return _initial.initialNormalizedConfig;
-  }
+module.exports = __toCommonJS(config_exports);
+var import_default = require("./default");
+var import_initial = require("./initial");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  checkIsLegacyConfig,
+  createDefaultConfig,
+  createLegacyDefaultConfig,
+  initialNormalizedConfig
 });
-var _default = require("./default");
-var _initial = require("./initial");

package/dist/js/node/config/initial/createHtmlConfig.js

@@ -1,9 +1,25 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 createHtmlConfig_exports = {};
+__export(createHtmlConfig_exports, {
+  createHtmlConfig: () => createHtmlConfig
 });
-exports.createHtmlConfig = createHtmlConfig;
+module.exports = __toCommonJS(createHtmlConfig_exports);
 function createHtmlConfig(config) {
   const {
     disableHtmlFolder,
@@ -35,4 +51,8 @@ function createHtmlConfig(config) {
     templateParameters,
     templateParametersByEntries
   };
-}
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createHtmlConfig
+});