@modern-js/app-tools 2.48.6 → 2.49.1-alpha.0

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

@@ -0,0 +1,41 @@
+import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
+import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
+function genNetlifyEntry() {
+  var _ref = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, config = _ref.config, plugins = _ref.plugins, appContext = _ref.appContext;
+  var defaultConfig = {
+    server: {
+      port: 8080
+    },
+    output: {
+      path: "."
+    }
+  };
+  return "\n\n  const fs = require('node:fs/promises');\n  const path = require('node:path');\n  const { createNetlifyFunction } = require('@modern-js/prod-server/netlify');\n  ".concat(genPluginImportsCode(plugins || []), `
+
+  let requestHandler = null;
+
+  if(!process.env.NODE_ENV){
+    process.env.NODE_ENV = 'production';
+  }
+
+  async function createHandler() {
+    try {
+      let routes = [];
+      const routeFilepath = path.join(__dirname, "`).concat(ROUTE_SPEC_FILE, `");
+      try {
+        await fs.access(routeFilepath);
+        const content = await fs.readFile(routeFilepath, "utf-8");
+        const routeSpec = JSON.parse(content);
+        routes = routeSpec.routes;
+      } catch (error) {
+        console.warn('route.json not found, continuing with empty routes.');
+      }
+
+      const prodServerOptions = {
+        pwd: __dirname,
+        routes,
+        config: `).concat(JSON.stringify(config || defaultConfig), ",\n        serverConfigFile: '").concat(DEFAULT_SERVER_CONFIG, "',\n        plugins: ").concat(getPluginsCode(plugins || []), ",\n        appContext: ").concat(appContext ? severAppContextTemplate(appContext) : "undefined", ",\n        disableCustomHook: true\n      }\n\n      requestHandler = await createNetlifyFunction(prodServerOptions)\n\n      return requestHandler\n    } catch(error) {\n      console.error(error);\n      process.exit(1);\n    }\n  }\n\n  createHandler();\n\n  const handleRequest = async(request, context) => {\n    if(typeof requestHandler !== 'function'){\n      await createHandler();\n    }\n    return requestHandler(request, context);\n  }\n\n  export default handleRequest;\n  ");
+}
+export {
+  genNetlifyEntry
+};

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

@@ -0,0 +1,39 @@
+import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
+import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
+function genNodeEntry() {
+  var _ref = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, config = _ref.config, plugins = _ref.plugins, appContext = _ref.appContext;
+  var defaultConfig = {
+    server: {
+      port: 8080
+    },
+    output: {
+      path: "."
+    }
+  };
+  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){
+    process.env.NODE_ENV = 'production';
+  }
+
+  async function main() {
+    try {
+      let routes = [];
+      const routeFilepath = path.join(__dirname, "`).concat(ROUTE_SPEC_FILE, `");
+      try {
+        await fs.access(routeFilepath);
+        const content = await fs.readFile(routeFilepath, "utf-8");
+        const routeSpec = JSON.parse(content);
+        routes = routeSpec.routes;
+      } catch (error) {
+        console.warn('route.json not found, continuing with empty routes.');
+      }
+
+      const prodServerOptions = {
+        pwd: __dirname,
+        routes,
+        config: `).concat(JSON.stringify(config || defaultConfig), ",\n        serverConfigFile: '").concat(DEFAULT_SERVER_CONFIG, "',\n        plugins: ").concat(getPluginsCode(plugins || []), ",\n        appContext: ").concat(appContext ? severAppContextTemplate(appContext) : "undefined", ",\n        disableCustomHook: true\n      }\n\n      const app = await createProdServer(prodServerOptions)\n\n      const port = process.env.PORT || 3000;\n\n      app.listen(port, () => {\n        console.log('\\x1b[32mServer is listening on port', port, '\\x1b[0m');\n      });\n    } catch(error) {\n      console.error(error);\n      process.exit(1);\n    }\n  }\n\n  main();\n  ");
+}
+export {
+  genNodeEntry
+};

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

@@ -0,0 +1,41 @@
+import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
+import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
+function genVercelEntry() {
+  var _ref = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, config = _ref.config, plugins = _ref.plugins, appContext = _ref.appContext;
+  var defaultConfig = {
+    server: {
+      port: 8080
+    },
+    output: {
+      path: "."
+    }
+  };
+  return "\n\n  const fs = require('node:fs/promises');\n  const path = require('node:path');\n  const { createNetlifyFunction } = require('@modern-js/prod-server/netlify');\n  ".concat(genPluginImportsCode(plugins || []), `
+
+  let requestHandler = null;
+
+  if(!process.env.NODE_ENV){
+    process.env.NODE_ENV = 'production';
+  }
+
+  async function createHandler() {
+    try {
+      let routes = [];
+      const routeFilepath = path.join(__dirname, "`).concat(ROUTE_SPEC_FILE, `");
+      try {
+        await fs.access(routeFilepath);
+        const content = await fs.readFile(routeFilepath, "utf-8");
+        const routeSpec = JSON.parse(content);
+        routes = routeSpec.routes;
+      } catch (error) {
+        console.warn('route.json not found, continuing with empty routes.');
+      }
+
+      const prodServerOptions = {
+        pwd: __dirname,
+        routes,
+        config: `).concat(JSON.stringify(config || defaultConfig), ",\n        serverConfigFile: '").concat(DEFAULT_SERVER_CONFIG, "',\n        plugins: ").concat(getPluginsCode(plugins || []), ",\n        appContext: ").concat(appContext ? severAppContextTemplate(appContext) : "undefined", ",\n        disableCustomHook: true\n      }\n\n      requestHandler = await createNetlifyFunction(prodServerOptions)\n\n      return requestHandler\n    } catch(error) {\n      console.error(error);\n      process.exit(1);\n    }\n  }\n\n  createHandler();\n\n  const handleRequest = async(request, context) => {\n    if(typeof requestHandler !== 'function'){\n      await createHandler();\n    }\n    return requestHandler(request, context);\n  }\n\n  export default handleRequest;\n  ");
+}
+export {
+  genVercelEntry
+};

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

@@ -0,0 +1,219 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import path from "path";
+import { fs as fse, getInternalPlugins } from "@modern-js/utils";
+import { getProjectUsage } from "./utils";
+import { handleDependencies } from "./dependencies";
+function deploy_default() {
+  return {
+    name: "@modern-js/plugin-deploy",
+    pre: [
+      "@modern-js/plugin-bff",
+      "@modern-js/plugin-server"
+    ],
+    setup: function(api) {
+      return {
+        beforeDeploy: function beforeDeploy() {
+          return _async_to_generator(function() {
+            var deployTarget, appContext, appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, configContext, outputDirectory, funcsDirectory, staticDirectory, bff, config, plugins, serverAppContext, code, genNodeEntry, genVercelEntry, genNetlifyEntry, _getProjectUsage, useSSR, useAPI, useWebServer, entryFilePath;
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  deployTarget = process.env.MODERNJS_DEPLOY || "node";
+                  appContext = api.useAppContext();
+                  appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverInternalPlugins = appContext.serverInternalPlugins, sharedDirectory = appContext.sharedDirectory, apiDirectory = appContext.apiDirectory, lambdaDirectory = appContext.lambdaDirectory, metaName = appContext.metaName;
+                  configContext = api.useResolvedConfigContext();
+                  outputDirectory = path.join(appDirectory, ".output");
+                  funcsDirectory = outputDirectory;
+                  staticDirectory = path.join(outputDirectory, "static");
+                  return [
+                    4,
+                    fse.remove(outputDirectory)
+                  ];
+                case 1:
+                  _state.sent();
+                  if (!(deployTarget === "node"))
+                    return [
+                      3,
+                      3
+                    ];
+                  return [
+                    4,
+                    fse.copy(distDirectory, outputDirectory, {
+                      filter: function(src) {
+                        var distStaticDirectory = path.join(distDirectory, "static");
+                        return !src.includes(distStaticDirectory);
+                      }
+                    })
+                  ];
+                case 2:
+                  _state.sent();
+                  _state.label = 3;
+                case 3:
+                  if (!(deployTarget === "vercel"))
+                    return [
+                      3,
+                      7
+                    ];
+                  funcsDirectory = path.join(outputDirectory, "functions");
+                  staticDirectory = path.join(outputDirectory, "static");
+                  return [
+                    4,
+                    fse.copy(distDirectory, funcsDirectory, {
+                      filter: function(src) {
+                        var distStaticDirectory = path.join(distDirectory, "static");
+                        return !src.includes(distStaticDirectory);
+                      }
+                    })
+                  ];
+                case 4:
+                  _state.sent();
+                  return [
+                    4,
+                    fse.copy(path.join(distDirectory, "static"), staticDirectory)
+                  ];
+                case 5:
+                  _state.sent();
+                  return [
+                    4,
+                    fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
+                      runtime: "nodejs16.x",
+                      handler: "index.js",
+                      launcherType: "Nodejs",
+                      shouldAddHelpers: false,
+                      supportsResponseStreaming: true
+                    })
+                  ];
+                case 6:
+                  _state.sent();
+                  _state.label = 7;
+                case 7:
+                  bff = configContext.bff;
+                  config = {
+                    output: {
+                      path: "."
+                    },
+                    bff
+                  };
+                  plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
+                  serverAppContext = {
+                    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
+                  };
+                  code = "";
+                  console.log("deployTarget111111111", deployTarget);
+                  switch (deployTarget) {
+                    case "node":
+                      return [
+                        3,
+                        8
+                      ];
+                    case "vercel":
+                      return [
+                        3,
+                        10
+                      ];
+                    case "netlify":
+                      return [
+                        3,
+                        12
+                      ];
+                  }
+                  return [
+                    3,
+                    14
+                  ];
+                case 8:
+                  return [
+                    4,
+                    import("./entrys/node")
+                  ];
+                case 9:
+                  genNodeEntry = _state.sent().genNodeEntry;
+                  code = genNodeEntry({
+                    plugins,
+                    config,
+                    appContext: serverAppContext
+                  });
+                  return [
+                    3,
+                    15
+                  ];
+                case 10:
+                  return [
+                    4,
+                    import("./entrys/vercel")
+                  ];
+                case 11:
+                  genVercelEntry = _state.sent().genVercelEntry;
+                  code = genVercelEntry({
+                    plugins,
+                    config,
+                    appContext: serverAppContext
+                  });
+                  return [
+                    3,
+                    15
+                  ];
+                case 12:
+                  return [
+                    4,
+                    import("./entrys/netlify")
+                  ];
+                case 13:
+                  genNetlifyEntry = _state.sent().genNetlifyEntry;
+                  code = genNetlifyEntry({
+                    plugins,
+                    config,
+                    appContext: serverAppContext
+                  });
+                  return [
+                    3,
+                    15
+                  ];
+                case 14:
+                  {
+                    code = 'throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");';
+                  }
+                  _state.label = 15;
+                case 15:
+                  _getProjectUsage = getProjectUsage(appDirectory, distDirectory), useSSR = _getProjectUsage.useSSR, useAPI = _getProjectUsage.useAPI, useWebServer = _getProjectUsage.useWebServer;
+                  entryFilePath = path.join(funcsDirectory, "index.js");
+                  if (!(useSSR || useAPI || useWebServer))
+                    return [
+                      3,
+                      17
+                    ];
+                  return [
+                    4,
+                    fse.writeFile(entryFilePath, code)
+                  ];
+                case 16:
+                  _state.sent();
+                  _state.label = 17;
+                case 17:
+                  return [
+                    4,
+                    handleDependencies(appDirectory, funcsDirectory, [
+                      "@modern-js/prod-server"
+                    ])
+                  ];
+                case 18:
+                  _state.sent();
+                  return [
+                    2
+                  ];
+              }
+            });
+          })();
+        }
+      };
+    }
+  };
+}
+;
+export {
+  deploy_default as default
+};

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

@@ -0,0 +1,244 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import path from "path";
+import os from "node:os";
+import { ROUTE_SPEC_FILE, fs as fse, isDepExists } from "@modern-js/utils";
+import { parseNodeModulePath } from "mlly";
+var severAppContextTemplate = function(serverAppContext) {
+  return "{\n    sharedDirectory: ".concat(serverAppContext.sharedDirectory, ",\n    apiDirectory: ").concat(serverAppContext.apiDirectory, ",\n    lambdaDirectory: ").concat(serverAppContext.lambdaDirectory, ",\n  }");
+};
+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      ");
+  }).join(";\n");
+};
+var getProjectUsage = function(appDirectory, distDirectory) {
+  var routeJSON = path.join(distDirectory, ROUTE_SPEC_FILE);
+  var routes = fse.readJSONSync(routeJSON).routes;
+  var useSSR = false;
+  var useAPI = false;
+  routes.forEach(function(route) {
+    if (route.isSSR) {
+      useSSR = true;
+    }
+    if (route.isApi) {
+      useAPI = true;
+    }
+  });
+  var useWebServer = isDepExists(appDirectory, "@modern-js/plugin-server");
+  return {
+    useSSR,
+    useAPI,
+    useWebServer
+  };
+};
+function applyProductionCondition(exports) {
+  if (!exports || typeof exports === "string") {
+    return;
+  }
+  if (exports.production) {
+    if (typeof exports.production === "string") {
+      exports.default = exports.production;
+    } else {
+      Object.assign(exports, exports.production);
+    }
+  }
+  for (var key in exports) {
+    applyProductionCondition(exports[key]);
+  }
+}
+function applyPublicCondition(pkg) {
+  var _pkg_publishConfig;
+  if (pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig = pkg.publishConfig) === null || _pkg_publishConfig === void 0 ? void 0 : _pkg_publishConfig.exports) {
+    var _pkg_publishConfig1;
+    pkg.exports = pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig1 = pkg.publishConfig) === null || _pkg_publishConfig1 === void 0 ? void 0 : _pkg_publishConfig1.exports;
+  }
+}
+var writePackage = function() {
+  var _ref = _async_to_generator(function(pkg, version, projectDir, _pkgPath) {
+    var pkgPath, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, src, subpath, dest, dirname, subpath1, dest1, dirname1, err, pkgJSON, packageJsonPath;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          pkgPath = _pkgPath || pkg.name;
+          _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+          _state.label = 1;
+        case 1:
+          _state.trys.push([
+            1,
+            10,
+            11,
+            12
+          ]);
+          _iterator = pkg.versions[version].files[Symbol.iterator]();
+          _state.label = 2;
+        case 2:
+          if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
+            return [
+              3,
+              9
+            ];
+          src = _step.value;
+          if (!src.includes("node_modules"))
+            return [
+              3,
+              5
+            ];
+          subpath = parseNodeModulePath(src).subpath;
+          dest = path.join(projectDir, "node_modules", pkgPath, subpath);
+          dirname = path.dirname(dest);
+          return [
+            4,
+            fse.ensureDir(dirname)
+          ];
+        case 3:
+          _state.sent();
+          return [
+            4,
+            fse.copyFile(src, dest)
+          ];
+        case 4:
+          _state.sent();
+          return [
+            3,
+            8
+          ];
+        case 5:
+          subpath1 = path.relative(pkg.versions[version].path, src);
+          dest1 = path.join(projectDir, "node_modules", pkgPath, subpath1);
+          dirname1 = path.dirname(dest1);
+          return [
+            4,
+            fse.ensureDir(dirname1)
+          ];
+        case 6:
+          _state.sent();
+          return [
+            4,
+            fse.copyFile(src, dest1)
+          ];
+        case 7:
+          _state.sent();
+          _state.label = 8;
+        case 8:
+          _iteratorNormalCompletion = true;
+          return [
+            3,
+            2
+          ];
+        case 9:
+          return [
+            3,
+            12
+          ];
+        case 10:
+          err = _state.sent();
+          _didIteratorError = true;
+          _iteratorError = err;
+          return [
+            3,
+            12
+          ];
+        case 11:
+          try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+              _iterator.return();
+            }
+          } finally {
+            if (_didIteratorError) {
+              throw _iteratorError;
+            }
+          }
+          return [
+            7
+          ];
+        case 12:
+          pkgJSON = pkg.versions[version].pkgJSON;
+          applyPublicCondition(pkgJSON);
+          packageJsonPath = path.join(projectDir, "node_modules", pkgPath, "package.json");
+          return [
+            4,
+            fse.ensureDir(path.dirname(packageJsonPath))
+          ];
+        case 13:
+          _state.sent();
+          return [
+            4,
+            fse.writeFile(packageJsonPath, JSON.stringify(pkgJSON, null, 2))
+          ];
+        case 14:
+          _state.sent();
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return function writePackage2(pkg, version, projectDir, _pkgPath) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var isWindows = os.platform() === "win32";
+var linkPackage = function() {
+  var _ref = _async_to_generator(function(from, to, projectRootDir) {
+    var src, dest, dstStat, exists;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          src = path.join(projectRootDir, "node_modules", from);
+          dest = path.join(projectRootDir, "node_modules", to);
+          return [
+            4,
+            fse.lstat(dest).catch(function() {
+              return null;
+            })
+          ];
+        case 1:
+          dstStat = _state.sent();
+          exists = dstStat === null || dstStat === void 0 ? void 0 : dstStat.isSymbolicLink();
+          if (exists) {
+            return [
+              2
+            ];
+          }
+          return [
+            4,
+            fse.mkdir(path.dirname(dest), {
+              recursive: true
+            })
+          ];
+        case 2:
+          _state.sent();
+          return [
+            4,
+            fse.symlink(path.relative(path.dirname(dest), src), dest, isWindows ? "junction" : "dir").catch(function(error) {
+              console.error("Cannot link", from, "to", to, error);
+            })
+          ];
+        case 3:
+          _state.sent();
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return function linkPackage2(from, to, projectRootDir) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export {
+  applyProductionCondition,
+  applyPublicCondition,
+  genPluginImportsCode,
+  getPluginsCode,
+  getProjectUsage,
+  linkPackage,
+  severAppContextTemplate,
+  writePackage
+};

package/dist/esm/utils/createServer.js

@@ -1,8 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { Server } from "@modern-js/server";
+import { createDevServer } from "@modern-js/server";
+import { initProdMiddlewares } from "@modern-js/prod-server";
 var server = null;
 var getServer = function() {
   return server;
@@ -13,26 +12,13 @@ var setServer = function(newServer) {
 var closeServer = function() {
   var _ref = _async_to_generator(function() {
     return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          if (!server)
-            return [
-              3,
-              2
-            ];
-          return [
-            4,
-            server.close()
-          ];
-        case 1:
-          _state.sent();
-          server = null;
-          _state.label = 2;
-        case 2:
-          return [
-            2
-          ];
+      if (server) {
+        server.close();
+        server = null;
       }
+      return [
+        2
+      ];
     });
   });
   return function closeServer2() {
@@ -41,33 +27,21 @@ var closeServer = function() {
 }();
 var createServer = function() {
   var _ref = _async_to_generator(function(options) {
-    var app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          if (!server)
-            return [
-              3,
-              2
-            ];
+          if (server) {
+            server.close();
+          }
           return [
             4,
-            server.close()
+            createDevServer(options, initProdMiddlewares)
           ];
         case 1:
-          _state.sent();
-          _state.label = 2;
-        case 2:
-          server = new Server(options);
-          return [
-            4,
-            server.init()
-          ];
-        case 3:
-          app = _state.sent();
+          server = _state.sent();
           return [
             2,
-            app
+            server
           ];
       }
     });
@@ -76,19 +50,9 @@ var createServer = function() {
     return _ref.apply(this, arguments);
   };
 }();
-var injectDataLoaderPlugin = function(internalPlugins) {
-  var DataLoaderPlugin = require.resolve("@modern-js/plugin-data-loader/server");
-  return _object_spread_props(_object_spread({}, internalPlugins), {
-    "@modern-js/plugin-data-loader": {
-      path: DataLoaderPlugin,
-      forced: true
-    }
-  });
-};
 export {
   closeServer,
   createServer,
   getServer,
-  injectDataLoaderPlugin,
   setServer
 };

package/dist/esm/utils/env.js

@@ -1,4 +1,4 @@
-import { cutNameByHyphen } from "@modern-js/utils";
+import { cutNameByHyphen } from "@modern-js/utils/universal";
 function getAutoInjectEnv(appContext) {
   var metaName = appContext.metaName;
   var prefix = "".concat(cutNameByHyphen(metaName), "_").toUpperCase();