@modern-js/monorepo-tools 2.0.0-beta.3 → 2.0.0-beta.4
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 +51 -0
- package/bin/modern.js +3 -1
- package/dist/js/modern/cli/build-watch.js +30 -5
- package/dist/js/modern/cli/build.js +31 -5
- package/dist/js/modern/cli/clear.js +30 -5
- package/dist/js/modern/cli/deploy.js +35 -7
- package/dist/js/modern/cli/index.js +1 -1
- package/dist/js/modern/cli/install.js +30 -5
- package/dist/js/modern/cli/new.js +56 -14
- package/dist/js/modern/commands/build-watch.js +32 -18
- package/dist/js/modern/commands/build.js +49 -23
- package/dist/js/modern/commands/clear.js +31 -15
- package/dist/js/modern/commands/deploy.js +38 -24
- package/dist/js/modern/commands/index.js +1 -1
- package/dist/js/modern/commands/install.js +32 -17
- package/dist/js/modern/constants.js +13 -9
- package/dist/js/modern/dag/create.js +27 -23
- package/dist/js/modern/dag/edge-manager.js +5 -4
- package/dist/js/modern/dag/index.js +6 -5
- package/dist/js/modern/dag/operator.js +174 -156
- package/dist/js/modern/dag/task.js +64 -39
- package/dist/js/modern/dag/utils.js +32 -38
- package/dist/js/modern/features/build/index.js +47 -28
- package/dist/js/modern/features/clear/index.js +16 -15
- package/dist/js/modern/features/deploy/index.js +107 -82
- package/dist/js/modern/features/dev/cmds.js +4 -3
- package/dist/js/modern/features/dev/create-task.js +43 -34
- package/dist/js/modern/features/dev/index.js +60 -41
- package/dist/js/modern/features/dev/watch-projects-state.js +47 -24
- package/dist/js/modern/features/install/index.js +43 -22
- package/dist/js/modern/hooks/index.js +6 -3
- package/dist/js/modern/index.js +18 -16
- package/dist/js/modern/locale/en.js +10 -7
- package/dist/js/modern/locale/index.js +6 -6
- package/dist/js/modern/locale/zh.js +11 -8
- package/dist/js/modern/log/error.js +6 -3
- package/dist/js/modern/log/multi-tasks-log.js +25 -34
- package/dist/js/modern/log/time.js +26 -11
- package/dist/js/modern/log/utils.js +9 -5
- package/dist/js/modern/package/index.js +5 -6
- package/dist/js/modern/parse-config/index.js +49 -22
- package/dist/js/modern/parse-config/monorepo.js +41 -26
- package/dist/js/modern/projects/check-project-change.js +59 -30
- package/dist/js/modern/projects/clear-memory-files.js +17 -7
- package/dist/js/modern/projects/get-projects-by-packages-config.js +89 -52
- package/dist/js/modern/projects/get-projects-by-workspace-file.js +68 -32
- package/dist/js/modern/projects/get-projects.js +96 -53
- package/dist/js/modern/type.js +0 -1
- package/dist/js/modern/utils/install.js +36 -19
- package/dist/js/modern/utils/language.js +6 -3
- package/dist/js/node/cli/build-watch.js +47 -10
- package/dist/js/node/cli/build.js +48 -10
- package/dist/js/node/cli/clear.js +47 -10
- package/dist/js/node/cli/deploy.js +52 -12
- package/dist/js/node/cli/index.js +22 -71
- package/dist/js/node/cli/install.js +47 -10
- package/dist/js/node/cli/new.js +73 -19
- package/dist/js/node/commands/build-watch.js +55 -29
- package/dist/js/node/commands/build.js +72 -32
- package/dist/js/node/commands/clear.js +53 -25
- package/dist/js/node/commands/deploy.js +61 -35
- package/dist/js/node/commands/index.js +21 -60
- package/dist/js/node/commands/install.js +55 -28
- package/dist/js/node/constants.js +28 -13
- package/dist/js/node/dag/create.js +44 -28
- package/dist/js/node/dag/edge-manager.js +21 -8
- package/dist/js/node/dag/index.js +26 -13
- package/dist/js/node/dag/operator.js +209 -174
- package/dist/js/node/dag/task.js +88 -46
- package/dist/js/node/dag/utils.js +51 -47
- package/dist/js/node/features/build/index.js +79 -47
- package/dist/js/node/features/clear/index.js +44 -28
- package/dist/js/node/features/deploy/index.js +135 -104
- package/dist/js/node/features/dev/cmds.js +22 -9
- package/dist/js/node/features/dev/create-task.js +75 -51
- package/dist/js/node/features/dev/index.js +94 -58
- package/dist/js/node/features/dev/watch-projects-state.js +69 -30
- package/dist/js/node/features/install/index.js +78 -41
- package/dist/js/node/hooks/index.js +23 -8
- package/dist/js/node/index.js +51 -32
- package/dist/js/node/locale/en.js +26 -11
- package/dist/js/node/locale/index.js +27 -15
- package/dist/js/node/locale/zh.js +27 -12
- package/dist/js/node/log/error.js +22 -7
- package/dist/js/node/log/multi-tasks-log.js +44 -41
- package/dist/js/node/log/time.js +43 -18
- package/dist/js/node/log/utils.js +26 -10
- package/dist/js/node/package/index.js +21 -10
- package/dist/js/node/parse-config/index.js +73 -30
- package/dist/js/node/parse-config/monorepo.js +71 -44
- package/dist/js/node/projects/check-project-change.js +96 -56
- package/dist/js/node/projects/clear-memory-files.js +38 -15
- package/dist/js/node/projects/get-projects-by-packages-config.js +116 -65
- package/dist/js/node/projects/get-projects-by-workspace-file.js +103 -55
- package/dist/js/node/projects/get-projects.js +109 -61
- package/dist/js/node/type.js +0 -5
- package/dist/js/node/utils/install.js +63 -31
- package/dist/js/node/utils/language.js +24 -8
- package/dist/types/dag/operator.d.ts +3 -0
- package/dist/types/dag/utils.d.ts +1 -0
- package/dist/types/features/dev/index.d.ts +1 -0
- package/dist/types/index.d.ts +2 -0
- package/dist/types/projects/get-projects.d.ts +1 -0
- package/package.json +12 -19
|
@@ -1,35 +1,62 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
+
};
|
|
9
|
+
var __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
+
}
|
|
15
|
+
return to;
|
|
16
|
+
};
|
|
17
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
+
var stdin_exports = {};
|
|
19
|
+
__export(stdin_exports, {
|
|
20
|
+
install: () => install
|
|
5
21
|
});
|
|
6
|
-
exports
|
|
7
|
-
var
|
|
8
|
-
var
|
|
9
|
-
var
|
|
10
|
-
var
|
|
11
|
-
|
|
12
|
-
|
|
22
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
23
|
+
var import_install = require("../features/install");
|
|
24
|
+
var import_monorepo = require("../parse-config/monorepo");
|
|
25
|
+
var import_get_projects = require("../projects/get-projects");
|
|
26
|
+
var import_dag = require("../dag");
|
|
27
|
+
var __async = (__this, __arguments, generator) => {
|
|
28
|
+
return new Promise((resolve, reject) => {
|
|
29
|
+
var fulfilled = (value) => {
|
|
30
|
+
try {
|
|
31
|
+
step(generator.next(value));
|
|
32
|
+
} catch (e) {
|
|
33
|
+
reject(e);
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
var rejected = (value) => {
|
|
37
|
+
try {
|
|
38
|
+
step(generator.throw(value));
|
|
39
|
+
} catch (e) {
|
|
40
|
+
reject(e);
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
44
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
45
|
+
});
|
|
46
|
+
};
|
|
47
|
+
const install = (..._0) => __async(void 0, [..._0], function* (projectNames = [], option, api) {
|
|
48
|
+
const { appDirectory } = api.useAppContext();
|
|
49
|
+
const { auto } = option;
|
|
50
|
+
const projects = yield (0, import_get_projects.getProjects)(
|
|
51
|
+
{ packagesMatchs: { enableAutoFinder: true } },
|
|
13
52
|
appDirectory
|
|
14
|
-
|
|
15
|
-
const
|
|
16
|
-
auto
|
|
17
|
-
} = option;
|
|
18
|
-
const projects = await (0, _getProjects.getProjects)({
|
|
19
|
-
packagesMatchs: {
|
|
20
|
-
enableAutoFinder: true
|
|
21
|
-
}
|
|
22
|
-
}, appDirectory);
|
|
23
|
-
const operator = (0, _dag.initDAG)(projects);
|
|
53
|
+
);
|
|
54
|
+
const operator = (0, import_dag.initDAG)(projects);
|
|
24
55
|
operator.checkCircle();
|
|
25
|
-
const {
|
|
26
|
-
|
|
27
|
-
packageManager
|
|
28
|
-
} = (0, _monorepo.getMonorepoBaseData)(appDirectory);
|
|
29
|
-
await (0, _install.runInstallTask)(projectNames, operator, {
|
|
56
|
+
const { rootPath, packageManager } = (0, import_monorepo.getMonorepoBaseData)(appDirectory);
|
|
57
|
+
yield (0, import_install.runInstallTask)(projectNames, operator, {
|
|
30
58
|
packageManager,
|
|
31
59
|
rootPath,
|
|
32
60
|
auto
|
|
33
61
|
});
|
|
34
|
-
};
|
|
35
|
-
exports.install = install;
|
|
62
|
+
});
|
|
@@ -1,18 +1,33 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
+
};
|
|
9
|
+
var __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
+
}
|
|
15
|
+
return to;
|
|
16
|
+
};
|
|
17
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
+
var stdin_exports = {};
|
|
19
|
+
__export(stdin_exports, {
|
|
20
|
+
LOCK_FILE: () => LOCK_FILE,
|
|
21
|
+
WORKSPACE_FILE: () => WORKSPACE_FILE
|
|
5
22
|
});
|
|
6
|
-
|
|
23
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
7
24
|
const WORKSPACE_FILE = {
|
|
8
|
-
LERNA:
|
|
9
|
-
YARN:
|
|
10
|
-
PNPM:
|
|
25
|
+
LERNA: "lerna.json",
|
|
26
|
+
YARN: "package.json",
|
|
27
|
+
PNPM: "pnpm-workspace.yaml"
|
|
11
28
|
};
|
|
12
|
-
exports.WORKSPACE_FILE = WORKSPACE_FILE;
|
|
13
29
|
const LOCK_FILE = {
|
|
14
|
-
YARN:
|
|
15
|
-
PNPM:
|
|
16
|
-
NPM:
|
|
30
|
+
YARN: "yarn.lock",
|
|
31
|
+
PNPM: "pnpm-lock.yaml",
|
|
32
|
+
NPM: "package-lock.json"
|
|
17
33
|
};
|
|
18
|
-
exports.LOCK_FILE = LOCK_FILE;
|
|
@@ -1,41 +1,61 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
+
};
|
|
9
|
+
var __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
+
}
|
|
15
|
+
return to;
|
|
16
|
+
};
|
|
17
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
+
var stdin_exports = {};
|
|
19
|
+
__export(stdin_exports, {
|
|
20
|
+
create: () => create
|
|
5
21
|
});
|
|
6
|
-
exports
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
22
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
23
|
+
var __defProp2 = Object.defineProperty;
|
|
24
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
25
|
+
var __hasOwnProp2 = Object.prototype.hasOwnProperty;
|
|
26
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
27
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
28
|
+
var __spreadValues = (a, b) => {
|
|
29
|
+
for (var prop in b || (b = {}))
|
|
30
|
+
if (__hasOwnProp2.call(b, prop))
|
|
31
|
+
__defNormalProp(a, prop, b[prop]);
|
|
32
|
+
if (__getOwnPropSymbols)
|
|
33
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
34
|
+
if (__propIsEnum.call(b, prop))
|
|
35
|
+
__defNormalProp(a, prop, b[prop]);
|
|
36
|
+
}
|
|
37
|
+
return a;
|
|
38
|
+
};
|
|
10
39
|
const initProjectDependencyAndDependent = (project, projectsName, projectsMap) => {
|
|
11
|
-
// dependencies、devDependencies、peerDependencies
|
|
12
40
|
const dependencies = project.extra.dependencies || {};
|
|
13
41
|
const devDependencies = project.extra.devDependencies || {};
|
|
14
42
|
const optionalDependencies = project.extra.optionalDependencies || {};
|
|
15
|
-
const DependencyProjectsName = Object.keys(
|
|
16
|
-
|
|
17
|
-
// init dependent key
|
|
43
|
+
const DependencyProjectsName = Object.keys(__spreadValues(__spreadValues(__spreadValues({}, dependencies), devDependencies), optionalDependencies)).filter((depName) => projectsName.includes(depName));
|
|
18
44
|
project.dependent = project.dependent || [];
|
|
19
|
-
|
|
20
|
-
project.dependency = DependencyProjectsName.map(projectName => {
|
|
21
|
-
// 在遍历该项目的 dependency 的时候,顺便更新这些 dependency 的 dependent
|
|
45
|
+
project.dependency = DependencyProjectsName.map((projectName) => {
|
|
22
46
|
const dependencyProject = projectsMap.get(projectName);
|
|
23
|
-
const dependent = (dependencyProject
|
|
24
|
-
if (
|
|
25
|
-
// 消除重复添加的情况
|
|
26
|
-
!dependent.some(p => p.name === project.name)) {
|
|
47
|
+
const dependent = (dependencyProject == null ? void 0 : dependencyProject.dependent) || [];
|
|
48
|
+
if (!dependent.some((p) => p.name === project.name)) {
|
|
27
49
|
dependencyProject.dependent = [...dependent, project];
|
|
28
50
|
dependencyProject.dependentEdge = dependencyProject.dependent.length;
|
|
29
51
|
}
|
|
30
52
|
return dependencyProject;
|
|
31
53
|
});
|
|
32
|
-
// NOTE: 一个节点有多少依赖,就代表有多少的入度或者叫指向该节点的边
|
|
33
|
-
// project.dagNodeEdge = project.dependency.length;
|
|
34
54
|
project.dependencyEdge = project.dependency.length;
|
|
35
55
|
};
|
|
36
|
-
const create = projects => {
|
|
56
|
+
const create = (projects) => {
|
|
37
57
|
const projectsName = [];
|
|
38
|
-
const projectsMap = new Map();
|
|
58
|
+
const projectsMap = /* @__PURE__ */ new Map();
|
|
39
59
|
for (const project of projects) {
|
|
40
60
|
projectsMap.set(project.name, project);
|
|
41
61
|
projectsName.push(project.name);
|
|
@@ -43,9 +63,5 @@ const create = projects => {
|
|
|
43
63
|
for (const project of projects) {
|
|
44
64
|
initProjectDependencyAndDependent(project, projectsName, projectsMap);
|
|
45
65
|
}
|
|
46
|
-
return {
|
|
47
|
-
projectsMap,
|
|
48
|
-
projectList: projectsName
|
|
49
|
-
};
|
|
66
|
+
return { projectsMap, projectList: projectsName };
|
|
50
67
|
};
|
|
51
|
-
exports.create = create;
|
|
@@ -1,13 +1,27 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
+
};
|
|
9
|
+
var __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
+
}
|
|
15
|
+
return to;
|
|
16
|
+
};
|
|
17
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
+
var stdin_exports = {};
|
|
19
|
+
__export(stdin_exports, {
|
|
20
|
+
EdgeManager: () => EdgeManager
|
|
5
21
|
});
|
|
6
|
-
exports
|
|
7
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
22
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
8
23
|
class EdgeManager {
|
|
9
24
|
constructor() {
|
|
10
|
-
_defineProperty(this, "_dependencyEdgeHash", void 0);
|
|
11
25
|
this._dependencyEdgeHash = {};
|
|
12
26
|
}
|
|
13
27
|
reduceOneEdge(project) {
|
|
@@ -32,4 +46,3 @@ class EdgeManager {
|
|
|
32
46
|
this._dependencyEdgeHash[project.name] = project.dependencyEdge;
|
|
33
47
|
}
|
|
34
48
|
}
|
|
35
|
-
exports.EdgeManager = EdgeManager;
|
|
@@ -1,16 +1,29 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
+
};
|
|
9
|
+
var __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
+
}
|
|
15
|
+
return to;
|
|
16
|
+
};
|
|
17
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
+
var stdin_exports = {};
|
|
19
|
+
__export(stdin_exports, {
|
|
20
|
+
initDAG: () => initDAG
|
|
5
21
|
});
|
|
6
|
-
exports
|
|
7
|
-
var
|
|
8
|
-
var
|
|
9
|
-
const initDAG = projects => {
|
|
10
|
-
const {
|
|
11
|
-
|
|
12
|
-
} = (0, _create.create)(projects);
|
|
13
|
-
const operator = new _operator.DagOperator(projects, projectsMap);
|
|
22
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
23
|
+
var import_create = require("./create");
|
|
24
|
+
var import_operator = require("./operator");
|
|
25
|
+
const initDAG = (projects) => {
|
|
26
|
+
const { projectsMap } = (0, import_create.create)(projects);
|
|
27
|
+
const operator = new import_operator.DagOperator(projects, projectsMap);
|
|
14
28
|
return operator;
|
|
15
29
|
};
|
|
16
|
-
exports.initDAG = initDAG;
|