@modern-js/app-tools 2.49.3-alpha.15 → 2.49.3-alpha.17

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

@@ -37,16 +37,6 @@ var import_utils = require("@modern-js/utils");
 var import_pkg_types = require("pkg-types");
 var import_mlly = require("mlly");
 var import_utils2 = require("./utils");
-const readDirRecursive = async (dir) => {
-  const files = await import_utils.fs.readdir(dir, {
-    withFileTypes: true
-  });
-  const filesAndDirs = await Promise.all(files.map(async (file) => {
-    const resPath = import_node_path.default.resolve(dir, file.name);
-    return file.isDirectory() ? readDirRecursive(resPath) : resPath;
-  }));
-  return filesAndDirs.flat();
-};
 async function isFile(file) {
   try {
     const stat = await import_utils.fs.stat(file);
@@ -59,7 +49,7 @@ async function isFile(file) {
   }
 }
 const findEntryFiles = async (rootDir) => {
-  const files = await readDirRecursive(rootDir);
+  const files = await (0, import_utils2.readDirRecursive)(rootDir);
   return files;
 };
 const handleDependencies = async (appDir, serverRootDir, include) => {
@@ -212,7 +202,6 @@ const handleDependencies = async (appDir, serverRootDir, include) => {
     const version = Object.keys(pkg.versions)[0];
     return (0, import_utils2.writePackage)(pkg, version, serverRootDir);
   }));
-  console.log("multiVersionPkgs111111111", multiVersionPkgs);
   for (const [pkgName, pkgVersions] of Object.entries(multiVersionPkgs)) {
     const versionEntires = Object.entries(pkgVersions).sort(([v1, p1], [v2, p2]) => {
       if (p1.length === 0) {

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

@@ -24,6 +24,23 @@ module.exports = __toCommonJS(deploy_exports);
 var import_std_env = require("std-env");
 var import_utils = require("./utils");
 var import_node = require("./platforms/node");
+var import_vercel = require("./platforms/vercel");
+var import_netlify = require("./platforms/netlify");
+const deployPresets = {
+  node: import_node.createNodePreset,
+  vercel: import_vercel.createVercelPreset,
+  netlify: import_netlify.createNetlifyPreset
+};
+async function getDeployPreset(appContext, modernConfig, deployTarget) {
+  const { appDirectory, distDirectory } = appContext;
+  const { useSSR, useAPI, useWebServer } = (0, import_utils.getProjectUsage)(appDirectory, distDirectory);
+  const needModernServer = useSSR || useAPI || useWebServer;
+  const createPreset = deployPresets[deployTarget];
+  if (!createPreset) {
+    throw new Error(`Unknown deploy target: '${deployTarget}'. MODERNJS_DEPLOY should be 'node', 'vercel', or 'netlify'.`);
+  }
+  return createPreset(appContext, modernConfig, needModernServer);
+}
 var deploy_default = () => ({
   name: "@modern-js/plugin-deploy",
   pre: [
@@ -35,25 +52,12 @@ var deploy_default = () => ({
     return {
       async beforeDeploy() {
         const appContext = api.useAppContext();
-        const { appDirectory, distDirectory } = appContext;
         const modernConfig = api.useResolvedConfigContext();
-        const { useSSR, useAPI, useWebServer } = (0, import_utils.getProjectUsage)(appDirectory, distDirectory);
-        const needModernServer = useSSR || useAPI || useWebServer;
-        let deployPreset;
-        switch (deployTarget) {
-          case "node":
-            deployPreset = (0, import_node.createNodePreset)(appContext, modernConfig, needModernServer);
-            break;
-          case "vercel":
-            deployPreset = (0, import_node.createNodePreset)(appContext, modernConfig, needModernServer);
-            break;
-          default: {
-            throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");
-          }
-        }
-        await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare());
-        await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput());
-        await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry());
+        const deployPreset = await getDeployPreset(appContext, modernConfig, deployTarget);
+        (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare) && await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare());
+        (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput) && await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput());
+        (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry) && await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry());
+        (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.end) && await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.end());
       }
     };
   }

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

@@ -36,86 +36,59 @@ var import_utils = require("@modern-js/utils");
 var import_routes = require("../../../utils/routes");
 var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
-const createNetlifyPreset = (appContext, config, needModernServer) => {
-  const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
+const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
+  const { appDirectory, distDirectory, serverInternalPlugins, entrypoints } = appContext;
   const plugins = (0, import_utils.getInternalPlugins)(appDirectory, serverInternalPlugins);
   const netlifyOutput = import_node_path.default.join(appDirectory, ".netlify");
-  const outputDirectory = import_node_path.default.join(netlifyOutput, "output");
-  const funcsDirectory = import_node_path.default.join(outputDirectory, "functions", "index.func");
+  const funcsDirectory = import_node_path.default.join(netlifyOutput, "functions");
   const entryFilePath = import_node_path.default.join(funcsDirectory, "index.js");
   return {
     async prepare() {
       await import_utils.fs.remove(netlifyOutput);
     },
     async writeOutput() {
-      const config2 = {
-        version: 3,
-        routes: [
-          {
-            src: "/static/(.*)",
-            headers: {
-              "cache-control": "s-maxage=31536000, immutable"
-            },
-            continue: true
-          },
-          {
-            handle: "filesystem"
-          }
-        ]
-      };
+      const routes = [];
+      const { source: { mainEntryName } } = modernConfig;
       if (!needModernServer) {
-        const { source: { mainEntryName } } = config2;
         entrypoints.forEach((entry) => {
           const isMain = (0, import_routes.isMainEntry)(entry.entryName, mainEntryName);
-          config2.routes.push({
-            src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
-            headers: {
-              "cache-control": "s-maxage=0"
-            },
-            dest: `/html/${entry.entryName}/index.html`
+          routes.push({
+            src: `/${isMain ? "" : `${entry.entryName}/`}*`,
+            dest: `/html/${entry.entryName}/index.html`,
+            status: 200
           });
         });
       } else {
-        config2.routes.push({
-          src: "/(.*)",
-          dest: `/index`
+        routes.push({
+          src: "/*",
+          dest: `/.netlify/functions/index`,
+          status: 200
         });
       }
-      await import_utils.fs.ensureDir(outputDirectory);
-      await import_utils.fs.writeJSON(import_node_path.default.join(outputDirectory, "config.json"), config2, {
-        spaces: 2
-      });
-      const staticDirectory = import_node_path.default.join(outputDirectory, "static/static");
-      await import_utils.fs.copy(import_node_path.default.join(distDirectory, "static"), staticDirectory);
-      if (!needModernServer) {
-        const destHtmlDirectory = import_node_path.default.join(distDirectory, "html");
-        const outputHtmlDirectory = import_node_path.default.join(import_node_path.default.join(outputDirectory, "static"), "html");
-        await import_utils.fs.copy(destHtmlDirectory, outputHtmlDirectory);
-      } else {
+      const redirectContent = routes.map((route) => {
+        return `${route.src} ${route.dest} ${route.status}`;
+      }).join("\n");
+      if (needModernServer) {
         await import_utils.fs.ensureDir(funcsDirectory);
+        await import_utils.fs.copy(distDirectory, funcsDirectory);
         await import_utils.fs.copy(distDirectory, funcsDirectory, {
           filter: (src) => {
-            const distStaticDirectory = import_node_path.default.join(distDirectory, "static");
+            const distStaticDirectory = import_node_path.default.join(distDirectory, `static`);
             return !src.includes(distStaticDirectory);
           }
         });
-        await import_utils.fs.writeJSON(import_node_path.default.join(funcsDirectory, ".vc-config.json"), {
-          runtime: "nodejs16.x",
-          handler: "index.js",
-          launcherType: "Nodejs",
-          shouldAddHelpers: false,
-          supportsResponseStreaming: true
-        });
       }
+      const redirectFilePath = import_node_path.default.join(distDirectory, "__redirects");
+      await import_utils.fs.writeFile(redirectFilePath, redirectContent);
     },
     async genEntry() {
-      var _config_bff;
+      var _modernConfig_bff;
       if (!needModernServer) {
         return;
       }
       const serverConfig = {
         bff: {
-          prefix: config === null || config === void 0 ? void 0 : (_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix
+          prefix: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_bff = modernConfig.bff) === null || _modernConfig_bff === void 0 ? void 0 : _modernConfig_bff.prefix
         },
         output: {
           path: "."

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

@@ -35,10 +35,11 @@ var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
 var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
-const createNodePreset = (appContext, config) => {
-  const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
+const createNodePreset = (appContext, config, needModernServer) => {
+  const { appDirectory, distDirectory, serverInternalPlugins } = appContext;
   const plugins = (0, import_utils.getInternalPlugins)(appDirectory, serverInternalPlugins);
   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");
   return {
     async prepare() {
@@ -49,6 +50,9 @@ const createNodePreset = (appContext, config) => {
     },
     async genEntry() {
       var _config_bff;
+      if (!needModernServer) {
+        return;
+      }
       const serverConfig = {
         server: {
           port: 8080
@@ -73,6 +77,10 @@ const createNodePreset = (appContext, config) => {
       await (0, import_dependencies.handleDependencies)(appDirectory, outputDirectory, [
         "@modern-js/prod-server"
       ]);
+    },
+    async end() {
+      console.log("Static directory:", import_utils.chalk.blue(import_node_path.default.relative(appDirectory, staticDirectory)));
+      console.log(`You can preview this build by`, import_utils.chalk.blue(`node .output/index`));
     }
   };
 };

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

@@ -36,8 +36,8 @@ var import_utils = require("@modern-js/utils");
 var import_routes = require("../../../utils/routes");
 var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
-const createVercelPreset = (appContext, config, needModernServer) => {
-  const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
+const createVercelPreset = (appContext, modernConfig, needModernServer) => {
+  const { appDirectory, distDirectory, serverInternalPlugins, entrypoints } = appContext;
   const plugins = (0, import_utils.getInternalPlugins)(appDirectory, serverInternalPlugins);
   const vercelOutput = import_node_path.default.join(appDirectory, ".vercel");
   const outputDirectory = import_node_path.default.join(vercelOutput, "output");
@@ -48,7 +48,7 @@ const createVercelPreset = (appContext, config, needModernServer) => {
       await import_utils.fs.remove(vercelOutput);
     },
     async writeOutput() {
-      const config2 = {
+      const config = {
         version: 3,
         routes: [
           {
@@ -64,10 +64,10 @@ const createVercelPreset = (appContext, config, needModernServer) => {
         ]
       };
       if (!needModernServer) {
-        const { source: { mainEntryName } } = config2;
+        const { source: { mainEntryName } } = modernConfig;
         entrypoints.forEach((entry) => {
           const isMain = (0, import_routes.isMainEntry)(entry.entryName, mainEntryName);
-          config2.routes.push({
+          config.routes.push({
             src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
             headers: {
               "cache-control": "s-maxage=0"
@@ -76,13 +76,13 @@ const createVercelPreset = (appContext, config, needModernServer) => {
           });
         });
       } else {
-        config2.routes.push({
+        config.routes.push({
           src: "/(.*)",
           dest: `/index`
         });
       }
       await import_utils.fs.ensureDir(outputDirectory);
-      await import_utils.fs.writeJSON(import_node_path.default.join(outputDirectory, "config.json"), config2, {
+      await import_utils.fs.writeJSON(import_node_path.default.join(outputDirectory, "config.json"), config, {
         spaces: 2
       });
       const staticDirectory = import_node_path.default.join(outputDirectory, "static/static");
@@ -109,13 +109,13 @@ const createVercelPreset = (appContext, config, needModernServer) => {
       }
     },
     async genEntry() {
-      var _config_bff;
+      var _modernConfig_bff;
       if (!needModernServer) {
         return;
       }
       const serverConfig = {
         bff: {
-          prefix: config === null || config === void 0 ? void 0 : (_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix
+          prefix: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_bff = modernConfig.bff) === null || _modernConfig_bff === void 0 ? void 0 : _modernConfig_bff.prefix
         },
         output: {
           path: "."

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

@@ -34,6 +34,7 @@ __export(utils_exports, {
   getPluginsCode: () => getPluginsCode,
   getProjectUsage: () => getProjectUsage,
   linkPackage: () => linkPackage,
+  readDirRecursive: () => readDirRecursive,
   serverAppContenxtTemplate: () => serverAppContenxtTemplate,
   writePackage: () => writePackage
 });
@@ -139,6 +140,16 @@ const linkPackage = async (from, to, projectRootDir) => {
     console.error("Cannot link", from, "to", to, error);
   });
 };
+const readDirRecursive = async (dir) => {
+  const files = await import_utils.fs.readdir(dir, {
+    withFileTypes: true
+  });
+  const filesAndDirs = await Promise.all(files.map(async (file) => {
+    const resPath = import_path.default.resolve(dir, file.name);
+    return file.isDirectory() ? readDirRecursive(resPath) : resPath;
+  }));
+  return filesAndDirs.flat();
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   applyProductionCondition,
@@ -147,6 +158,7 @@ const linkPackage = async (from, to, projectRootDir) => {
   getPluginsCode,
   getProjectUsage,
   linkPackage,
+  readDirRecursive,
   serverAppContenxtTemplate,
   writePackage
 });

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

@@ -8,52 +8,7 @@ import { nodeFileTrace, resolve } from "@vercel/nft";
 import { fs as fse, pkgUp, semver } from "@modern-js/utils";
 import { readPackageJSON } from "pkg-types";
 import { parseNodeModulePath } from "mlly";
-import { linkPackage, writePackage } from "./utils";
-var readDirRecursive = function() {
-  var _ref = _async_to_generator(function(dir) {
-    var files, filesAndDirs;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          return [
-            4,
-            fse.readdir(dir, {
-              withFileTypes: true
-            })
-          ];
-        case 1:
-          files = _state.sent();
-          return [
-            4,
-            Promise.all(files.map(function() {
-              var _ref2 = _async_to_generator(function(file) {
-                var resPath;
-                return _ts_generator(this, function(_state2) {
-                  resPath = path.resolve(dir, file.name);
-                  return [
-                    2,
-                    file.isDirectory() ? readDirRecursive(resPath) : resPath
-                  ];
-                });
-              });
-              return function(file) {
-                return _ref2.apply(this, arguments);
-              };
-            }()))
-          ];
-        case 2:
-          filesAndDirs = _state.sent();
-          return [
-            2,
-            filesAndDirs.flat()
-          ];
-      }
-    });
-  });
-  return function readDirRecursive2(dir) {
-    return _ref.apply(this, arguments);
-  };
-}();
+import { linkPackage, readDirRecursive, writePackage } from "./utils";
 function isFile(file) {
   return _isFile.apply(this, arguments);
 }
@@ -477,7 +432,6 @@ var handleDependencies = function() {
           ];
         case 12:
           _state.sent();
-          console.log("multiVersionPkgs111111111", multiVersionPkgs);
           _iteratorNormalCompletion3 = true, _didIteratorError3 = false, _iteratorError3 = void 0;
           _state.label = 13;
         case 13:

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

@@ -3,6 +3,35 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { provider } from "std-env";
 import { getProjectUsage } from "./utils";
 import { createNodePreset } from "./platforms/node";
+import { createVercelPreset } from "./platforms/vercel";
+import { createNetlifyPreset } from "./platforms/netlify";
+var deployPresets = {
+  node: createNodePreset,
+  vercel: createVercelPreset,
+  netlify: createNetlifyPreset
+};
+function getDeployPreset(appContext, modernConfig, deployTarget) {
+  return _getDeployPreset.apply(this, arguments);
+}
+function _getDeployPreset() {
+  _getDeployPreset = _async_to_generator(function(appContext, modernConfig, deployTarget) {
+    var appDirectory, distDirectory, _getProjectUsage, useSSR, useAPI, useWebServer, needModernServer, createPreset;
+    return _ts_generator(this, function(_state) {
+      appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory;
+      _getProjectUsage = getProjectUsage(appDirectory, distDirectory), useSSR = _getProjectUsage.useSSR, useAPI = _getProjectUsage.useAPI, useWebServer = _getProjectUsage.useWebServer;
+      needModernServer = useSSR || useAPI || useWebServer;
+      createPreset = deployPresets[deployTarget];
+      if (!createPreset) {
+        throw new Error("Unknown deploy target: '".concat(deployTarget, "'. MODERNJS_DEPLOY should be 'node', 'vercel', or 'netlify'."));
+      }
+      return [
+        2,
+        createPreset(appContext, modernConfig, needModernServer)
+      ];
+    });
+  });
+  return _getDeployPreset.apply(this, arguments);
+}
 function deploy_default() {
   return {
     name: "@modern-js/plugin-deploy",
@@ -15,44 +44,78 @@ function deploy_default() {
       return {
         beforeDeploy: function beforeDeploy() {
           return _async_to_generator(function() {
-            var appContext, appDirectory, distDirectory, modernConfig, _getProjectUsage, useSSR, useAPI, useWebServer, needModernServer, deployPreset;
+            var appContext, modernConfig, deployPreset, _tmp, _tmp1, _tmp2, _tmp3;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
                   appContext = api.useAppContext();
-                  appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory;
                   modernConfig = api.useResolvedConfigContext();
-                  _getProjectUsage = getProjectUsage(appDirectory, distDirectory), useSSR = _getProjectUsage.useSSR, useAPI = _getProjectUsage.useAPI, useWebServer = _getProjectUsage.useWebServer;
-                  needModernServer = useSSR || useAPI || useWebServer;
-                  switch (deployTarget) {
-                    case "node":
-                      deployPreset = createNodePreset(appContext, modernConfig, needModernServer);
-                      break;
-                    case "vercel":
-                      deployPreset = createNodePreset(appContext, modernConfig, needModernServer);
-                      break;
-                    default: {
-                      throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");
-                    }
-                  }
                   return [
                     4,
-                    deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare()
+                    getDeployPreset(appContext, modernConfig, deployTarget)
                   ];
                 case 1:
-                  _state.sent();
+                  deployPreset = _state.sent();
+                  _tmp = deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare;
+                  if (!_tmp)
+                    return [
+                      3,
+                      3
+                    ];
                   return [
                     4,
-                    deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput()
+                    deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare()
                   ];
                 case 2:
-                  _state.sent();
+                  _tmp = _state.sent();
+                  _state.label = 3;
+                case 3:
+                  _tmp;
+                  _tmp1 = deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput;
+                  if (!_tmp1)
+                    return [
+                      3,
+                      5
+                    ];
+                  return [
+                    4,
+                    deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput()
+                  ];
+                case 4:
+                  _tmp1 = _state.sent();
+                  _state.label = 5;
+                case 5:
+                  _tmp1;
+                  _tmp2 = deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry;
+                  if (!_tmp2)
+                    return [
+                      3,
+                      7
+                    ];
                   return [
                     4,
                     deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry()
                   ];
-                case 3:
-                  _state.sent();
+                case 6:
+                  _tmp2 = _state.sent();
+                  _state.label = 7;
+                case 7:
+                  _tmp2;
+                  _tmp3 = deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.end;
+                  if (!_tmp3)
+                    return [
+                      3,
+                      9
+                    ];
+                  return [
+                    4,
+                    deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.end()
+                  ];
+                case 8:
+                  _tmp3 = _state.sent();
+                  _state.label = 9;
+                case 9:
+                  _tmp3;
                   return [
                     2
                   ];