@modern-js/monorepo-tools 2.47.1 → 2.48.1

package/bin/modern.js

@@ -1,5 +1,11 @@
 #!/usr/bin/env node
 
+const { version } = require('../package.json');
+
+if (!process.env.MODERN_JS_VERSION) {
+  process.env.MODERN_JS_VERSION = version;
+}
+
 require('@modern-js/core/runBin').run({
-  initialLog: `Modern.js Monorepo v${require('../package.json').version}`,
+  initialLog: `Modern.js Monorepo v${version}`,
 });

package/dist/cjs/cli/index.js

@@ -21,6 +21,7 @@ __reExport(cli_exports, require("./build"), module.exports);
 __reExport(cli_exports, require("./buildWatch"), module.exports);
 __reExport(cli_exports, require("./clear"), module.exports);
 __reExport(cli_exports, require("./install"), module.exports);
+__reExport(cli_exports, require("./upgrade"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./new"),
@@ -28,5 +29,6 @@ __reExport(cli_exports, require("./install"), module.exports);
   ...require("./build"),
   ...require("./buildWatch"),
   ...require("./clear"),
-  ...require("./install")
+  ...require("./install"),
+  ...require("./upgrade")
 });

package/dist/cjs/cli/new.js

@@ -21,17 +21,17 @@ __export(new_exports, {
   newCli: () => newCli
 });
 module.exports = __toCommonJS(new_exports);
-var import_new_action = require("@modern-js/new-action");
+var import_utils = require("@modern-js/utils");
 var import_locale = require("../locale");
 const newCli = (program, locale) => {
   program.command("new").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.new.describe)).option("--config-file <configFile>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("--lang <lang>", import_locale.i18n.t(import_locale.localeKeys.command.new.lang)).option("-c, --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.new.config)).option("-p, --plugin <plugin>", import_locale.i18n.t(import_locale.localeKeys.command.new.plugin), (val, memo) => {
     memo.push(val);
     return memo;
   }, []).option("-d, --debug", import_locale.i18n.t(import_locale.localeKeys.command.new.debug), false).option("--dist-tag <tag>", import_locale.i18n.t(import_locale.localeKeys.command.new.distTag)).option("--registry", import_locale.i18n.t(import_locale.localeKeys.command.new.registry)).option("--no-need-install", import_locale.i18n.t(import_locale.localeKeys.command.shared.noNeedInstall)).action(async (options) => {
-    await (0, import_new_action.MonorepoNewAction)({
+    await (0, import_utils.newAction)({
       ...options,
       locale: options.lang || locale
-    });
+    }, "monorepo");
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/cli/upgrade.js

@@ -0,0 +1,33 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var upgrade_exports = {};
+__export(upgrade_exports, {
+  upgradeCli: () => upgradeCli
+});
+module.exports = __toCommonJS(upgrade_exports);
+var import_utils = require("@modern-js/utils");
+const upgradeCli = (program) => {
+  program.command("upgrade").allowUnknownOption().option("-h --help", "Show help").action(async () => {
+    await (0, import_utils.upgradeAction)();
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  upgradeCli
+});

package/dist/cjs/dag/edgeManager.js

@@ -21,7 +21,6 @@ __export(edgeManager_exports, {
   EdgeManager: () => EdgeManager
 });
 module.exports = __toCommonJS(edgeManager_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 class EdgeManager {
   reduceOneEdge(project) {
     if (!(project.name in this._dependencyEdgeHash)) {
@@ -45,7 +44,6 @@ class EdgeManager {
     this._dependencyEdgeHash[project.name] = project.dependencyEdge;
   }
   constructor() {
-    (0, import_define_property._)(this, "_dependencyEdgeHash", void 0);
     this._dependencyEdgeHash = {};
   }
 }

package/dist/cjs/dag/operator.js

@@ -31,7 +31,6 @@ __export(operator_exports, {
   DagOperator: () => DagOperator
 });
 module.exports = __toCommonJS(operator_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_p_map = __toESM(require("p-map"));
 var import_error = require("../log/error");
 var import_task = require("./task");
@@ -246,13 +245,10 @@ class DagOperator {
     return searchProjects.filter((p) => preNodes.map((preP) => preP.name).includes(p.name));
   }
   constructor(projects, projectsMap) {
-    (0, import_define_property._)(this, "_projects", void 0);
-    (0, import_define_property._)(this, "_projectsMap", void 0);
-    (0, import_define_property._)(this, "_sortedProjects", void 0);
-    (0, import_define_property._)(this, "_createTask", (project, task) => async (stopTask = () => void 0) => {
+    this._createTask = (project, task) => async (stopTask = () => void 0) => {
       await task(project, project.dependency || [], () => stopTask());
       return project.name;
-    });
+    };
     this._projects = projects;
     this._projectsMap = projectsMap;
     this._sortedProjects = [];

package/dist/cjs/dag/task.js

@@ -31,7 +31,6 @@ __export(task_exports, {
   TaskRunner: () => TaskRunner
 });
 module.exports = __toCommonJS(task_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_events = require("events");
 var import_p_map = __toESM(require("p-map"));
 class TaskRunner extends import_events.EventEmitter {
@@ -71,18 +70,14 @@ class TaskRunner extends import_events.EventEmitter {
   }
   constructor(tasks, { concurrency }) {
     super();
-    (0, import_define_property._)(this, "_tasks", void 0);
-    (0, import_define_property._)(this, "_concurrency", void 0);
-    (0, import_define_property._)(this, "_usableConcurrency", void 0);
-    (0, import_define_property._)(this, "_stopFlag", void 0);
     this._tasks = tasks;
     this._concurrency = concurrency || TaskRunner.DefaultConcurrency;
     this._usableConcurrency = this._concurrency;
     this._stopFlag = false;
   }
 }
-(0, import_define_property._)(TaskRunner, "DefaultConcurrency", 10);
-(0, import_define_property._)(TaskRunner, "TASK_FINISH", "task-finish");
+TaskRunner.DefaultConcurrency = 10;
+TaskRunner.TASK_FINISH = "task-finish";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   TaskRunner

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

@@ -31,7 +31,6 @@ __export(watchProjectsState_exports, {
   WatchedProjectsState: () => WatchedProjectsState
 });
 module.exports = __toCommonJS(watchProjectsState_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 class WatchedProjectsState {
@@ -78,10 +77,6 @@ class WatchedProjectsState {
     return Object.keys(this._watchProjects).map((projectPath) => this._watchProjects[projectPath].name);
   }
   constructor(fromNodes, config) {
-    (0, import_define_property._)(this, "_config", void 0);
-    (0, import_define_property._)(this, "_fromNodes", void 0);
-    (0, import_define_property._)(this, "_watchProjects", void 0);
-    (0, import_define_property._)(this, "_projectsFileMap", void 0);
     this._fromNodes = fromNodes;
     this._config = config;
     this._projectsFileMap = /* @__PURE__ */ new Map();

package/dist/cjs/index.js

@@ -25,13 +25,11 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_plugin_changeset = require("@modern-js/plugin-changeset");
 var import_plugin_lint = require("@modern-js/plugin-lint");
-var import_utils = require("@modern-js/utils");
 var import_language_detector = require("@modern-js/plugin-i18n/language-detector");
 var import_locale = require("./locale");
 var import_cli = require("./cli");
 var import_hooks = require("./hooks");
 __reExport(src_exports, require("./projects/getProjects"), module.exports);
-const upgradeModel = import_utils.Import.lazy("@modern-js/upgrade", require);
 const monorepoTools = () => ({
   name: "@modern-js/monorepo-tools",
   usePlugins: [
@@ -54,7 +52,7 @@ const monorepoTools = () => ({
         (0, import_cli.clearCli)(program, api);
         (0, import_cli.deployCli)(program, api);
         (0, import_cli.newCli)(program, locale);
-        upgradeModel.defineCommand(program.command("upgrade").option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("--no-need-install", import_locale.i18n.t(import_locale.localeKeys.command.shared.noNeedInstall)));
+        (0, import_cli.upgradeCli)(program);
       }
     };
   },

package/dist/cjs/log/multiTasksLog.js

@@ -21,7 +21,6 @@ __export(multiTasksLog_exports, {
   MultitasksLogger: () => MultitasksLogger
 });
 module.exports = __toCommonJS(multiTasksLog_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_utils = require("@modern-js/utils");
 var import_utils2 = require("./utils");
 const createLogger = (name, config) => {
@@ -79,10 +78,6 @@ class MultitasksLogger {
   finishListen() {
   }
   constructor() {
-    (0, import_define_property._)(this, "_taskNameList", void 0);
-    (0, import_define_property._)(this, "_taskStdoutListenerMap", void 0);
-    (0, import_define_property._)(this, "_taskStderrListenerMap", void 0);
-    (0, import_define_property._)(this, "_taskLogConfigMap", void 0);
     this._taskNameList = [];
     this._taskStdoutListenerMap = /* @__PURE__ */ new Map();
     this._taskStderrListenerMap = /* @__PURE__ */ new Map();

package/dist/cjs/package/index.js

@@ -21,7 +21,6 @@ __export(package_exports, {
   Package: () => Package
 });
 module.exports = __toCommonJS(package_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 class Package {
   get name() {
     return this.json.name;
@@ -33,9 +32,6 @@ class Package {
     return this.json[key];
   }
   constructor(packageJson, packageConfigPath, rootPath) {
-    (0, import_define_property._)(this, "json", void 0);
-    (0, import_define_property._)(this, "configPath", void 0);
-    (0, import_define_property._)(this, "rootPath", void 0);
     this.configPath = packageConfigPath;
     this.rootPath = rootPath;
     this.json = packageJson;

package/dist/esm/cli/index.js

@@ -4,3 +4,4 @@ export * from "./build";
 export * from "./buildWatch";
 export * from "./clear";
 export * from "./install";
+export * from "./upgrade";

package/dist/esm/cli/new.js

@@ -1,14 +1,14 @@
-import { MonorepoNewAction } from "@modern-js/new-action";
+import { newAction } from "@modern-js/utils";
 import { i18n, localeKeys } from "../locale";
 const newCli = (program, locale) => {
   program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("--config-file <configFile>", i18n.t(localeKeys.command.shared.config)).option("--lang <lang>", i18n.t(localeKeys.command.new.lang)).option("-c, --config <config>", i18n.t(localeKeys.command.new.config)).option("-p, --plugin <plugin>", i18n.t(localeKeys.command.new.plugin), (val, memo) => {
     memo.push(val);
     return memo;
   }, []).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).option("--no-need-install", i18n.t(localeKeys.command.shared.noNeedInstall)).action(async (options) => {
-    await MonorepoNewAction({
+    await newAction({
       ...options,
       locale: options.lang || locale
-    });
+    }, "monorepo");
   });
 };
 export {

package/dist/esm/cli/upgrade.js

@@ -0,0 +1,9 @@
+import { upgradeAction } from "@modern-js/utils";
+const upgradeCli = (program) => {
+  program.command("upgrade").allowUnknownOption().option("-h --help", "Show help").action(async () => {
+    await upgradeAction();
+  });
+};
+export {
+  upgradeCli
+};

package/dist/esm/dag/edgeManager.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 class EdgeManager {
   reduceOneEdge(project) {
     if (!(project.name in this._dependencyEdgeHash)) {
@@ -22,7 +21,6 @@ class EdgeManager {
     this._dependencyEdgeHash[project.name] = project.dependencyEdge;
   }
   constructor() {
-    _define_property(this, "_dependencyEdgeHash", void 0);
     this._dependencyEdgeHash = {};
   }
 }

package/dist/esm/dag/operator.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import pMap from "p-map";
 import { errorLog } from "../log/error";
 import { TaskRunner } from "./task";
@@ -213,13 +212,10 @@ class DagOperator {
     return searchProjects.filter((p) => preNodes.map((preP) => preP.name).includes(p.name));
   }
   constructor(projects, projectsMap) {
-    _define_property(this, "_projects", void 0);
-    _define_property(this, "_projectsMap", void 0);
-    _define_property(this, "_sortedProjects", void 0);
-    _define_property(this, "_createTask", (project, task) => async (stopTask = () => void 0) => {
+    this._createTask = (project, task) => async (stopTask = () => void 0) => {
       await task(project, project.dependency || [], () => stopTask());
       return project.name;
-    });
+    };
     this._projects = projects;
     this._projectsMap = projectsMap;
     this._sortedProjects = [];

package/dist/esm/dag/task.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { EventEmitter } from "events";
 import pMap from "p-map";
 class TaskRunner extends EventEmitter {
@@ -38,18 +37,14 @@ class TaskRunner extends EventEmitter {
   }
   constructor(tasks, { concurrency }) {
     super();
-    _define_property(this, "_tasks", void 0);
-    _define_property(this, "_concurrency", void 0);
-    _define_property(this, "_usableConcurrency", void 0);
-    _define_property(this, "_stopFlag", void 0);
     this._tasks = tasks;
     this._concurrency = concurrency || TaskRunner.DefaultConcurrency;
     this._usableConcurrency = this._concurrency;
     this._stopFlag = false;
   }
 }
-_define_property(TaskRunner, "DefaultConcurrency", 10);
-_define_property(TaskRunner, "TASK_FINISH", "task-finish");
+TaskRunner.DefaultConcurrency = 10;
+TaskRunner.TASK_FINISH = "task-finish";
 export {
   TaskRunner
 };

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import * as path from "path";
 import { globby } from "@modern-js/utils";
 class WatchedProjectsState {
@@ -45,10 +44,6 @@ class WatchedProjectsState {
     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();

package/dist/esm/index.js

@@ -1,12 +1,10 @@
 import { changesetPlugin } from "@modern-js/plugin-changeset";
 import { lintPlugin } from "@modern-js/plugin-lint";
-import { Import } from "@modern-js/utils";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
-import { i18n, localeKeys } from "./locale";
-import { newCli, deployCli, clearCli } from "./cli";
+import { i18n } from "./locale";
+import { newCli, deployCli, clearCli, upgradeCli } from "./cli";
 import { hooks } from "./hooks";
 export * from "./projects/getProjects";
-const upgradeModel = Import.lazy("@modern-js/upgrade", require);
 const monorepoTools = () => ({
   name: "@modern-js/monorepo-tools",
   usePlugins: [
@@ -29,7 +27,7 @@ const monorepoTools = () => ({
         clearCli(program, api);
         deployCli(program, api);
         newCli(program, locale);
-        upgradeModel.defineCommand(program.command("upgrade").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--no-need-install", i18n.t(localeKeys.command.shared.noNeedInstall)));
+        upgradeCli(program);
       }
     };
   },

package/dist/esm/log/multiTasksLog.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { Signale } from "@modern-js/utils";
 import { formatLog } from "./utils";
 const createLogger = (name, config) => {
@@ -56,10 +55,6 @@ class MultitasksLogger {
   finishListen() {
   }
   constructor() {
-    _define_property(this, "_taskNameList", void 0);
-    _define_property(this, "_taskStdoutListenerMap", void 0);
-    _define_property(this, "_taskStderrListenerMap", void 0);
-    _define_property(this, "_taskLogConfigMap", void 0);
     this._taskNameList = [];
     this._taskStdoutListenerMap = /* @__PURE__ */ new Map();
     this._taskStderrListenerMap = /* @__PURE__ */ new Map();

package/dist/esm/package/index.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 class Package {
   get name() {
     return this.json.name;
@@ -10,9 +9,6 @@ class Package {
     return this.json[key];
   }
   constructor(packageJson, packageConfigPath, rootPath) {
-    _define_property(this, "json", void 0);
-    _define_property(this, "configPath", void 0);
-    _define_property(this, "rootPath", void 0);
     this.configPath = packageConfigPath;
     this.rootPath = rootPath;
     this.json = packageJson;

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

@@ -4,3 +4,4 @@ export * from './build';
 export * from './buildWatch';
 export * from './clear';
 export * from './install';
+export * from './upgrade';

package/dist/types/cli/upgrade.d.ts

@@ -0,0 +1,2 @@
+import type { Command } from '@modern-js/utils';
+export declare const upgradeCli: (program: Command) => void;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.47.1",
+  "version": "2.48.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -43,14 +43,12 @@
     "md5": "^2.3.0",
     "p-map": "4.0.0",
     "@swc/helpers": "0.5.3",
-    "@modern-js/core": "2.47.1",
-    "@modern-js/upgrade": "2.47.1",
-    "@modern-js/plugin": "2.47.1",
-    "@modern-js/new-action": "2.47.1",
-    "@modern-js/plugin-changeset": "2.47.1",
-    "@modern-js/plugin-i18n": "2.47.1",
-    "@modern-js/plugin-lint": "2.47.1",
-    "@modern-js/utils": "2.47.1"
+    "@modern-js/core": "2.48.1",
+    "@modern-js/plugin-changeset": "2.48.1",
+    "@modern-js/plugin": "2.48.1",
+    "@modern-js/plugin-i18n": "2.48.1",
+    "@modern-js/utils": "2.48.1",
+    "@modern-js/plugin-lint": "2.48.1"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -58,8 +56,8 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@scripts/build": "2.47.1",
-    "@scripts/jest-config": "2.47.1"
+    "@scripts/build": "2.48.1",
+    "@scripts/jest-config": "2.48.1"
   },
   "sideEffects": false,
   "publishConfig": {