@modern-js/app-tools 2.19.1 → 2.21.0

package/dist/cjs/config/index.js

@@ -2,19 +2,7 @@
 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;
-}
+const _export_star = require("@swc/helpers/_/_export_star");
+_export_star._(require("./legacy"), exports);
+_export_star._(require("./initialize"), exports);
+_export_star._(require("./default"), exports);

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

@@ -14,48 +14,9 @@ _export(exports, {
   initSourceConfig: () => initSourceConfig,
   initToolsConfig: () => initToolsConfig
 });
-const _path = /* @__PURE__ */ _interop_require_wildcard(require("path"));
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));
 const _utils = require("@modern-js/utils");
-function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== "function")
-    return null;
-  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop2) {
-    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-  if (!nodeInterop && obj && obj.__esModule) {
-    return obj;
-  }
-  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-    return {
-      default: obj
-    };
-  }
-  var cache = _getRequireWildcardCache(nodeInterop);
-  if (cache && cache.has(obj)) {
-    return cache.get(obj);
-  }
-  var newObj = {};
-  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var key in obj) {
-    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-      if (desc && (desc.get || desc.set)) {
-        Object.defineProperty(newObj, key, desc);
-      } else {
-        newObj[key] = obj[key];
-      }
-    }
-  }
-  newObj.default = obj;
-  if (cache) {
-    cache.set(obj, newObj);
-  }
-  return newObj;
-}
 function initHtmlConfig(config, appContext) {
   const ICON_EXTENSIONS = [
     "png",

package/dist/cjs/index.js

@@ -15,84 +15,29 @@ _export(exports, {
   buildCommand: () => buildCommand,
   default: () => _default
 });
-const _path = /* @__PURE__ */ _interop_require_default(require("path"));
-const _pluginlint = /* @__PURE__ */ _interop_require_default(require("@modern-js/plugin-lint"));
+const _export_star = require("@swc/helpers/_/_export_star");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+const _pluginlint = /* @__PURE__ */ _interop_require_default._(require("@modern-js/plugin-lint"));
 const _utils = require("@modern-js/utils");
 const _lodash = require("@modern-js/utils/lodash");
 const _languagedetector = require("@modern-js/plugin-i18n/language-detector");
-const _analyze = /* @__PURE__ */ _interop_require_default(require("./analyze"));
-const _initialize = /* @__PURE__ */ _interop_require_default(require("./initialize"));
+const _analyze = /* @__PURE__ */ _interop_require_default._(require("./analyze"));
+const _initialize = /* @__PURE__ */ _interop_require_default._(require("./initialize"));
 const _hooks = require("./hooks");
 const _locale = require("./locale");
 const _restart = require("./utils/restart");
 const _generateWatchFiles = require("./utils/generateWatchFiles");
 const _core = require("@modern-js/core");
-_export_star(require("./defineConfig"), exports);
-_export_star(require("./types"), 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;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
-function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== "function")
-    return null;
-  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop2) {
-    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-  if (!nodeInterop && obj && obj.__esModule) {
-    return obj;
-  }
-  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-    return {
-      default: obj
-    };
-  }
-  var cache = _getRequireWildcardCache(nodeInterop);
-  if (cache && cache.has(obj)) {
-    return cache.get(obj);
-  }
-  var newObj = {};
-  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var key in obj) {
-    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-      if (desc && (desc.get || desc.set)) {
-        Object.defineProperty(newObj, key, desc);
-      } else {
-        newObj[key] = obj[key];
-      }
-    }
-  }
-  newObj.default = obj;
-  if (cache) {
-    cache.set(obj, newObj);
-  }
-  return newObj;
-}
+_export_star._(require("./defineConfig"), exports);
+_export_star._(require("./types"), exports);
 const upgradeModel = _utils.Import.lazy("@modern-js/upgrade", require);
 const devCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const devToolMetas = await runner.registerDev();
   const devProgram = program.command("dev").alias("start").usage("[options]").description(_locale.i18n.t(_locale.localeKeys.command.dev.describe)).option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)).option("-e --entry [entry...]", _locale.i18n.t(_locale.localeKeys.command.dev.entry)).option("--analyze", _locale.i18n.t(_locale.localeKeys.command.shared.analyze)).option("--api-only", _locale.i18n.t(_locale.localeKeys.command.dev.apiOnly)).option("--web-only", _locale.i18n.t(_locale.localeKeys.command.dev.webOnly)).action(async (options) => {
-    const { dev } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./commands/dev")));
+    const { dev } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/dev")));
     await dev(api, options);
   });
   for (const meta of devToolMetas) {
@@ -102,7 +47,7 @@ const devCommand = async (program, api) => {
     for (const subCmd of meta.subCommands) {
       devProgram.command(subCmd).action(async (options = {}) => {
         const { appDirectory } = api.useAppContext();
-        const { isTypescript } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("@modern-js/utils")));
+        const { isTypescript } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/utils")));
         await runner.beforeDevTask(meta);
         await meta.action(options, {
           isTsProject: isTypescript(appDirectory)
@@ -115,7 +60,7 @@ const buildCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const platformBuilders = await runner.registerBuildPlatform();
   const buildProgram = program.command("build").usage("[options]").description(_locale.i18n.t(_locale.localeKeys.command.build.describe)).option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)).option("--analyze", _locale.i18n.t(_locale.localeKeys.command.shared.analyze)).action(async (options) => {
-    const { build } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./commands/build")));
+    const { build } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/build")));
     await build(api, options);
   });
   for (const platformBuilder of platformBuilders) {
@@ -123,7 +68,7 @@ const buildCommand = async (program, api) => {
     for (const platform of platforms) {
       buildProgram.command(platform).action(async () => {
         const { appDirectory } = api.useAppContext();
-        const { isTypescript } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("@modern-js/utils")));
+        const { isTypescript } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/utils")));
         await runner.beforeBuildPlatform(platformBuilders);
         await platformBuilder.build(platform, {
           isTsProject: isTypescript(appDirectory)
@@ -158,34 +103,50 @@ const _default = (options = {
       (0, _pluginlint.default)()
     ],
     setup: (api) => {
+      const appContext = api.useAppContext();
+      api.setAppContext({
+        ...appContext,
+        toolsType: "app-tools"
+      });
       const locale = (0, _languagedetector.getLocaleLanguage)();
       _locale.i18n.changeLanguage({
         locale
       });
       return {
+        async beforeConfig() {
+          var _userConfig_output;
+          const userConfig = api.useConfigContext();
+          const appContext2 = api.useAppContext();
+          if ((_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir) {
+            api.setAppContext({
+              ...appContext2,
+              internalDirectory: _path.default.resolve(appContext2.appDirectory, userConfig.output.tempDir)
+            });
+          }
+        },
         async commands({ program }) {
           await devCommand(program, api);
           await buildCommand(program, api);
           program.command("serve").usage("[options]").description(_locale.i18n.t(_locale.localeKeys.command.serve.describe)).option("--api-only", _locale.i18n.t(_locale.localeKeys.command.dev.apiOnly)).option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)).action(async () => {
-            const { start } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./commands/serve")));
+            const { start } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/serve")));
             await start(api);
           });
           program.command("deploy").usage("[options]").option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)).description(_locale.i18n.t(_locale.localeKeys.command.deploy.describe)).action(async (options2) => {
-            const { build } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./commands/build")));
+            const { build } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/build")));
             await build(api);
-            const { deploy } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./commands/deploy")));
+            const { deploy } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/deploy")));
             await deploy(api, options2);
             process.exit(0);
           });
           program.command("new").usage("[options]").description(_locale.i18n.t(_locale.localeKeys.command.new.describe)).option("--lang <lang>", _locale.i18n.t(_locale.localeKeys.command.new.lang)).option("-c, --config <config>", _locale.i18n.t(_locale.localeKeys.command.new.config)).option("-d, --debug", _locale.i18n.t(_locale.localeKeys.command.new.debug), false).option("--dist-tag <tag>", _locale.i18n.t(_locale.localeKeys.command.new.distTag)).option("--registry", _locale.i18n.t(_locale.localeKeys.command.new.registry)).action(async (options2) => {
-            const { MWANewAction } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("@modern-js/new-action")));
+            const { MWANewAction } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/new-action")));
             await MWANewAction({
               ...options2,
               locale: options2.lang || locale
             });
           });
           program.command("inspect").description("inspect the internal configs").option(`--env <env>`, _locale.i18n.t(_locale.localeKeys.command.inspect.env), "development").option("--output <output>", _locale.i18n.t(_locale.localeKeys.command.inspect.output), "/").option("--verbose", _locale.i18n.t(_locale.localeKeys.command.inspect.verbose)).option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)).action(async (options2) => {
-            const { inspect } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./commands/inspect")));
+            const { inspect } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/inspect")));
             inspect(api, options2);
           });
           upgradeModel.defineCommand(program.command("upgrade"));
@@ -195,24 +156,24 @@ const _default = (options = {
           if (command === "dev" || command === "start" || command === "build" || command === "deploy") {
             const resolvedConfig = api.useResolvedConfigContext();
             if (resolvedConfig.output.cleanDistPath) {
-              const appContext = api.useAppContext();
-              await (0, _utils.emptyDir)(appContext.distDirectory);
+              const appContext2 = api.useAppContext();
+              await (0, _utils.emptyDir)(appContext2.distDirectory);
             }
           }
         },
         async watchFiles() {
-          const appContext = api.useAppContext();
+          const appContext2 = api.useAppContext();
           const config = api.useResolvedConfigContext();
-          return (0, _generateWatchFiles.generateWatchFiles)(appContext, config.source.configDir);
+          return (0, _generateWatchFiles.generateWatchFiles)(appContext2, config.source.configDir);
         },
         // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
         async fileChange(e) {
           const { filename, eventType } = e;
-          const appContext = api.useAppContext();
-          const { appDirectory, srcDirectory } = appContext;
+          const appContext2 = api.useAppContext();
+          const { appDirectory, srcDirectory } = appContext2;
           const absolutePath = _path.default.resolve(appDirectory, filename);
           if (!absolutePath.includes(srcDirectory) && (eventType === "change" || eventType === "unlink")) {
-            const { closeServer } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("./utils/createServer")));
+            const { closeServer } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./utils/createServer")));
             await closeServer();
             await (0, _restart.restart)(api.useHookRunners(), filename);
           }

package/dist/cjs/schema/Schema.js

@@ -6,20 +6,8 @@ Object.defineProperty(exports, "Schema", {
   enumerable: true,
   get: () => Schema
 });
+const _define_property = require("@swc/helpers/_/_define_property");
 const _lodash = require("@modern-js/utils/lodash");
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 class Schema extends Map {
   setSchema(key, object) {
     Object.entries(object).forEach(([k, v]) => {
@@ -53,7 +41,7 @@ class Schema extends Map {
   }
   constructor(baseSchema = {}) {
     super();
-    _define_property(this, "schema", void 0);
+    _define_property._(this, "schema", void 0);
     this.schema = baseSchema;
   }
 }

package/dist/cjs/schema/index.js

@@ -13,14 +13,10 @@ _export(exports, {
   legacySchema: () => _legacy.default,
   schema: () => schema
 });
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _utils = require("@modern-js/utils");
 const _Schema = require("./Schema");
-const _legacy = /* @__PURE__ */ _interop_require_default(require("./legacy"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _legacy = /* @__PURE__ */ _interop_require_default._(require("./legacy"));
 const source = {
   entries: {
     type: "object",

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

@@ -2,17 +2,5 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-_export_star(require("./output"), 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;
-}
+const _export_star = require("@swc/helpers/_/_export_star");
+_export_star._(require("./output"), exports);

package/dist/cjs/types/index.js

@@ -2,19 +2,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-_export_star(require("./hooks"), exports);
-_export_star(require("./config"), exports);
-_export_star(require("./legacyConfig"), 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;
-}
+const _export_star = require("@swc/helpers/_/_export_star");
+_export_star._(require("./hooks"), exports);
+_export_star._(require("./config"), exports);
+_export_star._(require("./legacyConfig"), exports);

package/dist/cjs/utils/config.js

@@ -15,49 +15,10 @@ _export(exports, {
   safeReplacer: () => safeReplacer,
   emitResolvedConfig: () => emitResolvedConfig
 });
-const _path = /* @__PURE__ */ _interop_require_wildcard(require("path"));
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));
 const _nodebundlerequire = require("@modern-js/node-bundle-require");
 const _utils = require("@modern-js/utils");
-function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== "function")
-    return null;
-  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop2) {
-    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-  if (!nodeInterop && obj && obj.__esModule) {
-    return obj;
-  }
-  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-    return {
-      default: obj
-    };
-  }
-  var cache = _getRequireWildcardCache(nodeInterop);
-  if (cache && cache.has(obj)) {
-    return cache.get(obj);
-  }
-  var newObj = {};
-  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var key in obj) {
-    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-      if (desc && (desc.get || desc.set)) {
-        Object.defineProperty(newObj, key, desc);
-      } else {
-        newObj[key] = obj[key];
-      }
-    }
-  }
-  newObj.default = obj;
-  if (cache) {
-    cache.set(obj, newObj);
-  }
-  return newObj;
-}
 const defineServerConfig = (config) => config;
 const buildServerConfig = async ({ appDirectory, distDirectory, configFile, options }) => {
   const configFilePath = await (0, _utils.getServerConfig)(appDirectory, configFile);

package/dist/cjs/utils/generateWatchFiles.js

@@ -13,13 +13,9 @@ _export(exports, {
   addServerConfigToDeps: () => addServerConfigToDeps,
   generateWatchFiles: () => generateWatchFiles
 });
-const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
 const getPackageConfig = (appDirectory, packageJsonConfig) => {
   const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
   const json = JSON.parse(_utils.fs.readFileSync(_path.default.resolve(appDirectory, "./package.json"), "utf8"));

package/dist/cjs/utils/routes.js

@@ -6,13 +6,9 @@ Object.defineProperty(exports, "generateRoutes", {
   enumerable: true,
   get: () => generateRoutes
 });
-const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
 const generateRoutes = async (appContext) => {
   const { serverRoutes, distDirectory } = appContext;
   const output = JSON.stringify({