@modern-js/app-tools 2.49.3-alpha.12 → 2.49.3-alpha.13

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

@@ -163,11 +163,12 @@ var deploy_default = () => ({
         }
         const plugins = (0, import_utils.getInternalPlugins)(appDirectory, serverInternalPlugins);
         const serverAppContext = {
-          sharedDirectory: import_path.default.join(__dirname, import_path.default.relative(appDirectory, sharedDirectory)),
-          apiDirectory: import_path.default.join(__dirname, import_path.default.relative(appDirectory, apiDirectory)),
-          lambdaDirectory: import_path.default.join(__dirname, import_path.default.relative(appDirectory, lambdaDirectory)),
+          sharedDirectory: `path.join(__dirname, "${import_path.default.relative(appDirectory, sharedDirectory)}")`,
+          apiDirectory: `path.join(__dirname, "${import_path.default.relative(appDirectory, apiDirectory)}")`,
+          lambdaDirectory: `path.join(__dirname, "${import_path.default.relative(appDirectory, lambdaDirectory)}")`,
           metaName
         };
+        console.log("serverAppContext", serverAppContext);
         let code = ``;
         console.log("deployTarget111111111", deployTarget);
         switch (deployTarget) {

package/dist/cjs/plugins/deploy/platforms/node.js

@@ -34,7 +34,7 @@ module.exports = __toCommonJS(node_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
 var import_utils2 = require("../utils");
-async function genNodeEntry({ config, plugins, appContext } = {}) {
+async function genNodeEntry({ config, plugins, appContext }) {
   const defaultConfig = {
     server: {
       port: 8080
@@ -47,19 +47,10 @@ async function genNodeEntry({ config, plugins, appContext } = {}) {
   const dynamicProdOptions = {
     config: config || defaultConfig,
     serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG,
-    plugins,
-    appContext: appContext ? {
-      sharedDirectory: appContext.sharedDirectory,
-      apiDirectory: appContext.apiDirectory,
-      lambdaDirectory: appContext.lambdaDirectory
-    } : "undefined"
+    plugins
   };
   let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./nodeEntry.js"))).toString();
-  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace(
-    "p_dynamicProdOptions",
-    // JSON.stringify(dynamicProdOptions),
-    JSON.stringify(dynamicProdOptions)
-  );
+  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_sharedDirectory", appContext.sharedDirectory).replace("p_apiDirectory", appContext.apiDirectory).replace("p_lambdaDirectory", appContext.lambdaDirectory);
   return entryCode;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/plugins/deploy/platforms/nodeEntry.js

@@ -25,12 +25,17 @@ async function main() {
     pwd: __dirname,
     routes,
     disableCustomHook: true,
+    appContext: {
+      sharedDirectory: p_sharedDirectory,
+      apiDirectory: p_apiDirectory,
+      lambdaDirectory: p_lambdaDirectory
+    },
     ...dynamicProdOptions
   };
   const app = await createProdServer(prodServerOptions);
   const port = process.env.PORT || 8080;
   app.listen(port, () => {
-    console.log("\\x1b[32mServer is listening on port", port, "\\x1b[0m");
+    console.log("\x1B[32mServer is listening on port", port, "\x1B[0m");
   });
 }
 main();

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

@@ -34,7 +34,7 @@ module.exports = __toCommonJS(vercel_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
 var import_utils2 = require("../utils");
-async function genVercelEntry({ config, plugins, appContext } = {}) {
+async function genVercelEntry({ config, plugins, appContext }) {
   const defaultConfig = {
     output: {
       path: "."
@@ -44,19 +44,10 @@ async function genVercelEntry({ config, plugins, appContext } = {}) {
   const dynamicProdOptions = {
     config: config || defaultConfig,
     serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG,
-    plugins,
-    appContext: appContext ? {
-      sharedDirectory: appContext.sharedDirectory,
-      apiDirectory: appContext.apiDirectory,
-      lambdaDirectory: appContext.lambdaDirectory
-    } : "undefined"
+    plugins
   };
   let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./vercelEntry.js"))).toString();
-  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace(
-    "p_dynamicProdOptions",
-    // JSON.stringify(dynamicProdOptions),
-    JSON.stringify(dynamicProdOptions)
-  );
+  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_sharedDirectory", appContext.sharedDirectory).replace("p_apiDirectory", appContext.apiDirectory).replace("p_lambdaDirectory", appContext.lambdaDirectory);
   return entryCode;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/plugins/deploy/platforms/vercelEntry.js

@@ -27,6 +27,11 @@ async function initServer() {
     pwd: __dirname,
     routes,
     disableCustomHook: true,
+    appContext: {
+      sharedDirectory: p_sharedDirectory,
+      apiDirectory: p_apiDirectory,
+      lambdaDirectory: p_lambdaDirectory
+    },
     ...dynamicProdOptions
   };
   const app = await createProdServer(prodServerOptions);

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

@@ -230,11 +230,12 @@ function deploy_default() {
                 case 18:
                   plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
                   serverAppContext = {
-                    sharedDirectory: path.join(__dirname, path.relative(appDirectory, sharedDirectory)),
-                    apiDirectory: path.join(__dirname, path.relative(appDirectory, apiDirectory)),
-                    lambdaDirectory: path.join(__dirname, path.relative(appDirectory, lambdaDirectory)),
+                    sharedDirectory: 'path.join(__dirname, "'.concat(path.relative(appDirectory, sharedDirectory), '")'),
+                    apiDirectory: 'path.join(__dirname, "'.concat(path.relative(appDirectory, apiDirectory), '")'),
+                    lambdaDirectory: 'path.join(__dirname, "'.concat(path.relative(appDirectory, lambdaDirectory), '")'),
                     metaName
                   };
+                  console.log("serverAppContext", serverAppContext);
                   code = "";
                   console.log("deployTarget111111111", deployTarget);
                   switch (deployTarget) {

package/dist/esm/plugins/deploy/platforms/node.js

@@ -3,17 +3,16 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
 import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse } from "@modern-js/utils";
 import { genPluginImportsCode } from "../utils";
-function genNodeEntry() {
+function genNodeEntry(_) {
   return _genNodeEntry.apply(this, arguments);
 }
 function _genNodeEntry() {
-  _genNodeEntry = _async_to_generator(function() {
-    var _ref, config, plugins, appContext, defaultConfig, pluginImportCode, dynamicProdOptions, entryCode;
-    var _arguments = arguments;
+  _genNodeEntry = _async_to_generator(function(param) {
+    var config, plugins, appContext, defaultConfig, pluginImportCode, dynamicProdOptions, entryCode;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          _ref = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : {}, config = _ref.config, plugins = _ref.plugins, appContext = _ref.appContext;
+          config = param.config, plugins = param.plugins, appContext = param.appContext;
           defaultConfig = {
             server: {
               port: 8080
@@ -26,12 +25,7 @@ function _genNodeEntry() {
           dynamicProdOptions = {
             config: config || defaultConfig,
             serverConfigFile: DEFAULT_SERVER_CONFIG,
-            plugins,
-            appContext: appContext ? {
-              sharedDirectory: appContext.sharedDirectory,
-              apiDirectory: appContext.apiDirectory,
-              lambdaDirectory: appContext.lambdaDirectory
-            } : "undefined"
+            plugins
           };
           return [
             4,
@@ -39,11 +33,7 @@ function _genNodeEntry() {
           ];
         case 1:
           entryCode = _state.sent().toString();
-          entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(ROUTE_SPEC_FILE, '"')).replace(
-            "p_dynamicProdOptions",
-            // JSON.stringify(dynamicProdOptions),
-            JSON.stringify(dynamicProdOptions)
-          );
+          entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(ROUTE_SPEC_FILE, '"')).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_sharedDirectory", appContext.sharedDirectory).replace("p_apiDirectory", appContext.apiDirectory).replace("p_lambdaDirectory", appContext.lambdaDirectory);
           return [
             2,
             entryCode

package/dist/esm/plugins/deploy/platforms/nodeEntry.js

@@ -76,7 +76,12 @@ function _main() {
           prodServerOptions = _object_spread._({
             pwd: __dirname,
             routes,
-            disableCustomHook: true
+            disableCustomHook: true,
+            appContext: {
+              sharedDirectory: p_sharedDirectory,
+              apiDirectory: p_apiDirectory,
+              lambdaDirectory: p_lambdaDirectory
+            }
           }, dynamicProdOptions);
           return [
             4,
@@ -86,7 +91,7 @@ function _main() {
           app = _state.sent();
           port = process.env.PORT || 8080;
           app.listen(port, function() {
-            console.log("\\x1b[32mServer is listening on port", port, "\\x1b[0m");
+            console.log("\x1B[32mServer is listening on port", port, "\x1B[0m");
           });
           return [
             2

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

@@ -3,17 +3,16 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
 import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse } from "@modern-js/utils";
 import { genPluginImportsCode } from "../utils";
-function genVercelEntry() {
+function genVercelEntry(_) {
   return _genVercelEntry.apply(this, arguments);
 }
 function _genVercelEntry() {
-  _genVercelEntry = _async_to_generator(function() {
-    var _ref, config, plugins, appContext, defaultConfig, pluginImportCode, dynamicProdOptions, entryCode;
-    var _arguments = arguments;
+  _genVercelEntry = _async_to_generator(function(param) {
+    var config, plugins, appContext, defaultConfig, pluginImportCode, dynamicProdOptions, entryCode;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          _ref = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : {}, config = _ref.config, plugins = _ref.plugins, appContext = _ref.appContext;
+          config = param.config, plugins = param.plugins, appContext = param.appContext;
           defaultConfig = {
             output: {
               path: "."
@@ -23,12 +22,7 @@ function _genVercelEntry() {
           dynamicProdOptions = {
             config: config || defaultConfig,
             serverConfigFile: DEFAULT_SERVER_CONFIG,
-            plugins,
-            appContext: appContext ? {
-              sharedDirectory: appContext.sharedDirectory,
-              apiDirectory: appContext.apiDirectory,
-              lambdaDirectory: appContext.lambdaDirectory
-            } : "undefined"
+            plugins
           };
           return [
             4,
@@ -36,11 +30,7 @@ function _genVercelEntry() {
           ];
         case 1:
           entryCode = _state.sent().toString();
-          entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(ROUTE_SPEC_FILE, '"')).replace(
-            "p_dynamicProdOptions",
-            // JSON.stringify(dynamicProdOptions),
-            JSON.stringify(dynamicProdOptions)
-          );
+          entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(ROUTE_SPEC_FILE, '"')).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_sharedDirectory", appContext.sharedDirectory).replace("p_apiDirectory", appContext.apiDirectory).replace("p_lambdaDirectory", appContext.lambdaDirectory);
           return [
             2,
             entryCode

package/dist/esm/plugins/deploy/platforms/vercelEntry.js

@@ -84,7 +84,12 @@ var require_vercelEntry = __commonJS({
               prodServerOptions = _object_spread._({
                 pwd: __dirname,
                 routes,
-                disableCustomHook: true
+                disableCustomHook: true,
+                appContext: {
+                  sharedDirectory: p_sharedDirectory,
+                  apiDirectory: p_apiDirectory,
+                  lambdaDirectory: p_lambdaDirectory
+                }
               }, dynamicProdOptions);
               return [
                 4,

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

@@ -130,11 +130,12 @@ var deploy_default = () => ({
         }
         const plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
         const serverAppContext = {
-          sharedDirectory: path.join(__dirname, path.relative(appDirectory, sharedDirectory)),
-          apiDirectory: path.join(__dirname, path.relative(appDirectory, apiDirectory)),
-          lambdaDirectory: path.join(__dirname, path.relative(appDirectory, lambdaDirectory)),
+          sharedDirectory: `path.join(__dirname, "${path.relative(appDirectory, sharedDirectory)}")`,
+          apiDirectory: `path.join(__dirname, "${path.relative(appDirectory, apiDirectory)}")`,
+          lambdaDirectory: `path.join(__dirname, "${path.relative(appDirectory, lambdaDirectory)}")`,
           metaName
         };
+        console.log("serverAppContext", serverAppContext);
         let code = ``;
         console.log("deployTarget111111111", deployTarget);
         switch (deployTarget) {

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

@@ -1,7 +1,7 @@
 import path from "node:path";
 import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse } from "@modern-js/utils";
 import { genPluginImportsCode } from "../utils";
-async function genNodeEntry({ config, plugins, appContext } = {}) {
+async function genNodeEntry({ config, plugins, appContext }) {
   const defaultConfig = {
     server: {
       port: 8080
@@ -14,19 +14,10 @@ async function genNodeEntry({ config, plugins, appContext } = {}) {
   const dynamicProdOptions = {
     config: config || defaultConfig,
     serverConfigFile: DEFAULT_SERVER_CONFIG,
-    plugins,
-    appContext: appContext ? {
-      sharedDirectory: appContext.sharedDirectory,
-      apiDirectory: appContext.apiDirectory,
-      lambdaDirectory: appContext.lambdaDirectory
-    } : "undefined"
+    plugins
   };
   let entryCode = (await fse.readFile(path.join(__dirname, "./nodeEntry.js"))).toString();
-  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace(
-    "p_dynamicProdOptions",
-    // JSON.stringify(dynamicProdOptions),
-    JSON.stringify(dynamicProdOptions)
-  );
+  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_sharedDirectory", appContext.sharedDirectory).replace("p_apiDirectory", appContext.apiDirectory).replace("p_lambdaDirectory", appContext.lambdaDirectory);
   return entryCode;
 }
 export {

package/dist/esm-node/plugins/deploy/platforms/nodeEntry.js

@@ -24,12 +24,17 @@ async function main() {
     pwd: __dirname,
     routes,
     disableCustomHook: true,
+    appContext: {
+      sharedDirectory: p_sharedDirectory,
+      apiDirectory: p_apiDirectory,
+      lambdaDirectory: p_lambdaDirectory
+    },
     ...dynamicProdOptions
   };
   const app = await createProdServer(prodServerOptions);
   const port = process.env.PORT || 8080;
   app.listen(port, () => {
-    console.log("\\x1b[32mServer is listening on port", port, "\\x1b[0m");
+    console.log("\x1B[32mServer is listening on port", port, "\x1B[0m");
   });
 }
 main();

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

@@ -1,7 +1,7 @@
 import path from "node:path";
 import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse } from "@modern-js/utils";
 import { genPluginImportsCode } from "../utils";
-async function genVercelEntry({ config, plugins, appContext } = {}) {
+async function genVercelEntry({ config, plugins, appContext }) {
   const defaultConfig = {
     output: {
       path: "."
@@ -11,19 +11,10 @@ async function genVercelEntry({ config, plugins, appContext } = {}) {
   const dynamicProdOptions = {
     config: config || defaultConfig,
     serverConfigFile: DEFAULT_SERVER_CONFIG,
-    plugins,
-    appContext: appContext ? {
-      sharedDirectory: appContext.sharedDirectory,
-      apiDirectory: appContext.apiDirectory,
-      lambdaDirectory: appContext.lambdaDirectory
-    } : "undefined"
+    plugins
   };
   let entryCode = (await fse.readFile(path.join(__dirname, "./vercelEntry.js"))).toString();
-  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace(
-    "p_dynamicProdOptions",
-    // JSON.stringify(dynamicProdOptions),
-    JSON.stringify(dynamicProdOptions)
-  );
+  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_sharedDirectory", appContext.sharedDirectory).replace("p_apiDirectory", appContext.apiDirectory).replace("p_lambdaDirectory", appContext.lambdaDirectory);
   return entryCode;
 }
 export {

package/dist/esm-node/plugins/deploy/platforms/vercelEntry.js

@@ -32,6 +32,11 @@ var require_vercelEntry = __commonJS({
         pwd: __dirname,
         routes,
         disableCustomHook: true,
+        appContext: {
+          sharedDirectory: p_sharedDirectory,
+          apiDirectory: p_apiDirectory,
+          lambdaDirectory: p_lambdaDirectory
+        },
         ...dynamicProdOptions
       };
       const app = await createProdServer(prodServerOptions);

package/dist/types/plugins/deploy/platforms/node.d.ts

@@ -1,5 +1,8 @@
-export declare function genNodeEntry({ config, plugins, appContext, }?: {
-    config?: Record<string, any>;
+import { NormalizedConfig } from '@modern-js/core';
+import { AppTools } from '../../../types';
+import { AppContext } from './platform';
+export declare function genNodeEntry({ config, plugins, appContext, }: {
+    config?: NormalizedConfig<AppTools>;
     plugins?: string[];
-    appContext?: Record<string, any>;
+    appContext: AppContext;
 }): Promise<string>;

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

@@ -1,8 +1,8 @@
 import { NormalizedConfig } from '@modern-js/core';
 import { AppTools } from '../../../types';
 import { AppContext } from './platform';
-export declare function genVercelEntry({ config, plugins, appContext, }?: {
+export declare function genVercelEntry({ config, plugins, appContext, }: {
     config?: NormalizedConfig<AppTools>;
     plugins?: string[];
-    appContext?: AppContext;
+    appContext: AppContext;
 }): Promise<string>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.3-alpha.12",
+  "version": "2.49.3-alpha.13",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -81,19 +81,19 @@
     "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-lint": "2.49.2",
+    "@modern-js/core": "2.49.2",
     "@modern-js/plugin-i18n": "2.49.2",
-    "@modern-js/server": "2.49.2",
+    "@modern-js/plugin-lint": "2.49.2",
+    "@modern-js/prod-server": "2.49.2",
     "@modern-js/rsbuild-plugin-esbuild": "2.49.2",
-    "@modern-js/core": "2.49.2",
-    "@modern-js/server-utils": "2.49.2",
-    "@modern-js/utils": "2.49.2",
-    "@modern-js/types": "2.49.2",
+    "@modern-js/plugin": "2.49.2",
+    "@modern-js/server": "2.49.2",
     "@modern-js/server-core": "2.49.2",
     "@modern-js/uni-builder": "2.49.2",
-    "@modern-js/prod-server": "2.49.2"
+    "@modern-js/server-utils": "2.49.2",
+    "@modern-js/types": "2.49.2",
+    "@modern-js/utils": "2.49.2"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.6.10",