@modern-js/app-tools 2.58.1-alpha.6 → 2.58.2

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

@@ -36,7 +36,8 @@ var import_utils = require("@modern-js/utils");
 var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
 const createNodePreset = (appContext, config) => {
-  const { appDirectory, distDirectory, serverPlugins } = appContext;
+  const { appDirectory, distDirectory, serverPlugins, moduleType } = appContext;
+  const isEsmProject = moduleType === "module";
   const plugins = serverPlugins.map((plugin) => plugin.name);
   const outputDirectory = import_node_path.default.join(appDirectory, ".output");
   const staticDirectory = import_node_path.default.join(outputDirectory, "static");
@@ -58,7 +59,9 @@ const createNodePreset = (appContext, config) => {
           prefix: config === null || config === void 0 ? void 0 : (_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix
         },
         output: {
-          path: "."
+          distPath: {
+            root: "."
+          }
         }
       };
       const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
@@ -69,10 +72,16 @@ const createNodePreset = (appContext, config) => {
       const pluginsCode = `[${plugins.map((plugin, index) => {
         return `plugin_${index}()`;
       }).join(",")}]`;
-      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./nodeEntry.js"))).toString();
+      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./node-entry.js"))).toString();
       const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
       entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
-      await import_utils.fs.writeFile(entryFilePath, entryCode);
+      if (isEsmProject) {
+        const cjsEntryFilePath = import_node_path.default.join(outputDirectory, "index.cjs");
+        await import_utils.fs.writeFile(cjsEntryFilePath, entryCode);
+        await import_utils.fs.writeFile(entryFilePath, `import('./index.cjs');`);
+      } else {
+        await import_utils.fs.writeFile(entryFilePath, entryCode);
+      }
     },
     async end() {
       console.log("Static directory:", import_utils.chalk.blue(import_node_path.default.relative(appDirectory, staticDirectory)));

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

@@ -0,0 +1,3 @@
+"use strict";
+const { handler } = require("./vercel-handler.cjs");
+module.exports = handler;

package/dist/cjs/plugins/deploy/platforms/vercel-entry.mjs

@@ -0,0 +1,3 @@
+import { handler } from './vercel-handler.cjs';
+
+export default handler;

package/dist/cjs/plugins/deploy/platforms/{vercelEntry.js → vercel-handler.js}

@@ -53,9 +53,12 @@ async function createHandler() {
   return requestHandler;
 }
 createHandler();
-module.exports = async (req, res) => {
+const handler = async (req, res) => {
   if (!requestHandler) {
     await createHandler();
   }
   return requestHandler(req, res);
 };
+module.exports = {
+  handler
+};

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

@@ -37,12 +37,14 @@ var import_routes = require("../../../utils/routes");
 var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
 const createVercelPreset = (appContext, modernConfig, needModernServer) => {
-  const { appDirectory, distDirectory, entrypoints, serverPlugins } = appContext;
+  const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
+  const isEsmProject = moduleType === "module";
   const plugins = serverPlugins.map((plugin) => plugin.name);
   const vercelOutput = import_node_path.default.join(appDirectory, ".vercel");
   const outputDirectory = import_node_path.default.join(vercelOutput, "output");
   const funcsDirectory = import_node_path.default.join(outputDirectory, "functions", "index.func");
   const entryFilePath = import_node_path.default.join(funcsDirectory, "index.js");
+  const handlerFilePath = import_node_path.default.join(funcsDirectory, "vercel-handler.cjs");
   return {
     async prepare() {
       await import_utils.fs.remove(vercelOutput);
@@ -118,7 +120,9 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
           prefix: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_bff = modernConfig.bff) === null || _modernConfig_bff === void 0 ? void 0 : _modernConfig_bff.prefix
         },
         output: {
-          path: "."
+          distPath: {
+            root: "."
+          }
         }
       };
       const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
@@ -130,9 +134,14 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
         return `plugin_${index}()`;
       }).join(",")}]`;
       const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
-      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./vercelEntry.js"))).toString();
-      entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
-      await import_utils.fs.writeFile(entryFilePath, entryCode);
+      let handlerCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./vercel-handler.js"))).toString();
+      handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      await import_utils.fs.writeFile(handlerFilePath, handlerCode);
+      if (isEsmProject) {
+        await import_utils.fs.copy(import_node_path.default.join(__dirname, "./vercel-entry.mjs"), entryFilePath);
+      } else {
+        await import_utils.fs.copy(import_node_path.default.join(__dirname, "./vercel-entry.js"), entryFilePath);
+      }
     },
     async end() {
       if (!needModernServer) {

package/dist/cjs/utils/config.js

@@ -40,7 +40,7 @@ var import_flatted = require("flatted");
 const defineServerConfig = (config) => config;
 const buildServerConfig = async ({ appDirectory, distDirectory, configFile, options, watch }) => {
   const configFilePath = await (0, import_utils.getServerConfig)(appDirectory, configFile);
-  const getOutputFile = async (filepath) => path.resolve(distDirectory, `${filepath.replace(new RegExp(import_utils.CONFIG_FILE_EXTENSIONS.join("|")), "")}.js`);
+  const getOutputFile = async (filepath) => path.resolve(distDirectory, `${filepath.replace(new RegExp(import_utils.CONFIG_FILE_EXTENSIONS.join("|")), "")}.cjs`);
   if (configFilePath) {
     const configHelperFilePath = path.normalize(path.join(distDirectory, "./config-helper.js"));
     const helperCode = `

package/dist/cjs/utils/loadPlugins.js

@@ -37,7 +37,7 @@ async function getServerPlugins(api, metaName = "modern-js") {
 }
 async function loadServerPlugins(api, appDirectory, metaName) {
   const plugins = await getServerPlugins(api, metaName);
-  const instances = (0, import_prod_server.loadServerPlugins)(plugins, appDirectory);
+  const instances = await (0, import_prod_server.loadServerPlugins)(plugins, appDirectory);
   return instances;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/utils/register.js

@@ -33,7 +33,15 @@ __export(register_exports, {
 module.exports = __toCommonJS(register_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
-const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
+const registerEsbuild = async ({ isTsProject, tsConfig, distDir }) => {
+  const esbuildRegister = await import("esbuild-register/dist/node");
+  esbuildRegister.register({
+    tsconfigRaw: isTsProject ? tsConfig : void 0,
+    hookIgnoreNodeModules: true,
+    hookMatcher: (fileName) => !fileName.startsWith(distDir)
+  });
+};
+const registerCompiler = async (appDir, distDir, alias) => {
   const TS_CONFIG_FILENAME = `tsconfig.json`;
   const tsconfigPath = import_node_path.default.resolve(appDir, TS_CONFIG_FILENAME);
   const isTsProject = await import_utils.fs.pathExists(tsconfigPath);
@@ -44,6 +52,17 @@ const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
   const { paths = {}, absoluteBaseUrl = "./" } = aliasConfig;
   const tsPaths = Object.keys(paths).reduce((o, key) => {
     let tsPath = paths[key];
+    if (typeof tsPath === "string" && key.startsWith("@") && tsPath.startsWith("@")) {
+      try {
+        tsPath = require.resolve(tsPath, {
+          paths: [
+            process.cwd(),
+            ...module.paths
+          ]
+        });
+      } catch {
+      }
+    }
     if (typeof tsPath === "string" && import_node_path.default.isAbsolute(tsPath)) {
       tsPath = import_node_path.default.relative(absoluteBaseUrl, tsPath);
     }
@@ -61,32 +80,40 @@ const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
   if (isTsProject) {
     tsConfig = (0, import_utils.readTsConfigByFile)(tsconfigPath);
   }
-  try {
-    const tsNode = await Promise.resolve().then(() => __toESM(require("ts-node")));
-    const tsNodeOptions = tsConfig["ts-node"];
-    if (isTsProject) {
-      tsNode.register({
-        project: tsconfigPath,
-        scope: true,
-        // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
-        files: true,
-        transpileOnly: true,
-        ignore: [
-          "(?:^|/)node_modules/",
-          `(?:^|/)${import_node_path.default.relative(appDir, distDir)}/`
-        ],
-        ...tsNodeOptions
+  const { MODERN_NODE_LOADER } = process.env;
+  if (MODERN_NODE_LOADER !== "esbuild") {
+    try {
+      const tsNode = await import("ts-node");
+      const tsNodeOptions = tsConfig["ts-node"];
+      if (isTsProject) {
+        tsNode.register({
+          project: tsconfigPath,
+          scope: true,
+          // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
+          files: true,
+          transpileOnly: true,
+          ignore: [
+            "(?:^|/)node_modules/",
+            `(?:^|/)${import_node_path.default.relative(appDir, distDir)}/`
+          ],
+          ...tsNodeOptions
+        });
+      }
+    } catch (error) {
+      await registerEsbuild({
+        isTsProject,
+        tsConfig,
+        distDir
       });
     }
-  } catch (error) {
-    const esbuildRegister = await Promise.resolve().then(() => __toESM(require("esbuild-register/dist/node")));
-    esbuildRegister.register({
-      tsconfigRaw: isTsProject ? tsConfig : void 0,
-      hookIgnoreNodeModules: true,
-      hookMatcher: (fileName) => !fileName.startsWith(distDir)
+  } else {
+    await registerEsbuild({
+      isTsProject,
+      tsConfig,
+      distDir
     });
   }
-  const tsConfigPaths = await Promise.resolve().then(() => __toESM(require("@modern-js/utils/tsconfig-paths")));
+  const tsConfigPaths = (await import("@modern-js/utils/tsconfig-paths")).default;
   if (await import_utils.fs.pathExists(appDir)) {
     const loaderRes = tsConfigPaths.loadConfig(appDir);
     if (loaderRes.resultType === "success") {

package/dist/types/builder/builder-rspack/adapterCopy.d.ts

@@ -1,3 +1,3 @@
-import { RsbuildPlugin } from '@modern-js/uni-builder';
-import { BuilderOptions } from '../shared';
+import type { RsbuildPlugin } from '@modern-js/uni-builder';
+import { type BuilderOptions } from '../shared';
 export declare const builderPluginAdpaterCopy: (options: BuilderOptions<'rspack'>) => RsbuildPlugin;

package/dist/types/builder/builder-rspack/index.d.ts

@@ -1,2 +1,2 @@
-import { BuilderOptions } from '../shared';
+import type { BuilderOptions } from '../shared';
 export declare function createRspackBuilderForModern(options: BuilderOptions<'rspack'>): Promise<import("@modern-js/uni-builder").UniBuilderInstance>;

package/dist/types/builder/builder-webpack/adapterModern.d.ts

@@ -1,5 +1,5 @@
-import { RsbuildPlugin } from '@modern-js/uni-builder';
-import { BuilderOptions } from '../shared';
+import type { RsbuildPlugin } from '@modern-js/uni-builder';
+import type { BuilderOptions } from '../shared';
 /**
  * Provides default configuration consistent with modern.js v1
  */

package/dist/types/builder/builder-webpack/index.d.ts

@@ -1,2 +1,2 @@
-import { BuilderOptions } from '../shared';
+import type { BuilderOptions } from '../shared';
 export declare function createWebpackBuilderForModern(options: BuilderOptions<'webpack'>): Promise<import("@modern-js/uni-builder").UniBuilderInstance>;

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

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

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

@@ -1 +1 @@
-export declare function createBuilderGenerator(bundler: 'webpack' | 'rspack'): Promise<typeof import("./builder-rspack").createRspackBuilderForModern>;
+export declare function createBuilderGenerator(bundler: 'webpack' | 'rspack'): Promise<typeof import("./builder-rspack/index.js").createRspackBuilderForModern>;

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

@@ -1,4 +1,4 @@
 import type { RsbuildPlugin } from '@rsbuild/core';
-import { Bundler } from '../../../types';
+import type { Bundler } from '../../../types';
 import type { BuilderOptions } from '../types';
 export declare const builderPluginAdapterHtml: <B extends Bundler>(options: BuilderOptions<B>) => RsbuildPlugin;

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

@@ -1,4 +1,4 @@
-import { RsbuildPlugin } from '@rsbuild/core';
+import { type RsbuildPlugin } from '@rsbuild/core';
 import type { Bundler } from '../../../types';
 import type { BuilderOptions } from '../types';
 export declare const builderPluginAdapterSSR: <B extends Bundler>(options: BuilderOptions<B>) => RsbuildPlugin;

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

@@ -1,4 +1,4 @@
-import { AppNormalizedConfig, IAppContext } from '../../types';
+import type { AppNormalizedConfig, IAppContext } from '../../types';
 export declare function createCopyInfo(appContext: IAppContext, config: AppNormalizedConfig<'shared'>): {
     configDir: string;
     uploadDir: string;

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

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

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

@@ -1,6 +1,6 @@
-import { PluginAPI } from '@modern-js/core';
-import { ApplyPlugins } from '@modern-js/server';
-import { DevOptions } from '../utils/types';
+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';
 export interface ExtraServerOptions {
     applyPlugins?: ApplyPlugins;

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

@@ -1,6 +1,6 @@
-import { PluginAPI } from '@modern-js/core';
-import { Command } from '@modern-js/utils';
-import { AppTools } from '../types';
+import type { PluginAPI } from '@modern-js/core';
+import { type Command } from '@modern-js/utils';
+import type { AppTools } from '../types';
 export declare const devCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => Promise<void>;
 export declare const buildCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => Promise<void>;
 export declare const serverCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => void;

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

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

package/dist/types/config/initialize/inits.d.ts

@@ -1,4 +1,4 @@
-import { AppNormalizedConfig, IAppContext } from '../../types';
+import type { AppNormalizedConfig, IAppContext } from '../../types';
 export declare function initHtmlConfig(config: AppNormalizedConfig<'shared'>, appContext: IAppContext): AppNormalizedConfig<'shared'>['html'];
 export declare function initSourceConfig(config: AppNormalizedConfig<'shared'>, appContext: IAppContext, bundler: 'webpack' | 'rspack'): void;
 export declare function createBuilderModuleScope(config: AppNormalizedConfig<'webpack'>): (string | RegExp)[] | undefined;

package/dist/types/config/legacy/createHtmlConfig.d.ts

@@ -1,2 +1,2 @@
-import { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
+import type { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
 export declare function createHtmlConfig(config: Readonly<AppLegacyNormalizedConfig>): AppNormalizedConfig<'webpack'>['html'];

package/dist/types/config/legacy/createOutputConfig.d.ts

@@ -1,2 +1,2 @@
-import { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
+import type { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
 export declare function createOutputConfig(config: Readonly<AppLegacyNormalizedConfig>): AppNormalizedConfig<'webpack'>['output'];

package/dist/types/config/legacy/createSourceConfig.d.ts

@@ -1,2 +1,2 @@
-import { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
+import type { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
 export declare function createSourceConfig(config: AppLegacyNormalizedConfig): AppNormalizedConfig<'webpack'>['source'];

package/dist/types/config/legacy/createToolsConfig.d.ts

@@ -1,2 +1,2 @@
-import { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
+import type { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
 export declare function createToolsConfig(config: AppLegacyNormalizedConfig): AppNormalizedConfig<'webpack'>['tools'];

package/dist/types/esm/esbuild-loader.d.mts

@@ -0,0 +1,6 @@
+export function initialize({ appDir, alias, tsconfigPath }: {
+    appDir: any;
+    alias: any;
+    tsconfigPath: any;
+}): Promise<void>;
+export function resolve(specifier: any, context: any, defaultResolve: any): any;

package/dist/types/esm/register-esm.d.mts

@@ -0,0 +1,5 @@
+export function registerEsm({ appDir, distDir, alias }: {
+    appDir: any;
+    distDir: any;
+    alias: any;
+}): Promise<void>;

package/dist/types/esm/ts-node-loader.d.mts

@@ -0,0 +1,6 @@
+export function initialize({ appDir, alias, tsconfigPath }: {
+    appDir: any;
+    alias: any;
+    tsconfigPath: any;
+}): Promise<void>;
+export function resolve(specifier: any, context: any, defaultResolve: any): any;

package/dist/types/esm/utils.d.mts

@@ -0,0 +1,6 @@
+export function createMatchPath({ alias, appDir, tsconfigPath }: {
+    alias: any;
+    appDir: any;
+    tsconfigPath: any;
+}): tsConfigPaths.MatchPath;
+import tsConfigPaths from '@modern-js/utils/tsconfig-paths';

package/dist/types/exports/server.d.ts

@@ -1,4 +1,4 @@
-import { UnstableMiddleware, UnstableMiddlewareContext, UnstableNext } from '@modern-js/types';
+import type { UnstableMiddleware, UnstableMiddlewareContext, UnstableNext } from '@modern-js/types';
 export type { ServerPlugin } from '@modern-js/server-core';
 export type RenderMiddleware = UnstableMiddleware;
 export type RenderMiddlewareContext = UnstableMiddlewareContext;

package/dist/types/hooks.d.ts

@@ -1,2 +1,2 @@
-import { AppToolsHooks } from './types/hooks';
+import type { AppToolsHooks } from './types/hooks';
 export declare const hooks: AppToolsHooks;

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
-import { CliPlugin } from '@modern-js/core';
-import { AppTools } from './types';
+import type { CliPlugin } from '@modern-js/core';
+import type { AppTools } from './types';
 export { dev } from './commands/dev';
 export type { DevOptions } from './utils/types';
 export { mergeConfig } from '@modern-js/core';

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

@@ -1,4 +1,4 @@
 import type { Entrypoint } from '@modern-js/types';
-import { CliHooksRunner } from '@modern-js/core';
+import type { CliHooksRunner } from '@modern-js/core';
 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 { CliHooksRunner } from '@modern-js/core';
+import type { CliHooksRunner } from '@modern-js/core';
 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/analyze/index.d.ts

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

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

@@ -1,22 +1,20 @@
 import type { PackageJson } from 'pkg-types';
 import type { NodeFileTraceOptions } from '@vercel/nft';
-import { traceFiles as defaultTraceFiles, CacheOptions } from './utils';
+import { traceFiles as defaultTraceFiles } from './utils';
 export type { NodeFileTraceOptions } from '@vercel/nft';
 export { nodeFileTrace } from '@vercel/nft';
-export declare const handleDependencies: ({ appDir, serverRootDir, includeEntries, traceFiles, entryFilter, modifyPackageJson, copyWholePackage, cacheOptions, traceOptions, }: {
+export declare const handleDependencies: ({ appDir, serverRootDir, includeEntries, traceFiles, entryFilter, modifyPackageJson, copyWholePackage, traceOptions, }: {
     appDir: string;
     serverRootDir: string;
     includeEntries: string[];
-    traceFiles?: (({ entryFiles, serverRootDir, base, cacheOptions, traceOptions, }: {
+    traceFiles?: (({ entryFiles, serverRootDir, base, traceOptions, }: {
         entryFiles: string[];
         serverRootDir: string;
         base?: string | undefined;
-        cacheOptions: CacheOptions;
         traceOptions?: NodeFileTraceOptions | undefined;
     }) => Promise<import("@vercel/nft").NodeFileTraceResult>) | undefined;
     entryFilter?: ((filePath: string) => boolean) | undefined;
     modifyPackageJson?: ((pkgJson: PackageJson) => PackageJson) | undefined;
     copyWholePackage?: ((pkgName: string) => boolean) | undefined;
-    cacheOptions?: CacheOptions | undefined;
     traceOptions?: NodeFileTraceOptions | undefined;
 }) => Promise<void>;

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

@@ -1,5 +1,5 @@
 import type { PackageJson } from 'pkg-types';
-import { NodeFileTraceOptions } from '@vercel/nft';
+import { type NodeFileTraceOptions } from '@vercel/nft';
 export type TracedPackage = {
     name: string;
     versions: Record<string, {
@@ -33,17 +33,10 @@ export declare const readDirRecursive: (dir: string, options?: ReadDirOptions) =
 export declare const isFile: (file: string) => Promise<boolean>;
 export declare const findEntryFiles: (rootDir: string, entryFilter?: ((filePath: string) => boolean) | undefined) => Promise<string[]>;
 export declare const findPackageParents: (pkg: TracedPackage, version: string, tracedFiles: Record<string, TracedFile>) => string[];
-export interface CacheOptions {
-    fileCache: boolean;
-    analysisCache: boolean;
-    symlinkCache: boolean;
-    cacheDir: string;
-}
-export declare const traceFiles: ({ entryFiles, serverRootDir, base, cacheOptions, traceOptions, }: {
+export declare const traceFiles: ({ entryFiles, serverRootDir, base, traceOptions, }: {
     entryFiles: string[];
     serverRootDir: string;
     base?: string | undefined;
-    cacheOptions: CacheOptions;
     traceOptions?: NodeFileTraceOptions | undefined;
 }) => Promise<import("@vercel/nft").NodeFileTraceResult>;
 export declare const resolveTracedPath: (base: string, p: string) => Promise<string>;

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

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

package/dist/types/plugins/deploy/platforms/netlify-entry.d.cts

@@ -0,0 +1 @@
+export default handler;

package/dist/types/plugins/deploy/platforms/netlify-entry.d.mts

@@ -0,0 +1 @@
+export { handler as default } from "./netlify-handler.cjs";

package/dist/types/plugins/deploy/platforms/netlify-handler.d.cts

@@ -0,0 +1 @@
+export function handler(request: any, context: any): Promise<any>;

package/dist/types/plugins/deploy/platforms/netlify.d.ts

@@ -1,2 +1,2 @@
-import { CreatePreset } from './platform';
+import type { CreatePreset } from './platform';
 export declare const createNetlifyPreset: CreatePreset;

package/dist/types/plugins/deploy/platforms/node.d.ts

@@ -1,2 +1,2 @@
-import { CreatePreset } from './platform';
+import type { CreatePreset } from './platform';
 export declare const createNodePreset: CreatePreset;

package/dist/types/plugins/deploy/platforms/platform.d.ts

@@ -1,5 +1,5 @@
-import { IAppContext, NormalizedConfig } from '@modern-js/core';
-import { AppTools } from '../../../types';
+import type { IAppContext, NormalizedConfig } from '@modern-js/core';
+import type { AppTools } from '../../../types';
 export type CreatePreset = (appContext: IAppContext, config: NormalizedConfig<AppTools>, needModernServer?: boolean) => DeployPreset;
 type DeployPreset = {
     prepare?: () => Promise<void>;

package/dist/types/plugins/deploy/platforms/vercel-entry.d.mts

@@ -0,0 +1,2 @@
+export default handler;
+import { handler } from './vercel-handler.cjs';

package/dist/types/plugins/deploy/platforms/vercel-entry.d.ts

@@ -0,0 +1,2 @@
+export = handler;
+import { handler } from "./vercel-handler.cjs";

package/dist/types/plugins/deploy/platforms/vercel-handler.d.cts

@@ -0,0 +1 @@
+export function handler(req: any, res: any): Promise<any>;

package/dist/types/plugins/deploy/platforms/vercel.d.ts

@@ -1,2 +1,2 @@
-import { CreatePreset } from './platform';
+import type { CreatePreset } from './platform';
 export declare const createVercelPreset: CreatePreset;

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

@@ -1,4 +1,4 @@
-import { IAppContext } from '@modern-js/core';
+import type { IAppContext } from '@modern-js/core';
 export type ServerAppContext = {
     sharedDirectory: string;
     apiDirectory: string;

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

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

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

@@ -2,7 +2,7 @@ import type { AsyncWaterfall, AsyncWorkflow, ParallelWorkflow } from '@modern-js
 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 { Bundler } from './utils';
+import type { Bundler } from './utils';
 export interface ImportSpecifier {
     local?: string;
     imported?: string;

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

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

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type { Server } from 'node:http';
-import { ModernDevServerOptions } from '@modern-js/server';
+import { type ModernDevServerOptions } from '@modern-js/server';
 export declare const getServer: () => Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | null;
 export declare const setServer: (newServer: Server) => void;
 export declare const closeServer: () => Promise<void>;

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

@@ -1,3 +1,3 @@
-import { IAppContext } from '../types';
+import type { IAppContext } from '../types';
 export declare const addServerConfigToDeps: (dependencies: string[], appDirectory: string, serverConfigFile: string) => Promise<void>;
 export declare function generateWatchFiles(appContext: IAppContext, configDir?: string): Promise<string[]>;

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

@@ -1,4 +1,4 @@
-import { Entrypoint } from '@modern-js/types';
+import type { Entrypoint } from '@modern-js/types';
 /**
  * Allow user to select entrypoints to build.
  */