@modern-js/app-tools 2.60.1 → 2.60.2-alpha.0

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

@@ -52,7 +52,10 @@ async function cleanDistDirectory(dir) {
 const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
   const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
   const isEsmProject = moduleType === "module";
-  const plugins = serverPlugins.map((plugin) => plugin.name);
+  const plugins = serverPlugins.map((plugin) => [
+    plugin.name,
+    plugin.options
+  ]);
   const netlifyOutput = import_node_path.default.join(appDirectory, ".netlify");
   const funcsDirectory = import_node_path.default.join(netlifyOutput, "functions");
   const entryFilePath = import_node_path.default.join(funcsDirectory, "index.js");
@@ -115,9 +118,7 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
         config: serverConfig,
         serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG
       };
-      const pluginsCode = `[${plugins.map((plugin, index) => {
-        return `plugin_${index}()`;
-      }).join(",")}]`;
+      const pluginsCode = (0, import_utils2.getPluginsCode)(plugins);
       let handlerCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./netlify-handler.js"))).toString();
       const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
       handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);

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

@@ -38,7 +38,10 @@ var import_utils2 = require("../utils");
 const createNodePreset = (appContext, config) => {
   const { appDirectory, distDirectory, serverPlugins, moduleType } = appContext;
   const isEsmProject = moduleType === "module";
-  const plugins = serverPlugins.map((plugin) => plugin.name);
+  const plugins = serverPlugins.map((plugin) => [
+    plugin.name,
+    plugin.options
+  ]);
   const outputDirectory = import_node_path.default.join(appDirectory, ".output");
   const staticDirectory = import_node_path.default.join(outputDirectory, "static");
   const entryFilePath = import_node_path.default.join(outputDirectory, "index.js");
@@ -69,9 +72,7 @@ const createNodePreset = (appContext, config) => {
         config: serverConfig,
         serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG
       };
-      const pluginsCode = `[${plugins.map((plugin, index) => {
-        return `plugin_${index}()`;
-      }).join(",")}]`;
+      const pluginsCode = (0, import_utils2.getPluginsCode)(plugins);
       let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./node-entry.js"))).toString();
       const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
       entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);

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

@@ -39,7 +39,10 @@ var import_utils2 = require("../utils");
 const createVercelPreset = (appContext, modernConfig, needModernServer) => {
   const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
   const isEsmProject = moduleType === "module";
-  const plugins = serverPlugins.map((plugin) => plugin.name);
+  const plugins = serverPlugins.map((plugin) => [
+    plugin.name,
+    plugin.options
+  ]);
   const vercelOutput = import_node_path.default.join(appDirectory, ".vercel");
   const outputDirectory = import_node_path.default.join(vercelOutput, "output");
   const funcsDirectory = import_node_path.default.join(outputDirectory, "functions", "index.func");
@@ -130,9 +133,7 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
         config: serverConfig,
         serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG
       };
-      const pluginsCode = `[${plugins.map((plugin, index) => {
-        return `plugin_${index}()`;
-      }).join(",")}]`;
+      const pluginsCode = (0, import_utils2.getPluginsCode)(plugins || []);
       const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
       let handlerCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./vercel-handler.js"))).toString();
       handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);

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

@@ -45,13 +45,15 @@ const serverAppContenxtTemplate = (appContext) => {
     metaName
   };
 };
-const getPluginsCode = (plugins) => `[${plugins.map((_, index) => `plugin_${index}()`).join(",")}]`;
 const genPluginImportsCode = (plugins) => {
-  return plugins.map((plugin, index) => `
-      let plugin_${index} = require('${plugin}')
+  return plugins.map(([name, options], index) => `
+      let plugin_${index} = require('${name}')
       plugin_${index} = plugin_${index}.default || plugin_${index}
       `).join(";\n");
 };
+const getPluginsCode = (plugins) => {
+  return `[${plugins.map(([, options], index) => `plugin_${index}(${options ? JSON.stringify(options) : ""})`).join(",")}]`;
+};
 const getProjectUsage = (appDirectory, distDirectory) => {
   const routeJSON = import_path.default.join(distDirectory, import_utils.ROUTE_SPEC_FILE);
   const { routes } = import_utils.fs.readJSONSync(routeJSON);

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

@@ -4,7 +4,7 @@ import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, fs as fse } from "@modern-js/utils";
 import { isMainEntry } from "../../../utils/routes";
 import { handleDependencies } from "../dependencies";
-import { genPluginImportsCode, serverAppContenxtTemplate } from "../utils";
+import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 function cleanDistDirectory(dir) {
   return _cleanDistDirectory.apply(this, arguments);
 }
@@ -114,7 +114,10 @@ var createNetlifyPreset = function(appContext, modernConfig, needModernServer) {
   var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, entrypoints = appContext.entrypoints, serverPlugins = appContext.serverPlugins, moduleType = appContext.moduleType;
   var isEsmProject = moduleType === "module";
   var plugins = serverPlugins.map(function(plugin) {
-    return plugin.name;
+    return [
+      plugin.name,
+      plugin.options
+    ];
   });
   var netlifyOutput = path.join(appDirectory, ".netlify");
   var funcsDirectory = path.join(netlifyOutput, "functions");
@@ -230,9 +233,7 @@ var createNetlifyPreset = function(appContext, modernConfig, needModernServer) {
                 config: serverConfig,
                 serverConfigFile: DEFAULT_SERVER_CONFIG
               };
-              pluginsCode = "[".concat(plugins.map(function(plugin, index) {
-                return "plugin_".concat(index, "()");
-              }).join(","), "]");
+              pluginsCode = getPluginsCode(plugins);
               return [
                 4,
                 fse.readFile(path.join(__dirname, "./netlify-handler.js"))

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

@@ -3,12 +3,15 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, chalk, fs as fse } from "@modern-js/utils";
 import { handleDependencies } from "../dependencies";
-import { genPluginImportsCode, serverAppContenxtTemplate } from "../utils";
+import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 var createNodePreset = function(appContext, config) {
   var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverPlugins = appContext.serverPlugins, moduleType = appContext.moduleType;
   var isEsmProject = moduleType === "module";
   var plugins = serverPlugins.map(function(plugin) {
-    return plugin.name;
+    return [
+      plugin.name,
+      plugin.options
+    ];
   });
   var outputDirectory = path.join(appDirectory, ".output");
   var staticDirectory = path.join(outputDirectory, "static");
@@ -74,9 +77,7 @@ var createNodePreset = function(appContext, config) {
                 config: serverConfig,
                 serverConfigFile: DEFAULT_SERVER_CONFIG
               };
-              pluginsCode = "[".concat(plugins.map(function(plugin, index) {
-                return "plugin_".concat(index, "()");
-              }).join(","), "]");
+              pluginsCode = getPluginsCode(plugins);
               return [
                 4,
                 fse.readFile(path.join(__dirname, "./node-entry.js"))

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

@@ -4,12 +4,15 @@ import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, fs as fse } from "@modern-js/utils";
 import { isMainEntry } from "../../../utils/routes";
 import { handleDependencies } from "../dependencies";
-import { genPluginImportsCode, serverAppContenxtTemplate } from "../utils";
+import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 var createVercelPreset = function(appContext, modernConfig, needModernServer) {
   var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, entrypoints = appContext.entrypoints, serverPlugins = appContext.serverPlugins, moduleType = appContext.moduleType;
   var isEsmProject = moduleType === "module";
   var plugins = serverPlugins.map(function(plugin) {
-    return plugin.name;
+    return [
+      plugin.name,
+      plugin.options
+    ];
   });
   var vercelOutput = path.join(appDirectory, ".vercel");
   var outputDirectory = path.join(vercelOutput, "output");
@@ -177,9 +180,7 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
                 config: serverConfig,
                 serverConfigFile: DEFAULT_SERVER_CONFIG
               };
-              pluginsCode = "[".concat(plugins.map(function(plugin, index) {
-                return "plugin_".concat(index, "()");
-              }).join(","), "]");
+              pluginsCode = getPluginsCode(plugins || []);
               serverAppContext = serverAppContenxtTemplate(appContext);
               return [
                 4,

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

@@ -1,3 +1,4 @@
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import path from "path";
 import { ROUTE_SPEC_FILE, fs as fse, isDepExists } from "@modern-js/utils";
 var serverAppContenxtTemplate = function(appContext) {
@@ -9,16 +10,18 @@ var serverAppContenxtTemplate = function(appContext) {
     metaName
   };
 };
-var getPluginsCode = function(plugins) {
-  return "[".concat(plugins.map(function(_, index) {
-    return "plugin_".concat(index, "()");
-  }).join(","), "]");
-};
 var genPluginImportsCode = function(plugins) {
-  return plugins.map(function(plugin, index) {
-    return "\n      let plugin_".concat(index, " = require('").concat(plugin, "')\n      plugin_").concat(index, " = plugin_").concat(index, ".default || plugin_").concat(index, "\n      ");
+  return plugins.map(function(param, index) {
+    var _param = _sliced_to_array(param, 2), name = _param[0], options = _param[1];
+    return "\n      let plugin_".concat(index, " = require('").concat(name, "')\n      plugin_").concat(index, " = plugin_").concat(index, ".default || plugin_").concat(index, "\n      ");
   }).join(";\n");
 };
+var getPluginsCode = function(plugins) {
+  return "[".concat(plugins.map(function(param, index) {
+    var _param = _sliced_to_array(param, 2), options = _param[1];
+    return "plugin_".concat(index, "(").concat(options ? JSON.stringify(options) : "", ")");
+  }).join(","), "]");
+};
 var getProjectUsage = function(appDirectory, distDirectory) {
   var routeJSON = path.join(distDirectory, ROUTE_SPEC_FILE);
   var routes = fse.readJSONSync(routeJSON).routes;

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

@@ -2,7 +2,7 @@ import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, fs as fse } from "@modern-js/utils";
 import { isMainEntry } from "../../../utils/routes";
 import { handleDependencies } from "../dependencies";
-import { genPluginImportsCode, serverAppContenxtTemplate } from "../utils";
+import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 async function cleanDistDirectory(dir) {
   try {
     const items = await fse.readdir(dir);
@@ -19,7 +19,10 @@ async function cleanDistDirectory(dir) {
 const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
   const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
   const isEsmProject = moduleType === "module";
-  const plugins = serverPlugins.map((plugin) => plugin.name);
+  const plugins = serverPlugins.map((plugin) => [
+    plugin.name,
+    plugin.options
+  ]);
   const netlifyOutput = path.join(appDirectory, ".netlify");
   const funcsDirectory = path.join(netlifyOutput, "functions");
   const entryFilePath = path.join(funcsDirectory, "index.js");
@@ -82,9 +85,7 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
         config: serverConfig,
         serverConfigFile: DEFAULT_SERVER_CONFIG
       };
-      const pluginsCode = `[${plugins.map((plugin, index) => {
-        return `plugin_${index}()`;
-      }).join(",")}]`;
+      const pluginsCode = getPluginsCode(plugins);
       let handlerCode = (await fse.readFile(path.join(__dirname, "./netlify-handler.js"))).toString();
       const serverAppContext = serverAppContenxtTemplate(appContext);
       handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);

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

@@ -1,11 +1,14 @@
 import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, chalk, fs as fse } from "@modern-js/utils";
 import { handleDependencies } from "../dependencies";
-import { genPluginImportsCode, serverAppContenxtTemplate } from "../utils";
+import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 const createNodePreset = (appContext, config) => {
   const { appDirectory, distDirectory, serverPlugins, moduleType } = appContext;
   const isEsmProject = moduleType === "module";
-  const plugins = serverPlugins.map((plugin) => plugin.name);
+  const plugins = serverPlugins.map((plugin) => [
+    plugin.name,
+    plugin.options
+  ]);
   const outputDirectory = path.join(appDirectory, ".output");
   const staticDirectory = path.join(outputDirectory, "static");
   const entryFilePath = path.join(outputDirectory, "index.js");
@@ -36,9 +39,7 @@ const createNodePreset = (appContext, config) => {
         config: serverConfig,
         serverConfigFile: DEFAULT_SERVER_CONFIG
       };
-      const pluginsCode = `[${plugins.map((plugin, index) => {
-        return `plugin_${index}()`;
-      }).join(",")}]`;
+      const pluginsCode = getPluginsCode(plugins);
       let entryCode = (await fse.readFile(path.join(__dirname, "./node-entry.js"))).toString();
       const serverAppContext = serverAppContenxtTemplate(appContext);
       entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);

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

@@ -2,11 +2,14 @@ import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, fs as fse } from "@modern-js/utils";
 import { isMainEntry } from "../../../utils/routes";
 import { handleDependencies } from "../dependencies";
-import { genPluginImportsCode, serverAppContenxtTemplate } from "../utils";
+import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 const createVercelPreset = (appContext, modernConfig, needModernServer) => {
   const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
   const isEsmProject = moduleType === "module";
-  const plugins = serverPlugins.map((plugin) => plugin.name);
+  const plugins = serverPlugins.map((plugin) => [
+    plugin.name,
+    plugin.options
+  ]);
   const vercelOutput = path.join(appDirectory, ".vercel");
   const outputDirectory = path.join(vercelOutput, "output");
   const funcsDirectory = path.join(outputDirectory, "functions", "index.func");
@@ -97,9 +100,7 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
         config: serverConfig,
         serverConfigFile: DEFAULT_SERVER_CONFIG
       };
-      const pluginsCode = `[${plugins.map((plugin, index) => {
-        return `plugin_${index}()`;
-      }).join(",")}]`;
+      const pluginsCode = getPluginsCode(plugins || []);
       const serverAppContext = serverAppContenxtTemplate(appContext);
       let handlerCode = (await fse.readFile(path.join(__dirname, "./vercel-handler.js"))).toString();
       handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);

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

@@ -9,13 +9,15 @@ const serverAppContenxtTemplate = (appContext) => {
     metaName
   };
 };
-const getPluginsCode = (plugins) => `[${plugins.map((_, index) => `plugin_${index}()`).join(",")}]`;
 const genPluginImportsCode = (plugins) => {
-  return plugins.map((plugin, index) => `
-      let plugin_${index} = require('${plugin}')
+  return plugins.map(([name, options], index) => `
+      let plugin_${index} = require('${name}')
       plugin_${index} = plugin_${index}.default || plugin_${index}
       `).join(";\n");
 };
+const getPluginsCode = (plugins) => {
+  return `[${plugins.map(([, options], index) => `plugin_${index}(${options ? JSON.stringify(options) : ""})`).join(",")}]`;
+};
 const getProjectUsage = (appDirectory, distDirectory) => {
   const routeJSON = path.join(distDirectory, ROUTE_SPEC_FILE);
   const { routes } = fse.readJSONSync(routeJSON);

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

@@ -11,8 +11,9 @@ export declare const serverAppContenxtTemplate: (appContext: IAppContext) => {
     lambdaDirectory: string;
     metaName: string;
 };
-export declare const getPluginsCode: (plugins: string[]) => string;
-export declare const genPluginImportsCode: (plugins: string[]) => string;
+export type PluginItem = [string, Record<string, any> | undefined];
+export declare const genPluginImportsCode: (plugins: PluginItem[]) => string;
+export declare const getPluginsCode: (plugins: PluginItem[]) => string;
 export declare const getProjectUsage: (appDirectory: string, distDirectory: string) => {
     useSSR: boolean;
     useAPI: boolean;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.1",
+  "version": "2.60.2-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -88,19 +88,19 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
+    "@modern-js/node-bundle-require": "2.60.1",
     "@modern-js/core": "2.60.1",
     "@modern-js/plugin": "2.60.1",
-    "@modern-js/node-bundle-require": "2.60.1",
-    "@modern-js/plugin-data-loader": "2.60.1",
-    "@modern-js/plugin-i18n": "2.60.1",
     "@modern-js/prod-server": "2.60.1",
-    "@modern-js/rsbuild-plugin-esbuild": "2.60.1",
+    "@modern-js/plugin-i18n": "2.60.1",
     "@modern-js/server": "2.60.1",
+    "@modern-js/rsbuild-plugin-esbuild": "2.60.1",
     "@modern-js/server-core": "2.60.1",
     "@modern-js/server-utils": "2.60.1",
-    "@modern-js/uni-builder": "2.60.1",
     "@modern-js/types": "2.60.1",
-    "@modern-js/utils": "2.60.1"
+    "@modern-js/uni-builder": "2.60.1",
+    "@modern-js/utils": "2.60.1",
+    "@modern-js/plugin-data-loader": "2.60.1"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "1.0.2",
@@ -112,8 +112,20 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.94.0",
-    "@scripts/jest-config": "2.60.1",
-    "@scripts/build": "2.60.1"
+    "@scripts/build": "2.60.1",
+    "@scripts/jest-config": "2.60.1"
+  },
+  "peerDependencies": {
+    "ts-node": "^10.7.0",
+    "tsconfig-paths": "^4.2.0"
+  },
+  "peerDependenciesMeta": {
+    "ts-node": {
+      "optional": true
+    },
+    "tsconfig-paths": {
+      "optional": true
+    }
   },
   "sideEffects": false,
   "publishConfig": {