@modern-js/app-tools 3.1.0 → 3.1.1

package/dist/cjs/plugins/deploy/platforms/templates/netlify-entry.cjs

@@ -54,4 +54,4 @@ const handler = async (request, context)=>{
     if (!requestHandler) await createHandler();
     return requestHandler(request, context);
 };
-exports.handler = handler;
+module.exports.default = handler;

package/dist/cjs/plugins/deploy/utils/generator.js

@@ -46,10 +46,11 @@ const lodash_namespaceObject = require("@modern-js/utils/lodash");
 const external_index_js_namespaceObject = require("./index.js");
 const serverAppContextTemplate = (appContext)=>{
     const { appDirectory, sharedDirectory, apiDirectory, lambdaDirectory, metaName, bffRuntimeFramework } = appContext;
+    const getRelativePathTemplate = (targetDirectory)=>`path.join(__dirname, ${JSON.stringify((0, external_index_js_namespaceObject.normalizePath)(external_node_path_default().relative(appDirectory, targetDirectory)))})`;
     return {
-        sharedDirectory: `path.join(__dirname, "${(0, external_index_js_namespaceObject.normalizePath)(external_node_path_default().relative(appDirectory, sharedDirectory))}")`,
-        apiDirectory: `path.join(__dirname, "${(0, external_index_js_namespaceObject.normalizePath)(external_node_path_default().relative(appDirectory, apiDirectory))}")`,
-        lambdaDirectory: `path.join(__dirname, "${(0, external_index_js_namespaceObject.normalizePath)(external_node_path_default().relative(appDirectory, lambdaDirectory))}")`,
+        sharedDirectory: getRelativePathTemplate(sharedDirectory),
+        apiDirectory: getRelativePathTemplate(apiDirectory),
+        lambdaDirectory: getRelativePathTemplate(lambdaDirectory),
         metaName,
         bffRuntimeFramework: bffRuntimeFramework || 'hono'
     };

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

@@ -7,7 +7,7 @@ const info = (file)=>({
 function createPublicPattern(appContext, config, chain) {
     const { publicDir } = createCopyInfo(appContext, config);
     return {
-        info,
+        info: info,
         from: '**/*',
         to: 'public',
         context: publicDir,

package/dist/esm/builder/index.mjs

@@ -1,7 +1,7 @@
-import { parseRspackConfig } from "@modern-js/builder";
-import { builderPluginAdapterBasic, builderPluginAdapterHooks } from "./shared/builderPlugins/index.mjs";
 async function createBuilderGenerator() {
     const { createRspackBuilderForModern } = await import("./builder-rspack/index.mjs");
     return createRspackBuilderForModern;
 }
-export { builderPluginAdapterBasic, builderPluginAdapterHooks, createBuilderGenerator, parseRspackConfig };
+export { parseRspackConfig } from "@modern-js/builder";
+export { builderPluginAdapterBasic, builderPluginAdapterHooks } from "./shared/builderPlugins/index.mjs";
+export { createBuilderGenerator };

package/dist/esm/builder/shared/loaders/serverModuleLoader.mjs

@@ -2,4 +2,4 @@ function loader() {
     return "module.exports = {}";
 }
 const serverModuleLoader = loader;
-export { serverModuleLoader as default };
+export default serverModuleLoader;

package/dist/esm/index.mjs

@@ -1,3 +1,5 @@
+export * from "./defineConfig.mjs";
+export * from "./types/index.mjs";
 import path from "path";
 import { castArray } from "@modern-js/builder";
 import { getLocaleLanguage } from "@modern-js/i18n-utils/language-detector";
@@ -15,13 +17,6 @@ import serverRuntime from "./plugins/serverRuntime.mjs";
 import { generateWatchFiles } from "./utils/generateWatchFiles.mjs";
 import { initAppContext } from "./utils/initAppContext.mjs";
 import { restart } from "./utils/restart.mjs";
-import { defineConfig } from "./defineConfig.mjs";
-import { dev } from "./commands/dev.mjs";
-import { serve } from "./commands/serve.mjs";
-import { resolveModernRsbuildConfig } from "./rsbuild.mjs";
-import { mergeConfig } from "@modern-js/plugin/cli";
-export * from "./defineConfig.mjs";
-export * from "./types/index.mjs";
 const appTools = ()=>({
         name: '@modern-js/app-tools',
         usePlugins: [
@@ -120,4 +115,10 @@ const appTools = ()=>({
         }
     });
 const src = appTools;
-export { appTools, src as default, defineConfig, dev, generateWatchFiles, initAppContext, mergeConfig, resolveModernRsbuildConfig, serve };
+export { defineConfig } from "./defineConfig.mjs";
+export { dev } from "./commands/dev.mjs";
+export { serve } from "./commands/serve.mjs";
+export { resolveModernRsbuildConfig } from "./rsbuild.mjs";
+export { mergeConfig } from "@modern-js/plugin/cli";
+export default src;
+export { appTools, generateWatchFiles, initAppContext };

package/dist/esm/plugins/analyze/index.mjs

@@ -174,7 +174,7 @@ const analyze = ()=>({
                     const getFlattenedPlugins = async (pluginOptions)=>{
                         let plugins = pluginOptions;
                         do plugins = (await Promise.all(plugins)).flat(1 / 0);
-                        while (plugins.some((v)=>isPromise(v)));
+                        while (plugins.some((v)=>isPromise(v)))
                         return plugins;
                     };
                     if (resolvedConfig.builderPlugins) {
@@ -200,4 +200,4 @@ const analyze = ()=>({
             });
         }
     });
-export { analyze as default };
+export default analyze;

package/dist/esm/plugins/deploy/index.mjs

@@ -40,4 +40,4 @@ const deploy = ()=>({
             });
         }
     });
-export { deploy as default };
+export default deploy;

package/dist/esm/plugins/deploy/platforms/templates/netlify-entry.cjs

@@ -54,4 +54,4 @@ const handler = async (request, context)=>{
     if (!requestHandler) await createHandler();
     return requestHandler(request, context);
 };
-exports.handler = handler;
+module.exports.default = handler;

package/dist/esm/plugins/deploy/utils/generator.mjs

@@ -4,10 +4,11 @@ import { merge } from "@modern-js/utils/lodash";
 import { normalizePath } from "./index.mjs";
 const serverAppContextTemplate = (appContext)=>{
     const { appDirectory, sharedDirectory, apiDirectory, lambdaDirectory, metaName, bffRuntimeFramework } = appContext;
+    const getRelativePathTemplate = (targetDirectory)=>`path.join(__dirname, ${JSON.stringify(normalizePath(node_path.relative(appDirectory, targetDirectory)))})`;
     return {
-        sharedDirectory: `path.join(__dirname, "${normalizePath(node_path.relative(appDirectory, sharedDirectory))}")`,
-        apiDirectory: `path.join(__dirname, "${normalizePath(node_path.relative(appDirectory, apiDirectory))}")`,
-        lambdaDirectory: `path.join(__dirname, "${normalizePath(node_path.relative(appDirectory, lambdaDirectory))}")`,
+        sharedDirectory: getRelativePathTemplate(sharedDirectory),
+        apiDirectory: getRelativePathTemplate(apiDirectory),
+        lambdaDirectory: getRelativePathTemplate(lambdaDirectory),
         metaName,
         bffRuntimeFramework: bffRuntimeFramework || 'hono'
     };

package/dist/esm/plugins/initialize/index.mjs

@@ -56,4 +56,4 @@ async function getServerPort(config) {
     if (isDev() && isDevCommand()) return getPort(Number(process.env.PORT) || prodPort);
     return prodPort;
 }
-export { initialize as default };
+export default initialize;

package/dist/esm/plugins/serverBuild.mjs

@@ -43,4 +43,4 @@ const serverBuild = ()=>({
             });
         }
     });
-export { serverBuild as default };
+export default serverBuild;

package/dist/esm/plugins/serverRuntime.mjs

@@ -12,4 +12,4 @@ const serverRuntime = ()=>({
                 }));
         }
     });
-export { serverRuntime as default };
+export default serverRuntime;

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

@@ -8,7 +8,7 @@ const info = (file)=>({
 function createPublicPattern(appContext, config, chain) {
     const { publicDir } = createCopyInfo(appContext, config);
     return {
-        info,
+        info: info,
         from: '**/*',
         to: 'public',
         context: publicDir,

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

@@ -1,8 +1,8 @@
 import "node:module";
-import { parseRspackConfig } from "@modern-js/builder";
-import { builderPluginAdapterBasic, builderPluginAdapterHooks } from "./shared/builderPlugins/index.mjs";
 async function createBuilderGenerator() {
     const { createRspackBuilderForModern } = await import("./builder-rspack/index.mjs");
     return createRspackBuilderForModern;
 }
-export { builderPluginAdapterBasic, builderPluginAdapterHooks, createBuilderGenerator, parseRspackConfig };
+export { parseRspackConfig } from "@modern-js/builder";
+export { builderPluginAdapterBasic, builderPluginAdapterHooks } from "./shared/builderPlugins/index.mjs";
+export { createBuilderGenerator };

package/dist/esm-node/builder/shared/loaders/serverModuleLoader.mjs

@@ -3,4 +3,4 @@ function loader() {
     return "module.exports = {}";
 }
 const serverModuleLoader = loader;
-export { serverModuleLoader as default };
+export default serverModuleLoader;

package/dist/esm-node/index.mjs

@@ -1,5 +1,7 @@
 import __rslib_shim_module__ from "node:module";
 const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
+export * from "./defineConfig.mjs";
+export * from "./types/index.mjs";
 import path from "path";
 import { castArray } from "@modern-js/builder";
 import { getLocaleLanguage } from "@modern-js/i18n-utils/language-detector";
@@ -17,13 +19,6 @@ import serverRuntime from "./plugins/serverRuntime.mjs";
 import { generateWatchFiles } from "./utils/generateWatchFiles.mjs";
 import { initAppContext } from "./utils/initAppContext.mjs";
 import { restart } from "./utils/restart.mjs";
-import { defineConfig } from "./defineConfig.mjs";
-import { dev } from "./commands/dev.mjs";
-import { serve } from "./commands/serve.mjs";
-import { resolveModernRsbuildConfig } from "./rsbuild.mjs";
-import { mergeConfig } from "@modern-js/plugin/cli";
-export * from "./defineConfig.mjs";
-export * from "./types/index.mjs";
 const appTools = ()=>({
         name: '@modern-js/app-tools',
         usePlugins: [
@@ -122,4 +117,10 @@ const appTools = ()=>({
         }
     });
 const src = appTools;
-export { appTools, src as default, defineConfig, dev, generateWatchFiles, initAppContext, mergeConfig, resolveModernRsbuildConfig, serve };
+export { defineConfig } from "./defineConfig.mjs";
+export { dev } from "./commands/dev.mjs";
+export { serve } from "./commands/serve.mjs";
+export { resolveModernRsbuildConfig } from "./rsbuild.mjs";
+export { mergeConfig } from "@modern-js/plugin/cli";
+export default src;
+export { appTools, generateWatchFiles, initAppContext };

package/dist/esm-node/plugins/analyze/index.mjs

@@ -201,4 +201,4 @@ const analyze = ()=>({
             });
         }
     });
-export { analyze as default };
+export default analyze;

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

@@ -41,4 +41,4 @@ const deploy = ()=>({
             });
         }
     });
-export { deploy as default };
+export default deploy;

package/dist/esm-node/plugins/deploy/platforms/templates/netlify-entry.cjs

@@ -54,4 +54,4 @@ const handler = async (request, context)=>{
     if (!requestHandler) await createHandler();
     return requestHandler(request, context);
 };
-exports.handler = handler;
+module.exports.default = handler;

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

@@ -5,10 +5,11 @@ import { merge } from "@modern-js/utils/lodash";
 import { normalizePath } from "./index.mjs";
 const serverAppContextTemplate = (appContext)=>{
     const { appDirectory, sharedDirectory, apiDirectory, lambdaDirectory, metaName, bffRuntimeFramework } = appContext;
+    const getRelativePathTemplate = (targetDirectory)=>`path.join(__dirname, ${JSON.stringify(normalizePath(node_path.relative(appDirectory, targetDirectory)))})`;
     return {
-        sharedDirectory: `path.join(__dirname, "${normalizePath(node_path.relative(appDirectory, sharedDirectory))}")`,
-        apiDirectory: `path.join(__dirname, "${normalizePath(node_path.relative(appDirectory, apiDirectory))}")`,
-        lambdaDirectory: `path.join(__dirname, "${normalizePath(node_path.relative(appDirectory, lambdaDirectory))}")`,
+        sharedDirectory: getRelativePathTemplate(sharedDirectory),
+        apiDirectory: getRelativePathTemplate(apiDirectory),
+        lambdaDirectory: getRelativePathTemplate(lambdaDirectory),
         metaName,
         bffRuntimeFramework: bffRuntimeFramework || 'hono'
     };

package/dist/esm-node/plugins/initialize/index.mjs

@@ -57,4 +57,4 @@ async function getServerPort(config) {
     if (isDev() && isDevCommand()) return getPort(Number(process.env.PORT) || prodPort);
     return prodPort;
 }
-export { initialize as default };
+export default initialize;

package/dist/esm-node/plugins/serverBuild.mjs

@@ -44,4 +44,4 @@ const serverBuild = ()=>({
             });
         }
     });
-export { serverBuild as default };
+export default serverBuild;

package/dist/esm-node/plugins/serverRuntime.mjs

@@ -13,4 +13,4 @@ const serverRuntime = ()=>({
                 }));
         }
     });
-export { serverRuntime as default };
+export default serverRuntime;

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

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

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.0",
+  "version": "3.1.1",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -94,19 +94,19 @@
     "ndepe": "^0.1.13",
     "pkg-types": "^1.3.1",
     "std-env": "^3.10.0",
-    "@modern-js/builder": "3.1.0",
-    "@modern-js/i18n-utils": "3.1.0",
-    "@modern-js/plugin": "3.1.0",
-    "@modern-js/plugin-data-loader": "3.1.0",
-    "@modern-js/prod-server": "3.1.0",
-    "@modern-js/server": "3.1.0",
-    "@modern-js/server-utils": "3.1.0",
-    "@modern-js/server-core": "3.1.0",
-    "@modern-js/types": "3.1.0",
-    "@modern-js/utils": "3.1.0"
+    "@modern-js/builder": "3.1.1",
+    "@modern-js/i18n-utils": "3.1.1",
+    "@modern-js/plugin": "3.1.1",
+    "@modern-js/plugin-data-loader": "3.1.1",
+    "@modern-js/prod-server": "3.1.1",
+    "@modern-js/server": "3.1.1",
+    "@modern-js/server-utils": "3.1.1",
+    "@modern-js/server-core": "3.1.1",
+    "@modern-js/utils": "3.1.1",
+    "@modern-js/types": "3.1.1"
   },
   "devDependencies": {
-    "@rslib/core": "0.19.6",
+    "@rslib/core": "0.20.0",
     "@types/babel__traverse": "7.28.0",
     "@types/node": "^20",
     "ts-node": "^10.9.2",

package/{rstest.config.ts → rstest.config.mts}

@@ -7,10 +7,6 @@ export default withTestPreset({
   globals: true,
   tools: {
     rspack: {
-      optimization: {
-        // Disable tree shaking to avoid issues with rstest mocking '@modern-js/utils'.
-        providedExports: false,
-      },
       module: {
         parser: {
           javascript: {