@modern-js/app-tools 2.58.2 → 2.58.3

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/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/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,
+      internalDirecory: 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,18 +36,18 @@ __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);

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/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) => {

package/dist/types/builder/generator/createBuilderProviderConfig.d.ts

@@ -1,2 +1,2 @@
-import type { Bundler, IAppContext, AppNormalizedConfig } from '../../types';
+import type { AppNormalizedConfig, Bundler, IAppContext } from '../../types';
 export declare function createBuilderProviderConfig<B extends Bundler>(resolveConfig: AppNormalizedConfig<B>, appContext: IAppContext): Omit<AppNormalizedConfig<B>, 'plugins'>;

package/dist/types/builder/generator/index.d.ts

@@ -1,6 +1,6 @@
-import { type UniBuilderInstance, type BundlerType } from '@modern-js/uni-builder';
-import type { BuilderOptions } from '../shared';
+import { type BundlerType, type UniBuilderInstance } from '@modern-js/uni-builder';
 import type { Bundler } from '../../types';
+import type { BuilderOptions } from '../shared';
 /**
  * @param options BuilderOptions
  * @param bundlerType BundlerType

package/dist/types/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.d.ts

@@ -1,4 +1,4 @@
-import type { Rspack, webpack, HtmlWebpackPlugin } from '@modern-js/uni-builder';
+import type { HtmlWebpackPlugin, Rspack, webpack } from '@modern-js/uni-builder';
 export declare class HtmlAsyncChunkPlugin {
     name: string;
     htmlWebpackPlugin: typeof HtmlWebpackPlugin;

package/dist/types/builder/shared/bundlerPlugins/HtmlBottomTemplate.d.ts

@@ -1,4 +1,4 @@
-import type { Rspack, webpack, HtmlWebpackPlugin } from '@modern-js/uni-builder';
+import type { HtmlWebpackPlugin, Rspack, webpack } from '@modern-js/uni-builder';
 export declare class BottomTemplatePlugin {
     htmlWebpackPlugin: typeof HtmlWebpackPlugin;
     bottomTemplateReg: RegExp;

package/dist/types/builder/shared/bundlerPlugins/RouterPlugin.d.ts

@@ -1,4 +1,4 @@
-import type { Rspack, webpack, HtmlWebpackPlugin } from '@modern-js/uni-builder';
+import type { HtmlWebpackPlugin, Rspack, webpack } from '@modern-js/uni-builder';
 import type { ScriptLoading } from '@rsbuild/core';
 export interface RouteAssets {
     [routeId: string]: {

package/dist/types/builder/shared/loaders/serverModuleLoader.d.ts

@@ -1,3 +1,3 @@
-import type { webpack, Rspack } from '@modern-js/uni-builder';
+import type { Rspack, webpack } from '@modern-js/uni-builder';
 declare function loader(this: webpack.LoaderContext<void> | Rspack.LoaderContext): string;
 export default loader;

package/dist/types/builder/shared/types.d.ts

@@ -1,4 +1,4 @@
-import type { Bundler, AppNormalizedConfig, IAppContext } from '../../types';
+import type { AppNormalizedConfig, Bundler, IAppContext } from '../../types';
 export type BuilderOptions<B extends Bundler> = {
     normalizedConfig: AppNormalizedConfig<B>;
     appContext: IAppContext;

package/dist/types/commands/build.d.ts

@@ -1,4 +1,4 @@
 import { type PluginAPI } from '@modern-js/core';
-import type { BuildOptions } from '../utils/types';
 import type { AppTools } from '../types';
+import type { BuildOptions } from '../utils/types';
 export declare const build: (api: PluginAPI<AppTools<'shared'>>, options?: BuildOptions) => Promise<void>;

package/dist/types/commands/dev.d.ts

@@ -1,7 +1,7 @@
 import { type PluginAPI } from '@modern-js/core';
 import { type ApplyPlugins } from '@modern-js/server';
-import type { DevOptions } from '../utils/types';
 import type { AppTools } from '../types';
+import type { DevOptions } from '../utils/types';
 export interface ExtraServerOptions {
     applyPlugins?: ApplyPlugins;
 }

package/dist/types/commands/inspect.d.ts

@@ -1,4 +1,4 @@
 import type { PluginAPI } from '@modern-js/core';
-import type { InspectOptions } from '../utils/types';
 import type { AppTools } from '../types';
+import type { InspectOptions } from '../utils/types';
 export declare const inspect: (api: PluginAPI<AppTools<'shared'>>, options: InspectOptions) => Promise<import("@rsbuild/core").InspectConfigResult<"rspack">>;

package/dist/types/config/default.d.ts

@@ -1,3 +1,3 @@
-import type { IAppContext, AppUserConfig, AppLegacyUserConfig } from '../types';
+import type { AppLegacyUserConfig, AppUserConfig, IAppContext } from '../types';
 export declare function createDefaultConfig(appContext: IAppContext): AppUserConfig<'webpack'> | AppUserConfig<'rspack'>;
 export declare function createLegacyDefaultConfig(appContext: IAppContext): AppLegacyUserConfig;

package/dist/types/plugins/analyze/getBundleEntry.d.ts

@@ -1,4 +1,4 @@
-import type { Entrypoint } from '@modern-js/types';
 import type { CliHooksRunner } from '@modern-js/core';
+import type { Entrypoint } from '@modern-js/types';
 import type { AppNormalizedConfig, AppTools, IAppContext } from '../../types';
 export declare const getBundleEntry: (hookRunners: CliHooksRunner<AppTools<'shared'>>, appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Promise<Entrypoint[]>;

package/dist/types/plugins/analyze/getFileSystemEntry.d.ts

@@ -1,5 +1,5 @@
-import type { Entrypoint } from '@modern-js/types';
 import type { CliHooksRunner } from '@modern-js/core';
+import type { Entrypoint } from '@modern-js/types';
 import type { AppNormalizedConfig, AppTools, IAppContext } from '../../types';
 export type { Entrypoint };
 export declare const getFileSystemEntry: (hookRunners: CliHooksRunner<AppTools<'shared'>>, appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Promise<Entrypoint[]>;

package/dist/types/plugins/deploy/dependencies/index.d.ts

@@ -1,5 +1,5 @@
-import type { PackageJson } from 'pkg-types';
 import type { NodeFileTraceOptions } from '@vercel/nft';
+import type { PackageJson } from 'pkg-types';
 import { traceFiles as defaultTraceFiles } from './utils';
 export type { NodeFileTraceOptions } from '@vercel/nft';
 export { nodeFileTrace } from '@vercel/nft';

package/dist/types/plugins/deploy/dependencies/utils.d.ts

@@ -1,5 +1,5 @@
-import type { PackageJson } from 'pkg-types';
 import { type NodeFileTraceOptions } from '@vercel/nft';
+import type { PackageJson } from 'pkg-types';
 export type TracedPackage = {
     name: string;
     versions: Record<string, {

package/dist/types/plugins/initialize/index.d.ts

@@ -1,4 +1,4 @@
-import type { CliPlugin, AppTools } from '../../types';
+import type { AppTools, CliPlugin } from '../../types';
 declare const _default: ({ bundler, }: {
     bundler: 'rspack' | 'webpack';
 }) => CliPlugin<AppTools<'shared'>>;

package/dist/types/plugins/serverBuild.d.ts

@@ -1,3 +1,3 @@
-import type { CliPlugin, AppTools } from '../types';
+import type { AppTools, CliPlugin } from '../types';
 declare const _default: () => CliPlugin<AppTools>;
 export default _default;

package/dist/types/types/config/index.d.ts

@@ -1,17 +1,17 @@
-import type { ServerUserConfig, BffUserConfig } from '@modern-js/server-core';
-import type { UniBuilderPlugin, LooseRsbuildPlugin } from '@modern-js/uni-builder';
+import type { BffUserConfig, ServerUserConfig } from '@modern-js/server-core';
+import type { LooseRsbuildPlugin, UniBuilderPlugin } from '@modern-js/uni-builder';
 import type { RsbuildConfig } from '@rsbuild/core';
 import type { Bundler } from '../utils';
+import type { DeployUserConfig } from './deploy';
+import type { DevUserConfig } from './dev';
+import type { ExperimentsUserConfig } from './experiments';
+import type { HtmlUserConfig } from './html';
 import type { OutputUserConfig } from './output';
+import type { PerformanceUserConfig } from './performance';
+import type { SecurityUserConfig } from './security';
 import type { SourceUserConfig } from './source';
 import type { TestingUserConfig } from './testing';
-import type { DevUserConfig } from './dev';
 import type { ToolsUserConfig } from './tools';
-import type { HtmlUserConfig } from './html';
-import type { SecurityUserConfig } from './security';
-import type { DeployUserConfig } from './deploy';
-import type { ExperimentsUserConfig } from './experiments';
-import type { PerformanceUserConfig } from './performance';
 export * from './output';
 export interface RuntimeUserConfig {
     [name: string]: any;

package/dist/types/types/config/output.d.ts

@@ -1,5 +1,5 @@
-import type { UniBuilderConfig } from '@modern-js/uni-builder';
 import type { SSGConfig } from '@modern-js/types';
+import type { UniBuilderConfig } from '@modern-js/uni-builder';
 import type { UnwrapBuilderConfig } from '../utils';
 export interface OutputUserConfig extends UnwrapBuilderConfig<UniBuilderConfig, 'output'> {
     /**

package/dist/types/types/config/tools.d.ts

@@ -1,8 +1,8 @@
-import type { JestConfig } from '@modern-js/types';
-import type { PluginSwcOptions } from '@rsbuild/plugin-swc';
 import type { PluginEsbuildOptions } from '@modern-js/rsbuild-plugin-esbuild';
+import type { JestConfig } from '@modern-js/types';
 import type { UniBuilderConfig } from '@modern-js/uni-builder';
-import type { UnwrapBuilderConfig, Bundler } from '../utils';
+import type { PluginSwcOptions } from '@rsbuild/plugin-swc';
+import type { Bundler, UnwrapBuilderConfig } from '../utils';
 export type Tailwindcss = Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
 type BuilderToolsConfig = UnwrapBuilderConfig<UniBuilderConfig, 'tools'>;
 export interface ToolsUserConfig<B extends Bundler = 'webpack'> extends Omit<BuilderToolsConfig, 'swc'> {

package/dist/types/types/hooks.d.ts

@@ -1,7 +1,7 @@
+import type { DevToolData, RegisterBuildPlatformResult } from '@modern-js/core';
 import type { AsyncWaterfall, AsyncWorkflow, ParallelWorkflow } from '@modern-js/plugin';
 import type { Entrypoint, HtmlPartials, NestedRouteForCli, PageRoute, RouteLegacy, ServerPlugin, ServerRoute } from '@modern-js/types';
-import type { RegisterBuildPlatformResult, DevToolData } from '@modern-js/core';
-import type { Rspack, webpack, Stats, MultiStats } from '@modern-js/uni-builder';
+import type { MultiStats, Rspack, Stats, webpack } from '@modern-js/uni-builder';
 import type { Bundler } from './utils';
 export interface ImportSpecifier {
     local?: string;

package/dist/types/types/index.d.ts

@@ -1,7 +1,7 @@
 import type { NormalizedConfig, UserConfig } from '@modern-js/core';
-import type { AppToolsUserConfig, AppToolsNormalizedConfig } from './config';
+import type { AppToolsNormalizedConfig, AppToolsUserConfig } from './config';
 import type { AppToolsHooks } from './hooks';
-import type { AppToolsLegacyUserConfig, AppToolsLegacyNormalizedConfig } from './legacyConfig';
+import type { AppToolsLegacyNormalizedConfig, AppToolsLegacyUserConfig } from './legacyConfig';
 import type { Bundler } from './utils';
 export * from './hooks';
 export * from './config';

package/dist/types/types/legacyConfig/index.d.ts

@@ -1,10 +1,10 @@
-import type { ServerUserConfig as LegacyServerUserConfig, BffUserConfig as LegacyBffUserConfig } from '@modern-js/server-core';
+import type { BffUserConfig as LegacyBffUserConfig, ServerUserConfig as LegacyServerUserConfig } from '@modern-js/server-core';
+import type { DeployLegacyUserConfig } from './deploy';
 import type { DevUserLegacyConfig } from './dev';
 import type { OutputLegacyUserConfig } from './output';
 import type { SourceLegacyUserConfig } from './source';
-import type { DeployLegacyUserConfig } from './deploy';
-import type { ToolsLegacyUserConfig } from './tools';
 import type { TestingLegacyUserConfig } from './testing';
+import type { ToolsLegacyUserConfig } from './tools';
 export type { DevUserLegacyConfig } from './dev';
 export type { OutputLegacyUserConfig } from './output';
 export type { DeployLegacyUserConfig } from './deploy';

package/dist/types/types/legacyConfig/tools.d.ts

@@ -1,4 +1,4 @@
-import type { JestConfig, DevServerOptions } from '@modern-js/types';
+import type { DevServerOptions, JestConfig } from '@modern-js/types';
 import type { UniBuilderConfig } from '@modern-js/uni-builder';
 type BuilderToolsConfig = Required<UniBuilderConfig>['tools'];
 export type ToolsLegacyUserConfig = BuilderToolsConfig & {

package/dist/types/utils/printInstructions.d.ts

@@ -1,3 +1,3 @@
-import type { IAppContext, CliHooksRunner } from '@modern-js/core';
+import type { CliHooksRunner, IAppContext } from '@modern-js/core';
 import type { AppNormalizedConfig, AppTools } from '../types';
 export declare const printInstructions: (hookRunners: CliHooksRunner<AppTools<'shared'>>, appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Promise<void>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.2",
+  "version": "2.58.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -88,20 +88,20 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.58.2",
-    "@modern-js/node-bundle-require": "2.58.2",
-    "@modern-js/plugin": "2.58.2",
-    "@modern-js/plugin-i18n": "2.58.2",
-    "@modern-js/plugin-data-loader": "2.58.2",
-    "@modern-js/plugin-lint": "2.58.2",
-    "@modern-js/prod-server": "2.58.2",
-    "@modern-js/server": "2.58.2",
-    "@modern-js/rsbuild-plugin-esbuild": "2.58.2",
-    "@modern-js/server-core": "2.58.2",
-    "@modern-js/types": "2.58.2",
-    "@modern-js/server-utils": "2.58.2",
-    "@modern-js/uni-builder": "2.58.2",
-    "@modern-js/utils": "2.58.2"
+    "@modern-js/core": "2.58.3",
+    "@modern-js/node-bundle-require": "2.58.3",
+    "@modern-js/plugin": "2.58.3",
+    "@modern-js/plugin-i18n": "2.58.3",
+    "@modern-js/plugin-lint": "2.58.3",
+    "@modern-js/prod-server": "2.58.3",
+    "@modern-js/rsbuild-plugin-esbuild": "2.58.3",
+    "@modern-js/server": "2.58.3",
+    "@modern-js/server-utils": "2.58.3",
+    "@modern-js/plugin-data-loader": "2.58.3",
+    "@modern-js/types": "2.58.3",
+    "@modern-js/server-core": "2.58.3",
+    "@modern-js/uni-builder": "2.58.3",
+    "@modern-js/utils": "2.58.3"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "1.0.1-beta.14",
@@ -113,8 +113,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.93.0",
-    "@scripts/jest-config": "2.58.2",
-    "@scripts/build": "2.58.2"
+    "@scripts/build": "2.58.3",
+    "@scripts/jest-config": "2.58.3"
   },
   "sideEffects": false,
   "publishConfig": {