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

package/dist/esm-node/config/default.js

@@ -70,7 +70,17 @@ function createDefaultConfig(appContext) {
     server,
     dev,
     html,
-    tools: {},
+    tools: {
+      tsChecker: {
+        issue: {
+          exclude: [
+            {
+              file: "**/api/lambda/**/*"
+            }
+          ]
+        }
+      }
+    },
     plugins: [],
     builderPlugins: [],
     runtime: {},

package/dist/esm-node/index.js

@@ -8,6 +8,7 @@ import initializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import serverBuildPlugin from "./plugins/serverBuild";
+import deployPlugin from "./plugins/deploy";
 import { restart } from "./utils/restart";
 import { generateWatchFiles } from "./utils/generateWatchFiles";
 import { mergeConfig } from "@modern-js/core";
@@ -81,7 +82,8 @@ const appTools = (options = {
       bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
     }),
     serverBuildPlugin(),
-    lintPlugin()
+    lintPlugin(),
+    deployPlugin()
   ],
   setup: (api) => {
     const appContext = api.useAppContext();
@@ -113,7 +115,7 @@ const appTools = (options = {
           const { start } = await import("./commands/serve");
           await start(api);
         });
-        program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-s --skip-build", i18n.t(localeKeys.command.shared.skipBuild)).description(i18n.t(localeKeys.command.deploy.describe)).action(async (options2) => {
+        program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-s --skip-build", i18n.t(localeKeys.command.shared.skipBuild)).option("-o --output <path>", i18n.t(localeKeys.command.deploy.output)).description(i18n.t(localeKeys.command.deploy.describe)).action(async (options2) => {
           if (!options2.skipBuild) {
             const { build } = await import("./commands/build");
             await build(api);

package/dist/esm-node/locale/en.js

@@ -21,7 +21,8 @@ const EN_LOCALE = {
       describe: "preview the production build locally"
     },
     deploy: {
-      describe: "deploy the application"
+      describe: "deploy the application",
+      output: "output path"
     },
     new: {
       describe: "enable optional features or add a new entry",

package/dist/esm-node/locale/zh.js

@@ -21,7 +21,8 @@ const ZH_LOCALE = {
       describe: "启动生产环境服务"
     },
     deploy: {
-      describe: "部署应用"
+      describe: "部署应用",
+      output: "输出路径"
     },
     new: {
       describe: "Web App 项目中执行生成器",

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

@@ -0,0 +1,222 @@
+import path, { isAbsolute } from "node:path";
+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";
+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();
+};
+async function isFile(file) {
+  try {
+    const stat = await fse.stat(file);
+    return stat.isFile();
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      return false;
+    }
+    throw error;
+  }
+}
+const findEntryFiles = async (rootDir) => {
+  const files = await readDirRecursive(rootDir);
+  return files;
+};
+const handleDependencies = async (appDir, serverRootDir, include) => {
+  const base = "/";
+  const entryFiles = await findEntryFiles(serverRootDir);
+  const includeEntries = include.map((item) => {
+    if (isAbsolute(item)) {
+      return item;
+    }
+    try {
+      return require.resolve(item);
+    } catch (error) {
+    }
+    return item;
+  });
+  const _fileTrace = await nodeFileTrace(entryFiles.concat(includeEntries), {
+    base,
+    processCwd: serverRootDir,
+    resolve: async (id, parent, job, isCjs) => {
+      if (id.startsWith("@modern-js/prod-server")) {
+        return require.resolve(id, {
+          paths: [
+            require.resolve("@modern-js/app-tools")
+          ]
+        });
+      } else {
+        return resolve(id, parent, job, isCjs);
+      }
+    }
+  });
+  const currentProjectModules = path.join(appDir, "node_modules");
+  const _resolveTracedPath = (p) => fse.realpath(path.resolve(base, p));
+  const tracedFiles = Object.fromEntries(await Promise.all([
+    ..._fileTrace.reasons.entries()
+  ].map(async ([_path, reasons]) => {
+    if (reasons.ignored) {
+      return;
+    }
+    const filePath = await _resolveTracedPath(_path);
+    if (filePath.startsWith(serverRootDir) || filePath.startsWith(appDir) && !filePath.startsWith(currentProjectModules)) {
+      return;
+    }
+    if (!await isFile(filePath)) {
+      return;
+    }
+    let baseDir;
+    let pkgName;
+    let subpath;
+    let pkgPath;
+    if (filePath.includes("node_modules")) {
+      const parsed = parseNodeModulePath(filePath);
+      baseDir = parsed.dir;
+      pkgName = parsed.name;
+      subpath = parsed.subpath;
+      pkgPath = path.join(baseDir, pkgName);
+    } else {
+      const MODERN_UTILS_PATH = "packages/toolkit/utils";
+      const MODERN_UTILS_PATH_REGEX = new RegExp(`(.*${MODERN_UTILS_PATH})`);
+      const match = filePath.match(MODERN_UTILS_PATH_REGEX);
+      const packageJsonPath = match ? path.join(match[0], "package.json") : await pkgUp({
+        cwd: path.dirname(filePath)
+      });
+      if (packageJsonPath) {
+        const packageJson = await fse.readJSON(packageJsonPath);
+        pkgPath = baseDir = path.dirname(packageJsonPath);
+        subpath = path.relative(baseDir, filePath);
+        pkgName = packageJson.name;
+      }
+    }
+    if (!baseDir) {
+      return;
+    }
+    const parents = await Promise.all([
+      ...reasons.parents
+    ].map((p) => _resolveTracedPath(p)));
+    const tracedFile = {
+      path: filePath,
+      parents,
+      subpath,
+      pkgName,
+      pkgPath
+    };
+    return [
+      filePath,
+      tracedFile
+    ];
+  })).then((r) => r.filter(Boolean)));
+  const tracedPackages = {};
+  for (const tracedFile of Object.values(tracedFiles)) {
+    const { pkgName } = tracedFile;
+    let tracedPackage = tracedPackages[pkgName];
+    let pkgJSON = await readPackageJSON(tracedFile.pkgPath, {
+      cache: true
+    }).catch(() => {
+    });
+    if (!pkgJSON) {
+      pkgJSON = {
+        name: pkgName,
+        version: "0.0.0"
+      };
+    }
+    if (!tracedPackage) {
+      tracedPackage = {
+        name: pkgName,
+        versions: {}
+      };
+      tracedPackages[pkgName] = tracedPackage;
+    }
+    let tracedPackageVersion = tracedPackage.versions[pkgJSON.version];
+    if (!tracedPackageVersion) {
+      tracedPackageVersion = {
+        path: tracedFile.pkgPath,
+        files: [],
+        pkgJSON
+      };
+      tracedPackage.versions[pkgJSON.version] = tracedPackageVersion;
+    }
+    tracedFile.path.startsWith(tracedFile.pkgPath) && tracedPackageVersion.path === tracedFile.pkgPath && tracedPackageVersion.files.push(tracedFile.path);
+    tracedFile.pkgName = pkgName;
+    tracedFile.pkgVersion = pkgJSON.version;
+  }
+  const findPackageParents = (pkg, version) => {
+    const versionFiles = pkg.versions[version].files.map((path2) => tracedFiles[path2]);
+    const parentPkgs = [
+      ...new Set(versionFiles.flatMap((file) => file.parents.map((parentPath) => {
+        const parentFile = tracedFiles[parentPath];
+        if (parentFile.pkgName === pkg.name) {
+          return null;
+        }
+        return `${parentFile.pkgName}@${parentFile.pkgVersion}`;
+      }).filter(Boolean)))
+    ];
+    return parentPkgs;
+  };
+  const multiVersionPkgs = {};
+  const singleVersionPackages = [];
+  for (const tracedPackage of Object.values(tracedPackages)) {
+    const versions = Object.keys(tracedPackage.versions);
+    if (versions.length === 1) {
+      singleVersionPackages.push(tracedPackage.name);
+      continue;
+    }
+    multiVersionPkgs[tracedPackage.name] = {};
+    for (const version of versions) {
+      multiVersionPkgs[tracedPackage.name][version] = findPackageParents(tracedPackage, version);
+    }
+  }
+  await Promise.all(singleVersionPackages.map((pkgName) => {
+    const pkg = tracedPackages[pkgName];
+    const version = Object.keys(pkg.versions)[0];
+    return 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) {
+        return -1;
+      }
+      if (p2.length === 0) {
+        return 1;
+      }
+      return semver.lt(v1, v2, {
+        loose: true
+      }) ? 1 : -1;
+    });
+    for (const [version, parentPkgs] of versionEntires) {
+      const pkg = tracedPackages[pkgName];
+      const pkgDestPath = `.modernjs/${pkgName}@${version}/node_modules/${pkgName}`;
+      await writePackage(pkg, version, serverRootDir, pkgDestPath);
+      await linkPackage(pkgDestPath, `${pkgName}`, serverRootDir);
+      for (const parentPkg of parentPkgs) {
+        const parentPkgName = parentPkg.replace(/@[^@]+$/, "");
+        await (multiVersionPkgs[parentPkgName] ? linkPackage(pkgDestPath, `.modernjs/${parentPkg}/node_modules/${pkgName}`, serverRootDir) : linkPackage(pkgDestPath, `${parentPkgName}/node_modules/${pkgName}`, serverRootDir));
+      }
+    }
+  }
+  const projectPkg = await readPackageJSON(serverRootDir).catch(() => ({}));
+  const outputPkgPath = path.join(serverRootDir, "package.json");
+  await fse.writeJSON(outputPkgPath, {
+    name: `${projectPkg.name || "modernjs-project"}-prod`,
+    version: projectPkg.version || "0.0.0",
+    private: true,
+    dependencies: Object.fromEntries([
+      ...Object.values(tracedPackages).map((pkg) => [
+        pkg.name,
+        Object.keys(pkg.versions)[0]
+      ])
+    ].sort(([a], [b]) => a.localeCompare(b)))
+  });
+};
+export {
+  handleDependencies
+};

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

@@ -0,0 +1,71 @@
+import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
+import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
+function genNetlifyEntry({ config, plugins, appContext } = {}) {
+  const defaultConfig = {
+    server: {
+      port: 8080
+    },
+    output: {
+      path: "."
+    }
+  };
+  return `
+
+  const fs = require('node:fs/promises');
+  const path = require('node:path');
+  const { createNetlifyFunction } = require('@modern-js/prod-server/netlify');
+  ${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, "${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: ${JSON.stringify(config || defaultConfig)},
+        serverConfigFile: '${DEFAULT_SERVER_CONFIG}',
+        plugins: ${getPluginsCode(plugins || [])},
+        appContext: ${appContext ? severAppContextTemplate(appContext) : "undefined"},
+        disableCustomHook: true
+      }
+
+      requestHandler = await createNetlifyFunction(prodServerOptions)
+
+      return requestHandler
+    } catch(error) {
+      console.error(error);
+      process.exit(1);
+    }
+  }
+
+  createHandler();
+
+  const handleRequest = async(request, context) => {
+    if(typeof requestHandler !== 'function'){
+      await createHandler();
+    }
+    return requestHandler(request, context);
+  }
+
+  export default handleRequest;
+  `;
+}
+export {
+  genNetlifyEntry
+};

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

@@ -0,0 +1,64 @@
+import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
+import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
+function genNodeEntry({ config, plugins, appContext } = {}) {
+  const defaultConfig = {
+    server: {
+      port: 8080
+    },
+    output: {
+      path: "."
+    }
+  };
+  return `
+
+  const fs = require('node:fs/promises');
+  const path = require('node:path');
+  const { createProdServer } = require('@modern-js/prod-server');
+  ${genPluginImportsCode(plugins || [])}
+
+  if(!process.env.NODE_ENV){
+    process.env.NODE_ENV = 'production';
+  }
+
+  async function main() {
+    try {
+      let routes = [];
+      const routeFilepath = path.join(__dirname, "${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: ${JSON.stringify(config || defaultConfig)},
+        serverConfigFile: '${DEFAULT_SERVER_CONFIG}',
+        plugins: ${getPluginsCode(plugins || [])},
+        appContext: ${appContext ? severAppContextTemplate(appContext) : "undefined"},
+        disableCustomHook: true
+      }
+
+      const app = await createProdServer(prodServerOptions)
+
+      const port = process.env.PORT || 3000;
+
+      app.listen(port, () => {
+        console.log('\\x1b[32mServer is listening on port', port, '\\x1b[0m');
+      });
+    } catch(error) {
+      console.error(error);
+      process.exit(1);
+    }
+  }
+
+  main();
+  `;
+}
+export {
+  genNodeEntry
+};

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

@@ -0,0 +1,70 @@
+import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
+import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
+function genVercelEntry({ config, plugins, appContext } = {}) {
+  const defaultConfig = {
+    server: {
+      port: 8080
+    },
+    output: {
+      path: "."
+    }
+  };
+  return `
+
+  const fs = require('node:fs/promises');
+  const path = require('node:path');
+  const { createProdServer } = require('@modern-js/prod-server');
+  ${genPluginImportsCode(plugins || [])}
+
+  if(!process.env.NODE_ENV){
+    process.env.NODE_ENV = 'production';
+  }
+
+  let requestHandler = null;
+  async function createHandler() {
+    try {
+      let routes = [];
+      const routeFilepath = path.join(__dirname, "${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: ${JSON.stringify(config || defaultConfig)},
+        serverConfigFile: '${DEFAULT_SERVER_CONFIG}',
+        plugins: ${getPluginsCode(plugins || [])},
+        appContext: ${appContext ? severAppContextTemplate(appContext) : "undefined"},
+        disableCustomHook: true
+      }
+
+      const app = await createProdServer(prodServerOptions)
+
+      requestHandler = app.getRequestListener();
+
+      return requestHandler;
+    } catch(error) {
+      console.error(error);
+      process.exit(1);
+    }
+  }
+
+  createHandler();
+
+  module.exports = async(req, res) => {
+    if(typeof requestHandler !== 'function'){
+      await createHandler();
+    }
+    return requestHandler(req, res);
+  }
+  `;
+}
+export {
+  genVercelEntry
+};

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

@@ -0,0 +1,156 @@
+import path from "path";
+import { fs as fse, getInternalPlugins } from "@modern-js/utils";
+import { provider } from "std-env";
+import { getProjectUsage } from "./utils";
+import { handleDependencies } from "./dependencies";
+var deploy_default = () => ({
+  name: "@modern-js/plugin-deploy",
+  pre: [
+    "@modern-js/plugin-bff",
+    "@modern-js/plugin-server"
+  ],
+  setup: (api) => {
+    const deployTarget = process.env.MODERNJS_DEPLOY || provider || "node";
+    return {
+      async beforeDeploy(options) {
+        const { output: outputPath } = options;
+        const appContext = api.useAppContext();
+        const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
+        const { useSSR, useAPI, useWebServer } = getProjectUsage(appDirectory, distDirectory);
+        const needModernServer = useSSR || useAPI || useWebServer;
+        const configContext = api.useResolvedConfigContext();
+        let outputDirectory = path.resolve(appDirectory, ".output");
+        if (outputPath) {
+          outputDirectory = path.isAbsolute(outputPath) ? outputPath : path.resolve(outputPath);
+        }
+        let funcsDirectory = outputDirectory;
+        let staticDirectory = path.join(outputDirectory, "static");
+        if (deployTarget === "node") {
+          await fse.remove(outputDirectory);
+          await fse.copy(distDirectory, outputDirectory);
+        }
+        if (deployTarget === "vercel") {
+          const vercelOutput = path.join(appDirectory, ".vercel");
+          await fse.remove(vercelOutput);
+          outputDirectory = path.join(vercelOutput, "output");
+          const config2 = {
+            version: 3,
+            routes: [
+              {
+                src: "/static/(.*)",
+                headers: {
+                  "cache-control": "s-maxage=31536000, immutable"
+                },
+                continue: true
+              },
+              {
+                handle: "filesystem"
+              }
+            ]
+          };
+          if (!needModernServer) {
+            entrypoints.forEach((entry) => {
+              config2.routes.push({
+                src: `/${entry.entryName}(?:/.*)?`,
+                headers: {
+                  "cache-control": "s-maxage=0"
+                },
+                dest: `/html/${entry.entryName}/index.html`
+              });
+            });
+          } else {
+            config2.routes.push({
+              src: "/(.*)",
+              dest: `/index`
+            });
+          }
+          await fse.ensureDir(outputDirectory);
+          await fse.writeJSON(path.join(outputDirectory, "config.json"), config2, {
+            spaces: 2
+          });
+          staticDirectory = path.join(outputDirectory, "static/static");
+          await fse.copy(path.join(distDirectory, "static"), staticDirectory);
+          if (!needModernServer) {
+            const destHtmlDirectory = path.join(distDirectory, "html");
+            const outputHtmlDirectory = path.join(path.join(outputDirectory, "static"), "html");
+            await fse.copy(destHtmlDirectory, outputHtmlDirectory);
+          } else {
+            funcsDirectory = path.join(outputDirectory, "functions", "index.func");
+            await fse.ensureDir(funcsDirectory);
+            await fse.copy(distDirectory, funcsDirectory, {
+              filter: (src) => {
+                const distStaticDirectory = path.join(distDirectory, "static");
+                return !src.includes(distStaticDirectory);
+              }
+            });
+            await fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
+              runtime: "nodejs16.x",
+              handler: "index.js",
+              launcherType: "Nodejs",
+              shouldAddHelpers: false,
+              supportsResponseStreaming: true
+            });
+          }
+        }
+        const { bff } = configContext;
+        const config = {
+          output: {
+            path: "."
+          },
+          bff
+        };
+        const plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
+        const serverAppContext = {
+          sharedDirectory: `path.join(__dirname, "${path.relative(appDirectory, sharedDirectory)}")`,
+          apiDirectory: `path.join(__dirname, "${path.relative(appDirectory, apiDirectory)}")`,
+          lambdaDirectory: `path.join(__dirname, "${path.relative(appDirectory, lambdaDirectory)}")`,
+          metaName
+        };
+        let code = ``;
+        console.log("deployTarget111111111", deployTarget);
+        switch (deployTarget) {
+          case "node": {
+            const { genNodeEntry } = await import("./entrys/node");
+            code = genNodeEntry({
+              plugins,
+              config,
+              appContext: serverAppContext
+            });
+            break;
+          }
+          case "vercel": {
+            const { genVercelEntry } = await import("./entrys/vercel");
+            code = genVercelEntry({
+              plugins,
+              config,
+              appContext: serverAppContext
+            });
+            break;
+          }
+          case "netlify": {
+            const { genNetlifyEntry } = await import("./entrys/netlify");
+            code = genNetlifyEntry({
+              plugins,
+              config,
+              appContext: serverAppContext
+            });
+            break;
+          }
+          default: {
+            code = `throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");`;
+          }
+        }
+        const entryFilePath = path.join(funcsDirectory, "index.js");
+        if (needModernServer) {
+          await fse.writeFile(entryFilePath, code);
+          await handleDependencies(appDirectory, funcsDirectory, [
+            "@modern-js/prod-server"
+          ]);
+        }
+      }
+    };
+  }
+});
+export {
+  deploy_default as default
+};