@modern-js/app-tools 2.63.0 → 2.63.1

package/dist/types/types/new.d.ts

@@ -1,6 +1,7 @@
 import type { DevToolData, RegisterBuildPlatformResult } from '@modern-js/core';
-import type { AppContext, InternalContext, PluginHook, PluginHookTap, TransformFunction } from '@modern-js/plugin-v2';
-import type { Entrypoint, NestedRouteForCli, PageRoute, RouteLegacy, ServerPlugin, ServerRoute } from '@modern-js/types';
+import type { AppContext, AsyncHook, InternalContext, PluginHook, PluginHookTap, TransformFunction } from '@modern-js/plugin-v2';
+import type { Hooks } from '@modern-js/plugin-v2/cli';
+import type { Entrypoint, HtmlPartials, HtmlTemplates, NestedRouteForCli, PageRoute, RouteLegacy, ServerPlugin, ServerRoute } from '@modern-js/types';
 import type { AppTools } from '.';
 import type { getHookRunners } from '../new/compat/hooks';
 import type { AppToolsNormalizedConfig, AppToolsUserConfig } from './config';
@@ -52,10 +53,7 @@ export type RegisterBuildPlatformFn = (params: {
     type: string;
     config: any;
 }) => Promise<RegisterBuildPlatformResult> | RegisterBuildPlatformResult;
-export type AddRuntimeExportsFn = (params: {
-    entrypoint: Entrypoint;
-    exports: string[];
-}) => Promise<void> | void;
+export type AddRuntimeExportsFn = () => Promise<void> | void;
 export interface AppToolsExtendAPI<B extends Bundler = 'webpack'> {
     onBeforeConfig: PluginHookTap<BeforeConfigFn>;
     onAfterPrepare: PluginHookTap<AfterPrepareFn>;
@@ -102,33 +100,33 @@ export interface AppToolsExtendAPI<B extends Bundler = 'webpack'> {
     useHookRunners: () => ReturnType<typeof getHookRunners>;
 }
 export interface AppToolsExtendHooks extends Record<string, PluginHook<(...args: any[]) => any>> {
-    onBeforeConfig: PluginHook<BeforeConfigFn>;
-    onAfterPrepare: PluginHook<AfterPrepareFn>;
-    deploy: PluginHook<DeplpoyFn>;
-    _internalRuntimePlugins: PluginHook<InternalRuntimePluginsFn>;
-    _internalServerPlugins: PluginHook<InternalServerPluginsFn>;
-    checkEntryPoint: PluginHook<CheckEntryPointFn>;
-    modifyEntrypoints: PluginHook<ModifyEntrypointsFn>;
-    modifyFileSystemRoutes: PluginHook<ModifyFileSystemRoutesFn>;
-    modifyServerRoutes: PluginHook<ModifyServerRoutesFn>;
-    generateEntryCode: PluginHook<GenerateEntryCodeFn>;
-    onBeforeGenerateRoutes: PluginHook<BeforeGenerateRoutesFn>;
+    onBeforeConfig: AsyncHook<BeforeConfigFn>;
+    onAfterPrepare: AsyncHook<AfterPrepareFn>;
+    deploy: AsyncHook<DeplpoyFn>;
+    _internalRuntimePlugins: AsyncHook<InternalRuntimePluginsFn>;
+    _internalServerPlugins: AsyncHook<InternalServerPluginsFn>;
+    checkEntryPoint: AsyncHook<CheckEntryPointFn>;
+    modifyEntrypoints: AsyncHook<ModifyEntrypointsFn>;
+    modifyFileSystemRoutes: AsyncHook<ModifyFileSystemRoutesFn>;
+    modifyServerRoutes: AsyncHook<ModifyServerRoutesFn>;
+    generateEntryCode: AsyncHook<GenerateEntryCodeFn>;
+    onBeforeGenerateRoutes: AsyncHook<BeforeGenerateRoutesFn>;
     /**
      * @deprecated
      */
-    onBeforePrintInstructions: PluginHook<BeforePrintInstructionsFn>;
+    onBeforePrintInstructions: AsyncHook<BeforePrintInstructionsFn>;
     /**
      * @deprecated
      */
-    registerDev: PluginHook<RegisterDevFn>;
+    registerDev: AsyncHook<RegisterDevFn>;
     /**
      * @deprecated
      */
-    registerBuildPlatform: PluginHook<RegisterBuildPlatformFn>;
+    registerBuildPlatform: AsyncHook<RegisterBuildPlatformFn>;
     /**
      * @deprecated
      */
-    addRuntimeExports: PluginHook<AddRuntimeExportsFn>;
+    addRuntimeExports: AsyncHook<AddRuntimeExportsFn>;
 }
 export type AppToolsExtendContext<B extends Bundler = 'webpack'> = {
     metaName: string;
@@ -140,6 +138,25 @@ export type AppToolsExtendContext<B extends Bundler = 'webpack'> = {
     lambdaDirectory: string;
     serverPlugins: ServerPlugin[];
     moduleType: 'module' | 'commonjs';
+    /** Information for entry points */
+    entrypoints: Entrypoint[];
+    /** Selected entry points */
+    checkedEntries: string[];
+    /** Information for server routes */
+    serverRoutes: ServerRoute[];
+    /** Whether to use api only mode */
+    apiOnly: boolean;
     _internalContext: InternalContext<AppTools<B>>;
+    /**
+     * Information for HTML templates by entry
+     * @private
+     */
+    partialsByEntrypoint?: Record<string, HtmlPartials>;
+    /**
+     * Information for HTML templates
+     * @private
+     */
+    htmlTemplates: HtmlTemplates;
 };
 export type AppToolsContext<B extends Bundler = 'webpack'> = AppContext<AppTools<B>> & AppToolsExtendContext<B>;
+export type AppToolsHooks<B extends Bundler = 'webpack'> = Hooks<AppToolsUserConfig<B>, AppToolsNormalizedConfig> & AppToolsExtendHooks;

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

@@ -1,3 +1,5 @@
 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>;
+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 printInstructionsCompat: (hookRunners: CliHooksRunner<AppTools<'shared'>>, appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Promise<void>;

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

@@ -1,4 +1,5 @@
 import type { IAppContext } from '@modern-js/core';
-export declare const generateRoutes: (appContext: IAppContext) => Promise<void>;
+import type { AppToolsContext } from '../types/new';
+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.63.0",
+  "version": "2.63.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -85,8 +85,8 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.26.0",
-    "@rsbuild/core": "~1.1.5",
-    "@rsbuild/plugin-node-polyfill": "~1.2.0",
+    "@rsbuild/core": "1.1.8",
+    "@rsbuild/plugin-node-polyfill": "1.2.0",
     "@swc/helpers": "0.5.13",
     "@vercel/nft": "^0.26.4",
     "es-module-lexer": "^1.1.0",
@@ -96,23 +96,23 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/plugin-v2": "2.63.0",
-    "@modern-js/node-bundle-require": "2.63.0",
-    "@modern-js/core": "2.63.0",
-    "@modern-js/plugin": "2.63.0",
-    "@modern-js/plugin-i18n": "2.63.0",
-    "@modern-js/plugin-data-loader": "2.63.0",
-    "@modern-js/rsbuild-plugin-esbuild": "2.63.0",
-    "@modern-js/prod-server": "2.63.0",
-    "@modern-js/server": "2.63.0",
-    "@modern-js/server-core": "2.63.0",
-    "@modern-js/server-utils": "2.63.0",
-    "@modern-js/types": "2.63.0",
-    "@modern-js/uni-builder": "2.63.0",
-    "@modern-js/utils": "2.63.0"
+    "@modern-js/node-bundle-require": "2.63.1",
+    "@modern-js/core": "2.63.1",
+    "@modern-js/plugin": "2.63.1",
+    "@modern-js/plugin-data-loader": "2.63.1",
+    "@modern-js/prod-server": "2.63.1",
+    "@modern-js/plugin-v2": "2.63.1",
+    "@modern-js/plugin-i18n": "2.63.1",
+    "@modern-js/rsbuild-plugin-esbuild": "2.63.1",
+    "@modern-js/server": "2.63.1",
+    "@modern-js/server-core": "2.63.1",
+    "@modern-js/types": "2.63.1",
+    "@modern-js/uni-builder": "2.63.1",
+    "@modern-js/server-utils": "2.63.1",
+    "@modern-js/utils": "2.63.1"
   },
   "devDependencies": {
-    "@rsbuild/plugin-webpack-swc": "~1.0.8",
+    "@rsbuild/plugin-webpack-swc": "1.0.9",
     "@types/babel__traverse": "7.20.6",
     "@types/jest": "^29",
     "@types/node": "^16",
@@ -121,8 +121,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.96.1",
-    "@scripts/build": "2.63.0",
-    "@scripts/jest-config": "2.63.0"
+    "@scripts/jest-config": "2.63.1",
+    "@scripts/build": "2.63.1"
   },
   "peerDependencies": {
     "ts-node": "^10.7.0",