@modern-js/monorepo-tools 2.27.0 → 2.29.0
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.
- package/CHANGELOG.md +33 -0
- package/dist/cjs/dag/create.js +2 -1
- package/dist/cjs/dag/operator.js +2 -1
- package/dist/cjs/features/deploy/index.js +2 -1
- package/dist/cjs/features/install/index.js +2 -2
- package/dist/cjs/projects/getProjectsByWorkspaceFile.js +4 -4
- package/dist/esm/dag/create.js +2 -1
- package/dist/esm/dag/operator.js +2 -1
- package/dist/esm/features/deploy/index.js +2 -1
- package/dist/esm/features/install/index.js +2 -2
- package/dist/esm/projects/getProjectsByWorkspaceFile.js +4 -4
- package/package.json +11 -11
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,38 @@
|
|
|
1
1
|
# @modern-js/monorepo-tools
|
|
2
2
|
|
|
3
|
+
## 2.29.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [e6b5355]
|
|
8
|
+
- Updated dependencies [93db783]
|
|
9
|
+
- Updated dependencies [cba7675]
|
|
10
|
+
- Updated dependencies [99052ea]
|
|
11
|
+
- Updated dependencies [1d71d2e]
|
|
12
|
+
- @modern-js/utils@2.29.0
|
|
13
|
+
- @modern-js/core@2.29.0
|
|
14
|
+
- @modern-js/plugin-changeset@2.29.0
|
|
15
|
+
- @modern-js/plugin-i18n@2.29.0
|
|
16
|
+
- @modern-js/plugin-lint@2.29.0
|
|
17
|
+
- @modern-js/new-action@2.29.0
|
|
18
|
+
- @modern-js/plugin@2.29.0
|
|
19
|
+
- @modern-js/upgrade@2.29.0
|
|
20
|
+
|
|
21
|
+
## 2.28.0
|
|
22
|
+
|
|
23
|
+
### Patch Changes
|
|
24
|
+
|
|
25
|
+
- Updated dependencies [00b58a7]
|
|
26
|
+
- Updated dependencies [d3e52e4]
|
|
27
|
+
- @modern-js/utils@2.28.0
|
|
28
|
+
- @modern-js/upgrade@2.28.0
|
|
29
|
+
- @modern-js/core@2.28.0
|
|
30
|
+
- @modern-js/plugin-changeset@2.28.0
|
|
31
|
+
- @modern-js/plugin-i18n@2.28.0
|
|
32
|
+
- @modern-js/plugin-lint@2.28.0
|
|
33
|
+
- @modern-js/new-action@2.28.0
|
|
34
|
+
- @modern-js/plugin@2.28.0
|
|
35
|
+
|
|
3
36
|
## 2.27.0
|
|
4
37
|
|
|
5
38
|
### Patch Changes
|
package/dist/cjs/dag/create.js
CHANGED
|
@@ -19,8 +19,9 @@ 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;
|
|
22
23
|
const dependencyProject = projectsMap.get(projectName);
|
|
23
|
-
const dependent = (dependencyProject === null ||
|
|
24
|
+
const dependent = ((_dependencyProject = dependencyProject) === null || _dependencyProject === void 0 ? void 0 : _dependencyProject.dependent) || [];
|
|
24
25
|
if (
|
|
25
26
|
// 消除重复添加的情况
|
|
26
27
|
!dependent.some((p) => p.name === project.name)
|
package/dist/cjs/dag/operator.js
CHANGED
|
@@ -142,12 +142,13 @@ class DagOperator {
|
|
|
142
142
|
*/
|
|
143
143
|
// TODO: 执行顺序还需要再确定一下
|
|
144
144
|
async traverseDependenciesToProject(name, task, { withSelf = false, runTaskConcurrency } = {}) {
|
|
145
|
+
var _leafNodes;
|
|
145
146
|
if (!this._projectsMap.has(name)) {
|
|
146
147
|
(0, _error.errorLog)(`No '${name}' project exist`);
|
|
147
148
|
}
|
|
148
149
|
const traverseTargetNode = this._projectsMap.get(name);
|
|
149
150
|
const leafNodes = this._getDependencyLeafNodes(traverseTargetNode);
|
|
150
|
-
if ((leafNodes === null ||
|
|
151
|
+
if (((_leafNodes = leafNodes) === null || _leafNodes === void 0 ? void 0 : _leafNodes.length) === 0) {
|
|
151
152
|
await this._createTask(traverseTargetNode, task)();
|
|
152
153
|
return;
|
|
153
154
|
}
|
|
@@ -112,9 +112,10 @@ const checkAndRunDeployCommand = async (monorepoPath, targetProject, packageMana
|
|
|
112
112
|
}
|
|
113
113
|
};
|
|
114
114
|
const installDependency = async (deployDir, packageManager) => {
|
|
115
|
+
var _packageJson;
|
|
115
116
|
const packageJsonPath = _path.join(deployDir, "package.json");
|
|
116
117
|
const packageJson = _nodecorelibrary.JsonFile.load(packageJsonPath);
|
|
117
|
-
const scripts = (packageJson === null ||
|
|
118
|
+
const scripts = ((_packageJson = packageJson) === null || _packageJson === void 0 ? void 0 : _packageJson.scripts) || {};
|
|
118
119
|
let commands = [];
|
|
119
120
|
if (scripts.setup) {
|
|
120
121
|
_utils.logger.info(`The 'setup' command is detected, execute '${packageManager} run setup' to start installing the dependencies`);
|
|
@@ -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;
|
|
31
|
+
var _pkg_workspaces, _pkg;
|
|
32
32
|
const pkg = _nodecorelibrary.JsonFile.load(pkgFilePath);
|
|
33
|
-
if (pkg === null ||
|
|
33
|
+
if ((_pkg = 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);
|
|
@@ -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;
|
|
42
|
+
var _pkgJson_workspaces, _pkgJson;
|
|
43
43
|
const pkgJson = _nodecorelibrary.JsonFile.load(_path.resolve(rootPath, workspaceFile));
|
|
44
|
-
packagesConfig = (pkgJson === null ||
|
|
44
|
+
packagesConfig = ((_pkgJson = 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;
|
|
68
|
+
var _pkgJson_workspaces, _pkgJson;
|
|
69
69
|
const pkgJson = _nodecorelibrary.JsonFile.load(_path.resolve(rootPath, workspaceFile));
|
|
70
|
-
packagesConfig = (pkgJson === null ||
|
|
70
|
+
packagesConfig = ((_pkgJson = 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,8 +9,9 @@ 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;
|
|
12
13
|
const dependencyProject = projectsMap.get(projectName);
|
|
13
|
-
const dependent = (dependencyProject === null ||
|
|
14
|
+
const dependent = ((_dependencyProject = dependencyProject) === null || _dependencyProject === void 0 ? void 0 : _dependencyProject.dependent) || [];
|
|
14
15
|
if (
|
|
15
16
|
// 消除重复添加的情况
|
|
16
17
|
!dependent.some((p) => p.name === project.name)
|
package/dist/esm/dag/operator.js
CHANGED
|
@@ -131,12 +131,13 @@ export class DagOperator {
|
|
|
131
131
|
*/
|
|
132
132
|
// TODO: 执行顺序还需要再确定一下
|
|
133
133
|
async traverseDependenciesToProject(name, task, { withSelf = false, runTaskConcurrency } = {}) {
|
|
134
|
+
var _leafNodes;
|
|
134
135
|
if (!this._projectsMap.has(name)) {
|
|
135
136
|
errorLog(`No '${name}' project exist`);
|
|
136
137
|
}
|
|
137
138
|
const traverseTargetNode = this._projectsMap.get(name);
|
|
138
139
|
const leafNodes = this._getDependencyLeafNodes(traverseTargetNode);
|
|
139
|
-
if ((leafNodes === null ||
|
|
140
|
+
if (((_leafNodes = leafNodes) === null || _leafNodes === void 0 ? void 0 : _leafNodes.length) === 0) {
|
|
140
141
|
await this._createTask(traverseTargetNode, task)();
|
|
141
142
|
return;
|
|
142
143
|
}
|
|
@@ -101,9 +101,10 @@ const checkAndRunDeployCommand = async (monorepoPath, targetProject, packageMana
|
|
|
101
101
|
}
|
|
102
102
|
};
|
|
103
103
|
const installDependency = async (deployDir, packageManager) => {
|
|
104
|
+
var _packageJson;
|
|
104
105
|
const packageJsonPath = path.join(deployDir, "package.json");
|
|
105
106
|
const packageJson = JsonFile.load(packageJsonPath);
|
|
106
|
-
const scripts = (packageJson === null ||
|
|
107
|
+
const scripts = ((_packageJson = packageJson) === null || _packageJson === void 0 ? void 0 : _packageJson.scripts) || {};
|
|
107
108
|
let commands = [];
|
|
108
109
|
if (scripts.setup) {
|
|
109
110
|
logger.info(`The 'setup' command is detected, execute '${packageManager} run setup' to start installing the dependencies`);
|
|
@@ -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;
|
|
20
|
+
var _pkg_workspaces, _pkg;
|
|
21
21
|
const pkg = JsonFile.load(pkgFilePath);
|
|
22
|
-
if (pkg === null ||
|
|
22
|
+
if ((_pkg = 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);
|
|
@@ -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;
|
|
22
|
+
var _pkgJson_workspaces, _pkgJson;
|
|
23
23
|
const pkgJson = JsonFile.load(path.resolve(rootPath, workspaceFile));
|
|
24
|
-
packagesConfig = (pkgJson === null ||
|
|
24
|
+
packagesConfig = ((_pkgJson = 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;
|
|
48
|
+
var _pkgJson_workspaces, _pkgJson;
|
|
49
49
|
const pkgJson = JsonFile.load(path.resolve(rootPath, workspaceFile));
|
|
50
|
-
packagesConfig = (pkgJson === null ||
|
|
50
|
+
packagesConfig = ((_pkgJson = 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.
|
|
18
|
+
"version": "2.29.0",
|
|
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.
|
|
47
|
-
"@modern-js/new-action": "2.
|
|
48
|
-
"@modern-js/upgrade": "2.
|
|
49
|
-
"@modern-js/plugin": "2.
|
|
50
|
-
"@modern-js/plugin-changeset": "2.
|
|
51
|
-
"@modern-js/plugin-i18n": "2.
|
|
52
|
-
"@modern-js/plugin-lint": "2.
|
|
53
|
-
"@modern-js/utils": "2.
|
|
46
|
+
"@modern-js/core": "2.29.0",
|
|
47
|
+
"@modern-js/new-action": "2.29.0",
|
|
48
|
+
"@modern-js/upgrade": "2.29.0",
|
|
49
|
+
"@modern-js/plugin": "2.29.0",
|
|
50
|
+
"@modern-js/plugin-changeset": "2.29.0",
|
|
51
|
+
"@modern-js/plugin-i18n": "2.29.0",
|
|
52
|
+
"@modern-js/plugin-lint": "2.29.0",
|
|
53
|
+
"@modern-js/utils": "2.29.0"
|
|
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/
|
|
62
|
-
"@scripts/
|
|
61
|
+
"@scripts/jest-config": "2.29.0",
|
|
62
|
+
"@scripts/build": "2.29.0"
|
|
63
63
|
},
|
|
64
64
|
"sideEffects": false,
|
|
65
65
|
"publishConfig": {
|