@modern-js/monorepo-tools 2.15.0 → 2.16.0

package/dist/esm/features/clear/index.js

@@ -1,8 +1,10 @@
 import * as path from "path";
 import { logger } from "@modern-js/utils";
 import { FileSystem } from "@rushstack/node-core-library";
-const defaultRemoveDirs = ["node_modules"];
-const runClearTask = (projectNames, projects, config) => {
+export const defaultRemoveDirs = [
+  "node_modules"
+];
+export const runClearTask = (projectNames, projects, config) => {
   const { removeDirs = defaultRemoveDirs, rootPath } = config;
   if (projectNames.length > 0) {
     projects.forEach((project) => {
@@ -29,7 +31,3 @@ const runClearTask = (projectNames, projects, config) => {
     });
   }
 };
-export {
-  defaultRemoveDirs,
-  runClearTask
-};

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

@@ -1,16 +1,6 @@
 import * as path from "path";
-import {
-  FileSystem,
-  JsonFile
-} from "@rushstack/node-core-library";
-import {
-  fs,
-  yaml,
-  execa,
-  logger,
-  chalk,
-  getPnpmVersion
-} from "@modern-js/utils";
+import { FileSystem, JsonFile } from "@rushstack/node-core-library";
+import { fs, yaml, execa, logger, chalk, getPnpmVersion } from "@modern-js/utils";
 import { WORKSPACE_FILE } from "../../constants";
 const createCopyMap = (rootPath, targetProject, copyProjects, deployDir) => {
   const map = /* @__PURE__ */ new Map();
@@ -34,12 +24,10 @@ const createCopyFromMonorepoToDeployDirFn = (monorepoDir, deployDir) => (filenam
   }
 };
 const checkAndUpdatePMWorkspaces = (deployDir) => {
-  var _a;
+  var _pkg_workspaces;
   const pnpmWp = path.join(deployDir, WORKSPACE_FILE.PNPM);
   if (fs.existsSync(pnpmWp)) {
-    const pnpmWorkspace = yaml.load(
-      fs.readFileSync(pnpmWp, "utf-8")
-    );
+    const pnpmWorkspace = yaml.load(fs.readFileSync(pnpmWp, "utf-8"));
     if (pnpmWorkspace.packages && Array.isArray(pnpmWorkspace.packages)) {
       pnpmWorkspace.packages.push("apps/**");
     }
@@ -47,7 +35,7 @@ const checkAndUpdatePMWorkspaces = (deployDir) => {
   }
   const pkgPath = path.join(deployDir, WORKSPACE_FILE.YARN);
   const pkg = JsonFile.load(pkgPath);
-  if (((_a = pkg.workspaces) == null ? void 0 : _a.packages) && Array.isArray(pkg.workspaces.packages)) {
+  if (((_pkg_workspaces = pkg.workspaces) === null || _pkg_workspaces === void 0 ? void 0 : _pkg_workspaces.packages) && Array.isArray(pkg.workspaces.packages)) {
     pkg.workspaces.packages.push("app/**");
   }
 };
@@ -66,60 +54,82 @@ const generatorAndCopyRequiredFiles = (rootPath, deployDir) => {
   checkAndUpdatePMWorkspaces(deployDir);
 };
 const checkAndRunDeployCommand = async (monorepoPath, targetProject, packageManager) => {
-  var _a, _b, _c;
-  const scripts = ((_a = targetProject.extra) == null ? void 0 : _a.scripts) || {};
+  var _targetProject_extra;
+  const scripts = ((_targetProject_extra = targetProject.extra) === null || _targetProject_extra === void 0 ? void 0 : _targetProject_extra.scripts) || {};
   if (scripts.deploy) {
-    logger.info(
-      `The 'deploy' command for the ${targetProject.name} is detected, so 'deploy' will be executed`
-    );
-    let runDeployCommands = ["run", "deploy"];
+    var _childProcess_stdout, _childProcess_stderr;
+    logger.info(`The 'deploy' command for the ${targetProject.name} is detected, so 'deploy' will be executed`);
+    let runDeployCommands = [
+      "run",
+      "deploy"
+    ];
     if (packageManager === "pnpm") {
       const pnpmVersion = await getPnpmVersion();
       if (pnpmVersion.startsWith("6")) {
-        runDeployCommands = ["run", "deploy", "--filter", targetProject.name];
+        runDeployCommands = [
+          "run",
+          "deploy",
+          "--filter",
+          targetProject.name
+        ];
       } else {
-        runDeployCommands = ["run", "--filter", targetProject.name, "deploy"];
+        runDeployCommands = [
+          "run",
+          "--filter",
+          targetProject.name,
+          "deploy"
+        ];
       }
     } else if (packageManager === "yarn") {
-      runDeployCommands = ["workspace", targetProject.name, "run", "deploy"];
+      runDeployCommands = [
+        "workspace",
+        targetProject.name,
+        "run",
+        "deploy"
+      ];
     }
     const cwd = packageManager === "npm" ? targetProject.extra.path : monorepoPath;
     const childProcess = execa(packageManager, runDeployCommands, {
       cwd,
-      stdio: ["pipe"]
+      stdio: [
+        "pipe"
+      ]
     });
-    (_b = childProcess.stdout) == null ? void 0 : _b.pipe(process.stdout);
-    (_c = childProcess.stderr) == null ? void 0 : _c.pipe(process.stderr);
+    (_childProcess_stdout = childProcess.stdout) === null || _childProcess_stdout === void 0 ? void 0 : _childProcess_stdout.pipe(process.stdout);
+    (_childProcess_stderr = childProcess.stderr) === null || _childProcess_stderr === void 0 ? void 0 : _childProcess_stderr.pipe(process.stderr);
     await childProcess;
   }
 };
 const installDependency = async (deployDir, packageManager) => {
   const packageJsonPath = path.join(deployDir, "package.json");
   const packageJson = JsonFile.load(packageJsonPath);
-  const scripts = (packageJson == null ? void 0 : packageJson.scripts) || {};
+  const scripts = (packageJson === null || packageJson === void 0 ? void 0 : packageJson.scripts) || {};
   let commands = [];
   if (scripts.setup) {
-    logger.info(
-      `The 'setup' command is detected, execute '${packageManager} run setup' to start installing the dependencies`
-    );
-    commands = ["run", "setup"];
+    logger.info(`The 'setup' command is detected, execute '${packageManager} run setup' to start installing the dependencies`);
+    commands = [
+      "run",
+      "setup"
+    ];
   } else {
-    logger.info(
-      `No 'setup' command detected, execute '${packageManager} install' to start installing dependencies`
-    );
-    commands = ["install"];
+    logger.info(`No 'setup' command detected, execute '${packageManager} install' to start installing dependencies`);
+    commands = [
+      "install"
+    ];
   }
   logger.log(chalk.rgb(218, 152, 92)("Install Log:\n"));
   const childProcess = execa(packageManager, commands, {
     stdio: "inherit",
     cwd: deployDir,
-    env: { NODE_ENV: void 0 }
+    env: {
+      NODE_ENV: void 0
+    }
   });
   await childProcess;
 };
 const excludeDirs = (filePath, dirs) => dirs.some((dir) => filePath.includes(dir));
 const defaultDeployPath = "output";
-const deploy = async (deployProjectNames, operator, config) => {
+export const deploy = async (deployProjectNames, operator, config) => {
   const { rootPath, packageManager, deployPath = defaultDeployPath } = config;
   const realDeployPath = path.isAbsolute(deployPath) ? deployPath : path.join(rootPath, deployPath);
   FileSystem.deleteFolder(realDeployPath);
@@ -128,12 +138,7 @@ const deploy = async (deployProjectNames, operator, config) => {
       checkExist: true
     });
     const alldeps = operator.getNodeAllDependencyData(deployProjectName);
-    const copyMap = createCopyMap(
-      rootPath,
-      currentProject,
-      alldeps,
-      realDeployPath
-    );
+    const copyMap = createCopyMap(rootPath, currentProject, alldeps, realDeployPath);
     await checkAndRunDeployCommand(rootPath, currentProject, packageManager);
     FileSystem.ensureFolder(realDeployPath);
     for (const [from, to] of copyMap) {
@@ -143,7 +148,10 @@ const deploy = async (deployProjectNames, operator, config) => {
         // If true, then when copying symlinks, copy the target object instead of copying the link.
         dereferenceSymlinks: false,
         filter(filePath) {
-          if (excludeDirs(filePath, ["node_modules", "dist"])) {
+          if (excludeDirs(filePath, [
+            "node_modules",
+            "dist"
+          ])) {
             return false;
           }
           return true;
@@ -154,6 +162,3 @@ const deploy = async (deployProjectNames, operator, config) => {
   generatorAndCopyRequiredFiles(rootPath, realDeployPath);
   logger.success(`Deploy success. The deploy dir is in '${rootPath}/output'`);
 };
-export {
-  deploy
-};

package/dist/esm/features/dev/cmds.js

@@ -1,4 +1,4 @@
-const defaultBuildWatchCmds = ["dev", "build"];
-export {
-  defaultBuildWatchCmds
-};
+export const defaultBuildWatchCmds = [
+  "dev",
+  "build"
+];

package/dist/esm/features/dev/createTask.js

@@ -5,17 +5,23 @@ import { defaultBuildWatchCmds } from "./cmds";
 const getFinalTaskCmds = (taskCmds, project) => {
   let finalTaskCmds = [];
   if (taskCmds.length === 1) {
-    finalTaskCmds = [taskCmds[0]];
+    finalTaskCmds = [
+      taskCmds[0]
+    ];
   } else if (taskCmds.length === 2 && typeof taskCmds[0] === "string" && typeof taskCmds[1] === "string") {
-    finalTaskCmds = [taskCmds[1]];
+    finalTaskCmds = [
+      taskCmds[1]
+    ];
   } else if (taskCmds.length === 2 && typeof taskCmds[0] === "string" && typeof taskCmds[1] === "function") {
     finalTaskCmds = taskCmds[1](project);
   } else {
-    finalTaskCmds = ["build"];
+    finalTaskCmds = [
+      "build"
+    ];
   }
   return finalTaskCmds;
 };
-const createDependenciesTask = (config, taskCmds = defaultBuildWatchCmds, taskLogger) => {
+export const createDependenciesTask = (config, taskCmds = defaultBuildWatchCmds, taskLogger) => {
   const { packageManager } = config;
   const timelogInstance = timeLog.initTimeLog();
   const task = async (project) => {
@@ -26,14 +32,22 @@ const createDependenciesTask = (config, taskCmds = defaultBuildWatchCmds, taskLo
         const prefix = `run ${project.name} ${taskCmd} script`;
         timeLog.startTime(timelogInstance, prefix);
         try {
-          const childProcess = execa(packageManager, [taskCmd], {
+          const childProcess = execa(packageManager, [
+            taskCmd
+          ], {
             cwd: project.extra.path,
-            stdio: ["pipe", "pipe", "pipe"]
+            stdio: [
+              "pipe",
+              "pipe",
+              "pipe"
+            ]
           });
           taskLogger.addLogProvider(project.name, {
             stdout: childProcess.stdout,
             stderr: childProcess.stderr,
-            logConfig: { label: "WATCH: " }
+            logConfig: {
+              label: "WATCH: "
+            }
           });
           await childProcess;
         } catch (e) {
@@ -47,15 +61,19 @@ const createDependenciesTask = (config, taskCmds = defaultBuildWatchCmds, taskLo
   };
   return task;
 };
-const createDevTask = (config, taskCmds = defaultBuildWatchCmds, taskLogger) => {
+export const createDevTask = (config, taskCmds = defaultBuildWatchCmds, taskLogger) => {
   const { packageManager } = config;
   const task = async (project) => {
-    const devCmds = [taskCmds[0]];
+    const devCmds = [
+      taskCmds[0]
+    ];
     const cmd = project.extra.scripts || {};
     for (const taskCmd of devCmds) {
       if (cmd[taskCmd]) {
         try {
-          const childProcess = execa(packageManager, [taskCmd], {
+          const childProcess = execa(packageManager, [
+            taskCmd
+          ], {
             cwd: project.extra.path,
             stdio: "pipe",
             all: true
@@ -63,7 +81,9 @@ const createDevTask = (config, taskCmds = defaultBuildWatchCmds, taskLogger) =>
           taskLogger.addLogProvider(project.name, {
             stdout: childProcess.stdout,
             stderr: childProcess.stderr,
-            logConfig: { label: `${taskCmd.toUpperCase()}: ` }
+            logConfig: {
+              label: `${taskCmd.toUpperCase()}: `
+            }
           });
           const ret = await childProcess;
           console.info(ret);
@@ -77,7 +97,3 @@ const createDevTask = (config, taskCmds = defaultBuildWatchCmds, taskLogger) =>
   };
   return task;
 };
-export {
-  createDependenciesTask,
-  createDevTask
-};

package/dist/esm/features/dev/index.js

@@ -14,7 +14,7 @@ const getIgnored = (config) => (watchFilePath) => {
   }
   return false;
 };
-const runBuildWatchTask = async (projectName, operator, config, taskCmds = defaultBuildWatchCmds) => {
+export const runBuildWatchTask = async (projectName, operator, config, taskCmds = defaultBuildWatchCmds) => {
   const { needInit = true } = config;
   const taskLogger = new MultitasksLogger();
   const dependenciesTask = createDependenciesTask(config, taskCmds, taskLogger);
@@ -32,12 +32,9 @@ const runBuildWatchTask = async (projectName, operator, config, taskCmds = defau
   });
   watcher.add(watchedProjectState.getWatchedProjectsPath());
   if (needInit) {
-    await operator.traverseDependenciesToProject(
-      projectName,
-      async (currentProject) => {
-        await dependenciesTask(currentProject);
-      }
-    );
+    await operator.traverseDependenciesToProject(projectName, async (currentProject) => {
+      await dependenciesTask(currentProject);
+    });
   }
   await new Promise((resolve) => {
     console.info("start watch");
@@ -47,22 +44,18 @@ const runBuildWatchTask = async (projectName, operator, config, taskCmds = defau
       }
       const changedProject = watchedProjectState.getChangedProject(changeFilePath);
       if (changedProject) {
-        await operator.traverseProjectToDependent(
-          changedProject.name,
-          async (currentProject, _, earlyFinish) => {
-            if (currentProject.name === projectName) {
-              earlyFinish();
-              return;
-            }
-            if (watchedProjectState.watchProjectsName.includes(
-              currentProject.name
-            )) {
-              console.info("run build", currentProject.name);
-              await dependenciesTask(currentProject);
-            }
-          },
-          { withSelf: true }
-        );
+        await operator.traverseProjectToDependent(changedProject.name, async (currentProject, _, earlyFinish) => {
+          if (currentProject.name === projectName) {
+            earlyFinish();
+            return;
+          }
+          if (watchedProjectState.watchProjectsName.includes(currentProject.name)) {
+            console.info("run build", currentProject.name);
+            await dependenciesTask(currentProject);
+          }
+        }, {
+          withSelf: true
+        });
         resolve(null);
       } else {
         console.info("changed is not in monorepo manager");
@@ -70,8 +63,7 @@ const runBuildWatchTask = async (projectName, operator, config, taskCmds = defau
     });
     resolve(null);
   });
-  await devTask(operator.getNodeData(projectName, { checkExist: true }));
-};
-export {
-  runBuildWatchTask
+  await devTask(operator.getNodeData(projectName, {
+    checkExist: true
+  }));
 };

package/dist/esm/features/dev/watchProjectsState.js

@@ -1,37 +1,41 @@
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
 import * as path from "path";
 import { globby } from "@modern-js/utils";
-class WatchedProjectsState {
-  constructor(fromNodes, config) {
-    this._fromNodes = fromNodes;
-    this._config = config;
-    this._projectsFileMap = /* @__PURE__ */ new Map();
-    this._watchProjects = {};
-    this._initState();
-  }
+export class WatchedProjectsState {
   _initState() {
     const globOption = {
       cwd: this._config.rootPath,
       absolute: true,
       expandDirectories: false,
       followSymbolicLinks: false,
-      ignore: ["**/node_modules/**", ".project-memory/**", "dist/**"]
+      ignore: [
+        "**/node_modules/**",
+        ".project-memory/**",
+        "dist/**"
+      ]
     };
-    this._watchProjects = this._fromNodes.reduce(
-      (ret, node) => {
-        const files = globby.sync(`${node.extra.path}/**`, globOption);
-        for (const filePath of files) {
-          this._projectsFileMap.set(
-            path.relative(this._config.rootPath, filePath),
-            node.extra.path
-          );
-        }
-        return {
-          ...ret,
-          [node.extra.path]: node
-        };
-      },
-      {}
-    );
+    this._watchProjects = this._fromNodes.reduce((ret, node) => {
+      const files = globby.sync(`${node.extra.path}/**`, globOption);
+      for (const filePath of files) {
+        this._projectsFileMap.set(path.relative(this._config.rootPath, filePath), node.extra.path);
+      }
+      return {
+        ...ret,
+        [node.extra.path]: node
+      };
+    }, {});
   }
   getChangedProject(changedFilPath) {
     if (this._projectsFileMap.has(changedFilPath)) {
@@ -50,11 +54,17 @@ class WatchedProjectsState {
     return this._watchProjects;
   }
   get watchProjectsName() {
-    return Object.keys(this._watchProjects).map(
-      (projectPath) => this._watchProjects[projectPath].name
-    );
+    return Object.keys(this._watchProjects).map((projectPath) => this._watchProjects[projectPath].name);
+  }
+  constructor(fromNodes, config) {
+    _define_property(this, "_config", void 0);
+    _define_property(this, "_fromNodes", void 0);
+    _define_property(this, "_watchProjects", void 0);
+    _define_property(this, "_projectsFileMap", void 0);
+    this._fromNodes = fromNodes;
+    this._config = config;
+    this._projectsFileMap = /* @__PURE__ */ new Map();
+    this._watchProjects = {};
+    this._initState();
   }
 }
-export {
-  WatchedProjectsState
-};

package/dist/esm/features/install/index.js

@@ -3,27 +3,23 @@ import { fs, yaml } from "@modern-js/utils";
 import { JsonFile } from "@rushstack/node-core-library";
 import { WORKSPACE_FILE } from "../../constants";
 import { installByPackageManager } from "../../utils/install";
-const replaceWorkspaces = ({
-  rootPath,
-  projectsInWorkspaces
-}) => {
-  var _a;
+const replaceWorkspaces = ({ rootPath, projectsInWorkspaces }) => {
   const pnpmWsFilePath = path.join(rootPath, WORKSPACE_FILE.PNPM);
   if (fs.existsSync(pnpmWsFilePath)) {
     const pnpmWorkspace = fs.readFileSync(pnpmWsFilePath, "utf-8");
     const originalPnpmWorkspaces = yaml.load(pnpmWorkspace);
-    fs.writeFileSync(
-      pnpmWsFilePath,
-      yaml.dump({ packages: projectsInWorkspaces })
-    );
+    fs.writeFileSync(pnpmWsFilePath, yaml.dump({
+      packages: projectsInWorkspaces
+    }));
     return () => {
       yaml.dump(originalPnpmWorkspaces);
     };
   }
   const pkgFilePath = path.join(rootPath, WORKSPACE_FILE.YARN);
   if (fs.existsSync(pkgFilePath)) {
+    var _pkg_workspaces;
     const pkg = JsonFile.load(pkgFilePath);
-    if ((_a = pkg == null ? void 0 : pkg.workspaces) == null ? void 0 : _a.packages) {
+    if (pkg === null || pkg === void 0 ? void 0 : (_pkg_workspaces = pkg.workspaces) === null || _pkg_workspaces === void 0 ? void 0 : _pkg_workspaces.packages) {
       const originalPkg = pkg;
       pkg.workspaces.packages = projectsInWorkspaces;
       JsonFile.save(pkg, pkgFilePath);
@@ -34,7 +30,7 @@ const replaceWorkspaces = ({
   }
   return false;
 };
-const runInstallTask = async (projectNames, operator, config) => {
+export const runInstallTask = async (projectNames, operator, config) => {
   const { rootPath, packageManager } = config;
   let projectsInWorkspaces = [];
   if (projectNames.length === 0) {
@@ -54,11 +50,11 @@ const runInstallTask = async (projectNames, operator, config) => {
     rootPath,
     projectsInWorkspaces: noDupProjectList
   });
-  await installByPackageManager(packageManager, { rootPath, removeLock: true });
+  await installByPackageManager(packageManager, {
+    rootPath,
+    removeLock: true
+  });
   if (restorWorkspace) {
     restorWorkspace();
   }
 };
-export {
-  runInstallTask
-};

package/dist/esm/hooks/index.js

@@ -1,8 +1,5 @@
 import { createAsyncWorkflow } from "@modern-js/plugin";
 const afterMonorepoDeploy = createAsyncWorkflow();
-const hooks = {
+export const hooks = {
   afterMonorepoDeploy
 };
-export {
-  hooks
-};

package/dist/esm/index.js

@@ -5,17 +5,19 @@ import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import { i18n } from "./locale";
 import { newCli, deployCli, clearCli } from "./cli";
 import { hooks } from "./hooks";
-const upgradeModel = Import.lazy(
-  "@modern-js/upgrade",
-  require
-);
-var src_default = () => ({
+const upgradeModel = Import.lazy("@modern-js/upgrade", require);
+export default () => ({
   name: "@modern-js/monorepo-tools",
-  usePlugins: [changesetPlugin(), lintPlugin()],
+  usePlugins: [
+    changesetPlugin(),
+    lintPlugin()
+  ],
   registerHook: hooks,
   setup: (api) => {
     const locale = getLocaleLanguage();
-    i18n.changeLanguage({ locale });
+    i18n.changeLanguage({
+      locale
+    });
     return {
       commands({ program }) {
         clearCli(program, api);
@@ -25,8 +27,7 @@ var src_default = () => ({
       }
     };
   },
-  post: ["@modern-js/plugin-changeset"]
+  post: [
+    "@modern-js/plugin-changeset"
+  ]
 });
-export {
-  src_default as default
-};

package/dist/esm/locale/en.js

@@ -1,4 +1,4 @@
-const EN_LOCALE = {
+export const EN_LOCALE = {
   command: {
     new: {
       describe: "generator runner for monorepo project",
@@ -11,6 +11,3 @@ const EN_LOCALE = {
     }
   }
 };
-export {
-  EN_LOCALE
-};

package/dist/esm/locale/index.js

@@ -2,8 +2,8 @@ import { I18n } from "@modern-js/plugin-i18n";
 import { ZH_LOCALE } from "./zh";
 import { EN_LOCALE } from "./en";
 const i18n = new I18n();
-const localeKeys = i18n.init("en", { zh: ZH_LOCALE, en: EN_LOCALE });
-export {
-  i18n,
-  localeKeys
-};
+const localeKeys = i18n.init("en", {
+  zh: ZH_LOCALE,
+  en: EN_LOCALE
+});
+export { i18n, localeKeys };

package/dist/esm/locale/zh.js

@@ -1,4 +1,4 @@
-const ZH_LOCALE = {
+export const ZH_LOCALE = {
   command: {
     new: {
       describe: "Monorepo 创建子项目",
@@ -11,6 +11,3 @@ const ZH_LOCALE = {
     }
   }
 };
-export {
-  ZH_LOCALE
-};

package/dist/esm/log/error.js

@@ -1,6 +1,3 @@
-const errorLog = (...rest) => {
+export const errorLog = (...rest) => {
   throw new Error(rest.join("\n"));
 };
-export {
-  errorLog
-};