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

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

@@ -99,6 +99,16 @@ const linkPackage = async (from, to, projectRootDir) => {
     console.error("Cannot link", from, "to", to, error);
   });
 };
+const readDirRecursive = async (dir) => {
+  const files = await fse.readdir(dir, {
+    withFileTypes: true
+  });
+  const filesAndDirs = await Promise.all(files.map(async (file) => {
+    const resPath = path.resolve(dir, file.name);
+    return file.isDirectory() ? readDirRecursive(resPath) : resPath;
+  }));
+  return filesAndDirs.flat();
+};
 export {
   applyProductionCondition,
   applyPublicCondition,
@@ -106,6 +116,7 @@ export {
   getPluginsCode,
   getProjectUsage,
   linkPackage,
+  readDirRecursive,
   serverAppContenxtTemplate,
   writePackage
 };

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

@@ -2,8 +2,9 @@ import { IAppContext, NormalizedConfig } from '@modern-js/core';
 import { AppTools } from '../../../types';
 export type CreatePreset = (appContext: IAppContext, config: NormalizedConfig<AppTools>, needModernServer?: boolean) => DeployPreset;
 type DeployPreset = {
-    prepare: () => Promise<void>;
-    writeOutput: () => Promise<void>;
-    genEntry: () => Promise<void>;
+    prepare?: () => Promise<void>;
+    writeOutput?: () => Promise<void>;
+    genEntry?: () => Promise<void>;
+    end?: () => Promise<void>;
 };
 export {};

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

@@ -31,3 +31,4 @@ export type TracedPackage = {
 };
 export declare const writePackage: (pkg: TracedPackage, version: string, projectDir: string, _pkgPath?: string) => Promise<void>;
 export declare const linkPackage: (from: string, to: string, projectRootDir: string) => Promise<void>;
+export declare const readDirRecursive: (dir: string) => Promise<string[]>;

package/package.json

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

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

@@ -1,216 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var index_copy_exports = {};
-__export(index_copy_exports, {
-  default: () => index_copy_default
-});
-module.exports = __toCommonJS(index_copy_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_std_env = require("std-env");
-var import_routes = require("../../utils/routes");
-var import_utils2 = require("./utils");
-var import_dependencies = require("./dependencies");
-var index_copy_default = () => ({
-  name: "@modern-js/plugin-deploy",
-  pre: [
-    "@modern-js/plugin-bff",
-    "@modern-js/plugin-server"
-  ],
-  setup: (api) => {
-    const deployTarget = process.env.MODERNJS_DEPLOY || import_std_env.provider || "node";
-    return {
-      async beforeDeploy() {
-        const appContext = api.useAppContext();
-        const modernConfig = api.useResolvedConfigContext();
-        const { source: { mainEntryName } } = modernConfig;
-        const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
-        const { useSSR, useAPI, useWebServer } = (0, import_utils2.getProjectUsage)(appDirectory, distDirectory);
-        const needModernServer = useSSR || useAPI || useWebServer;
-        let outputDirectory = import_path.default.join(appDirectory, ".output");
-        let funcsDirectory = outputDirectory;
-        let staticDirectory = import_path.default.join(outputDirectory, "static");
-        if (deployTarget === "node") {
-          await import_utils.fs.remove(outputDirectory);
-          await import_utils.fs.copy(distDirectory, outputDirectory);
-        }
-        if (deployTarget === "netlify") {
-          const netlifyOutput = import_path.default.join(appDirectory, ".netlify");
-          funcsDirectory = import_path.default.join(netlifyOutput, "functions");
-          const routes = [];
-          if (!needModernServer) {
-            entrypoints.forEach((entry) => {
-              const isMain = (0, import_routes.isMainEntry)(entry.entryName, mainEntryName);
-              routes.push({
-                src: `/${isMain ? "" : `${entry.entryName}/`}*`,
-                dest: `/html/${entry.entryName}/index.html`,
-                status: 200
-              });
-            });
-          } else {
-            routes.push({
-              src: `/*`,
-              dest: `/.netlify/functions/index`,
-              status: 200
-            });
-            throw new Error("Currently on the Netlify platform, only CSR projects are supported, Support for SSR and BFF projects will be available later");
-          }
-          console.log("routes", routes, needModernServer);
-          const redirectContent = routes.map((route) => {
-            return `${route.src} ${route.dest} ${route.status}`;
-          }).join("\n");
-          console.log("redirectContent", redirectContent);
-          await import_utils.fs.remove(outputDirectory);
-          await import_utils.fs.ensureDir(funcsDirectory);
-          await import_utils.fs.copy(distDirectory, funcsDirectory, {
-            filter: (src) => {
-              const distStaticDirectory = import_path.default.join(distDirectory, "static");
-              return !src.includes(distStaticDirectory);
-            }
-          });
-          const redirectFilePath = import_path.default.join(distDirectory, "_redirects");
-          await import_utils.fs.writeFile(redirectFilePath, redirectContent);
-        }
-        if (deployTarget === "vercel") {
-          const vercelOutput = import_path.default.join(appDirectory, ".vercel");
-          await import_utils.fs.remove(vercelOutput);
-          outputDirectory = import_path.default.join(vercelOutput, "output");
-          const config = {
-            version: 3,
-            routes: [
-              {
-                src: "/static/(.*)",
-                headers: {
-                  "cache-control": "s-maxage=31536000, immutable"
-                },
-                continue: true
-              },
-              {
-                handle: "filesystem"
-              }
-            ]
-          };
-          if (!needModernServer) {
-            entrypoints.forEach((entry) => {
-              const isMain = (0, import_routes.isMainEntry)(entry.entryName, mainEntryName);
-              config.routes.push({
-                src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
-                headers: {
-                  "cache-control": "s-maxage=0"
-                },
-                dest: `/html/${entry.entryName}/index.html`
-              });
-            });
-          } else {
-            config.routes.push({
-              src: "/(.*)",
-              dest: `/index`
-            });
-          }
-          await import_utils.fs.ensureDir(outputDirectory);
-          await import_utils.fs.writeJSON(import_path.default.join(outputDirectory, "config.json"), config, {
-            spaces: 2
-          });
-          staticDirectory = import_path.default.join(outputDirectory, "static/static");
-          await import_utils.fs.copy(import_path.default.join(distDirectory, "static"), staticDirectory);
-          if (!needModernServer) {
-            const destHtmlDirectory = import_path.default.join(distDirectory, "html");
-            const outputHtmlDirectory = import_path.default.join(import_path.default.join(outputDirectory, "static"), "html");
-            await import_utils.fs.copy(destHtmlDirectory, outputHtmlDirectory);
-          } else {
-            funcsDirectory = import_path.default.join(outputDirectory, "functions", "index.func");
-            await import_utils.fs.ensureDir(funcsDirectory);
-            await import_utils.fs.copy(distDirectory, funcsDirectory, {
-              filter: (src) => {
-                const distStaticDirectory = import_path.default.join(distDirectory, "static");
-                return !src.includes(distStaticDirectory);
-              }
-            });
-            await import_utils.fs.writeJSON(import_path.default.join(funcsDirectory, ".vc-config.json"), {
-              runtime: "nodejs16.x",
-              handler: "index.js",
-              launcherType: "Nodejs",
-              shouldAddHelpers: false,
-              supportsResponseStreaming: true
-            });
-          }
-        }
-        const plugins = (0, import_utils.getInternalPlugins)(appDirectory, serverInternalPlugins);
-        const serverAppContext = {
-          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) {
-          case "node": {
-            const { genNodeEntry } = await Promise.resolve().then(() => __toESM(require("./platforms/node")));
-            code = await genNodeEntry({
-              plugins,
-              config: modernConfig,
-              appContext: serverAppContext
-            });
-            break;
-          }
-          case "vercel": {
-            const { genVercelEntry } = await Promise.resolve().then(() => __toESM(require("./platforms/vercel")));
-            code = await genVercelEntry({
-              plugins,
-              config: modernConfig,
-              appContext: serverAppContext
-            });
-            break;
-          }
-          case "netlify": {
-            const { genNetlifyEntry } = await Promise.resolve().then(() => __toESM(require("./platforms/netlify")));
-            code = await genNetlifyEntry({
-              plugins,
-              config: modernConfig,
-              appContext: serverAppContext
-            });
-            break;
-          }
-          default: {
-            code = `throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");`;
-          }
-        }
-        const entryFilePath = import_path.default.join(funcsDirectory, "index.js");
-        if (needModernServer) {
-          await import_utils.fs.writeFile(entryFilePath, code);
-          await (0, import_dependencies.handleDependencies)(appDirectory, funcsDirectory, [
-            "@modern-js/prod-server"
-          ]);
-        }
-      }
-    };
-  }
-});

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

@@ -1,367 +0,0 @@
-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 { provider } from "std-env";
-import { isMainEntry } from "../../utils/routes";
-import { getProjectUsage } from "./utils";
-import { handleDependencies } from "./dependencies";
-function index_copy_default() {
-  return {
-    name: "@modern-js/plugin-deploy",
-    pre: [
-      "@modern-js/plugin-bff",
-      "@modern-js/plugin-server"
-    ],
-    setup: function(api) {
-      var deployTarget = process.env.MODERNJS_DEPLOY || provider || "node";
-      return {
-        beforeDeploy: function beforeDeploy() {
-          return _async_to_generator(function() {
-            var appContext, modernConfig, mainEntryName, appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints, _getProjectUsage, useSSR, useAPI, useWebServer, needModernServer, outputDirectory, funcsDirectory, staticDirectory, netlifyOutput, routes, redirectContent, redirectFilePath, vercelOutput, config, destHtmlDirectory, outputHtmlDirectory, plugins, serverAppContext, code, genNodeEntry, genVercelEntry, genNetlifyEntry, entryFilePath;
-            return _ts_generator(this, function(_state) {
-              switch (_state.label) {
-                case 0:
-                  appContext = api.useAppContext();
-                  modernConfig = api.useResolvedConfigContext();
-                  mainEntryName = modernConfig.source.mainEntryName;
-                  appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverInternalPlugins = appContext.serverInternalPlugins, sharedDirectory = appContext.sharedDirectory, apiDirectory = appContext.apiDirectory, lambdaDirectory = appContext.lambdaDirectory, metaName = appContext.metaName, entrypoints = appContext.entrypoints;
-                  _getProjectUsage = getProjectUsage(appDirectory, distDirectory), useSSR = _getProjectUsage.useSSR, useAPI = _getProjectUsage.useAPI, useWebServer = _getProjectUsage.useWebServer;
-                  needModernServer = useSSR || useAPI || useWebServer;
-                  outputDirectory = path.join(appDirectory, ".output");
-                  funcsDirectory = outputDirectory;
-                  staticDirectory = path.join(outputDirectory, "static");
-                  if (!(deployTarget === "node"))
-                    return [
-                      3,
-                      3
-                    ];
-                  return [
-                    4,
-                    fse.remove(outputDirectory)
-                  ];
-                case 1:
-                  _state.sent();
-                  return [
-                    4,
-                    fse.copy(distDirectory, outputDirectory)
-                  ];
-                case 2:
-                  _state.sent();
-                  _state.label = 3;
-                case 3:
-                  if (!(deployTarget === "netlify"))
-                    return [
-                      3,
-                      8
-                    ];
-                  netlifyOutput = path.join(appDirectory, ".netlify");
-                  funcsDirectory = path.join(netlifyOutput, "functions");
-                  routes = [];
-                  if (!needModernServer) {
-                    entrypoints.forEach(function(entry) {
-                      var isMain = isMainEntry(entry.entryName, mainEntryName);
-                      routes.push({
-                        src: "/".concat(isMain ? "" : "".concat(entry.entryName, "/"), "*"),
-                        dest: "/html/".concat(entry.entryName, "/index.html"),
-                        status: 200
-                      });
-                    });
-                  } else {
-                    routes.push({
-                      src: "/*",
-                      dest: "/.netlify/functions/index",
-                      status: 200
-                    });
-                    throw new Error("Currently on the Netlify platform, only CSR projects are supported, Support for SSR and BFF projects will be available later");
-                  }
-                  console.log("routes", routes, needModernServer);
-                  redirectContent = routes.map(function(route) {
-                    return "".concat(route.src, " ").concat(route.dest, " ").concat(route.status);
-                  }).join("\n");
-                  console.log("redirectContent", redirectContent);
-                  return [
-                    4,
-                    fse.remove(outputDirectory)
-                  ];
-                case 4:
-                  _state.sent();
-                  return [
-                    4,
-                    fse.ensureDir(funcsDirectory)
-                  ];
-                case 5:
-                  _state.sent();
-                  return [
-                    4,
-                    fse.copy(distDirectory, funcsDirectory, {
-                      filter: function(src) {
-                        var distStaticDirectory = path.join(distDirectory, "static");
-                        return !src.includes(distStaticDirectory);
-                      }
-                    })
-                  ];
-                case 6:
-                  _state.sent();
-                  redirectFilePath = path.join(distDirectory, "_redirects");
-                  return [
-                    4,
-                    fse.writeFile(redirectFilePath, redirectContent)
-                  ];
-                case 7:
-                  _state.sent();
-                  _state.label = 8;
-                case 8:
-                  if (!(deployTarget === "vercel"))
-                    return [
-                      3,
-                      18
-                    ];
-                  vercelOutput = path.join(appDirectory, ".vercel");
-                  return [
-                    4,
-                    fse.remove(vercelOutput)
-                  ];
-                case 9:
-                  _state.sent();
-                  outputDirectory = path.join(vercelOutput, "output");
-                  config = {
-                    version: 3,
-                    routes: [
-                      {
-                        src: "/static/(.*)",
-                        headers: {
-                          "cache-control": "s-maxage=31536000, immutable"
-                        },
-                        continue: true
-                      },
-                      {
-                        handle: "filesystem"
-                      }
-                    ]
-                  };
-                  if (!needModernServer) {
-                    entrypoints.forEach(function(entry) {
-                      var isMain = isMainEntry(entry.entryName, mainEntryName);
-                      config.routes.push({
-                        src: "/".concat(isMain ? "" : entry.entryName, "(?:/.*)?"),
-                        headers: {
-                          "cache-control": "s-maxage=0"
-                        },
-                        dest: "/html/".concat(entry.entryName, "/index.html")
-                      });
-                    });
-                  } else {
-                    config.routes.push({
-                      src: "/(.*)",
-                      dest: "/index"
-                    });
-                  }
-                  return [
-                    4,
-                    fse.ensureDir(outputDirectory)
-                  ];
-                case 10:
-                  _state.sent();
-                  return [
-                    4,
-                    fse.writeJSON(path.join(outputDirectory, "config.json"), config, {
-                      spaces: 2
-                    })
-                  ];
-                case 11:
-                  _state.sent();
-                  staticDirectory = path.join(outputDirectory, "static/static");
-                  return [
-                    4,
-                    fse.copy(path.join(distDirectory, "static"), staticDirectory)
-                  ];
-                case 12:
-                  _state.sent();
-                  if (!!needModernServer)
-                    return [
-                      3,
-                      14
-                    ];
-                  destHtmlDirectory = path.join(distDirectory, "html");
-                  outputHtmlDirectory = path.join(path.join(outputDirectory, "static"), "html");
-                  return [
-                    4,
-                    fse.copy(destHtmlDirectory, outputHtmlDirectory)
-                  ];
-                case 13:
-                  _state.sent();
-                  return [
-                    3,
-                    18
-                  ];
-                case 14:
-                  funcsDirectory = path.join(outputDirectory, "functions", "index.func");
-                  return [
-                    4,
-                    fse.ensureDir(funcsDirectory)
-                  ];
-                case 15:
-                  _state.sent();
-                  return [
-                    4,
-                    fse.copy(distDirectory, funcsDirectory, {
-                      filter: function(src) {
-                        var distStaticDirectory = path.join(distDirectory, "static");
-                        return !src.includes(distStaticDirectory);
-                      }
-                    })
-                  ];
-                case 16:
-                  _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 17:
-                  _state.sent();
-                  _state.label = 18;
-                case 18:
-                  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
-                  };
-                  console.log("serverAppContext", serverAppContext);
-                  code = "";
-                  console.log("deployTarget111111111", deployTarget);
-                  switch (deployTarget) {
-                    case "node":
-                      return [
-                        3,
-                        19
-                      ];
-                    case "vercel":
-                      return [
-                        3,
-                        22
-                      ];
-                    case "netlify":
-                      return [
-                        3,
-                        25
-                      ];
-                  }
-                  return [
-                    3,
-                    28
-                  ];
-                case 19:
-                  return [
-                    4,
-                    import("./platforms/node")
-                  ];
-                case 20:
-                  genNodeEntry = _state.sent().genNodeEntry;
-                  return [
-                    4,
-                    genNodeEntry({
-                      plugins,
-                      config: modernConfig,
-                      appContext: serverAppContext
-                    })
-                  ];
-                case 21:
-                  code = _state.sent();
-                  return [
-                    3,
-                    29
-                  ];
-                case 22:
-                  return [
-                    4,
-                    import("./platforms/vercel")
-                  ];
-                case 23:
-                  genVercelEntry = _state.sent().genVercelEntry;
-                  return [
-                    4,
-                    genVercelEntry({
-                      plugins,
-                      config: modernConfig,
-                      appContext: serverAppContext
-                    })
-                  ];
-                case 24:
-                  code = _state.sent();
-                  return [
-                    3,
-                    29
-                  ];
-                case 25:
-                  return [
-                    4,
-                    import("./platforms/netlify")
-                  ];
-                case 26:
-                  genNetlifyEntry = _state.sent().genNetlifyEntry;
-                  return [
-                    4,
-                    genNetlifyEntry({
-                      plugins,
-                      config: modernConfig,
-                      appContext: serverAppContext
-                    })
-                  ];
-                case 27:
-                  code = _state.sent();
-                  return [
-                    3,
-                    29
-                  ];
-                case 28:
-                  {
-                    code = 'throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");';
-                  }
-                  _state.label = 29;
-                case 29:
-                  entryFilePath = path.join(funcsDirectory, "index.js");
-                  if (!needModernServer)
-                    return [
-                      3,
-                      32
-                    ];
-                  return [
-                    4,
-                    fse.writeFile(entryFilePath, code)
-                  ];
-                case 30:
-                  _state.sent();
-                  return [
-                    4,
-                    handleDependencies(appDirectory, funcsDirectory, [
-                      "@modern-js/prod-server"
-                    ])
-                  ];
-                case 31:
-                  _state.sent();
-                  _state.label = 32;
-                case 32:
-                  return [
-                    2
-                  ];
-              }
-            });
-          })();
-        }
-      };
-    }
-  };
-}
-;
-export {
-  index_copy_default as default
-};