@modern-js/app-tools 3.4.0 → 3.6.0

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

@@ -48,6 +48,13 @@ async function generateBuilder(options, bundlerType) {
         else mergedEnvironments[name] = builderConfig.environments[name];
         builderConfig.environments = mergedEnvironments;
     } else builderConfig.environments = environments;
+    const hooks = appContext._internalContext.pluginAPI?.getHooks();
+    if (hooks?.modifyBuilderEnvironments) {
+        const { environments: modifiedEnvironments } = await hooks.modifyBuilderEnvironments.call({
+            environments: builderConfig.environments
+        });
+        builderConfig.environments = modifiedEnvironments;
+    }
     const builder = await (0, builder_namespaceObject.createBuilder)({
         cwd: appContext.appDirectory,
         rscClientRuntimePath: `@${appContext.metaName}/runtime/rsc/client`,

package/dist/cjs/index.js

@@ -195,6 +195,7 @@ var __webpack_exports__ = {};
                 deploy: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
                 checkEntryPoint: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
                 modifyEntrypoints: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
+                modifyBuilderEnvironments: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
                 modifyFileSystemRoutes: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
                 generateEntryCode: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),
                 onBeforeGenerateRoutes: (0, _modern_js_plugin__rspack_import_3.createAsyncHook)(),

package/dist/esm/builder/generator/index.mjs

@@ -16,6 +16,13 @@ async function generateBuilder(options, bundlerType) {
         else mergedEnvironments[name] = builderConfig.environments[name];
         builderConfig.environments = mergedEnvironments;
     } else builderConfig.environments = environments;
+    const hooks = appContext._internalContext.pluginAPI?.getHooks();
+    if (hooks?.modifyBuilderEnvironments) {
+        const { environments: modifiedEnvironments } = await hooks.modifyBuilderEnvironments.call({
+            environments: builderConfig.environments
+        });
+        builderConfig.environments = modifiedEnvironments;
+    }
     const builder = await createBuilder({
         cwd: appContext.appDirectory,
         rscClientRuntimePath: `@${appContext.metaName}/runtime/rsc/client`,

package/dist/esm/index.mjs

@@ -40,6 +40,7 @@ const appTools = ()=>({
             deploy: createAsyncHook(),
             checkEntryPoint: createAsyncHook(),
             modifyEntrypoints: createAsyncHook(),
+            modifyBuilderEnvironments: createAsyncHook(),
             modifyFileSystemRoutes: createAsyncHook(),
             generateEntryCode: createAsyncHook(),
             onBeforeGenerateRoutes: createAsyncHook(),

package/dist/esm-node/builder/generator/index.mjs

@@ -17,6 +17,13 @@ async function generateBuilder(options, bundlerType) {
         else mergedEnvironments[name] = builderConfig.environments[name];
         builderConfig.environments = mergedEnvironments;
     } else builderConfig.environments = environments;
+    const hooks = appContext._internalContext.pluginAPI?.getHooks();
+    if (hooks?.modifyBuilderEnvironments) {
+        const { environments: modifiedEnvironments } = await hooks.modifyBuilderEnvironments.call({
+            environments: builderConfig.environments
+        });
+        builderConfig.environments = modifiedEnvironments;
+    }
     const builder = await createBuilder({
         cwd: appContext.appDirectory,
         rscClientRuntimePath: `@${appContext.metaName}/runtime/rsc/client`,

package/dist/esm-node/builder/shared/builderPlugins/adapterBasic.mjs

@@ -3,7 +3,7 @@ import node_path from "node:path";
 import { SERVICE_WORKER_ENVIRONMENT_NAME } from "@modern-js/builder";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { dirname as __rspack_dirname } from "node:path";
-var adapterBasic_dirname = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
+var __rspack_import_meta_dirname__ = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
 const builderPluginAdapterBasic = (options)=>({
         name: 'builder-plugin-adapter-modern-basic',
         setup (api) {
@@ -14,7 +14,7 @@ const builderPluginAdapterBasic = (options)=>({
                     const bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
                     const depExt = 'mjs';
                     chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
-                    chain.module.rule('bare-server-module').test(bareServerModuleReg).use('server-module-loader').loader(node_path.join(adapterBasic_dirname, `../loaders/serverModuleLoader.${depExt}`));
+                    chain.module.rule('bare-server-module').test(bareServerModuleReg).use('server-module-loader').loader(node_path.join(__rspack_import_meta_dirname__, `../loaders/serverModuleLoader.${depExt}`));
                 }
                 const { appContext } = options;
                 const { metaName } = appContext;

package/dist/esm-node/index.mjs

@@ -42,6 +42,7 @@ const appTools = ()=>({
             deploy: createAsyncHook(),
             checkEntryPoint: createAsyncHook(),
             modifyEntrypoints: createAsyncHook(),
+            modifyBuilderEnvironments: createAsyncHook(),
             modifyFileSystemRoutes: createAsyncHook(),
             generateEntryCode: createAsyncHook(),
             onBeforeGenerateRoutes: createAsyncHook(),

package/dist/esm-node/plugins/deploy/utils/index.mjs

@@ -4,7 +4,7 @@ import path from "path";
 import { ROUTE_SPEC_FILE, SERVER_DIR, fs, getMeta } from "@modern-js/utils";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { dirname as __rspack_dirname } from "node:path";
-var utils_dirname = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
+var __rspack_import_meta_dirname__ = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
 const normalizePath = (filePath)=>filePath.replace(/\\/g, '/');
 const getProjectUsage = (appDirectory, distDirectory, metaName)=>{
     const routeJSON = path.join(distDirectory, ROUTE_SPEC_FILE);
@@ -27,7 +27,7 @@ const getProjectUsage = (appDirectory, distDirectory, metaName)=>{
         useWebServer: isServerConfigExists
     };
 };
-const getTemplatePath = (file)=>path.join(utils_dirname, '../platforms/templates', file);
+const getTemplatePath = (file)=>path.join(__rspack_import_meta_dirname__, '../platforms/templates', file);
 const readTemplate = async (file)=>(await fs.readFile(getTemplatePath(file))).toString();
 const resolveESMDependency = async (entry)=>{
     const conditions = new Set([
@@ -38,7 +38,7 @@ const resolveESMDependency = async (entry)=>{
     ]);
     try {
         const { moduleResolve } = await import("import-meta-resolve");
-        return normalizePath(moduleResolve(entry, pathToFileURL(`${utils_dirname}/`), conditions, false).pathname.replace(/^\/(\w)\:/, '$1:'));
+        return normalizePath(moduleResolve(entry, pathToFileURL(`${__rspack_import_meta_dirname__}/`), conditions, false).pathname.replace(/^\/(\w)\:/, '$1:'));
     } catch (err) {}
 };
 export { getProjectUsage, getTemplatePath, normalizePath, readTemplate, resolveESMDependency };

package/dist/types/types/plugin.d.ts

@@ -2,6 +2,7 @@ import type { AppContext, AsyncHook, InternalContext, PluginHook, PluginHookTap,
 import type { Hooks } from '@modern-js/plugin/cli';
 import type { Entrypoint, HtmlPartials, HtmlTemplates, NestedRouteForCli, PageRoute, RouteLegacy, ServerPlugin, ServerRoute } from '@modern-js/types';
 import type { EagerRouteComponentFilesByEntry } from '@modern-js/utils';
+import type { EnvironmentConfig } from '@rsbuild/core';
 import type { AppTools } from '.';
 import type { getHookRunners } from '../compat/hooks';
 import type { AppToolsNormalizedConfig, AppToolsUserConfig } from './config';
@@ -13,6 +14,9 @@ export type CheckEntryPointFn = TransformFunction<{
 export type ModifyEntrypointsFn = TransformFunction<{
     entrypoints: Entrypoint[];
 }>;
+export type ModifyBuilderEnvironmentsFn = TransformFunction<{
+    environments: Record<string, EnvironmentConfig>;
+}>;
 export type ModifyFileSystemRoutesFn = TransformFunction<{
     entrypoint: Entrypoint;
     routes: RouteLegacy[] | (NestedRouteForCli | PageRoute)[];
@@ -34,6 +38,7 @@ export interface AppToolsExtendAPI {
     deploy: PluginHookTap<DeplpoyFn>;
     checkEntryPoint: PluginHookTap<CheckEntryPointFn>;
     modifyEntrypoints: PluginHookTap<ModifyEntrypointsFn>;
+    modifyBuilderEnvironments: PluginHookTap<ModifyBuilderEnvironmentsFn>;
     modifyFileSystemRoutes: PluginHookTap<ModifyFileSystemRoutesFn>;
     generateEntryCode: PluginHookTap<GenerateEntryCodeFn>;
     onBeforeGenerateRoutes: PluginHookTap<BeforeGenerateRoutesFn>;
@@ -63,6 +68,7 @@ export interface AppToolsExtendHooks extends Record<string, PluginHook<(...args:
     deploy: AsyncHook<DeplpoyFn>;
     checkEntryPoint: AsyncHook<CheckEntryPointFn>;
     modifyEntrypoints: AsyncHook<ModifyEntrypointsFn>;
+    modifyBuilderEnvironments: AsyncHook<ModifyBuilderEnvironmentsFn>;
     modifyFileSystemRoutes: AsyncHook<ModifyFileSystemRoutesFn>;
     generateEntryCode: AsyncHook<GenerateEntryCodeFn>;
     onBeforeGenerateRoutes: AsyncHook<BeforeGenerateRoutesFn>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.4.0",
+  "version": "3.6.0",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "@babel/parser": "^7.29.7",
     "@babel/traverse": "^7.29.7",
     "@babel/types": "^7.29.7",
-    "@rsbuild/core": "2.0.10",
+    "@rsbuild/core": "2.1.0",
     "@swc/core": "1.15.41",
     "@swc/helpers": "^0.5.17",
     "es-module-lexer": "^1.7.0",
@@ -93,26 +93,26 @@
     "ndepe": "^0.1.13",
     "pkg-types": "^1.3.1",
     "std-env": "^3.10.0",
-    "@modern-js/builder": "3.4.0",
-    "@modern-js/plugin-data-loader": "3.4.0",
-    "@modern-js/plugin": "3.4.0",
-    "@modern-js/i18n-utils": "3.4.0",
-    "@modern-js/prod-server": "3.4.0",
-    "@modern-js/server-core": "3.4.0",
-    "@modern-js/server": "3.4.0",
-    "@modern-js/server-utils": "3.4.0",
-    "@modern-js/types": "3.4.0",
-    "@modern-js/utils": "3.4.0"
+    "@modern-js/builder": "3.6.0",
+    "@modern-js/i18n-utils": "3.6.0",
+    "@modern-js/plugin-data-loader": "3.6.0",
+    "@modern-js/plugin": "3.6.0",
+    "@modern-js/prod-server": "3.6.0",
+    "@modern-js/server": "3.6.0",
+    "@modern-js/server-core": "3.6.0",
+    "@modern-js/server-utils": "3.6.0",
+    "@modern-js/types": "3.6.0",
+    "@modern-js/utils": "3.6.0"
   },
   "devDependencies": {
-    "@rslib/core": "0.22.1",
+    "@rslib/core": "0.23.2",
     "@types/babel__traverse": "7.28.0",
     "@types/node": "^20",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
-    "@modern-js/rslib": "2.68.10",
-    "@scripts/rstest-config": "2.66.0"
+    "@scripts/rstest-config": "2.66.0",
+    "@modern-js/rslib": "2.68.10"
   },
   "peerDependencies": {
     "ts-node": "^10.9.2",