@modern-js/app-tools 2.58.2 → 2.59.0

package/dist/cjs/builder/builder-rspack/adapterCopy.js

@@ -32,8 +32,8 @@ __export(adapterCopy_exports, {
 });
 module.exports = __toCommonJS(adapterCopy_exports);
 var import_path = __toESM(require("path"));
-var import_fs_extra = __toESM(require("@modern-js/utils/fs-extra"));
 var import_utils = require("@modern-js/utils");
+var import_fs_extra = __toESM(require("@modern-js/utils/fs-extra"));
 var import_shared = require("../shared");
 const builderPluginAdpaterCopy = (options) => ({
   name: "builder-plugin-adapter-rspack-copy",

package/dist/cjs/builder/generator/getBuilderEnvironments.js

@@ -21,8 +21,8 @@ __export(getBuilderEnvironments_exports, {
   getBuilderEnvironments: () => getBuilderEnvironments
 });
 module.exports = __toCommonJS(getBuilderEnvironments_exports);
-var import_utils = require("@modern-js/utils");
 var import_uni_builder = require("@modern-js/uni-builder");
+var import_utils = require("@modern-js/utils");
 function getBuilderEnvironments(normalizedConfig, appContext) {
   const entries = {};
   const { entrypoints = [], checkedEntries } = appContext;

package/dist/cjs/builder/generator/index.js

@@ -50,12 +50,11 @@ async function generateBuilder(options, bundlerType) {
   return builder;
 }
 async function applyBuilderPlugins(builder, options) {
-  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterWorker } = await import("../shared/builderPlugins/index.js");
+  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR } = await import("../shared/builderPlugins/index.js");
   builder.addPlugins([
     builderPluginAdapterBasic(),
     builderPluginAdapterSSR(options),
-    builderPluginAdapterHtml(options),
-    builderPluginAdapterWorker()
+    builderPluginAdapterHtml(options)
   ]);
   const { normalizedConfig } = options;
   if (!normalizedConfig.output.disableNodePolyfill) {

package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js

@@ -32,11 +32,11 @@ __export(adapterSSR_exports, {
 });
 module.exports = __toCommonJS(adapterSSR_exports);
 var path = __toESM(require("path"));
-var import_core = require("@rsbuild/core");
-var import_utils = require("@modern-js/utils");
 var import_uni_builder = require("@modern-js/uni-builder");
-var import_bundlerPlugins = require("../bundlerPlugins");
+var import_utils = require("@modern-js/utils");
+var import_core = require("@rsbuild/core");
 var import_utils2 = require("../../../plugins/analyze/utils");
+var import_bundlerPlugins = require("../bundlerPlugins");
 const builderPluginAdapterSSR = (options) => ({
   name: "builder-plugin-adapter-modern-ssr",
   setup(api) {
@@ -49,7 +49,7 @@ const builderPluginAdapterSSR = (options) => ({
         server: {
           // the http-compression can't handler stream http.
           // so we disable compress when user use stream ssr temporarily.
-          compress: isStreamingSSR(normalizedConfig) || isSSRPreload(normalizedConfig) ? false : void 0
+          compress: isStreamingSSR(normalizedConfig) ? false : void 0
         }
       });
     });
@@ -57,10 +57,6 @@ const builderPluginAdapterSSR = (options) => ({
       const builderConfig = environment.config;
       const { normalizedConfig: normalizedConfig2 } = options;
       applyRouterPlugin(chain, "route-plugin", options, HtmlBundlerPlugin);
-      if ((0, import_utils.isUseSSRBundle)(normalizedConfig2)) {
-        await applySSRLoaderEntry(chain, options, isServer);
-        applySSRDataLoader(chain, options);
-      }
       const isServiceWorker = environment.name === import_uni_builder.SERVICE_WORKER_ENVIRONMENT_NAME;
       if (target === "node" || isServiceWorker) {
         applyFilterEntriesBySSRConfig({
@@ -69,6 +65,10 @@ const builderPluginAdapterSSR = (options) => ({
           appNormalizedConfig: normalizedConfig2
         });
       }
+      if ((0, import_utils.isUseSSRBundle)(normalizedConfig2)) {
+        await applySSRLoaderEntry(chain, options, isServer);
+        applySSRDataLoader(chain, options);
+      }
       if (!(0, import_uni_builder.isHtmlDisabled)(builderConfig, target)) {
         applyAsyncChunkHtmlPlugin({
           chain,
@@ -79,11 +79,6 @@ const builderPluginAdapterSSR = (options) => ({
     });
   }
 });
-const isSSRPreload = (userConfig) => {
-  const { server: { ssr, ssrByEntries } } = userConfig;
-  const checkUsePreload = (ssr2) => typeof ssr2 === "object" && Boolean(ssr2.preload);
-  return checkUsePreload(ssr) || Object.values(ssrByEntries || {}).some((ssr2) => checkUsePreload(ssr2));
-};
 const isStreamingSSR = (userConfig) => {
   const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
   const { server } = userConfig;

package/dist/cjs/builder/shared/builderPlugins/index.js

@@ -18,11 +18,9 @@ module.exports = __toCommonJS(builderPlugins_exports);
 __reExport(builderPlugins_exports, require("./adapterBasic"), module.exports);
 __reExport(builderPlugins_exports, require("./adapterHtml"), module.exports);
 __reExport(builderPlugins_exports, require("./adapterSSR"), module.exports);
-__reExport(builderPlugins_exports, require("./adapterWorker"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./adapterBasic"),
   ...require("./adapterHtml"),
-  ...require("./adapterSSR"),
-  ...require("./adapterWorker")
+  ...require("./adapterSSR")
 });

package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -22,8 +22,8 @@ __export(RouterPlugin_exports, {
 });
 module.exports = __toCommonJS(RouterPlugin_exports);
 var import_crypto = require("crypto");
-var import_lodash = require("@modern-js/utils/lodash");
 var import_utils = require("@modern-js/utils");
+var import_lodash = require("@modern-js/utils/lodash");
 var import_constants = require("@modern-js/utils/universal/constants");
 const PLUGIN_NAME = "ModernjsRoutePlugin";
 const generateContentHash = (content) => {

package/dist/cjs/commands/build.js

@@ -33,10 +33,10 @@ __export(build_exports, {
 module.exports = __toCommonJS(build_exports);
 var import_core = require("@modern-js/core");
 var import_utils = require("@modern-js/utils");
-var import_loadPlugins = require("../utils/loadPlugins");
-var import_routes = require("../utils/routes");
 var import_config = require("../utils/config");
+var import_loadPlugins = require("../utils/loadPlugins");
 var import_register = require("../utils/register");
+var import_routes = require("../utils/routes");
 const build = async (api, options) => {
   var _resolvedConfig_source;
   if (options === null || options === void 0 ? void 0 : options.analyze) {

package/dist/cjs/commands/dev.js

@@ -33,15 +33,15 @@ __export(dev_exports, {
 module.exports = __toCommonJS(dev_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_core = require("@modern-js/core");
-var import_utils = require("@modern-js/utils");
-var import_server = require("@modern-js/server");
 var import_prod_server = require("@modern-js/prod-server");
+var import_server = require("@modern-js/server");
+var import_utils = require("@modern-js/utils");
+var import_config = require("../utils/config");
+var import_createServer = require("../utils/createServer");
 var import_loadPlugins = require("../utils/loadPlugins");
-var import_register = require("../utils/register");
 var import_printInstructions = require("../utils/printInstructions");
-var import_createServer = require("../utils/createServer");
+var import_register = require("../utils/register");
 var import_routes = require("../utils/routes");
-var import_config = require("../utils/config");
 const dev = async (api, options, devServerOptions) => {
   var _normalizedConfig_source, _normalizedConfig_tools, _normalizedConfig_dev;
   if (options.analyze) {
@@ -90,6 +90,7 @@ const dev = async (api, options, devServerOptions) => {
     },
     appContext: {
       appDirectory,
+      internalDirectory: appContext.internalDirectory,
       apiDirectory: appContext.apiDirectory,
       lambdaDirectory: appContext.lambdaDirectory,
       sharedDirectory: appContext.sharedDirectory

package/dist/cjs/commands/index.js

@@ -37,8 +37,8 @@ __export(commands_exports, {
   upgradeCommand: () => upgradeCommand
 });
 module.exports = __toCommonJS(commands_exports);
-var import_utils = require("@modern-js/utils");
 var import_uni_builder = require("@modern-js/uni-builder");
+var import_utils = require("@modern-js/utils");
 var import_locale = require("../locale");
 const devCommand = async (program, api) => {
   const runner = api.useHookRunners();

package/dist/cjs/commands/serve.js

@@ -32,16 +32,16 @@ __export(serve_exports, {
 });
 module.exports = __toCommonJS(serve_exports);
 var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
 var import_prod_server = require("@modern-js/prod-server");
-var import_printInstructions = require("../utils/printInstructions");
+var import_utils = require("@modern-js/utils");
 var import_loadPlugins = require("../utils/loadPlugins");
+var import_printInstructions = require("../utils/printInstructions");
 const start = async (api) => {
   var _userConfig_source, _userConfig_output_distPath;
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
-  const { distDirectory, appDirectory, port, metaName, serverRoutes, serverConfigFile } = appContext;
+  const { distDirectory, appDirectory, internalDirectory, port, metaName, serverRoutes, serverConfigFile } = appContext;
   import_utils.logger.info(`Starting production server...`);
   const apiOnly = await (0, import_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, appContext.apiDirectory);
   let runMode;
@@ -69,6 +69,7 @@ const start = async (api) => {
     serverConfigPath,
     appContext: {
       appDirectory,
+      internalDirectory,
       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)

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

@@ -22,10 +22,10 @@ __export(legacy_exports, {
   transformNormalizedConfig: () => transformNormalizedConfig
 });
 module.exports = __toCommonJS(legacy_exports);
-var import_createToolsConfig = require("./createToolsConfig");
-var import_createSourceConfig = require("./createSourceConfig");
-var import_createOutputConfig = require("./createOutputConfig");
 var import_createHtmlConfig = require("./createHtmlConfig");
+var import_createOutputConfig = require("./createOutputConfig");
+var import_createSourceConfig = require("./createSourceConfig");
+var import_createToolsConfig = require("./createToolsConfig");
 function transformNormalizedConfig(config) {
   const html = (0, import_createHtmlConfig.createHtmlConfig)(config);
   const output = (0, import_createOutputConfig.createOutputConfig)(config);

package/dist/cjs/esm/register-esm.mjs

@@ -1,6 +1,6 @@
-import path from 'node:path';
-import { fs, readTsConfigByFile, isVersionAtLeast1819 } from '@modern-js/utils';
 import assert from 'node:assert';
+import path from 'node:path';
+import { fs, isVersionAtLeast1819, readTsConfigByFile } from '@modern-js/utils';
 
 const checkDep = async dep => {
   try {
@@ -20,7 +20,6 @@ export const registerEsm = async ({ appDir, distDir, alias }) => {
     `The node version of the esm project must be greater than 18.19.0, current version is ${nodeVersion}`,
   );
   const hasTsNode = await checkDep('ts-node');
-  // biome-ignore lint/style/noUnusedTemplateLiteral: <explanation>
   const TS_CONFIG_FILENAME = `tsconfig.json`;
   const tsconfigPath = path.resolve(appDir, TS_CONFIG_FILENAME);
   const hasTsconfig = await fs.pathExists(tsconfigPath);

package/dist/cjs/esm/utils.mjs

@@ -1,7 +1,7 @@
-import path from 'path';
 import { createRequire } from 'module';
-import tsConfigPaths from '@modern-js/utils/tsconfig-paths';
+import path from 'path';
 import { getAliasConfig } from '@modern-js/utils';
+import tsConfigPaths from '@modern-js/utils/tsconfig-paths';
 
 const require = createRequire(import.meta.url);
 export function createMatchPath({ alias, appDir, tsconfigPath }) {

package/dist/cjs/index.js

@@ -36,23 +36,24 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_path = __toESM(require("path"));
+var import_language_detector = require("@modern-js/plugin-i18n/language-detector");
 var import_plugin_lint = require("@modern-js/plugin-lint");
 var import_utils = require("@modern-js/utils");
-var import_language_detector = require("@modern-js/plugin-i18n/language-detector");
-var import_initialize = __toESM(require("./plugins/initialize"));
-var import_analyze = __toESM(require("./plugins/analyze"));
-var import_serverBuild = __toESM(require("./plugins/serverBuild"));
-var import_deploy = __toESM(require("./plugins/deploy"));
 var import_hooks = require("./hooks");
 var import_locale = require("./locale");
-var import_restart = require("./utils/restart");
-var import_generateWatchFiles = require("./utils/generateWatchFiles");
+var import_analyze = __toESM(require("./plugins/analyze"));
+var import_deploy = __toESM(require("./plugins/deploy"));
+var import_initialize = __toESM(require("./plugins/initialize"));
+var import_serverBuild = __toESM(require("./plugins/serverBuild"));
 var import_commands = require("./commands");
+var import_generateWatchFiles = require("./utils/generateWatchFiles");
+var import_restart = require("./utils/restart");
 var import_dev = require("./commands/dev");
 var import_core = require("@modern-js/core");
 __reExport(src_exports, require("./defineConfig"), module.exports);
 __reExport(src_exports, require("./types"), module.exports);
 const appTools = (options = {
+  // default webpack to be compatible with original projects
   bundler: "webpack"
 }) => ({
   name: "@modern-js/app-tools",
@@ -69,10 +70,16 @@ const appTools = (options = {
   registerHook: import_hooks.hooks,
   usePlugins: [
     (0, import_initialize.default)({
-      bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+      bundler: (options === null || options === void 0 ? void 0 : options.bundler) && [
+        "rspack",
+        "experimental-rspack"
+      ].includes(options.bundler) ? "rspack" : "webpack"
     }),
     (0, import_analyze.default)({
-      bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+      bundler: (options === null || options === void 0 ? void 0 : options.bundler) && [
+        "rspack",
+        "experimental-rspack"
+      ].includes(options.bundler) ? "rspack" : "webpack"
     }),
     (0, import_serverBuild.default)(),
     (0, import_plugin_lint.lintPlugin)(),
@@ -139,7 +146,7 @@ const appTools = (options = {
       async fileChange(e) {
         const { filename, eventType, isPrivate } = e;
         if (!isPrivate && (eventType === "change" || eventType === "unlink")) {
-          const { closeServer } = await import("./utils/createServer");
+          const { closeServer } = await import("./utils/createServer.js");
           await closeServer();
           await (0, import_restart.restart)(api.useHookRunners(), filename);
         }

package/dist/cjs/locale/index.js

@@ -23,8 +23,8 @@ __export(locale_exports, {
 });
 module.exports = __toCommonJS(locale_exports);
 var import_plugin_i18n = require("@modern-js/plugin-i18n");
-var import_zh = require("./zh");
 var import_en = require("./en");
+var import_zh = require("./zh");
 const i18n = new import_plugin_i18n.I18n();
 const localeKeys = i18n.init("en", {
   zh: import_zh.ZH_LOCALE,

package/dist/cjs/plugins/analyze/getFileSystemEntry.js

@@ -53,51 +53,57 @@ const isBundleEntry = async (hookRunners, dir, enableCustomEntry) => {
   }
   return hasIndex(dir);
 };
-const scanDir = (hookRunners, dirs, enableCustomEntry) => Promise.all(dirs.map(async (dir) => {
-  const indexFile = hasIndex(dir);
-  const customBootstrap = (0, import_isDefaultExportFunction.isDefaultExportFunction)(indexFile) ? indexFile : false;
-  const entryName = import_path.default.basename(dir);
-  const customEntryFile = hasEntry(dir);
-  const customServerEntry = hasServerEntry(dir);
-  if (indexFile && !customBootstrap) {
-    return {
-      entryName,
-      isMainEntry: false,
-      entry: indexFile,
-      absoluteEntryDir: import_path.default.resolve(dir),
-      isAutoMount: false,
-      customBootstrap
-    };
-  }
-  const entryFile = (await hookRunners.checkEntryPoint({
-    path: dir,
-    entry: false
-  })).entry;
-  if (entryFile) {
-    return {
-      entryName,
-      isMainEntry: false,
-      entry: enableCustomEntry ? customEntryFile || entryFile : entryFile,
-      customServerEntry,
-      absoluteEntryDir: import_path.default.resolve(dir),
-      isAutoMount: true,
-      customBootstrap,
-      customEntry: enableCustomEntry ? Boolean(customEntryFile) : false
-    };
-  }
-  if (enableCustomEntry && customEntryFile) {
-    return {
-      entryName,
-      isMainEntry: false,
-      entry: customEntryFile,
-      customServerEntry,
-      absoluteEntryDir: import_path.default.resolve(dir),
-      isAutoMount: false,
-      customEntry: Boolean(customEntryFile)
-    };
+const scanDir = async (hookRunners, dirs, enableCustomEntry) => {
+  const entries = await Promise.all(dirs.map(async (dir) => {
+    const indexFile = hasIndex(dir);
+    const customBootstrap = (0, import_isDefaultExportFunction.isDefaultExportFunction)(indexFile) ? indexFile : false;
+    const entryName = import_path.default.basename(dir);
+    const customEntryFile = hasEntry(dir);
+    const customServerEntry = hasServerEntry(dir);
+    if (indexFile && !customBootstrap) {
+      return {
+        entryName,
+        isMainEntry: false,
+        entry: indexFile,
+        absoluteEntryDir: import_path.default.resolve(dir),
+        isAutoMount: false,
+        customBootstrap
+      };
+    }
+    const entryFile = (await hookRunners.checkEntryPoint({
+      path: dir,
+      entry: false
+    })).entry;
+    if (entryFile) {
+      return {
+        entryName,
+        isMainEntry: false,
+        entry: enableCustomEntry ? customEntryFile || entryFile : entryFile,
+        customServerEntry,
+        absoluteEntryDir: import_path.default.resolve(dir),
+        isAutoMount: true,
+        customBootstrap,
+        customEntry: enableCustomEntry ? Boolean(customEntryFile) : false
+      };
+    }
+    if (enableCustomEntry && customEntryFile) {
+      return {
+        entryName,
+        isMainEntry: false,
+        entry: customEntryFile,
+        customServerEntry,
+        absoluteEntryDir: import_path.default.resolve(dir),
+        isAutoMount: false,
+        customEntry: Boolean(customEntryFile)
+      };
+    }
+    return false;
+  })).then((entries2) => entries2.filter(Boolean));
+  if (entries.length === 0) {
+    throw Error("There is no valid entry point in the current project!");
   }
-  throw Error("There is no valid entry point in the current project!");
-}));
+  return entries;
+};
 const getFileSystemEntry = async (hookRunners, appContext, config) => {
   const { appDirectory } = appContext;
   const { source: { entriesDir, disableEntryDirs, enableCustomEntry } } = config;

package/dist/cjs/plugins/analyze/getServerRoutes.js

@@ -31,8 +31,8 @@ __export(getServerRoutes_exports, {
   getServerRoutes: () => getServerRoutes
 });
 module.exports = __toCommonJS(getServerRoutes_exports);
-var import_path = __toESM(require("path"));
 var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_routes = require("../../utils/routes");
 var import_utils2 = require("./utils");
@@ -111,7 +111,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
     const entryOptions = (0, import_utils.getEntryOptions)(entryName, isMain, ssr, ssrByEntries, packageName);
     const isSSR = Boolean(entryOptions);
     const isWorker = Boolean(workerSSR);
-    const isStream = typeof entryOptions === "object" && (entryOptions.mode === "stream" || Boolean(entryOptions.preload));
+    const isStream = typeof entryOptions === "object" && entryOptions.mode === "stream";
     const { resHeaders } = (routes === null || routes === void 0 ? void 0 : routes[entryName]) || {};
     let route = {
       urlPath: `/${isMain ? "" : entryName}`,

package/dist/cjs/plugins/analyze/index.js

@@ -33,12 +33,12 @@ __export(analyze_exports, {
 module.exports = __toCommonJS(analyze_exports);
 var path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
+var import_builder = require("../../builder");
+var import_config = require("../../config");
+var import_config2 = require("../../utils/config");
+var import_getSelectedEntries = require("../../utils/getSelectedEntries");
 var import_printInstructions = require("../../utils/printInstructions");
 var import_routes = require("../../utils/routes");
-var import_config = require("../../utils/config");
-var import_getSelectedEntries = require("../../utils/getSelectedEntries");
-var import_config2 = require("../../config");
-var import_builder = require("../../builder");
 var import_utils2 = require("./utils");
 const debug = (0, import_utils.createDebugger)("plugin-analyze");
 var analyze_default = ({ bundler }) => ({
@@ -147,7 +147,7 @@ var analyze_default = ({ bundler }) => ({
             await hookRunners2.afterBuild({
               stats
             });
-            await (0, import_config.emitResolvedConfig)(appContext.appDirectory, normalizedConfig);
+            await (0, import_config2.emitResolvedConfig)(appContext.appDirectory, normalizedConfig);
           });
           builder.onDevCompileDone(async ({ isFirstCompile }) => {
             const hookRunners2 = api.useHookRunners();
@@ -186,7 +186,7 @@ var analyze_default = ({ bundler }) => ({
       },
       resolvedConfig({ resolved }) {
         const appContext = api.useAppContext();
-        const config = (0, import_config2.initialNormalizedConfig)(resolved, appContext, bundler);
+        const config = (0, import_config.initialNormalizedConfig)(resolved, appContext, bundler);
         return {
           resolved: config
         };

package/dist/cjs/plugins/analyze/utils.js

@@ -39,8 +39,8 @@ module.exports = __toCommonJS(utils_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_esbuild = require("esbuild");
 var import_es_module_lexer = require("es-module-lexer");
+var import_esbuild = require("esbuild");
 const walkDirectory = (dir) => import_fs.default.readdirSync(dir).reduce((previous, filename) => {
   const filePath = import_path.default.join(dir, filename);
   if (import_fs.default.statSync(filePath).isDirectory()) {

package/dist/cjs/plugins/deploy/dependencies/index.js

@@ -34,8 +34,8 @@ __export(dependencies_exports, {
 module.exports = __toCommonJS(dependencies_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
-var import_pkg_types = require("pkg-types");
 var import_mlly = require("mlly");
+var import_pkg_types = require("pkg-types");
 var import_utils2 = require("./utils");
 var import_nft = require("@vercel/nft");
 const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = import_utils2.traceFiles, entryFilter, modifyPackageJson, copyWholePackage, traceOptions }) => {

package/dist/cjs/plugins/deploy/dependencies/utils.js

@@ -39,11 +39,11 @@ __export(utils_exports, {
   writePackage: () => writePackage
 });
 module.exports = __toCommonJS(utils_exports);
-var import_path = __toESM(require("path"));
 var import_node_os = __toESM(require("node:os"));
+var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_mlly = require("mlly");
 var import_nft = require("@vercel/nft");
+var import_mlly = require("mlly");
 function applyPublicCondition(pkg) {
   var _pkg_publishConfig;
   if (pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig = pkg.publishConfig) === null || _pkg_publishConfig === void 0 ? void 0 : _pkg_publishConfig.exports) {

package/dist/cjs/plugins/deploy/index.js

@@ -22,10 +22,10 @@ __export(deploy_exports, {
 });
 module.exports = __toCommonJS(deploy_exports);
 var import_std_env = require("std-env");
-var import_utils = require("./utils");
+var import_netlify = require("./platforms/netlify");
 var import_node = require("./platforms/node");
 var import_vercel = require("./platforms/vercel");
-var import_netlify = require("./platforms/netlify");
+var import_utils = require("./utils");
 const deployPresets = {
   node: import_node.createNodePreset,
   vercel: import_vercel.createVercelPreset,

package/dist/cjs/plugins/deploy/platforms/netlify.js

@@ -34,8 +34,8 @@ module.exports = __toCommonJS(netlify_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
 var import_routes = require("../../../utils/routes");
-var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
+var import_utils2 = require("../utils");
 async function cleanDistDirectory(dir) {
   try {
     const items = await import_utils.fs.readdir(dir);

package/dist/cjs/plugins/deploy/platforms/node.js

@@ -33,8 +33,8 @@ __export(node_exports, {
 module.exports = __toCommonJS(node_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
-var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
+var import_utils2 = require("../utils");
 const createNodePreset = (appContext, config) => {
   const { appDirectory, distDirectory, serverPlugins, moduleType } = appContext;
   const isEsmProject = moduleType === "module";

package/dist/cjs/plugins/deploy/platforms/vercel.js

@@ -34,8 +34,8 @@ module.exports = __toCommonJS(vercel_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
 var import_routes = require("../../../utils/routes");
-var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
+var import_utils2 = require("../utils");
 const createVercelPreset = (appContext, modernConfig, needModernServer) => {
   const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
   const isEsmProject = moduleType === "module";

package/dist/cjs/plugins/serverBuild.js

@@ -31,10 +31,10 @@ __export(serverBuild_exports, {
   default: () => serverBuild_default
 });
 module.exports = __toCommonJS(serverBuild_exports);
-var import_path = __toESM(require("path"));
 var import_fs = __toESM(require("fs"));
-var import_utils = require("@modern-js/utils");
+var import_path = __toESM(require("path"));
 var import_server_utils = require("@modern-js/server-utils");
+var import_utils = require("@modern-js/utils");
 const TS_CONFIG_FILENAME = "tsconfig.json";
 function checkHasCache(appDir) {
   const tsFilepath = import_path.default.resolve(appDir, import_utils.SERVER_DIR, "cache.ts");

package/dist/cjs/utils/createServer.js

@@ -24,8 +24,8 @@ __export(createServer_exports, {
   setServer: () => setServer
 });
 module.exports = __toCommonJS(createServer_exports);
-var import_server = require("@modern-js/server");
 var import_prod_server = require("@modern-js/prod-server");
+var import_server = require("@modern-js/server");
 let server = null;
 const getServer = () => server;
 const setServer = (newServer) => {