@modern-js/app-tools 2.49.3-alpha.0 → 2.49.3-alpha.1

package/dist/cjs/index.js

@@ -154,7 +154,7 @@ const appTools = (options = {
           const { start } = await Promise.resolve().then(() => __toESM(require("./commands/serve")));
           await start(api);
         });
-        program.command("deploy").usage("[options]").option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("-s --skip-build", import_locale.i18n.t(import_locale.localeKeys.command.shared.skipBuild)).option("-o --output <path>", import_locale.i18n.t(import_locale.localeKeys.command.deploy.output)).description(import_locale.i18n.t(import_locale.localeKeys.command.deploy.describe)).action(async (options2) => {
+        program.command("deploy").usage("[options]").option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("-s --skip-build", import_locale.i18n.t(import_locale.localeKeys.command.shared.skipBuild)).description(import_locale.i18n.t(import_locale.localeKeys.command.deploy.describe)).action(async (options2) => {
           if (!options2.skipBuild) {
             const { build } = await Promise.resolve().then(() => __toESM(require("./commands/build")));
             await build(api);

package/dist/cjs/locale/en.js

@@ -44,8 +44,7 @@ const EN_LOCALE = {
       describe: "preview the production build locally"
     },
     deploy: {
-      describe: "deploy the application",
-      output: "output path"
+      describe: "deploy the application"
     },
     new: {
       describe: "enable optional features or add a new entry",

package/dist/cjs/locale/zh.js

@@ -44,8 +44,7 @@ const ZH_LOCALE = {
       describe: "启动生产环境服务"
     },
     deploy: {
-      describe: "部署应用",
-      output: "输出路径"
+      describe: "部署应用"
     },
     new: {
       describe: "Web App 项目中执行生成器",

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

@@ -32,6 +32,9 @@ function genVercelEntry({ config, plugins, appContext } = {}) {
       path: "."
     }
   };
+  if (appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory) {
+    appContext.apiDirectory = appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory.replace(/\/api$/, "/_api");
+  }
   return `
 
   const fs = require('node:fs/promises');

package/dist/cjs/plugins/deploy/index.js

@@ -45,17 +45,13 @@ var deploy_default = () => ({
   setup: (api) => {
     const deployTarget = process.env.MODERNJS_DEPLOY || import_std_env.provider || "node";
     return {
-      async beforeDeploy(options) {
-        const { output: outputPath } = options;
+      async beforeDeploy() {
         const appContext = api.useAppContext();
         const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
         const { useSSR, useAPI, useWebServer } = (0, import_utils2.getProjectUsage)(appDirectory, distDirectory);
         const needModernServer = useSSR || useAPI || useWebServer;
         const configContext = api.useResolvedConfigContext();
-        let outputDirectory = import_path.default.resolve(appDirectory, ".output");
-        if (outputPath) {
-          outputDirectory = import_path.default.isAbsolute(outputPath) ? outputPath : import_path.default.resolve(outputPath);
-        }
+        let outputDirectory = import_path.default.join(appDirectory, ".output");
         let funcsDirectory = outputDirectory;
         let staticDirectory = import_path.default.join(outputDirectory, "static");
         if (deployTarget === "node") {
@@ -116,6 +112,10 @@ var deploy_default = () => ({
                 return !src.includes(distStaticDirectory);
               }
             });
+            const apiDirectory2 = import_path.default.join(funcsDirectory, "api");
+            if (await import_utils.fs.pathExists(apiDirectory2)) {
+              await import_utils.fs.rename(apiDirectory2, import_path.default.join(funcsDirectory, "_api"));
+            }
             await import_utils.fs.writeJSON(import_path.default.join(funcsDirectory, ".vc-config.json"), {
               runtime: "nodejs16.x",
               handler: "index.js",

package/dist/esm/index.js

@@ -368,7 +368,7 @@ var appTools = function() {
                       }
                     });
                   }));
-                  program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-s --skip-build", i18n.t(localeKeys.command.shared.skipBuild)).option("-o --output <path>", i18n.t(localeKeys.command.deploy.output)).description(i18n.t(localeKeys.command.deploy.describe)).action(function() {
+                  program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-s --skip-build", i18n.t(localeKeys.command.shared.skipBuild)).description(i18n.t(localeKeys.command.deploy.describe)).action(function() {
                     var _ref = _async_to_generator(function(options2) {
                       var build, deploy;
                       return _ts_generator(this, function(_state2) {

package/dist/esm/locale/en.js

@@ -21,8 +21,7 @@ var EN_LOCALE = {
       describe: "preview the production build locally"
     },
     deploy: {
-      describe: "deploy the application",
-      output: "output path"
+      describe: "deploy the application"
     },
     new: {
       describe: "enable optional features or add a new entry",

package/dist/esm/locale/zh.js

@@ -21,8 +21,7 @@ var ZH_LOCALE = {
       describe: "启动生产环境服务"
     },
     deploy: {
-      describe: "部署应用",
-      output: "输出路径"
+      describe: "部署应用"
     },
     new: {
       describe: "Web App 项目中执行生成器",

package/dist/esm/plugins/deploy/entrys/vercel.js

@@ -10,6 +10,9 @@ function genVercelEntry() {
       path: "."
     }
   };
+  if (appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory) {
+    appContext.apiDirectory = appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory.replace(/\/api$/, "/_api");
+  }
   return "\n\n  const fs = require('node:fs/promises');\n  const path = require('node:path');\n  const { createProdServer } = require('@modern-js/prod-server');\n  ".concat(genPluginImportsCode(plugins || []), `
 
   if(!process.env.NODE_ENV){

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

@@ -15,22 +15,18 @@ function deploy_default() {
     setup: function(api) {
       var deployTarget = process.env.MODERNJS_DEPLOY || provider || "node";
       return {
-        beforeDeploy: function beforeDeploy(options) {
+        beforeDeploy: function beforeDeploy() {
           return _async_to_generator(function() {
-            var outputPath, appContext, appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints, _getProjectUsage, useSSR, useAPI, useWebServer, needModernServer, configContext, outputDirectory, funcsDirectory, staticDirectory, vercelOutput, config, destHtmlDirectory, outputHtmlDirectory, bff, config1, plugins, serverAppContext, code, genNodeEntry, genVercelEntry, genNetlifyEntry, entryFilePath;
+            var appContext, appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints, _getProjectUsage, useSSR, useAPI, useWebServer, needModernServer, configContext, outputDirectory, funcsDirectory, staticDirectory, vercelOutput, config, destHtmlDirectory, outputHtmlDirectory, apiDirectory1, bff, config1, plugins, serverAppContext, code, genNodeEntry, genVercelEntry, genNetlifyEntry, entryFilePath;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
-                  outputPath = options.output;
                   appContext = api.useAppContext();
                   appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverInternalPlugins = appContext.serverInternalPlugins, sharedDirectory = appContext.sharedDirectory, apiDirectory = appContext.apiDirectory, lambdaDirectory = appContext.lambdaDirectory, metaName = appContext.metaName, entrypoints = appContext.entrypoints;
                   _getProjectUsage = getProjectUsage(appDirectory, distDirectory), useSSR = _getProjectUsage.useSSR, useAPI = _getProjectUsage.useAPI, useWebServer = _getProjectUsage.useWebServer;
                   needModernServer = useSSR || useAPI || useWebServer;
                   configContext = api.useResolvedConfigContext();
-                  outputDirectory = path.resolve(appDirectory, ".output");
-                  if (outputPath) {
-                    outputDirectory = path.isAbsolute(outputPath) ? outputPath : path.resolve(outputPath);
-                  }
+                  outputDirectory = path.join(appDirectory, ".output");
                   funcsDirectory = outputDirectory;
                   staticDirectory = path.join(outputDirectory, "static");
                   if (!(deployTarget === "node"))
@@ -55,7 +51,7 @@ function deploy_default() {
                   if (!(deployTarget === "vercel"))
                     return [
                       3,
-                      13
+                      16
                     ];
                   vercelOutput = path.join(appDirectory, ".vercel");
                   return [
@@ -132,7 +128,7 @@ function deploy_default() {
                   _state.sent();
                   return [
                     3,
-                    13
+                    16
                   ];
                 case 9:
                   funcsDirectory = path.join(outputDirectory, "functions", "index.func");
@@ -153,6 +149,25 @@ function deploy_default() {
                   ];
                 case 11:
                   _state.sent();
+                  apiDirectory1 = path.join(funcsDirectory, "api");
+                  return [
+                    4,
+                    fse.pathExists(apiDirectory1)
+                  ];
+                case 12:
+                  if (!_state.sent())
+                    return [
+                      3,
+                      14
+                    ];
+                  return [
+                    4,
+                    fse.rename(apiDirectory1, path.join(funcsDirectory, "_api"))
+                  ];
+                case 13:
+                  _state.sent();
+                  _state.label = 14;
+                case 14:
                   return [
                     4,
                     fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
@@ -163,10 +178,10 @@ function deploy_default() {
                       supportsResponseStreaming: true
                     })
                   ];
-                case 12:
+                case 15:
                   _state.sent();
-                  _state.label = 13;
-                case 13:
+                  _state.label = 16;
+                case 16:
                   bff = configContext.bff;
                   config1 = {
                     output: {
@@ -187,29 +202,29 @@ function deploy_default() {
                     case "node":
                       return [
                         3,
-                        14
+                        17
                       ];
                     case "vercel":
                       return [
                         3,
-                        16
+                        19
                       ];
                     case "netlify":
                       return [
                         3,
-                        18
+                        21
                       ];
                   }
                   return [
                     3,
-                    20
+                    23
                   ];
-                case 14:
+                case 17:
                   return [
                     4,
                     import("./entrys/node")
                   ];
-                case 15:
+                case 18:
                   genNodeEntry = _state.sent().genNodeEntry;
                   code = genNodeEntry({
                     plugins,
@@ -218,14 +233,14 @@ function deploy_default() {
                   });
                   return [
                     3,
-                    21
+                    24
                   ];
-                case 16:
+                case 19:
                   return [
                     4,
                     import("./entrys/vercel")
                   ];
-                case 17:
+                case 20:
                   genVercelEntry = _state.sent().genVercelEntry;
                   code = genVercelEntry({
                     plugins,
@@ -234,14 +249,14 @@ function deploy_default() {
                   });
                   return [
                     3,
-                    21
+                    24
                   ];
-                case 18:
+                case 21:
                   return [
                     4,
                     import("./entrys/netlify")
                   ];
-                case 19:
+                case 22:
                   genNetlifyEntry = _state.sent().genNetlifyEntry;
                   code = genNetlifyEntry({
                     plugins,
@@ -250,25 +265,25 @@ function deploy_default() {
                   });
                   return [
                     3,
-                    21
+                    24
                   ];
-                case 20:
+                case 23:
                   {
                     code = 'throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");';
                   }
-                  _state.label = 21;
-                case 21:
+                  _state.label = 24;
+                case 24:
                   entryFilePath = path.join(funcsDirectory, "index.js");
                   if (!needModernServer)
                     return [
                       3,
-                      24
+                      27
                     ];
                   return [
                     4,
                     fse.writeFile(entryFilePath, code)
                   ];
-                case 22:
+                case 25:
                   _state.sent();
                   return [
                     4,
@@ -276,10 +291,10 @@ function deploy_default() {
                       "@modern-js/prod-server"
                     ])
                   ];
-                case 23:
+                case 26:
                   _state.sent();
-                  _state.label = 24;
-                case 24:
+                  _state.label = 27;
+                case 27:
                   return [
                     2
                   ];

package/dist/esm-node/index.js

@@ -115,7 +115,7 @@ const appTools = (options = {
           const { start } = await import("./commands/serve");
           await start(api);
         });
-        program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-s --skip-build", i18n.t(localeKeys.command.shared.skipBuild)).option("-o --output <path>", i18n.t(localeKeys.command.deploy.output)).description(i18n.t(localeKeys.command.deploy.describe)).action(async (options2) => {
+        program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-s --skip-build", i18n.t(localeKeys.command.shared.skipBuild)).description(i18n.t(localeKeys.command.deploy.describe)).action(async (options2) => {
           if (!options2.skipBuild) {
             const { build } = await import("./commands/build");
             await build(api);

package/dist/esm-node/locale/en.js

@@ -21,8 +21,7 @@ const EN_LOCALE = {
       describe: "preview the production build locally"
     },
     deploy: {
-      describe: "deploy the application",
-      output: "output path"
+      describe: "deploy the application"
     },
     new: {
       describe: "enable optional features or add a new entry",

package/dist/esm-node/locale/zh.js

@@ -21,8 +21,7 @@ const ZH_LOCALE = {
       describe: "启动生产环境服务"
     },
     deploy: {
-      describe: "部署应用",
-      output: "输出路径"
+      describe: "部署应用"
     },
     new: {
       describe: "Web App 项目中执行生成器",

package/dist/esm-node/plugins/deploy/entrys/vercel.js

@@ -9,6 +9,9 @@ function genVercelEntry({ config, plugins, appContext } = {}) {
       path: "."
     }
   };
+  if (appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory) {
+    appContext.apiDirectory = appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory.replace(/\/api$/, "/_api");
+  }
   return `
 
   const fs = require('node:fs/promises');

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

@@ -12,17 +12,13 @@ var deploy_default = () => ({
   setup: (api) => {
     const deployTarget = process.env.MODERNJS_DEPLOY || provider || "node";
     return {
-      async beforeDeploy(options) {
-        const { output: outputPath } = options;
+      async beforeDeploy() {
         const appContext = api.useAppContext();
         const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
         const { useSSR, useAPI, useWebServer } = getProjectUsage(appDirectory, distDirectory);
         const needModernServer = useSSR || useAPI || useWebServer;
         const configContext = api.useResolvedConfigContext();
-        let outputDirectory = path.resolve(appDirectory, ".output");
-        if (outputPath) {
-          outputDirectory = path.isAbsolute(outputPath) ? outputPath : path.resolve(outputPath);
-        }
+        let outputDirectory = path.join(appDirectory, ".output");
         let funcsDirectory = outputDirectory;
         let staticDirectory = path.join(outputDirectory, "static");
         if (deployTarget === "node") {
@@ -83,6 +79,10 @@ var deploy_default = () => ({
                 return !src.includes(distStaticDirectory);
               }
             });
+            const apiDirectory2 = path.join(funcsDirectory, "api");
+            if (await fse.pathExists(apiDirectory2)) {
+              await fse.rename(apiDirectory2, path.join(funcsDirectory, "_api"));
+            }
             await fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
               runtime: "nodejs16.x",
               handler: "index.js",

package/dist/types/locale/en.d.ts

@@ -22,7 +22,6 @@ export declare const EN_LOCALE: {
         };
         deploy: {
             describe: string;
-            output: string;
         };
         new: {
             describe: string;

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

@@ -24,7 +24,6 @@ declare const localeKeys: {
         };
         deploy: {
             describe: string;
-            output: string;
         };
         new: {
             describe: string;
@@ -64,7 +63,6 @@ declare const localeKeys: {
         };
         deploy: {
             describe: string;
-            output: string;
         };
         new: {
             describe: string;

package/dist/types/locale/zh.d.ts

@@ -22,7 +22,6 @@ export declare const ZH_LOCALE: {
         };
         deploy: {
             describe: string;
-            output: string;
         };
         new: {
             describe: string;

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

@@ -1,5 +1,6 @@
+import { ServerAppContext } from '../utils';
 export declare function genVercelEntry({ config, plugins, appContext, }?: {
     config?: Record<string, any>;
     plugins?: string[];
-    appContext?: Record<string, any>;
+    appContext?: ServerAppContext;
 }): string;

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

@@ -10,7 +10,6 @@ export type BuildOptions = {
 };
 export type DeployOptions = {
     config?: string;
-    output?: string;
     skipBuild?: boolean;
 };
 export type StartOptions = {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.3-alpha.0",
+  "version": "2.49.3-alpha.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -80,20 +80,20 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/node-bundle-require": "2.49.2",
-    "@modern-js/plugin": "2.49.2",
     "@modern-js/plugin-data-loader": "2.49.2",
-    "@modern-js/plugin-i18n": "2.49.2",
-    "@modern-js/rsbuild-plugin-esbuild": "2.49.2",
+    "@modern-js/prod-server": "2.49.2",
     "@modern-js/plugin-lint": "2.49.2",
-    "@modern-js/server-utils": "2.49.2",
-    "@modern-js/server": "2.49.2",
-    "@modern-js/types": "2.49.2",
-    "@modern-js/core": "2.49.2",
+    "@modern-js/plugin": "2.49.2",
+    "@modern-js/rsbuild-plugin-esbuild": "2.49.2",
     "@modern-js/server-core": "2.49.2",
-    "@modern-js/utils": "2.49.2",
+    "@modern-js/plugin-i18n": "2.49.2",
+    "@modern-js/core": "2.49.2",
+    "@modern-js/types": "2.49.2",
     "@modern-js/uni-builder": "2.49.2",
-    "@modern-js/prod-server": "2.49.2"
+    "@modern-js/utils": "2.49.2",
+    "@modern-js/server": "2.49.2",
+    "@modern-js/node-bundle-require": "2.49.2",
+    "@modern-js/server-utils": "2.49.2"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.6.10",