@modern-js/monorepo-tools 2.35.0 → 2.35.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/dist/cjs/dag/create.js +1 -2
  2. package/dist/cjs/dag/operator.js +1 -2
  3. package/dist/cjs/features/deploy/index.js +1 -2
  4. package/dist/cjs/features/install/index.js +2 -2
  5. package/dist/cjs/projects/getProjectsByWorkspaceFile.js +4 -4
  6. package/dist/esm/dag/create.js +1 -2
  7. package/dist/esm/dag/operator.js +1 -2
  8. package/dist/esm/features/deploy/index.js +1 -2
  9. package/dist/esm/features/install/index.js +2 -2
  10. package/dist/esm/projects/getProjectsByWorkspaceFile.js +4 -4
  11. package/package.json +11 -11
package/dist/cjs/dag/create.js CHANGED
@@ -19,9 +19,8 @@ const initProjectDependencyAndDependent = (project, projectsName, projectsMap) =
19
19
  }).filter((depName) => projectsName.includes(depName));
20
20
  project.dependent = project.dependent || [];
21
21
  project.dependency = DependencyProjectsName.map((projectName) => {
22
- var _dependencyProject;
23
22
  const dependencyProject = projectsMap.get(projectName);
24
- const dependent = ((_dependencyProject = dependencyProject) === null || _dependencyProject === void 0 ? void 0 : _dependencyProject.dependent) || [];
23
+ const dependent = (dependencyProject === null || dependencyProject === void 0 ? void 0 : dependencyProject.dependent) || [];
25
24
  if (
26
25
  // 消除重复添加的情况
27
26
  !dependent.some((p) => p.name === project.name)
package/dist/cjs/dag/operator.js CHANGED
@@ -142,13 +142,12 @@ class DagOperator {
142
142
  */
143
143
  // TODO: 执行顺序还需要再确定一下
144
144
  async traverseDependenciesToProject(name, task, { withSelf = false, runTaskConcurrency } = {}) {
145
- var _leafNodes;
146
145
  if (!this._projectsMap.has(name)) {
147
146
  (0, _error.errorLog)(`No '${name}' project exist`);
148
147
  }
149
148
  const traverseTargetNode = this._projectsMap.get(name);
150
149
  const leafNodes = this._getDependencyLeafNodes(traverseTargetNode);
151
- if (((_leafNodes = leafNodes) === null || _leafNodes === void 0 ? void 0 : _leafNodes.length) === 0) {
150
+ if ((leafNodes === null || leafNodes === void 0 ? void 0 : leafNodes.length) === 0) {
152
151
  await this._createTask(traverseTargetNode, task)();
153
152
  return;
154
153
  }
package/dist/cjs/features/deploy/index.js CHANGED
@@ -112,10 +112,9 @@ const checkAndRunDeployCommand = async (monorepoPath, targetProject, packageMana
112
112
  }
113
113
  };
114
114
  const installDependency = async (deployDir, packageManager) => {
115
- var _packageJson;
116
115
  const packageJsonPath = _path.join(deployDir, "package.json");
117
116
  const packageJson = _nodecorelibrary.JsonFile.load(packageJsonPath);
118
- const scripts = ((_packageJson = packageJson) === null || _packageJson === void 0 ? void 0 : _packageJson.scripts) || {};
117
+ const scripts = (packageJson === null || packageJson === void 0 ? void 0 : packageJson.scripts) || {};
119
118
  let commands = [];
120
119
  if (scripts.setup) {
121
120
  _utils.logger.info(`The 'setup' command is detected, execute '${packageManager} run setup' to start installing the dependencies`);
package/dist/cjs/features/install/index.js CHANGED
@@ -28,9 +28,9 @@ const replaceWorkspaces = ({ rootPath, projectsInWorkspaces }) => {
28
28
  }
29
29
  const pkgFilePath = _path.join(rootPath, _constants.WORKSPACE_FILE.YARN);
30
30
  if (_utils.fs.existsSync(pkgFilePath)) {
31
- var _pkg_workspaces, _pkg;
31
+ var _pkg_workspaces;
32
32
  const pkg = _nodecorelibrary.JsonFile.load(pkgFilePath);
33
- if ((_pkg = pkg) === null || _pkg === void 0 ? void 0 : (_pkg_workspaces = _pkg.workspaces) === null || _pkg_workspaces === void 0 ? void 0 : _pkg_workspaces.packages) {
33
+ if (pkg === null || pkg === void 0 ? void 0 : (_pkg_workspaces = pkg.workspaces) === null || _pkg_workspaces === void 0 ? void 0 : _pkg_workspaces.packages) {
34
34
  const originalPkg = pkg;
35
35
  pkg.workspaces.packages = projectsInWorkspaces;
36
36
  _nodecorelibrary.JsonFile.save(pkg, pkgFilePath);
package/dist/cjs/projects/getProjectsByWorkspaceFile.js CHANGED
@@ -39,9 +39,9 @@ const getProjectsByWorkspaceFile = async (rootPath, config, ignoreConfigs) => {
39
39
  const pnpmWorkspace = _utils.yaml.load(yamlString);
40
40
  packagesConfig = pnpmWorkspace.packages || [];
41
41
  } else if (workspaceFile === _constants.WORKSPACE_FILE.YARN) {
42
- var _pkgJson_workspaces, _pkgJson;
42
+ var _pkgJson_workspaces;
43
43
  const pkgJson = _nodecorelibrary.JsonFile.load(_path.resolve(rootPath, workspaceFile));
44
- packagesConfig = ((_pkgJson = pkgJson) === null || _pkgJson === void 0 ? void 0 : (_pkgJson_workspaces = _pkgJson.workspaces) === null || _pkgJson_workspaces === void 0 ? void 0 : _pkgJson_workspaces.packages) || [];
44
+ packagesConfig = (pkgJson === null || pkgJson === void 0 ? void 0 : (_pkgJson_workspaces = pkgJson.workspaces) === null || _pkgJson_workspaces === void 0 ? void 0 : _pkgJson_workspaces.packages) || [];
45
45
  } else if (workspaceFile === _constants.WORKSPACE_FILE.LERNA) {
46
46
  const lernaJson = _nodecorelibrary.JsonFile.load(_path.resolve(rootPath, workspaceFile));
47
47
  var _lernaJson_packages;
@@ -65,9 +65,9 @@ const syncGetProjectsByWorkspaceFile = (rootPath, config, ignoreConfigs) => {
65
65
  const pnpmWorkspace = _utils.yaml.load(yamlString);
66
66
  packagesConfig = pnpmWorkspace.packages || [];
67
67
  } else if (workspaceFile === _constants.WORKSPACE_FILE.YARN) {
68
- var _pkgJson_workspaces, _pkgJson;
68
+ var _pkgJson_workspaces;
69
69
  const pkgJson = _nodecorelibrary.JsonFile.load(_path.resolve(rootPath, workspaceFile));
70
- packagesConfig = ((_pkgJson = pkgJson) === null || _pkgJson === void 0 ? void 0 : (_pkgJson_workspaces = _pkgJson.workspaces) === null || _pkgJson_workspaces === void 0 ? void 0 : _pkgJson_workspaces.packages) || [];
70
+ packagesConfig = (pkgJson === null || pkgJson === void 0 ? void 0 : (_pkgJson_workspaces = pkgJson.workspaces) === null || _pkgJson_workspaces === void 0 ? void 0 : _pkgJson_workspaces.packages) || [];
71
71
  } else if (workspaceFile === _constants.WORKSPACE_FILE.LERNA) {
72
72
  const lernaJson = _nodecorelibrary.JsonFile.load(_path.resolve(rootPath, workspaceFile));
73
73
  var _lernaJson_packages;
package/dist/esm/dag/create.js CHANGED
@@ -9,9 +9,8 @@ const initProjectDependencyAndDependent = (project, projectsName, projectsMap) =
9
9
  }).filter((depName) => projectsName.includes(depName));
10
10
  project.dependent = project.dependent || [];
11
11
  project.dependency = DependencyProjectsName.map((projectName) => {
12
- var _dependencyProject;
13
12
  const dependencyProject = projectsMap.get(projectName);
14
- const dependent = ((_dependencyProject = dependencyProject) === null || _dependencyProject === void 0 ? void 0 : _dependencyProject.dependent) || [];
13
+ const dependent = (dependencyProject === null || dependencyProject === void 0 ? void 0 : dependencyProject.dependent) || [];
15
14
  if (
16
15
  // 消除重复添加的情况
17
16
  !dependent.some((p) => p.name === project.name)
package/dist/esm/dag/operator.js CHANGED
@@ -131,13 +131,12 @@ export class DagOperator {
131
131
  */
132
132
  // TODO: 执行顺序还需要再确定一下
133
133
  async traverseDependenciesToProject(name, task, { withSelf = false, runTaskConcurrency } = {}) {
134
- var _leafNodes;
135
134
  if (!this._projectsMap.has(name)) {
136
135
  errorLog(`No '${name}' project exist`);
137
136
  }
138
137
  const traverseTargetNode = this._projectsMap.get(name);
139
138
  const leafNodes = this._getDependencyLeafNodes(traverseTargetNode);
140
- if (((_leafNodes = leafNodes) === null || _leafNodes === void 0 ? void 0 : _leafNodes.length) === 0) {
139
+ if ((leafNodes === null || leafNodes === void 0 ? void 0 : leafNodes.length) === 0) {
141
140
  await this._createTask(traverseTargetNode, task)();
142
141
  return;
143
142
  }
package/dist/esm/features/deploy/index.js CHANGED
@@ -101,10 +101,9 @@ const checkAndRunDeployCommand = async (monorepoPath, targetProject, packageMana
101
101
  }
102
102
  };
103
103
  const installDependency = async (deployDir, packageManager) => {
104
- var _packageJson;
105
104
  const packageJsonPath = path.join(deployDir, "package.json");
106
105
  const packageJson = JsonFile.load(packageJsonPath);
107
- const scripts = ((_packageJson = packageJson) === null || _packageJson === void 0 ? void 0 : _packageJson.scripts) || {};
106
+ const scripts = (packageJson === null || packageJson === void 0 ? void 0 : packageJson.scripts) || {};
108
107
  let commands = [];
109
108
  if (scripts.setup) {
110
109
  logger.info(`The 'setup' command is detected, execute '${packageManager} run setup' to start installing the dependencies`);
package/dist/esm/features/install/index.js CHANGED
@@ -17,9 +17,9 @@ const replaceWorkspaces = ({ rootPath, projectsInWorkspaces }) => {
17
17
  }
18
18
  const pkgFilePath = path.join(rootPath, WORKSPACE_FILE.YARN);
19
19
  if (fs.existsSync(pkgFilePath)) {
20
- var _pkg_workspaces, _pkg;
20
+ var _pkg_workspaces;
21
21
  const pkg = JsonFile.load(pkgFilePath);
22
- if ((_pkg = pkg) === null || _pkg === void 0 ? void 0 : (_pkg_workspaces = _pkg.workspaces) === null || _pkg_workspaces === void 0 ? void 0 : _pkg_workspaces.packages) {
22
+ if (pkg === null || pkg === void 0 ? void 0 : (_pkg_workspaces = pkg.workspaces) === null || _pkg_workspaces === void 0 ? void 0 : _pkg_workspaces.packages) {
23
23
  const originalPkg = pkg;
24
24
  pkg.workspaces.packages = projectsInWorkspaces;
25
25
  JsonFile.save(pkg, pkgFilePath);
package/dist/esm/projects/getProjectsByWorkspaceFile.js CHANGED
@@ -19,9 +19,9 @@ export const getProjectsByWorkspaceFile = async (rootPath, config, ignoreConfigs
19
19
  const pnpmWorkspace = yaml.load(yamlString);
20
20
  packagesConfig = pnpmWorkspace.packages || [];
21
21
  } else if (workspaceFile === WORKSPACE_FILE.YARN) {
22
- var _pkgJson_workspaces, _pkgJson;
22
+ var _pkgJson_workspaces;
23
23
  const pkgJson = JsonFile.load(path.resolve(rootPath, workspaceFile));
24
- packagesConfig = ((_pkgJson = pkgJson) === null || _pkgJson === void 0 ? void 0 : (_pkgJson_workspaces = _pkgJson.workspaces) === null || _pkgJson_workspaces === void 0 ? void 0 : _pkgJson_workspaces.packages) || [];
24
+ packagesConfig = (pkgJson === null || pkgJson === void 0 ? void 0 : (_pkgJson_workspaces = pkgJson.workspaces) === null || _pkgJson_workspaces === void 0 ? void 0 : _pkgJson_workspaces.packages) || [];
25
25
  } else if (workspaceFile === WORKSPACE_FILE.LERNA) {
26
26
  const lernaJson = JsonFile.load(path.resolve(rootPath, workspaceFile));
27
27
  var _lernaJson_packages;
@@ -45,9 +45,9 @@ export const syncGetProjectsByWorkspaceFile = (rootPath, config, ignoreConfigs)
45
45
  const pnpmWorkspace = yaml.load(yamlString);
46
46
  packagesConfig = pnpmWorkspace.packages || [];
47
47
  } else if (workspaceFile === WORKSPACE_FILE.YARN) {
48
- var _pkgJson_workspaces, _pkgJson;
48
+ var _pkgJson_workspaces;
49
49
  const pkgJson = JsonFile.load(path.resolve(rootPath, workspaceFile));
50
- packagesConfig = ((_pkgJson = pkgJson) === null || _pkgJson === void 0 ? void 0 : (_pkgJson_workspaces = _pkgJson.workspaces) === null || _pkgJson_workspaces === void 0 ? void 0 : _pkgJson_workspaces.packages) || [];
50
+ packagesConfig = (pkgJson === null || pkgJson === void 0 ? void 0 : (_pkgJson_workspaces = pkgJson.workspaces) === null || _pkgJson_workspaces === void 0 ? void 0 : _pkgJson_workspaces.packages) || [];
51
51
  } else if (workspaceFile === WORKSPACE_FILE.LERNA) {
52
52
  const lernaJson = JsonFile.load(path.resolve(rootPath, workspaceFile));
53
53
  var _lernaJson_packages;
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.35.0",
18
+ "version": "2.35.1",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -43,14 +43,14 @@
43
43
  "md5": "^2.3.0",
44
44
  "p-map": "^4.0.0",
45
45
  "@swc/helpers": "0.5.1",
46
- "@modern-js/core": "2.35.0",
47
- "@modern-js/upgrade": "2.35.0",
48
- "@modern-js/new-action": "2.35.0",
49
- "@modern-js/plugin": "2.35.0",
50
- "@modern-js/plugin-i18n": "2.35.0",
51
- "@modern-js/plugin-changeset": "2.35.0",
52
- "@modern-js/plugin-lint": "2.35.0",
53
- "@modern-js/utils": "2.35.0"
46
+ "@modern-js/core": "2.35.1",
47
+ "@modern-js/new-action": "2.35.1",
48
+ "@modern-js/upgrade": "2.35.1",
49
+ "@modern-js/plugin": "2.35.1",
50
+ "@modern-js/plugin-changeset": "2.35.1",
51
+ "@modern-js/plugin-i18n": "2.35.1",
52
+ "@modern-js/plugin-lint": "2.35.1",
53
+ "@modern-js/utils": "2.35.1"
54
54
  },
55
55
  "devDependencies": {
56
56
  "@types/jest": "^29",
@@ -58,8 +58,8 @@
58
58
  "@types/node": "^14",
59
59
  "jest": "^29",
60
60
  "typescript": "^5",
61
- "@scripts/build": "2.35.0",
62
- "@scripts/jest-config": "2.35.0"
61
+ "@scripts/build": "2.35.1",
62
+ "@scripts/jest-config": "2.35.1"
63
63
  },
64
64
  "sideEffects": false,
65
65
  "publishConfig": {