@modern-js/app-tools 2.65.4 → 2.66.0

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

@@ -103,7 +103,7 @@ const applyRouteOptions = (original, routeOptions) => {
 };
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
   var _deploy_worker;
-  const { source: { mainEntryName }, html: { disableHtmlFolder }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries, rsc }, deploy } = config;
+  const { source: { mainEntryName }, html: { disableHtmlFolder, outputStructure }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries, rsc }, deploy } = config;
   const { packageName } = appContext;
   const workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   let htmlRoutes = entrypoints.reduce((previous, { entryName }) => {
@@ -117,7 +117,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
     let route = {
       urlPath: `/${isMain ? "" : entryName}`,
       entryName,
-      entryPath: (0, import_utils.removeLeadingSlash)(import_path.default.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`)),
+      entryPath: (0, import_utils.removeLeadingSlash)(import_path.default.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder || outputStructure === "flat" ? ".html" : "/index.html"}`)),
       isSPA: true,
       isStream: isStream || isRSC,
       isSSR,

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

@@ -70,7 +70,7 @@ var applyRouteOptions = function(original, routeOptions) {
 };
 var collectHtmlRoutes = function(entrypoints, appContext, config) {
   var _deploy_worker;
-  var mainEntryName = config.source.mainEntryName, disableHtmlFolder = config.html.disableHtmlFolder, _config_output = config.output, tmp = _config_output.distPath, _ref = tmp === void 0 ? {} : tmp, htmlPath = _ref.html, _config_server = config.server, baseUrl = _config_server.baseUrl, routes = _config_server.routes, ssr = _config_server.ssr, ssrByEntries = _config_server.ssrByEntries, rsc = _config_server.rsc, deploy = config.deploy;
+  var mainEntryName = config.source.mainEntryName, _config_html = config.html, disableHtmlFolder = _config_html.disableHtmlFolder, outputStructure = _config_html.outputStructure, _config_output = config.output, tmp = _config_output.distPath, _ref = tmp === void 0 ? {} : tmp, htmlPath = _ref.html, _config_server = config.server, baseUrl = _config_server.baseUrl, routes = _config_server.routes, ssr = _config_server.ssr, ssrByEntries = _config_server.ssrByEntries, rsc = _config_server.rsc, deploy = config.deploy;
   var packageName = appContext.packageName;
   var workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   var htmlRoutes = entrypoints.reduce(function(previous, param) {
@@ -85,7 +85,7 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
     var route = {
       urlPath: "/".concat(isMain ? "" : entryName),
       entryName,
-      entryPath: removeLeadingSlash(path.posix.normalize("".concat(htmlPath, "/").concat(entryName).concat(disableHtmlFolder ? ".html" : "/index.html"))),
+      entryPath: removeLeadingSlash(path.posix.normalize("".concat(htmlPath, "/").concat(entryName).concat(disableHtmlFolder || outputStructure === "flat" ? ".html" : "/index.html"))),
       isSPA: true,
       isStream: isStream || isRSC,
       isSSR,

package/dist/esm-node/plugins/analyze/getServerRoutes.js

@@ -69,7 +69,7 @@ const applyRouteOptions = (original, routeOptions) => {
 };
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
   var _deploy_worker;
-  const { source: { mainEntryName }, html: { disableHtmlFolder }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries, rsc }, deploy } = config;
+  const { source: { mainEntryName }, html: { disableHtmlFolder, outputStructure }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries, rsc }, deploy } = config;
   const { packageName } = appContext;
   const workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   let htmlRoutes = entrypoints.reduce((previous, { entryName }) => {
@@ -83,7 +83,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
     let route = {
       urlPath: `/${isMain ? "" : entryName}`,
       entryName,
-      entryPath: removeLeadingSlash(path.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`)),
+      entryPath: removeLeadingSlash(path.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder || outputStructure === "flat" ? ".html" : "/index.html"}`)),
       isSPA: true,
       isStream: isStream || isRSC,
       isSSR,

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { Rspack, RspackChain } from '@rsbuild/core';
 import type { AppNormalizedConfig, Bundler } from '../../types';
 import type { AppToolsContext } from '../../types/new';

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

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

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

@@ -1,3 +1,3 @@
 import type { CLIPluginAPI } from '@modern-js/plugin-v2';
 import type { AppTools } from '../types';
-export declare const deploy: (api: CLIPluginAPI<AppTools<'shared'>>, options: any) => Promise<void>;
+export declare const deploy: (api: CLIPluginAPI<AppTools<"shared">>, options: any) => Promise<void>;

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

@@ -5,5 +5,5 @@ import type { DevOptions } from '../utils/types';
 interface ExtraServerOptions {
     applyPlugins?: ApplyPlugins;
 }
-export declare const dev: (api: CLIPluginAPI<AppTools<'shared'>>, options: DevOptions, devServerOptions?: ExtraServerOptions) => Promise<void>;
+export declare const dev: (api: CLIPluginAPI<AppTools<"shared">>, options: DevOptions, devServerOptions?: ExtraServerOptions) => Promise<void>;
 export {};

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

@@ -1,10 +1,10 @@
 import type { CLIPluginAPI } from '@modern-js/plugin-v2';
 import { type Command } from '@modern-js/utils';
 import type { AppTools } from '../types';
-export declare const devCommand: (program: Command, api: CLIPluginAPI<AppTools<'shared'>>) => Promise<void>;
-export declare const buildCommand: (program: Command, api: CLIPluginAPI<AppTools<'shared'>>) => Promise<void>;
-export declare const serverCommand: (program: Command, api: CLIPluginAPI<AppTools<'shared'>>) => void;
-export declare const deployCommand: (program: Command, api: CLIPluginAPI<AppTools<'shared'>>) => void;
+export declare const devCommand: (program: Command, api: CLIPluginAPI<AppTools<"shared">>) => Promise<void>;
+export declare const buildCommand: (program: Command, api: CLIPluginAPI<AppTools<"shared">>) => Promise<void>;
+export declare const serverCommand: (program: Command, api: CLIPluginAPI<AppTools<"shared">>) => void;
+export declare const deployCommand: (program: Command, api: CLIPluginAPI<AppTools<"shared">>) => void;
 export declare const newCommand: (program: Command, locale: string) => void;
-export declare const inspectCommand: (program: Command, api: CLIPluginAPI<AppTools<'shared'>>) => void;
+export declare const inspectCommand: (program: Command, api: CLIPluginAPI<AppTools<"shared">>) => void;
 export declare const upgradeCommand: (program: Command) => void;

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

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

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

@@ -4,5 +4,5 @@ import type { AppTools } from '../types';
 type ExtraServerOptions = {
     launcher?: typeof createProdServer;
 };
-export declare const serve: (api: CLIPluginAPI<AppTools<'shared'>>, serverOptions?: ExtraServerOptions) => Promise<void>;
+export declare const serve: (api: CLIPluginAPI<AppTools<"shared">>, serverOptions?: ExtraServerOptions) => Promise<void>;
 export {};

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

@@ -1,2 +1,2 @@
 import type { AppTools, CliPluginFuture } from '../types';
-export declare const compatPlugin: () => CliPluginFuture<AppTools<'shared'>>;
+export declare const compatPlugin: () => CliPluginFuture<AppTools<"shared">>;

package/dist/types/defineConfig.d.ts

@@ -4,7 +4,7 @@ import type { AppLegacyUserConfig, AppUserConfig } from './types';
  * This function helps you to autocomplete configuration types.
  * It accepts a direct config object, or a function that returns a config.
  */
-export declare const defineConfig: <B extends "webpack" | "rspack" = "webpack">(config: UserConfigExport<AppUserConfig<B>>) => UserConfigExport<AppUserConfig<B>>;
+export declare const defineConfig: <B extends "rspack" | "webpack" = "webpack">(config: UserConfigExport<AppUserConfig<B>>) => UserConfigExport<AppUserConfig<B>>;
 /**
  * @deprecated Please use `defineConfig` instead.
  * `defineLegacyConfig` will be removed in the future major version.

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

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

package/dist/types/index.d.ts

@@ -1,7 +1,7 @@
 import type { AppTools, AppToolsOptions, CliPluginFuture } from './types';
 import { initAppContext } from './utils/initAppContext';
 export * from './defineConfig';
-export declare const appTools: (options?: AppToolsOptions) => CliPluginFuture<AppTools<'shared'>>;
+export declare const appTools: (options?: AppToolsOptions) => CliPluginFuture<AppTools<"shared">>;
 export { defineConfig, defineLegacyConfig } from './defineConfig';
 export { mergeConfig } from '@modern-js/core';
 export type { RuntimeUserConfig } from './types/config';

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

@@ -1,4 +1,4 @@
 import type { Entrypoint } from '@modern-js/types';
 import type { AppNormalizedConfig } from '../../types';
 import type { AppToolsContext, AppToolsHooks } from '../../types/new';
-export declare const getBundleEntry: (hooks: AppToolsHooks<'shared'>, appContext: AppToolsContext<'shared'>, config: AppNormalizedConfig<'shared'>) => Promise<Entrypoint[]>;
+export declare const getBundleEntry: (hooks: AppToolsHooks<"shared">, appContext: AppToolsContext<"shared">, config: AppNormalizedConfig<"shared">) => Promise<Entrypoint[]>;

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

@@ -2,4 +2,4 @@ import type { Entrypoint } from '@modern-js/types';
 import type { AppNormalizedConfig } from '../../types';
 import type { AppToolsContext, AppToolsHooks } from '../../types/new';
 export type { Entrypoint };
-export declare const getFileSystemEntry: (hooks: AppToolsHooks<'shared'>, appContext: AppToolsContext<'shared'>, config: AppNormalizedConfig<'shared'>) => Promise<Entrypoint[]>;
+export declare const getFileSystemEntry: (hooks: AppToolsHooks<"shared">, appContext: AppToolsContext<"shared">, config: AppNormalizedConfig<"shared">) => Promise<Entrypoint[]>;

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

@@ -18,9 +18,9 @@ export declare const getModifyHtmlPartials: (partials: Record<keyof HtmlPartials
         current: string[];
     };
 };
-export declare const getHtmlTemplate: (entrypoints: Entrypoint[], hooks: AppToolsHooks<'shared'>, { appContext, config, }: {
-    appContext: AppToolsContext<'shared'>;
-    config: AppNormalizedConfig<'shared'>;
+export declare const getHtmlTemplate: (entrypoints: Entrypoint[], hooks: AppToolsHooks<"shared">, { appContext, config, }: {
+    appContext: AppToolsContext<"shared">;
+    config: AppNormalizedConfig<"shared">;
 }) => Promise<{
     partialsByEntrypoint: Record<string, HtmlPartials>;
     htmlTemplates: HtmlTemplates;

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

@@ -2,7 +2,7 @@ import type { Entrypoint, ServerRoute } from '@modern-js/types';
 import type { AppNormalizedConfig } from '../../types';
 import type { AppToolsContext } from '../../types/new';
 export declare const getServerRoutes: (entrypoints: Entrypoint[], { appContext, config, }: {
-    appContext: AppToolsContext<'shared'>;
-    config: AppNormalizedConfig<'shared'>;
+    appContext: AppToolsContext<"shared">;
+    config: AppNormalizedConfig<"shared">;
 }) => ServerRoute[];
 export declare const getProdServerRoutes: (distDirectory: string) => any;

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

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

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

@@ -3,7 +3,7 @@ export declare const replaceWithAlias: (base: string, filePath: string, alias: s
 export declare const parseModule: ({ source, filename, }: {
     source: string;
     filename: string;
-}) => Promise<readonly [imports: readonly import("es-module-lexer").ImportSpecifier[], exports: readonly import("es-module-lexer").ExportSpecifier[], facade: boolean]>;
+}) => Promise<readonly [imports: readonly import("es-module-lexer").ImportSpecifier[], exports: readonly import("es-module-lexer").ExportSpecifier[], facade: boolean, hasModuleSyntax: boolean]>;
 export declare const getServerCombinedModueFile: (internalDirectory: string, entryName: string) => string;
 export declare const checkIsBuildCommands: () => boolean;
 export declare const checkIsServeCommand: () => boolean;

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

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

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

@@ -5,7 +5,7 @@ export type ServerAppContext = {
     lambdaDirectory: string;
     metaName: string;
 };
-export declare const serverAppContenxtTemplate: (appContext: AppToolsContext<'shared'>) => {
+export declare const serverAppContenxtTemplate: (appContext: AppToolsContext<"shared">) => {
     sharedDirectory: string;
     apiDirectory: string;
     lambdaDirectory: string;

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

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

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

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

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

@@ -7,6 +7,6 @@ export declare const buildServerConfig: ({ appDirectory, distDirectory, configFi
     distDirectory: string;
     configFile: string;
     options?: Parameters<typeof bundle>[1];
-    watch?: boolean | undefined;
+    watch?: boolean;
 }) => Promise<void>;
-export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: AppNormalizedConfig<'shared'>) => Promise<void>;
+export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: AppNormalizedConfig<"shared">) => Promise<void>;

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

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

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

@@ -2,14 +2,14 @@ export declare const initAppContext: ({ appDirectory, runtimeConfigFile, options
     appDirectory: string;
     runtimeConfigFile: string;
     options?: {
-        metaName?: string | undefined;
-        srcDir?: string | undefined;
-        apiDir?: string | undefined;
-        distDir?: string | undefined;
-        sharedDir?: string | undefined;
-    } | undefined;
+        metaName?: string;
+        srcDir?: string;
+        apiDir?: string;
+        distDir?: string;
+        sharedDir?: string;
+    };
     serverConfigFile: string;
-    tempDir?: string | undefined;
+    tempDir?: string;
 }) => {
     metaName: string;
     runtimeConfigFile: string;

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

@@ -1,3 +1,3 @@
 import type { AppNormalizedConfig } from '../types';
 import type { AppToolsContext, AppToolsHooks } from '../types/new';
-export declare const printInstructions: (hooks: AppToolsHooks<'shared'>, appContext: AppToolsContext<'shared'>, config: AppNormalizedConfig<'shared'>) => Promise<void>;
+export declare const printInstructions: (hooks: AppToolsHooks<"shared">, appContext: AppToolsContext<"shared">, config: AppNormalizedConfig<"shared">) => Promise<void>;

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

@@ -1,5 +1,5 @@
 import type { IAppContext } from '@modern-js/core';
 import type { AppToolsContext } from '../types/new';
-export declare const generateRoutes: (appContext: AppToolsContext<'shared'> | IAppContext) => Promise<void>;
+export declare const generateRoutes: (appContext: AppToolsContext<"shared"> | IAppContext) => Promise<void>;
 export declare const getPathWithoutExt: (filename: string) => string;
 export declare const isMainEntry: (entryName: string, mainEntryName?: string) => boolean;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.65.4",
+  "version": "2.66.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -80,7 +80,7 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.26.0",
-    "@rsbuild/core": "1.2.18",
+    "@rsbuild/core": "1.2.19",
     "@rsbuild/plugin-node-polyfill": "1.3.0",
     "@swc/helpers": "0.5.13",
     "es-module-lexer": "^1.1.0",
@@ -88,23 +88,23 @@
     "esbuild-register": "^3.5.0",
     "flatted": "^3.2.9",
     "mlly": "^1.6.1",
-    "ndepe": "0.1.5",
+    "ndepe": "0.1.8",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.65.4",
-    "@modern-js/node-bundle-require": "2.65.4",
-    "@modern-js/plugin": "2.65.4",
-    "@modern-js/plugin-v2": "2.65.4",
-    "@modern-js/plugin-data-loader": "2.65.4",
-    "@modern-js/prod-server": "2.65.4",
-    "@modern-js/plugin-i18n": "2.65.4",
-    "@modern-js/rsbuild-plugin-esbuild": "2.65.4",
-    "@modern-js/server": "2.65.4",
-    "@modern-js/server-core": "2.65.4",
-    "@modern-js/server-utils": "2.65.4",
-    "@modern-js/types": "2.65.4",
-    "@modern-js/uni-builder": "2.65.4",
-    "@modern-js/utils": "2.65.4"
+    "@modern-js/core": "2.66.0",
+    "@modern-js/node-bundle-require": "2.66.0",
+    "@modern-js/plugin": "2.66.0",
+    "@modern-js/plugin-data-loader": "2.66.0",
+    "@modern-js/plugin-i18n": "2.66.0",
+    "@modern-js/plugin-v2": "2.66.0",
+    "@modern-js/rsbuild-plugin-esbuild": "2.66.0",
+    "@modern-js/prod-server": "2.66.0",
+    "@modern-js/server": "2.66.0",
+    "@modern-js/server-core": "2.66.0",
+    "@modern-js/server-utils": "2.66.0",
+    "@modern-js/types": "2.66.0",
+    "@modern-js/uni-builder": "2.66.0",
+    "@modern-js/utils": "2.66.0"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "1.0.12",
@@ -116,8 +116,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.98.0",
-    "@scripts/build": "2.65.4",
-    "@scripts/jest-config": "2.65.4"
+    "@scripts/jest-config": "2.66.0",
+    "@scripts/build": "2.66.0"
   },
   "peerDependencies": {
     "ts-node": "^10.7.0",
@@ -134,8 +134,7 @@
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "provenance": true
+    "access": "public"
   },
   "scripts": {
     "new": "modern-lib new",