@modern-js/app-tools 2.63.1 → 2.63.3

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

@@ -1,202 +0,0 @@
-import path from "node:path";
-import { fs as fse, pkgUp, semver } from "@modern-js/utils";
-import { parseNodeModulePath } from "mlly";
-import { readPackageJSON } from "pkg-types";
-import { traceFiles as defaultTraceFiles, findEntryFiles, findPackageParents, isFile, isSubPath, linkPackage, readDirRecursive, resolveTracedPath, writePackage } from "./utils";
-import { nodeFileTrace } from "@vercel/nft";
-const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = defaultTraceFiles, entryFilter, modifyPackageJson, copyWholePackage, traceOptions }) => {
-  const base = "/";
-  const entryFiles = await findEntryFiles(serverRootDir, entryFilter);
-  const fileTrace = await traceFiles({
-    entryFiles: entryFiles.concat(includeEntries),
-    serverRootDir,
-    base,
-    traceOptions
-  });
-  const currentProjectModules = path.join(appDir, "node_modules");
-  const dependencySearchRoot = path.resolve(appDir, "../../../../../../");
-  const tracedFiles = Object.fromEntries(await Promise.all([
-    ...fileTrace.reasons.entries()
-  ].map(async ([_path, reasons]) => {
-    if (reasons.ignored) {
-      return;
-    }
-    const filePath = await resolveTracedPath(base, _path);
-    if (isSubPath(serverRootDir, filePath) || isSubPath(appDir, filePath) && !isSubPath(currentProjectModules, filePath)) {
-      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 && isSubPath(dependencySearchRoot, 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(base, p)));
-    const tracedFile = {
-      path: filePath,
-      parents,
-      isDirectDep: parents.some((parent) => {
-        return isSubPath(appDir, parent) && !isSubPath(currentProjectModules, parent);
-      }),
-      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: [],
-        isDirectDep: false,
-        pkgJSON
-      };
-      if (tracedFile.isDirectDep) {
-        tracedPackageVersion.isDirectDep = tracedFile.isDirectDep;
-      }
-      tracedPackage.versions[pkgJSON.version] = tracedPackageVersion;
-    }
-    tracedFile.pkgName = pkgName;
-    tracedFile.pkgVersion = pkgJSON.version;
-    const shouldCopyWholePackage = copyWholePackage === null || copyWholePackage === void 0 ? void 0 : copyWholePackage(pkgName);
-    if (tracedFile.path.startsWith(tracedFile.pkgPath) && // Merged package files are based on the version, not on paths, to handle some boundary cases
-    tracedPackageVersion.pkgJSON.version === tracedFile.pkgVersion) {
-      if (shouldCopyWholePackage) {
-        const allFiles = await readDirRecursive(tracedFile.pkgPath);
-        tracedPackageVersion.files.push(...allFiles);
-      } else {
-        tracedPackageVersion.files.push(tracedFile.path);
-      }
-    }
-  }
-  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, tracedFiles);
-    }
-  }
-  await Promise.all(singleVersionPackages.map((pkgName) => {
-    const pkg = tracedPackages[pkgName];
-    const version = Object.keys(pkg.versions)[0];
-    return writePackage({
-      pkg,
-      version,
-      projectDir: serverRootDir
-    });
-  }));
-  const projectPkgJson = await readPackageJSON(serverRootDir).catch(() => ({}));
-  for (const [pkgName, pkgVersions] of Object.entries(multiVersionPkgs)) {
-    const versionEntires = Object.entries(pkgVersions).sort(([v1, p1], [v2, p2]) => {
-      var _tracedPackages_pkgName_versions_v1, _tracedPackages_pkgName_versions, _tracedPackages_pkgName, _tracedPackages_pkgName_versions_v2, _tracedPackages_pkgName_versions1, _tracedPackages_pkgName1;
-      const shouldHoist1 = (_tracedPackages_pkgName = tracedPackages[pkgName]) === null || _tracedPackages_pkgName === void 0 ? void 0 : (_tracedPackages_pkgName_versions = _tracedPackages_pkgName.versions) === null || _tracedPackages_pkgName_versions === void 0 ? void 0 : (_tracedPackages_pkgName_versions_v1 = _tracedPackages_pkgName_versions[v1]) === null || _tracedPackages_pkgName_versions_v1 === void 0 ? void 0 : _tracedPackages_pkgName_versions_v1.isDirectDep;
-      const shouldHoist2 = (_tracedPackages_pkgName1 = tracedPackages[pkgName]) === null || _tracedPackages_pkgName1 === void 0 ? void 0 : (_tracedPackages_pkgName_versions1 = _tracedPackages_pkgName1.versions) === null || _tracedPackages_pkgName_versions1 === void 0 ? void 0 : (_tracedPackages_pkgName_versions_v2 = _tracedPackages_pkgName_versions1[v2]) === null || _tracedPackages_pkgName_versions_v2 === void 0 ? void 0 : _tracedPackages_pkgName_versions_v2.isDirectDep;
-      if (shouldHoist1 && !shouldHoist2) {
-        return -1;
-      }
-      if (!shouldHoist1 && shouldHoist2) {
-        return 1;
-      }
-      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,
-        projectDir: serverRootDir,
-        _pkgPath: 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 outputPkgPath = path.join(serverRootDir, "package.json");
-  const newPkgJson = {
-    name: `${projectPkgJson.name || "modernjs-project"}-prod`,
-    version: projectPkgJson.version || "0.0.0",
-    private: true,
-    type: projectPkgJson.type || "commonjs",
-    dependencies: Object.fromEntries([
-      ...Object.values(tracedPackages).map((pkg) => [
-        pkg.name,
-        Object.keys(pkg.versions)[0]
-      ])
-    ].sort(([a], [b]) => a.localeCompare(b)))
-  };
-  const finalPkgJson = (modifyPackageJson === null || modifyPackageJson === void 0 ? void 0 : modifyPackageJson(newPkgJson)) || newPkgJson;
-  await fse.writeJSON(outputPkgPath, finalPkgJson);
-};
-export {
-  handleDependencies,
-  nodeFileTrace
-};

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

@@ -1,137 +0,0 @@
-import os from "node:os";
-import path from "path";
-import { fs as fse } from "@modern-js/utils";
-import { nodeFileTrace, resolve } from "@vercel/nft";
-import { parseNodeModulePath } from "mlly";
-function applyPublicCondition(pkg) {
-  var _pkg_publishConfig;
-  if (pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig = pkg.publishConfig) === null || _pkg_publishConfig === void 0 ? void 0 : _pkg_publishConfig.exports) {
-    var _pkg_publishConfig1;
-    pkg.exports = pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig1 = pkg.publishConfig) === null || _pkg_publishConfig1 === void 0 ? void 0 : _pkg_publishConfig1.exports;
-  }
-}
-const writePackage = async (options) => {
-  const { pkg, version, projectDir, _pkgPath } = options;
-  const pkgPath = _pkgPath || pkg.name;
-  for (const src of pkg.versions[version].files) {
-    if (src.includes("node_modules")) {
-      const { subpath } = parseNodeModulePath(src);
-      const dest = path.join(projectDir, "node_modules", pkgPath, subpath);
-      const dirname = path.dirname(dest);
-      await fse.ensureDir(dirname);
-      await fse.copyFile(src, dest);
-    } else {
-      const subpath = path.relative(pkg.versions[version].path, src);
-      const dest = path.join(projectDir, "node_modules", pkgPath, subpath);
-      const dirname = path.dirname(dest);
-      await fse.ensureDir(dirname);
-      await fse.copyFile(src, dest);
-    }
-  }
-  const { pkgJSON } = pkg.versions[version];
-  applyPublicCondition(pkgJSON);
-  const packageJsonPath = path.join(projectDir, "node_modules", pkgPath, "package.json");
-  await fse.ensureDir(path.dirname(packageJsonPath));
-  await fse.writeFile(packageJsonPath, JSON.stringify(pkgJSON, null, 2));
-};
-const isWindows = os.platform() === "win32";
-const linkPackage = async (from, to, projectRootDir) => {
-  const src = path.join(projectRootDir, "node_modules", from);
-  const dest = path.join(projectRootDir, "node_modules", to);
-  const dstStat = await fse.lstat(dest).catch(() => null);
-  const exists = dstStat === null || dstStat === void 0 ? void 0 : dstStat.isSymbolicLink();
-  if (exists) {
-    return;
-  }
-  await fse.mkdir(path.dirname(dest), {
-    recursive: true
-  });
-  await fse.symlink(path.relative(path.dirname(dest), src), dest, isWindows ? "junction" : "dir").catch((error) => {
-    console.error("Cannot link", from, "to", to, error);
-  });
-};
-const readDirRecursive = async (dir, options = {}) => {
-  const { filter } = options;
-  const files = await fse.readdir(dir, {
-    withFileTypes: true
-  });
-  const filesAndDirs = await Promise.all(files.map(async (file) => {
-    const resolvedPath = path.resolve(dir, file.name);
-    if (file.isDirectory()) {
-      return readDirRecursive(resolvedPath, options);
-    } else {
-      return filter && !filter(resolvedPath) ? [] : resolvedPath;
-    }
-  }));
-  return filesAndDirs.flat();
-};
-const isFile = async (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, entryFilter) => {
-  const files = await readDirRecursive(rootDir, {
-    filter: entryFilter
-  });
-  return files.filter((file) => file.endsWith(".mjs") || file.endsWith(".cjs") || file.endsWith(".js"));
-};
-const findPackageParents = (pkg, version, tracedFiles) => {
-  const versionFiles = pkg.versions[version].files.map((path2) => tracedFiles[path2]);
-  const parentPkgs = [
-    ...new Set(versionFiles.flatMap((file) => (
-      // Because it supports copyWholePackage configuration, not all files exist.
-      file === null || file === void 0 ? void 0 : file.parents.map((parentPath) => {
-        const parentFile = tracedFiles[parentPath];
-        if (!parentFile || parentFile.pkgName === pkg.name) {
-          return null;
-        }
-        return `${parentFile.pkgName}@${parentFile.pkgVersion}`;
-      }).filter(Boolean)
-    )))
-  ];
-  return parentPkgs.filter((parentPkg) => parentPkg);
-};
-const traceFiles = async ({ entryFiles, serverRootDir, base = "/", traceOptions }) => {
-  return await nodeFileTrace(entryFiles, {
-    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);
-      }
-    },
-    ...traceOptions
-  });
-};
-const resolveTracedPath = async (base, p) => fse.realpath(path.resolve(base, p));
-const isSubPath = (parentPath, childPath) => {
-  if (!parentPath || !childPath) {
-    return false;
-  }
-  const relative = path.relative(parentPath, childPath);
-  return relative && !relative.startsWith("..");
-};
-export {
-  findEntryFiles,
-  findPackageParents,
-  isFile,
-  isSubPath,
-  linkPackage,
-  readDirRecursive,
-  resolveTracedPath,
-  traceFiles,
-  writePackage
-};

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

@@ -1,4 +0,0 @@
-import { handleDependencies } from "./dependencies";
-export {
-  handleDependencies
-};

package/dist/types/hooks.d.ts

@@ -1,2 +0,0 @@
-import type { AppToolsHooks } from './types/hooks';
-export declare const hooks: AppToolsHooks;

package/dist/types/new/compat/index.d.ts

@@ -1,2 +0,0 @@
-import type { AppTools, CliPluginFuture } from '../../types';
-export declare const compatPlugin: () => CliPluginFuture<AppTools>;

package/dist/types/new/index.d.ts

@@ -1,6 +0,0 @@
-import { type AppToolsOptions } from '../old';
-import type { AppTools, CliPluginFuture } from '../types';
-import { initAppContext } from './context';
-export * from '../defineConfig';
-export { initAppContext };
-export declare const appTools: (options?: AppToolsOptions) => CliPluginFuture<AppTools<'shared'>>;

package/dist/types/new/loadPlugins.d.ts

@@ -1,9 +0,0 @@
-import type { Plugin } from '@modern-js/plugin-v2';
-import type { InternalPlugins } from '@modern-js/types';
-/**
- * Load internal plugins which in @modern-js scope and user's custom plugins.
- * @param appDirectory - Application root directory.
- * @param internalPlugins - Internal plugins.
- * @returns Plugin Objects has been required.
- */
-export declare const loadInternalPlugins: (appDirectory: string, internalPlugins?: InternalPlugins, autoLoad?: InternalPlugins, autoLoadPlugins?: boolean) => Promise<Plugin[]>;

package/dist/types/new/utils/index.d.ts

@@ -1 +0,0 @@
-export declare function getIsAutoLoadPlugins(appDirectory: string, configFile?: string, packageJsonConfig?: string): Promise<boolean>;

package/dist/types/old.d.ts

@@ -1,13 +0,0 @@
-import type { CliPlugin } from '@modern-js/core';
-import type { AppTools, AppToolsOptions } from './types';
-export { dev } from './commands/dev';
-export type { DevOptions } from './utils/types';
-export { mergeConfig } from '@modern-js/core';
-export * from './defineConfig';
-export * from './types';
-export type { RuntimeUserConfig } from './types/config';
-/**
- * The core package of the framework, providing CLI commands, build capabilities, configuration parsing and more.
- */
-export declare const appTools: (options?: AppToolsOptions) => CliPlugin<AppTools<'shared'>>;
-export default appTools;

package/dist/types/plugins/deploy/dependencies/index.d.ts

@@ -1,20 +0,0 @@
-import type { NodeFileTraceOptions } from '@vercel/nft';
-import type { PackageJson } from 'pkg-types';
-import { traceFiles as defaultTraceFiles } from './utils';
-export type { NodeFileTraceOptions } from '@vercel/nft';
-export { nodeFileTrace } from '@vercel/nft';
-export declare const handleDependencies: ({ appDir, serverRootDir, includeEntries, traceFiles, entryFilter, modifyPackageJson, copyWholePackage, traceOptions, }: {
-    appDir: string;
-    serverRootDir: string;
-    includeEntries: string[];
-    traceFiles?: (({ entryFiles, serverRootDir, base, traceOptions, }: {
-        entryFiles: string[];
-        serverRootDir: string;
-        base?: string | undefined;
-        traceOptions?: NodeFileTraceOptions | undefined;
-    }) => Promise<import("@vercel/nft").NodeFileTraceResult>) | undefined;
-    entryFilter?: ((filePath: string) => boolean) | undefined;
-    modifyPackageJson?: ((pkgJson: PackageJson) => PackageJson) | undefined;
-    copyWholePackage?: ((pkgName: string) => boolean) | undefined;
-    traceOptions?: NodeFileTraceOptions | undefined;
-}) => Promise<void>;

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

@@ -1,44 +0,0 @@
-import { type NodeFileTraceOptions } from '@vercel/nft';
-import type { PackageJson } from 'pkg-types';
-export type TracedPackage = {
-    name: string;
-    versions: Record<string, {
-        pkgJSON: PackageJson;
-        path: string;
-        isDirectDep: boolean;
-        files: string[];
-    }>;
-};
-export type TracedFile = {
-    path: string;
-    subpath: string;
-    parents: string[];
-    isDirectDep: boolean;
-    pkgPath: string;
-    pkgName: string;
-    pkgVersion?: string;
-};
-interface WritePackageOptions {
-    pkg: TracedPackage;
-    version: string;
-    projectDir: string;
-    _pkgPath?: string;
-}
-export declare const writePackage: (options: WritePackageOptions) => Promise<void>;
-export declare const linkPackage: (from: string, to: string, projectRootDir: string) => Promise<void>;
-interface ReadDirOptions {
-    filter?: (filePath: string) => boolean;
-}
-export declare const readDirRecursive: (dir: string, options?: ReadDirOptions) => Promise<string[]>;
-export declare const isFile: (file: string) => Promise<boolean>;
-export declare const findEntryFiles: (rootDir: string, entryFilter?: ((filePath: string) => boolean) | undefined) => Promise<string[]>;
-export declare const findPackageParents: (pkg: TracedPackage, version: string, tracedFiles: Record<string, TracedFile>) => string[];
-export declare const traceFiles: ({ entryFiles, serverRootDir, base, traceOptions, }: {
-    entryFiles: string[];
-    serverRootDir: string;
-    base?: string | undefined;
-    traceOptions?: NodeFileTraceOptions | undefined;
-}) => Promise<import("@vercel/nft").NodeFileTraceResult>;
-export declare const resolveTracedPath: (base: string, p: string) => Promise<string>;
-export declare const isSubPath: (parentPath: string, childPath: string) => boolean | "";
-export {};

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

@@ -1 +0,0 @@
-export { handleDependencies } from './dependencies';