@modern-js/monorepo-tools 2.15.0 → 2.16.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 +25 -0
- package/dist/cjs/cli/build.js +10 -31
- package/dist/cjs/cli/buildWatch.js +11 -31
- package/dist/cjs/cli/clear.js +11 -31
- package/dist/cjs/cli/deploy.js +14 -36
- package/dist/cjs/cli/index.js +23 -22
- package/dist/cjs/cli/install.js +11 -31
- package/dist/cjs/cli/new.js +17 -37
- package/dist/cjs/commands/build.js +21 -46
- package/dist/cjs/commands/buildWatch.js +19 -36
- package/dist/cjs/commands/clear.js +17 -34
- package/dist/cjs/commands/deploy.js +25 -41
- package/dist/cjs/commands/index.js +22 -21
- package/dist/cjs/commands/install.js +19 -36
- package/dist/cjs/constants.js +13 -26
- package/dist/cjs/dag/create.js +16 -28
- package/dist/cjs/dag/edgeManager.js +24 -28
- package/dist/cjs/dag/index.js +11 -29
- package/dist/cjs/dag/operator.js +106 -123
- package/dist/cjs/dag/task.js +52 -63
- package/dist/cjs/dag/utils.js +52 -49
- package/dist/cjs/features/build/index.js +52 -68
- package/dist/cjs/features/clear/index.js +66 -47
- package/dist/cjs/features/deploy/index.js +126 -96
- package/dist/cjs/features/dev/cmds.js +10 -25
- package/dist/cjs/features/dev/createTask.js +93 -56
- package/dist/cjs/features/dev/index.js +43 -71
- package/dist/cjs/features/dev/watchProjectsState.js +89 -64
- package/dist/cjs/features/install/index.js +74 -63
- package/dist/cjs/hooks/index.js +9 -27
- package/dist/cjs/index.js +36 -53
- package/dist/cjs/locale/en.js +7 -25
- package/dist/cjs/locale/index.js +18 -28
- package/dist/cjs/locale/zh.js +7 -25
- package/dist/cjs/log/error.js +7 -25
- package/dist/cjs/log/multiTasksLog.js +42 -43
- package/dist/cjs/log/time.js +19 -29
- package/dist/cjs/log/utils.js +7 -25
- package/dist/cjs/package/index.js +28 -30
- package/dist/cjs/parse-config/index.js +61 -49
- package/dist/cjs/parse-config/monorepo.js +81 -67
- package/dist/cjs/projects/checkProjectChange.js +95 -73
- package/dist/cjs/projects/clearMemoryFiles.js +52 -44
- package/dist/cjs/projects/getProjects.js +38 -65
- package/dist/cjs/projects/getProjectsByPackagesConfig.js +93 -71
- package/dist/cjs/projects/getProjectsByWorkspaceFile.js +89 -85
- package/dist/cjs/type.js +4 -15
- package/dist/cjs/utils/install.js +69 -44
- package/dist/cjs/utils/types.js +4 -15
- package/dist/esm/cli/build.js +2 -8
- package/dist/esm/cli/buildWatch.js +4 -9
- package/dist/esm/cli/clear.js +4 -9
- package/dist/esm/cli/deploy.js +7 -14
- package/dist/esm/cli/install.js +4 -9
- package/dist/esm/cli/new.js +9 -14
- package/dist/esm/commands/build.js +7 -17
- package/dist/esm/commands/buildWatch.js +6 -8
- package/dist/esm/commands/clear.js +6 -8
- package/dist/esm/commands/deploy.js +10 -11
- package/dist/esm/commands/install.js +6 -8
- package/dist/esm/constants.js +2 -6
- package/dist/esm/dag/create.js +10 -7
- package/dist/esm/dag/edgeManager.js +17 -6
- package/dist/esm/dag/index.js +1 -4
- package/dist/esm/dag/operator.js +77 -74
- package/dist/esm/dag/task.js +39 -30
- package/dist/esm/dag/utils.js +39 -27
- package/dist/esm/features/build/index.js +22 -27
- package/dist/esm/features/clear/index.js +4 -6
- package/dist/esm/features/deploy/index.js +55 -50
- package/dist/esm/features/dev/cmds.js +4 -4
- package/dist/esm/features/dev/createTask.js +31 -15
- package/dist/esm/features/dev/index.js +19 -27
- package/dist/esm/features/dev/watchProjectsState.js +41 -31
- package/dist/esm/features/install/index.js +11 -15
- package/dist/esm/hooks/index.js +1 -4
- package/dist/esm/index.js +12 -11
- package/dist/esm/locale/en.js +1 -4
- package/dist/esm/locale/index.js +5 -5
- package/dist/esm/locale/zh.js +1 -4
- package/dist/esm/log/error.js +1 -4
- package/dist/esm/log/multiTasksLog.js +32 -18
- package/dist/esm/log/time.js +7 -8
- package/dist/esm/log/utils.js +1 -4
- package/dist/esm/package/index.js +21 -8
- package/dist/esm/parse-config/index.js +11 -14
- package/dist/esm/parse-config/monorepo.js +20 -27
- package/dist/esm/projects/checkProjectChange.js +19 -23
- package/dist/esm/projects/clearMemoryFiles.js +3 -13
- package/dist/esm/projects/getProjects.js +21 -45
- package/dist/esm/projects/getProjectsByPackagesConfig.js +29 -33
- package/dist/esm/projects/getProjectsByWorkspaceFile.js +21 -41
- package/dist/esm/type.js +1 -0
- package/dist/esm/utils/install.js +12 -8
- package/dist/esm/utils/types.js +1 -0
- package/package.json +16 -12
|
@@ -3,76 +3,56 @@ import { FileSystem, JsonFile } from "@rushstack/node-core-library";
|
|
|
3
3
|
import { fs, yaml } from "@modern-js/utils";
|
|
4
4
|
import { getWorkspaceFile } from "../parse-config/monorepo";
|
|
5
5
|
import { WORKSPACE_FILE } from "../constants";
|
|
6
|
-
import {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
} from "./getProjectsByPackagesConfig";
|
|
10
|
-
const getProjectsByWorkspaceFile = async (rootPath, config, ignoreConfigs) => {
|
|
11
|
-
var _a, _b, _c;
|
|
6
|
+
import { getProjectsByPackageConfig, syncGetProjectsByPackageConfig } from "./getProjectsByPackagesConfig";
|
|
7
|
+
export const getProjectsByWorkspaceFile = async (rootPath, config, ignoreConfigs) => {
|
|
8
|
+
var _config_workspaceFile;
|
|
12
9
|
let { workspaceFile } = config;
|
|
13
|
-
if (!config.enableAutoFinder && (!("workspaceFile" in config) || ((
|
|
14
|
-
throw new Error(
|
|
15
|
-
"Missing workspaceFile Key or workspaceFile is empty string"
|
|
16
|
-
);
|
|
10
|
+
if (!config.enableAutoFinder && (!("workspaceFile" in config) || ((_config_workspaceFile = config.workspaceFile) === null || _config_workspaceFile === void 0 ? void 0 : _config_workspaceFile.length) === 0)) {
|
|
11
|
+
throw new Error("Missing workspaceFile Key or workspaceFile is empty string");
|
|
17
12
|
}
|
|
18
13
|
if (config.enableAutoFinder) {
|
|
19
14
|
workspaceFile = getWorkspaceFile(rootPath);
|
|
20
15
|
}
|
|
21
16
|
let packagesConfig = [];
|
|
22
17
|
if (workspaceFile === WORKSPACE_FILE.PNPM) {
|
|
23
|
-
const yamlString = await FileSystem.readFileAsync(
|
|
24
|
-
path.resolve("/", rootPath, workspaceFile)
|
|
25
|
-
).then((data) => data.toString());
|
|
18
|
+
const yamlString = await FileSystem.readFileAsync(path.resolve("/", rootPath, workspaceFile)).then((data) => data.toString());
|
|
26
19
|
const pnpmWorkspace = yaml.load(yamlString);
|
|
27
20
|
packagesConfig = pnpmWorkspace.packages || [];
|
|
28
21
|
} else if (workspaceFile === WORKSPACE_FILE.YARN) {
|
|
22
|
+
var _pkgJson_workspaces;
|
|
29
23
|
const pkgJson = JsonFile.load(path.resolve(rootPath, workspaceFile));
|
|
30
|
-
packagesConfig = (
|
|
24
|
+
packagesConfig = (pkgJson === null || pkgJson === void 0 ? void 0 : (_pkgJson_workspaces = pkgJson.workspaces) === null || _pkgJson_workspaces === void 0 ? void 0 : _pkgJson_workspaces.packages) || [];
|
|
31
25
|
} else if (workspaceFile === WORKSPACE_FILE.LERNA) {
|
|
32
26
|
const lernaJson = JsonFile.load(path.resolve(rootPath, workspaceFile));
|
|
33
|
-
|
|
27
|
+
var _lernaJson_packages;
|
|
28
|
+
packagesConfig = (_lernaJson_packages = lernaJson.packages) !== null && _lernaJson_packages !== void 0 ? _lernaJson_packages : [];
|
|
34
29
|
}
|
|
35
|
-
const projects = await getProjectsByPackageConfig(
|
|
36
|
-
rootPath,
|
|
37
|
-
packagesConfig,
|
|
38
|
-
ignoreConfigs
|
|
39
|
-
);
|
|
30
|
+
const projects = await getProjectsByPackageConfig(rootPath, packagesConfig, ignoreConfigs);
|
|
40
31
|
return projects;
|
|
41
32
|
};
|
|
42
|
-
const syncGetProjectsByWorkspaceFile = (rootPath, config, ignoreConfigs) => {
|
|
43
|
-
var
|
|
33
|
+
export const syncGetProjectsByWorkspaceFile = (rootPath, config, ignoreConfigs) => {
|
|
34
|
+
var _config_workspaceFile;
|
|
44
35
|
let { workspaceFile } = config;
|
|
45
|
-
if (!config.enableAutoFinder && (!("workspaceFile" in config) || ((
|
|
46
|
-
throw new Error(
|
|
47
|
-
"Missing workspaceFile Key or workspaceFile is empty string"
|
|
48
|
-
);
|
|
36
|
+
if (!config.enableAutoFinder && (!("workspaceFile" in config) || ((_config_workspaceFile = config.workspaceFile) === null || _config_workspaceFile === void 0 ? void 0 : _config_workspaceFile.length) === 0)) {
|
|
37
|
+
throw new Error("Missing workspaceFile Key or workspaceFile is empty string");
|
|
49
38
|
}
|
|
50
39
|
if (config.enableAutoFinder) {
|
|
51
40
|
workspaceFile = getWorkspaceFile(rootPath);
|
|
52
41
|
}
|
|
53
42
|
let packagesConfig = [];
|
|
54
43
|
if (workspaceFile === WORKSPACE_FILE.PNPM) {
|
|
55
|
-
const yamlString = fs.readFileSync(
|
|
56
|
-
path.resolve("/", rootPath, workspaceFile),
|
|
57
|
-
"utf-8"
|
|
58
|
-
);
|
|
44
|
+
const yamlString = fs.readFileSync(path.resolve("/", rootPath, workspaceFile), "utf-8");
|
|
59
45
|
const pnpmWorkspace = yaml.load(yamlString);
|
|
60
46
|
packagesConfig = pnpmWorkspace.packages || [];
|
|
61
47
|
} else if (workspaceFile === WORKSPACE_FILE.YARN) {
|
|
48
|
+
var _pkgJson_workspaces;
|
|
62
49
|
const pkgJson = JsonFile.load(path.resolve(rootPath, workspaceFile));
|
|
63
|
-
packagesConfig = (
|
|
50
|
+
packagesConfig = (pkgJson === null || pkgJson === void 0 ? void 0 : (_pkgJson_workspaces = pkgJson.workspaces) === null || _pkgJson_workspaces === void 0 ? void 0 : _pkgJson_workspaces.packages) || [];
|
|
64
51
|
} else if (workspaceFile === WORKSPACE_FILE.LERNA) {
|
|
65
52
|
const lernaJson = JsonFile.load(path.resolve(rootPath, workspaceFile));
|
|
66
|
-
|
|
53
|
+
var _lernaJson_packages;
|
|
54
|
+
packagesConfig = (_lernaJson_packages = lernaJson.packages) !== null && _lernaJson_packages !== void 0 ? _lernaJson_packages : [];
|
|
67
55
|
}
|
|
68
|
-
const projects = syncGetProjectsByPackageConfig(
|
|
69
|
-
rootPath,
|
|
70
|
-
packagesConfig,
|
|
71
|
-
ignoreConfigs
|
|
72
|
-
);
|
|
56
|
+
const projects = syncGetProjectsByPackageConfig(rootPath, packagesConfig, ignoreConfigs);
|
|
73
57
|
return projects;
|
|
74
58
|
};
|
|
75
|
-
export {
|
|
76
|
-
getProjectsByWorkspaceFile,
|
|
77
|
-
syncGetProjectsByWorkspaceFile
|
|
78
|
-
};
|
package/dist/esm/type.js
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as path from "path";
|
|
2
2
|
import { fs, execa } from "@modern-js/utils";
|
|
3
3
|
import { LOCK_FILE } from "../constants";
|
|
4
|
-
const removeLockFile = (rootPath, packageManager) => {
|
|
4
|
+
export const removeLockFile = (rootPath, packageManager) => {
|
|
5
5
|
if (packageManager === "pnpm") {
|
|
6
6
|
fs.removeSync(path.join(rootPath, LOCK_FILE.PNPM));
|
|
7
7
|
} else if (packageManager === "yarn") {
|
|
@@ -10,18 +10,22 @@ const removeLockFile = (rootPath, packageManager) => {
|
|
|
10
10
|
fs.removeSync(path.join(rootPath, LOCK_FILE.NPM));
|
|
11
11
|
}
|
|
12
12
|
};
|
|
13
|
-
const installByPackageManager = async (packageManager, { rootPath, removeLock }) => {
|
|
13
|
+
export const installByPackageManager = async (packageManager, { rootPath, removeLock }) => {
|
|
14
14
|
if (removeLock) {
|
|
15
15
|
removeLockFile(rootPath, packageManager);
|
|
16
16
|
}
|
|
17
17
|
if (packageManager === "pnpm") {
|
|
18
|
-
await execa("pnpm", [
|
|
18
|
+
await execa("pnpm", [
|
|
19
|
+
"install"
|
|
20
|
+
], {
|
|
21
|
+
stdio: "inherit"
|
|
22
|
+
});
|
|
19
23
|
}
|
|
20
24
|
if (packageManager === "yarn") {
|
|
21
|
-
await execa("yarn", [
|
|
25
|
+
await execa("yarn", [
|
|
26
|
+
"install"
|
|
27
|
+
], {
|
|
28
|
+
stdio: "inherit"
|
|
29
|
+
});
|
|
22
30
|
}
|
|
23
31
|
};
|
|
24
|
-
export {
|
|
25
|
-
installByPackageManager,
|
|
26
|
-
removeLockFile
|
|
27
|
-
};
|
package/dist/esm/utils/types.js
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
package/package.json
CHANGED
|
@@ -3,7 +3,11 @@
|
|
|
3
3
|
"description": "A Progressive React Framework for modern web development.",
|
|
4
4
|
"homepage": "https://modernjs.dev",
|
|
5
5
|
"bugs": "https://github.com/web-infra-dev/modern.js/issues",
|
|
6
|
-
"repository":
|
|
6
|
+
"repository": {
|
|
7
|
+
"type": "git",
|
|
8
|
+
"url": "https://github.com/web-infra-dev/modern.js",
|
|
9
|
+
"directory": "packages/solutions/monorepo-tools"
|
|
10
|
+
},
|
|
7
11
|
"license": "MIT",
|
|
8
12
|
"keywords": [
|
|
9
13
|
"react",
|
|
@@ -11,7 +15,7 @@
|
|
|
11
15
|
"modern",
|
|
12
16
|
"modern.js"
|
|
13
17
|
],
|
|
14
|
-
"version": "2.
|
|
18
|
+
"version": "2.16.0",
|
|
15
19
|
"jsnext:source": "./src/index.ts",
|
|
16
20
|
"types": "./dist/types/index.d.ts",
|
|
17
21
|
"main": "./dist/cjs/index.js",
|
|
@@ -39,14 +43,14 @@
|
|
|
39
43
|
"anymatch": "^3.1.2",
|
|
40
44
|
"md5": "^2.3.0",
|
|
41
45
|
"p-map": "^4.0.0",
|
|
42
|
-
"@modern-js/core": "2.
|
|
43
|
-
"@modern-js/new-action": "2.
|
|
44
|
-
"@modern-js/upgrade": "2.
|
|
45
|
-
"@modern-js/plugin": "2.
|
|
46
|
-
"@modern-js/plugin-changeset": "2.
|
|
47
|
-
"@modern-js/plugin-i18n": "2.
|
|
48
|
-
"@modern-js/plugin-lint": "2.
|
|
49
|
-
"@modern-js/utils": "2.
|
|
46
|
+
"@modern-js/core": "2.16.0",
|
|
47
|
+
"@modern-js/new-action": "2.16.0",
|
|
48
|
+
"@modern-js/upgrade": "2.16.0",
|
|
49
|
+
"@modern-js/plugin": "2.16.0",
|
|
50
|
+
"@modern-js/plugin-changeset": "2.16.0",
|
|
51
|
+
"@modern-js/plugin-i18n": "2.16.0",
|
|
52
|
+
"@modern-js/plugin-lint": "2.16.0",
|
|
53
|
+
"@modern-js/utils": "2.16.0"
|
|
50
54
|
},
|
|
51
55
|
"devDependencies": {
|
|
52
56
|
"@types/jest": "^29",
|
|
@@ -54,8 +58,8 @@
|
|
|
54
58
|
"@types/node": "^14",
|
|
55
59
|
"jest": "^29",
|
|
56
60
|
"typescript": "^4",
|
|
57
|
-
"@scripts/build": "2.
|
|
58
|
-
"@scripts/jest-config": "2.
|
|
61
|
+
"@scripts/build": "2.16.0",
|
|
62
|
+
"@scripts/jest-config": "2.16.0"
|
|
59
63
|
},
|
|
60
64
|
"sideEffects": false,
|
|
61
65
|
"publishConfig": {
|