@modern-js/app-tools 2.58.1-alpha.6 → 2.58.2

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

@@ -1,69 +0,0 @@
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var require_vercelEntry = __commonJS({
-  "src/plugins/deploy/platforms/vercelEntry.js"(exports, module) {
-    const fs = require("node:fs/promises");
-    const path = require("node:path");
-    const { createProdServer } = require("@modern-js/prod-server");
-    p_genPluginImportsCode;
-    if (!process.env.NODE_ENV) {
-      process.env.NODE_ENV = "production";
-    }
-    let requestHandler = null;
-    let handlerCreationPromise = null;
-    async function loadRoutes(routeFilepath) {
-      try {
-        await fs.access(routeFilepath);
-        const content = await fs.readFile(routeFilepath, "utf-8");
-        const routeSpec = JSON.parse(content);
-        return routeSpec.routes || [];
-      } catch (error) {
-        console.warn("route.json not found or invalid, continuing with empty routes.");
-        return [];
-      }
-    }
-    async function initServer() {
-      const routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
-      const routes = await loadRoutes(routeFilepath);
-      const dynamicProdOptions = p_dynamicProdOptions;
-      const prodServerOptions = {
-        pwd: __dirname,
-        routes,
-        disableCustomHook: true,
-        appContext: {
-          sharedDirectory: p_sharedDirectory,
-          apiDirectory: p_apiDirectory,
-          lambdaDirectory: p_lambdaDirectory
-        },
-        plugins: p_plugins,
-        ...dynamicProdOptions
-      };
-      const app = await createProdServer(prodServerOptions);
-      return app.getRequestListener();
-    }
-    async function createHandler() {
-      if (!handlerCreationPromise) {
-        handlerCreationPromise = (async () => {
-          try {
-            requestHandler = await initServer();
-          } catch (error) {
-            console.error("Error creating server:", error);
-            process.exit(1);
-          }
-        })();
-      }
-      await handlerCreationPromise;
-      return requestHandler;
-    }
-    createHandler();
-    module.exports = async (req, res) => {
-      if (!requestHandler) {
-        await createHandler();
-      }
-      return requestHandler(req, res);
-    };
-  }
-});
-export default require_vercelEntry();

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

@@ -1,44 +0,0 @@
-import path from "path";
-import { ROUTE_SPEC_FILE, fs as fse, isDepExists } from "@modern-js/utils";
-const serverAppContenxtTemplate = (appContext) => {
-  const { appDirectory, sharedDirectory, apiDirectory, lambdaDirectory, metaName } = appContext;
-  return {
-    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
-  };
-};
-const getPluginsCode = (plugins) => `[${plugins.map((_, index) => `plugin_${index}()`).join(",")}]`;
-const genPluginImportsCode = (plugins) => {
-  return plugins.map((plugin, index) => `
-      let plugin_${index} = require('${plugin}')
-      plugin_${index} = plugin_${index}.default || plugin_${index}
-      `).join(";\n");
-};
-const getProjectUsage = (appDirectory, distDirectory) => {
-  const routeJSON = path.join(distDirectory, ROUTE_SPEC_FILE);
-  const { routes } = fse.readJSONSync(routeJSON);
-  let useSSR = false;
-  let useAPI = false;
-  routes.forEach((route) => {
-    if (route.isSSR) {
-      useSSR = true;
-    }
-    if (route.isApi) {
-      useAPI = true;
-    }
-  });
-  const useWebServer = isDepExists(appDirectory, "@modern-js/plugin-server");
-  return {
-    useSSR,
-    useAPI,
-    useWebServer
-  };
-};
-export {
-  genPluginImportsCode,
-  getPluginsCode,
-  getProjectUsage,
-  serverAppContenxtTemplate
-};

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

@@ -1,84 +0,0 @@
-import { ensureAbsolutePath, getPort, isDev, isDevCommand } from "@modern-js/utils";
-import { checkIsLegacyConfig, createDefaultConfig, createLegacyDefaultConfig, transformNormalizedConfig } from "../../config";
-var initialize_default = ({ bundler }) => ({
-  name: "@modern-js/plugin-initialize",
-  post: [
-    "@modern-js/plugin-ssr",
-    "@modern-js/plugin-document",
-    "@modern-js/plugin-state",
-    "@modern-js/plugin-router",
-    "@modern-js/plugin-router-v5",
-    "@modern-js/plugin-polyfill"
-  ],
-  setup(api) {
-    const config = () => {
-      const appContext = api.useAppContext();
-      const userConfig = api.useConfigContext();
-      api.setAppContext({
-        ...appContext,
-        bundlerType: bundler
-      });
-      return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext);
-    };
-    return {
-      config,
-      async resolvedConfig({ resolved }) {
-        var _resolved_output_distPath;
-        let appContext = api.useAppContext();
-        const userConfig = api.useConfigContext();
-        const port = await getServerPort(resolved);
-        appContext = {
-          ...appContext,
-          port,
-          distDirectory: ensureAbsolutePath(appContext.distDirectory, ((_resolved_output_distPath = resolved.output.distPath) === null || _resolved_output_distPath === void 0 ? void 0 : _resolved_output_distPath.root) || "dist")
-        };
-        api.setAppContext(appContext);
-        const normalizedConfig = checkIsLegacyConfig(resolved) ? transformNormalizedConfig(resolved) : resolved;
-        resolved._raw = userConfig;
-        resolved.server = {
-          ...normalizedConfig.server || {},
-          port
-        };
-        var _normalizedConfig_autoLoadPlugins;
-        resolved.autoLoadPlugins = (_normalizedConfig_autoLoadPlugins = normalizedConfig.autoLoadPlugins) !== null && _normalizedConfig_autoLoadPlugins !== void 0 ? _normalizedConfig_autoLoadPlugins : false;
-        stabilizeConfig(resolved, normalizedConfig, [
-          "source",
-          "bff",
-          "dev",
-          "html",
-          "output",
-          "tools",
-          "testing",
-          "plugins",
-          "builderPlugins",
-          "runtime",
-          "runtimeByEntries",
-          "deploy",
-          "performance"
-        ]);
-        if (bundler === "webpack") {
-          resolved.security = normalizedConfig.security || {};
-          resolved.experiments = normalizedConfig.experiments;
-        }
-        return {
-          resolved
-        };
-      }
-    };
-  }
-});
-function stabilizeConfig(resolve, config, keys) {
-  keys.forEach((key) => {
-    resolve[key] = config[key] || {};
-  });
-}
-async function getServerPort(config) {
-  const prodPort = Number(process.env.PORT) || config.server.port || 8080;
-  if (isDev() && isDevCommand()) {
-    return getPort(Number(process.env.PORT) || config.dev.port || prodPort);
-  }
-  return prodPort;
-}
-export {
-  initialize_default as default
-};

package/dist/esm-node/plugins/serverBuild.js

@@ -1,58 +0,0 @@
-import path from "path";
-import fs from "fs";
-import { SERVER_DIR, SHARED_DIR, getMeta } from "@modern-js/utils";
-import { compile } from "@modern-js/server-utils";
-const TS_CONFIG_FILENAME = "tsconfig.json";
-function checkHasCache(appDir) {
-  const tsFilepath = path.resolve(appDir, SERVER_DIR, "cache.ts");
-  const jsfilepath = path.resolve(appDir, SERVER_DIR, "cache.js");
-  return fs.existsSync(tsFilepath) || fs.existsSync(jsfilepath);
-}
-function checkHasConfig(appDir, metaName = "modern-js") {
-  const meta = getMeta(metaName);
-  const tsFilepath = path.resolve(appDir, SERVER_DIR, `${meta}.server.ts`);
-  const jsfilepath = path.resolve(appDir, SERVER_DIR, `${meta}.server.js`);
-  return fs.existsSync(tsFilepath) || fs.existsSync(jsfilepath);
-}
-var serverBuild_default = () => ({
-  name: "@modern-js/server-build",
-  setup(api) {
-    return {
-      async afterBuild() {
-        const { appDirectory, distDirectory, metaName } = api.useAppContext();
-        if (!checkHasCache(appDirectory) && !checkHasConfig(appDirectory, metaName)) {
-          return;
-        }
-        const modernConfig = api.useResolvedConfigContext();
-        const distDir = path.resolve(distDirectory);
-        const serverDir = path.resolve(appDirectory, SERVER_DIR);
-        const sharedDir = path.resolve(appDirectory, SHARED_DIR);
-        const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-        const sourceDirs = [];
-        if (fs.existsSync(serverDir)) {
-          sourceDirs.push(serverDir);
-          if (fs.existsSync(sharedDir)) {
-            sourceDirs.push(sharedDir);
-          }
-        }
-        const { server } = modernConfig;
-        const { alias } = modernConfig.source;
-        const { babel } = modernConfig.tools;
-        if (sourceDirs.length > 0) {
-          await compile(appDirectory, {
-            server,
-            alias,
-            babelConfig: babel
-          }, {
-            sourceDirs,
-            distDir,
-            tsconfigPath
-          });
-        }
-      }
-    };
-  }
-});
-export {
-  serverBuild_default as default
-};

package/dist/esm-node/types/config/index.js

@@ -1 +0,0 @@
-export * from "./output";

package/dist/esm-node/types/index.js

@@ -1,3 +0,0 @@
-export * from "./hooks";
-export * from "./config";
-export * from "./legacyConfig";

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

@@ -1,49 +0,0 @@
-import * as path from "path";
-import { bundle } from "@modern-js/node-bundle-require";
-import { fs, getServerConfig, ensureAbsolutePath, OUTPUT_CONFIG_FILE, CONFIG_FILE_EXTENSIONS } from "@modern-js/utils";
-import { stringify } from "flatted";
-const defineServerConfig = (config) => config;
-const buildServerConfig = async ({ appDirectory, distDirectory, configFile, options, watch }) => {
-  const configFilePath = await getServerConfig(appDirectory, configFile);
-  const getOutputFile = async (filepath) => path.resolve(distDirectory, `${filepath.replace(new RegExp(CONFIG_FILE_EXTENSIONS.join("|")), "")}.js`);
-  if (configFilePath) {
-    const configHelperFilePath = path.normalize(path.join(distDirectory, "./config-helper.js"));
-    const helperCode = `
-      export const defineConfig = (config) => config;
-    `;
-    await fs.ensureDir(distDirectory);
-    await fs.writeFile(configHelperFilePath, helperCode);
-    await bundle(configFilePath, {
-      ...options,
-      watch,
-      getOutputFile,
-      esbuildPlugins: [
-        {
-          name: "native-build-config",
-          setup(ctx) {
-            ctx.onResolve({
-              filter: /app-tools\/server/
-            }, () => {
-              return {
-                path: configHelperFilePath
-              };
-            });
-          }
-        }
-      ]
-    });
-  }
-};
-const emitResolvedConfig = async (appDirectory, resolvedConfig) => {
-  var _resolvedConfig_output_distPath;
-  const outputPath = ensureAbsolutePath(appDirectory, path.join(((_resolvedConfig_output_distPath = resolvedConfig.output.distPath) === null || _resolvedConfig_output_distPath === void 0 ? void 0 : _resolvedConfig_output_distPath.root) || "./dist", OUTPUT_CONFIG_FILE));
-  const output = stringify(resolvedConfig);
-  await fs.writeFile(outputPath, output, {
-    encoding: "utf-8"
-  });
-};
-export {
-  buildServerConfig,
-  defineServerConfig,
-  emitResolvedConfig
-};

package/dist/esm-node/utils/createServer.js

@@ -1,26 +0,0 @@
-import { createDevServer } from "@modern-js/server";
-import { applyPlugins } from "@modern-js/prod-server";
-let server = null;
-const getServer = () => server;
-const setServer = (newServer) => {
-  server = newServer;
-};
-const closeServer = async () => {
-  if (server) {
-    server.close();
-    server = null;
-  }
-};
-const createServer = async (options) => {
-  if (server) {
-    server.close();
-  }
-  server = (await createDevServer(options, applyPlugins)).server;
-  return server;
-};
-export {
-  closeServer,
-  createServer,
-  getServer,
-  setServer
-};

package/dist/esm-node/utils/env.js

@@ -1,16 +0,0 @@
-import { cutNameByHyphen } from "@modern-js/utils/universal";
-function getAutoInjectEnv(appContext) {
-  const { metaName } = appContext;
-  const prefix = `${cutNameByHyphen(metaName)}_`.toUpperCase();
-  const envReg = new RegExp(`^${prefix}`);
-  return Object.keys(process.env).reduce((prev, key) => {
-    const value = process.env[key];
-    if (envReg.test(key) && typeof value !== "undefined") {
-      prev[`process.env.${key}`] = value;
-    }
-    return prev;
-  }, {});
-}
-export {
-  getAutoInjectEnv
-};

package/dist/esm-node/utils/generateWatchFiles.js

@@ -1,30 +0,0 @@
-import path from "path";
-import { fs, getServerConfig } from "@modern-js/utils";
-const getPackageConfig = (appDirectory, packageJsonConfig) => {
-  const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
-  const json = JSON.parse(fs.readFileSync(path.resolve(appDirectory, "./package.json"), "utf8"));
-  return json[packageJsonConfig !== null && packageJsonConfig !== void 0 ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
-};
-const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
-  const serverConfig = await getServerConfig(appDirectory, serverConfigFile);
-  if (serverConfig) {
-    dependencies.push(serverConfig);
-  }
-};
-async function generateWatchFiles(appContext, configDir) {
-  const { appDirectory, configFile } = appContext;
-  const configPath = path.join(appDirectory, configDir || "");
-  const dependencies = getPackageConfig(appContext.appDirectory, appContext.packageName) ? [
-    path.resolve(appDirectory, "./package.json")
-  ] : [];
-  await addServerConfigToDeps(dependencies, appContext.appDirectory, appContext.serverConfigFile);
-  return [
-    `${configPath}/html`,
-    configFile || "./config",
-    ...dependencies
-  ];
-}
-export {
-  addServerConfigToDeps,
-  generateWatchFiles
-};

package/dist/esm-node/utils/getSelectedEntries.js

@@ -1,34 +0,0 @@
-import { chalk, inquirer } from "@modern-js/utils";
-import { i18n, localeKeys } from "../locale";
-const getSelectedEntries = async (entry, entrypoints) => {
-  const entryNames = entrypoints.map((e) => e.entryName);
-  if (!entry) {
-    return entryNames;
-  }
-  if (typeof entry === "boolean") {
-    const { selected } = await inquirer.prompt([
-      {
-        type: "checkbox",
-        name: "selected",
-        choices: entryNames,
-        message: i18n.t(localeKeys.command.dev.selectEntry),
-        validate(answer) {
-          if (answer.length < 1) {
-            return i18n.t(localeKeys.command.dev.requireEntry);
-          }
-          return true;
-        }
-      }
-    ]);
-    return selected;
-  }
-  entry.forEach((name) => {
-    if (!entryNames.includes(name)) {
-      throw new Error(`Can not found entry ${chalk.yellow(name)}, the entry should be one of ${chalk.yellow(entryNames.join(", "))}`);
-    }
-  });
-  return entry;
-};
-export {
-  getSelectedEntries
-};

package/dist/esm-node/utils/loadPlugins.js

@@ -1,22 +0,0 @@
-import { loadServerPlugins as loadServerPluginInstances } from "@modern-js/prod-server";
-async function getServerPlugins(api, metaName = "modern-js") {
-  const runner = api.useHookRunners();
-  const { plugins } = await runner._internalServerPlugins({
-    plugins: []
-  });
-  const filtedPlugins = plugins.filter((plugin) => plugin.name.includes(metaName));
-  api.setAppContext({
-    ...api.useAppContext(),
-    serverPlugins: filtedPlugins
-  });
-  return filtedPlugins;
-}
-async function loadServerPlugins(api, appDirectory, metaName) {
-  const plugins = await getServerPlugins(api, metaName);
-  const instances = loadServerPluginInstances(plugins, appDirectory);
-  return instances;
-}
-export {
-  getServerPlugins,
-  loadServerPlugins
-};

package/dist/esm-node/utils/printInstructions.js

@@ -1,11 +0,0 @@
-import { prettyInstructions, logger } from "@modern-js/utils";
-const printInstructions = async (hookRunners, appContext, config) => {
-  const message = prettyInstructions(appContext, config);
-  const { instructions } = await hookRunners.beforePrintInstructions({
-    instructions: message
-  });
-  logger.log(instructions);
-};
-export {
-  printInstructions
-};

package/dist/esm-node/utils/register.js

@@ -1,69 +0,0 @@
-import path from "node:path";
-import { fs, getAliasConfig, readTsConfigByFile } from "@modern-js/utils";
-const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
-  const TS_CONFIG_FILENAME = `tsconfig.json`;
-  const tsconfigPath = path.resolve(appDir, TS_CONFIG_FILENAME);
-  const isTsProject = await fs.pathExists(tsconfigPath);
-  const aliasConfig = getAliasConfig(alias, {
-    appDirectory: appDir,
-    tsconfigPath
-  });
-  const { paths = {}, absoluteBaseUrl = "./" } = aliasConfig;
-  const tsPaths = Object.keys(paths).reduce((o, key) => {
-    let tsPath = paths[key];
-    if (typeof tsPath === "string" && path.isAbsolute(tsPath)) {
-      tsPath = path.relative(absoluteBaseUrl, tsPath);
-    }
-    if (typeof tsPath === "string") {
-      tsPath = [
-        tsPath
-      ];
-    }
-    return {
-      ...o,
-      [`${key}`]: tsPath
-    };
-  }, {});
-  let tsConfig = {};
-  if (isTsProject) {
-    tsConfig = readTsConfigByFile(tsconfigPath);
-  }
-  try {
-    const tsNode = await import("ts-node");
-    const tsNodeOptions = tsConfig["ts-node"];
-    if (isTsProject) {
-      tsNode.register({
-        project: tsconfigPath,
-        scope: true,
-        // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
-        files: true,
-        transpileOnly: true,
-        ignore: [
-          "(?:^|/)node_modules/",
-          `(?:^|/)${path.relative(appDir, distDir)}/`
-        ],
-        ...tsNodeOptions
-      });
-    }
-  } catch (error) {
-    const esbuildRegister = await import("esbuild-register/dist/node");
-    esbuildRegister.register({
-      tsconfigRaw: isTsProject ? tsConfig : void 0,
-      hookIgnoreNodeModules: true,
-      hookMatcher: (fileName) => !fileName.startsWith(distDir)
-    });
-  }
-  const tsConfigPaths = await import("@modern-js/utils/tsconfig-paths");
-  if (await fs.pathExists(appDir)) {
-    const loaderRes = tsConfigPaths.loadConfig(appDir);
-    if (loaderRes.resultType === "success") {
-      tsConfigPaths.register({
-        baseUrl: absoluteBaseUrl || "./",
-        paths: tsPaths
-      });
-    }
-  }
-};
-export {
-  registerCompiler
-};

package/dist/esm-node/utils/restart.js

@@ -1,22 +0,0 @@
-import { cli } from "@modern-js/core";
-import { chalk, clearConsole, getFullArgv, logger, program } from "@modern-js/utils";
-async function restart(hooksRunner, filename) {
-  clearConsole();
-  logger.info(`Restart because ${chalk.yellow(filename)} is changed...
-`);
-  let hasGetError = false;
-  await hooksRunner.beforeRestart();
-  try {
-    await cli.init(cli.getPrevInitOptions());
-  } catch (err) {
-    console.error(err);
-    hasGetError = true;
-  } finally {
-    if (!hasGetError) {
-      program.parse(getFullArgv());
-    }
-  }
-}
-export {
-  restart
-};

package/dist/esm-node/utils/routes.js

@@ -1,21 +0,0 @@
-import path from "path";
-import { fs, MAIN_ENTRY_NAME, ROUTE_SPEC_FILE } from "@modern-js/utils";
-const generateRoutes = async (appContext) => {
-  const { serverRoutes, distDirectory } = appContext;
-  const output = JSON.stringify({
-    routes: serverRoutes
-  }, null, 2);
-  await fs.outputFile(path.join(distDirectory, ROUTE_SPEC_FILE), output);
-};
-const getPathWithoutExt = (filename) => {
-  const extname = path.extname(filename);
-  return filename.slice(0, -extname.length);
-};
-const isMainEntry = (entryName, mainEntryName) => {
-  return entryName === (mainEntryName || MAIN_ENTRY_NAME);
-};
-export {
-  generateRoutes,
-  getPathWithoutExt,
-  isMainEntry
-};

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

@@ -1,2 +0,0 @@
-declare function _default(request: any, context: any): Promise<any>;
-export default _default;

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

@@ -1,2 +0,0 @@
-declare function _exports(req: any, res: any): Promise<any>;
-export = _exports;