@nrwl/workspace 13.4.0-beta.1 → 13.4.1-beta.1
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +3 -3
- package/index.d.ts +1 -2
- package/index.js +2 -6
- package/index.js.map +1 -1
- package/package.json +6 -10
- package/presets/core.json +21 -0
- package/presets/npm.json +0 -1
- package/src/command-line/dep-graph.js +2 -2
- package/src/command-line/dep-graph.js.map +1 -1
- package/src/command-line/format.js +18 -20
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/nx-commands.js +1 -1
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/utils.js +1 -1
- package/src/command-line/utils.js.map +1 -1
- package/src/core/dep-graph/3rdpartylicenses.txt +196 -216
- package/src/core/dep-graph/index.html +15 -187
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/core/dep-graph/main.esm.js.LICENSE.txt +51 -0
- package/src/core/dep-graph/styles.css +1 -1
- package/src/core/file-utils.js +3 -3
- package/src/core/file-utils.js.map +1 -1
- package/src/core/nx-deps/nx-deps-cache.js +13 -4
- package/src/core/nx-deps/nx-deps-cache.js.map +1 -1
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.d.ts +4 -1
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js +11 -4
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js.map +1 -1
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js +2 -1
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -1
- package/src/core/project-graph/build-dependencies/implicit-project-dependencies.js +6 -1
- package/src/core/project-graph/build-dependencies/implicit-project-dependencies.js.map +1 -1
- package/src/core/project-graph/build-nodes/workspace-projects.js +6 -2
- package/src/core/project-graph/build-nodes/workspace-projects.js.map +1 -1
- package/src/core/project-graph/build-project-graph.js +26 -19
- package/src/core/project-graph/build-project-graph.js.map +1 -1
- package/src/core/project-graph/daemon/server/server.js +1 -1
- package/src/core/project-graph/daemon/server/server.js.map +1 -1
- package/src/core/project-graph/daemon/server/watcher.d.ts +3 -1
- package/src/core/project-graph/daemon/server/watcher.js +24 -25
- package/src/core/project-graph/daemon/server/watcher.js.map +1 -1
- package/src/core/project-graph/project-graph-worker.js +3 -1
- package/src/core/project-graph/project-graph-worker.js.map +1 -1
- package/src/core/project-graph/project-graph.js +1 -1
- package/src/generators/init/init.js +4 -5
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/new/new.d.ts +1 -1
- package/src/generators/new/new.js +25 -10
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/preset/preset.js +7 -6
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/utils/presets.d.ts +5 -2
- package/src/generators/utils/presets.js +4 -1
- package/src/generators/utils/presets.js.map +1 -1
- package/src/generators/workspace/files/README.md__tmpl__ +2 -2
- package/src/generators/workspace/workspace.js +10 -4
- package/src/generators/workspace/workspace.js.map +1 -1
- package/src/migrations/update-10-3-0/add-vscode-extensions.js +4 -6
- package/src/migrations/update-10-3-0/add-vscode-extensions.js.map +1 -1
- package/src/migrations/update-13-2-0/set-parallel-default.js +12 -8
- package/src/migrations/update-13-2-0/set-parallel-default.js.map +1 -1
- package/src/tasks-runner/forked-process-task-runner.js +1 -0
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/life-cycle.d.ts +15 -11
- package/src/tasks-runner/life-cycle.js +4 -4
- package/src/tasks-runner/life-cycle.js.map +1 -1
- package/src/tasks-runner/{run-command/index.d.ts → run-command.d.ts} +7 -4
- package/src/tasks-runner/{run-command/index.js → run-command.js} +19 -35
- package/src/tasks-runner/run-command.js.map +1 -0
- package/src/tasks-runner/task-orchestrator.d.ts +3 -0
- package/src/tasks-runner/task-orchestrator.js +29 -13
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/task-timings-life-cycle.d.ts +10 -3
- package/src/tasks-runner/task-timings-life-cycle.js +56 -3
- package/src/tasks-runner/task-timings-life-cycle.js.map +1 -1
- package/src/tasks-runner/tasks-runner.d.ts +1 -1
- package/src/tasks-runner/tasks-runner.js.map +1 -1
- package/src/tasks-runner/utils.js +4 -1
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utilities/buildable-libs-utils.d.ts +1 -0
- package/src/utilities/buildable-libs-utils.js +26 -21
- package/src/utilities/buildable-libs-utils.js.map +1 -1
- package/src/utilities/cache-directory.d.ts +1 -1
- package/src/utilities/cache-directory.js +3 -3
- package/src/utilities/cache-directory.js.map +1 -1
- package/src/utilities/create-package-json.js +3 -3
- package/src/utilities/create-package-json.js.map +1 -1
- package/src/utilities/fileutils.d.ts +0 -2
- package/src/utilities/fileutils.js +1 -4
- package/src/utilities/fileutils.js.map +1 -1
- package/src/utilities/plugins/installed-plugins.js +2 -2
- package/src/utilities/plugins/installed-plugins.js.map +1 -1
- package/src/utilities/project-graph-utils.d.ts +2 -2
- package/src/utilities/project-graph-utils.js.map +1 -1
- package/src/utilities/typescript/compilation.d.ts +1 -1
- package/src/utilities/typescript/compilation.js +11 -12
- package/src/utilities/typescript/compilation.js.map +1 -1
- package/src/utils/fileutils.d.ts +0 -2
- package/src/utils/fileutils.js +1 -4
- package/src/utils/fileutils.js.map +1 -1
- package/src/utils/runtime-lint-utils.js +1 -1
- package/src/utils/runtime-lint-utils.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +2 -2
- package/src/devkit-reexport.d.ts +0 -4
- package/src/devkit-reexport.js +0 -20
- package/src/devkit-reexport.js.map +0 -1
- package/src/tasks-runner/run-command/components/no-targets-run.d.ts +0 -7
- package/src/tasks-runner/run-command/components/no-targets-run.js +0 -20
- package/src/tasks-runner/run-command/components/no-targets-run.js.map +0 -1
- package/src/tasks-runner/run-command/components/nx-output-row-title.d.ts +0 -7
- package/src/tasks-runner/run-command/components/nx-output-row-title.js +0 -17
- package/src/tasks-runner/run-command/components/nx-output-row-title.js.map +0 -1
- package/src/tasks-runner/run-command/components/run-command.d.ts +0 -16
- package/src/tasks-runner/run-command/components/run-command.js +0 -55
- package/src/tasks-runner/run-command/components/run-command.js.map +0 -1
- package/src/tasks-runner/run-command/components/run-many.d.ts +0 -15
- package/src/tasks-runner/run-command/components/run-many.js +0 -123
- package/src/tasks-runner/run-command/components/run-many.js.map +0 -1
- package/src/tasks-runner/run-command/components/task-list.d.ts +0 -7
- package/src/tasks-runner/run-command/components/task-list.js +0 -29
- package/src/tasks-runner/run-command/components/task-list.js.map +0 -1
- package/src/tasks-runner/run-command/components/task-row.d.ts +0 -12
- package/src/tasks-runner/run-command/components/task-row.js +0 -52
- package/src/tasks-runner/run-command/components/task-row.js.map +0 -1
- package/src/tasks-runner/run-command/index.js.map +0 -1
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.d.ts +0 -30
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.js +0 -34
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.js.map +0 -1
@@ -1,22 +1,40 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.TaskTimingsLifeCycle = void 0;
|
4
|
+
const fs_1 = require("fs");
|
5
|
+
const perf_hooks_1 = require("perf_hooks");
|
6
|
+
const path_1 = require("path");
|
4
7
|
class TaskTimingsLifeCycle {
|
5
|
-
constructor() {
|
8
|
+
constructor(perfLoggingEnvValue) {
|
9
|
+
this.perfLoggingEnvValue = perfLoggingEnvValue;
|
6
10
|
this.timings = {};
|
11
|
+
this.profile = [];
|
12
|
+
this.registeredGroups = new Set();
|
13
|
+
if (typeof perfLoggingEnvValue === 'string' &&
|
14
|
+
perfLoggingEnvValue !== 'true') {
|
15
|
+
this.profileFile = (0, path_1.join)(process.cwd(), perfLoggingEnvValue);
|
16
|
+
}
|
7
17
|
}
|
8
|
-
startTasks(tasks) {
|
18
|
+
startTasks(tasks, { groupId }) {
|
19
|
+
if (this.profileFile && !this.registeredGroups.has(groupId)) {
|
20
|
+
this.registerGroup(groupId);
|
21
|
+
}
|
9
22
|
for (let t of tasks) {
|
10
23
|
this.timings[`${t.target.project}:${t.target.target}`] = {
|
11
24
|
start: new Date().getTime(),
|
12
25
|
end: undefined,
|
26
|
+
perfStart: perf_hooks_1.performance.now(),
|
13
27
|
};
|
14
28
|
}
|
15
29
|
}
|
16
|
-
endTasks(taskResults) {
|
30
|
+
endTasks(taskResults, metadata) {
|
17
31
|
for (let tr of taskResults) {
|
18
32
|
this.timings[`${tr.task.target.project}:${tr.task.target.target}`].end =
|
19
33
|
new Date().getTime();
|
34
|
+
this.timings[`${tr.task.target.project}:${tr.task.target.target}`].perfEnd = perf_hooks_1.performance.now();
|
35
|
+
}
|
36
|
+
if (this.profileFile) {
|
37
|
+
this.recordTaskCompletions(taskResults, metadata);
|
20
38
|
}
|
21
39
|
}
|
22
40
|
endCommand() {
|
@@ -27,6 +45,41 @@ class TaskTimingsLifeCycle {
|
|
27
45
|
timings[p] = t.end ? t.end - t.start : null;
|
28
46
|
});
|
29
47
|
console.log(JSON.stringify(timings, null, 2));
|
48
|
+
if (this.profileFile) {
|
49
|
+
(0, fs_1.writeFileSync)('profile.json', JSON.stringify(this.profile));
|
50
|
+
console.log(`Performance Profile: ${this.profileFile}`);
|
51
|
+
}
|
52
|
+
}
|
53
|
+
recordTaskCompletions(tasks, { groupId }) {
|
54
|
+
for (const { task, status } of tasks) {
|
55
|
+
const { perfStart, perfEnd } = this.timings[`${task.target.project}:${task.target.target}`];
|
56
|
+
this.profile.push({
|
57
|
+
name: task.id,
|
58
|
+
cat: Object.values(task.target).join(','),
|
59
|
+
ph: 'X',
|
60
|
+
ts: perfStart * 1000,
|
61
|
+
dur: (perfEnd - perfStart) * 1000,
|
62
|
+
pid: process.pid,
|
63
|
+
tid: groupId,
|
64
|
+
args: {
|
65
|
+
target: task.target,
|
66
|
+
status,
|
67
|
+
},
|
68
|
+
});
|
69
|
+
}
|
70
|
+
}
|
71
|
+
registerGroup(groupId) {
|
72
|
+
this.profile.push({
|
73
|
+
name: 'thread_name',
|
74
|
+
ph: 'M',
|
75
|
+
pid: process.pid,
|
76
|
+
tid: groupId,
|
77
|
+
ts: 0,
|
78
|
+
args: {
|
79
|
+
name: 'Group #' + (groupId + 1),
|
80
|
+
},
|
81
|
+
});
|
82
|
+
this.registeredGroups.add(groupId);
|
30
83
|
}
|
31
84
|
}
|
32
85
|
exports.TaskTimingsLifeCycle = TaskTimingsLifeCycle;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"task-timings-life-cycle.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/task-timings-life-cycle.ts"],"names":[],"mappings":";;;AAIA,MAAa,oBAAoB;
|
1
|
+
{"version":3,"file":"task-timings-life-cycle.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/task-timings-life-cycle.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import type { Observable } from 'rxjs';
|
2
2
|
import type { NxJsonConfiguration, ProjectGraph, Task } from '@nrwl/devkit';
|
3
3
|
export type { Task } from '@nrwl/devkit';
|
4
|
-
export declare type TaskStatus = 'success' | 'failure' | 'skipped' | 'cache'
|
4
|
+
export declare type TaskStatus = 'success' | 'failure' | 'skipped' | 'cache';
|
5
5
|
/**
|
6
6
|
* @deprecated Return Promise<{[id: string]: TaskStatus}> from the tasks runner
|
7
7
|
*
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"tasks-runner.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/tasks-runner.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"tasks-runner.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/tasks-runner.ts"],"names":[],"mappings":";;;AAQA;;;;GAIG;AACH,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IAC3B,qDAAgC,CAAA;IAChC,uDAAkC,CAAA;IAClC,qEAAgD,CAAA;AAClD,CAAC,EAJW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAI5B"}
|
@@ -7,6 +7,7 @@ const output_1 = require("../utilities/output");
|
|
7
7
|
const project_graph_utils_1 = require("../utilities/project-graph-utils");
|
8
8
|
const fs_1 = require("fs");
|
9
9
|
const path_1 = require("path");
|
10
|
+
const nx_plugin_1 = require("@nrwl/tao/src/shared/nx-plugin");
|
10
11
|
function getCommandAsString(task) {
|
11
12
|
const execCommand = (0, devkit_1.getPackageManagerCommand)().exec;
|
12
13
|
const args = getCommandArgsForTask(task);
|
@@ -116,10 +117,12 @@ function interpolateOutputs(template, data) {
|
|
116
117
|
});
|
117
118
|
}
|
118
119
|
function getExecutorNameForTask(task, workspace) {
|
119
|
-
const
|
120
|
+
const workspaceConfiguration = workspace.readWorkspaceConfiguration();
|
121
|
+
const project = workspaceConfiguration.projects[task.target.project];
|
120
122
|
if ((0, fs_1.existsSync)((0, path_1.join)(project.root, 'package.json'))) {
|
121
123
|
project.targets = (0, project_graph_utils_1.mergeNpmScriptsWithTargets)(project.root, project.targets);
|
122
124
|
}
|
125
|
+
project.targets = (0, nx_plugin_1.mergePluginTargetsWithNxTargets)(project.root, project.targets, (0, nx_plugin_1.loadNxPlugins)(workspaceConfiguration.plugins));
|
123
126
|
if (!project.targets[task.target.target]) {
|
124
127
|
throw new Error(`Cannot find configuration for task ${task.target.project}:${task.target.target}`);
|
125
128
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/utils.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,+BAA+B;AAC/B,gDAA6C;AAE7C,0EAA8E;AAC9E,2BAAgC;AAChC,+BAA4B;
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/utils.ts"],"names":[],"mappings":"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"}
|
@@ -7,6 +7,7 @@ export declare type DependentBuildableProjectNode = {
|
|
7
7
|
export declare function calculateProjectDependencies(projGraph: ProjectGraph, root: string, projectName: string, targetName: string, configurationName: string): {
|
8
8
|
target: ProjectGraphNode;
|
9
9
|
dependencies: DependentBuildableProjectNode[];
|
10
|
+
nonBuildableDependencies: string[];
|
10
11
|
};
|
11
12
|
export declare function computeCompilerOptionsPaths(tsConfig: string, dependencies: DependentBuildableProjectNode[]): any;
|
12
13
|
export declare function createTmpTsConfig(tsconfigPath: string, workspaceRoot: string, projectRoot: string, dependencies: DependentBuildableProjectNode[]): string;
|
@@ -17,24 +17,29 @@ function isBuildable(target, node) {
|
|
17
17
|
function calculateProjectDependencies(projGraph, root, projectName, targetName, configurationName) {
|
18
18
|
const target = projGraph.nodes[projectName];
|
19
19
|
// gather the library dependencies
|
20
|
+
const nonBuildableDependencies = [];
|
20
21
|
const dependencies = recursivelyCollectDependencies(projectName, projGraph, [])
|
21
22
|
.map((dep) => {
|
22
23
|
const depNode = projGraph.nodes[dep] || projGraph.externalNodes[dep];
|
23
|
-
if (depNode.type === project_graph_1.ProjectType.lib
|
24
|
-
isBuildable(targetName, depNode)) {
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
24
|
+
if (depNode.type === project_graph_1.ProjectType.lib) {
|
25
|
+
if (isBuildable(targetName, depNode)) {
|
26
|
+
const libPackageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(root, depNode.data.root, 'package.json'));
|
27
|
+
return {
|
28
|
+
name: libPackageJson.name,
|
29
|
+
outputs: (0, utils_1.getOutputsForTargetAndConfiguration)({
|
30
|
+
overrides: {},
|
31
|
+
target: {
|
32
|
+
project: projectName,
|
33
|
+
target: targetName,
|
34
|
+
configuration: configurationName,
|
35
|
+
},
|
36
|
+
}, depNode),
|
37
|
+
node: depNode,
|
38
|
+
};
|
39
|
+
}
|
40
|
+
else {
|
41
|
+
nonBuildableDependencies.push(dep);
|
42
|
+
}
|
38
43
|
}
|
39
44
|
else if (depNode.type === 'npm') {
|
40
45
|
return {
|
@@ -48,7 +53,7 @@ function calculateProjectDependencies(projGraph, root, projectName, targetName,
|
|
48
53
|
}
|
49
54
|
})
|
50
55
|
.filter((x) => !!x);
|
51
|
-
return { target, dependencies };
|
56
|
+
return { target, dependencies, nonBuildableDependencies };
|
52
57
|
}
|
53
58
|
exports.calculateProjectDependencies = calculateProjectDependencies;
|
54
59
|
function recursivelyCollectDependencies(project, projGraph, acc) {
|
@@ -100,7 +105,7 @@ function createTmpTsConfig(tsconfigPath, workspaceRoot, projectRoot, dependencie
|
|
100
105
|
const tmpTsConfigPath = (0, path_1.join)(workspaceRoot, 'tmp', projectRoot, 'tsconfig.generated.json');
|
101
106
|
const parsedTSConfig = readTsConfigWithRemappedPaths(tsconfigPath, tmpTsConfigPath, dependencies);
|
102
107
|
process.on('exit', () => cleanupTmpTsConfigFile(tmpTsConfigPath));
|
103
|
-
(0,
|
108
|
+
(0, devkit_1.writeJsonFile)(tmpTsConfigPath, parsedTSConfig);
|
104
109
|
return (0, path_1.join)(tmpTsConfigPath);
|
105
110
|
}
|
106
111
|
exports.createTmpTsConfig = createTmpTsConfig;
|
@@ -176,8 +181,8 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
|
|
176
181
|
let packageJson;
|
177
182
|
let workspacePackageJson;
|
178
183
|
try {
|
179
|
-
packageJson = (0,
|
180
|
-
workspacePackageJson = (0,
|
184
|
+
packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
|
185
|
+
workspacePackageJson = (0, devkit_1.readJsonFile)(`${root}/package.json`);
|
181
186
|
}
|
182
187
|
catch (e) {
|
183
188
|
// cannot find or invalid package.json
|
@@ -206,7 +211,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
|
|
206
211
|
},
|
207
212
|
}, entry.node);
|
208
213
|
const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
|
209
|
-
depVersion = (0,
|
214
|
+
depVersion = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;
|
210
215
|
packageJson[typeOfDependency][packageName] = depVersion;
|
211
216
|
}
|
212
217
|
else if ((0, project_graph_1.isNpmProject)(entry.node)) {
|
@@ -226,7 +231,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
|
|
226
231
|
}
|
227
232
|
});
|
228
233
|
if (updatePackageJson) {
|
229
|
-
(0,
|
234
|
+
(0, devkit_1.writeJsonFile)(packageJsonPath, packageJson);
|
230
235
|
}
|
231
236
|
}
|
232
237
|
exports.updateBuildableProjectPackageJsonDependencies = updateBuildableProjectPackageJsonDependencies;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"buildable-libs-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/buildable-libs-utils.ts"],"names":[],"mappings":";;;AAAA,yDAAkE;AAClE,+BAAwD;AACxD,
|
1
|
+
{"version":3,"file":"buildable-libs-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/buildable-libs-utils.ts"],"names":[],"mappings":";;;AAAA,yDAAkE;AAClE,+BAAwD;AACxD,2CAA8C;AAC9C,yCAAyE;AAEzE,iDAA4E;AAC5E,iCAAiC;AACjC,2BAAgC;AAChC,qCAAkC;AAElC,SAAS,WAAW,CAAC,MAAc,EAAE,IAAsB;IACzD,OAAO,CACL,IAAI,CAAC,IAAI,CAAC,OAAO;QACjB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,KAAK,EAAE,CAC1C,CAAC;AACJ,CAAC;AAQD,SAAgB,4BAA4B,CAC1C,SAAuB,EACvB,IAAY,EACZ,WAAmB,EACnB,UAAkB,EAClB,iBAAyB;IAMzB,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC5C,kCAAkC;IAClC,MAAM,wBAAwB,GAAG,EAAE,CAAC;IACpC,MAAM,YAAY,GAAG,8BAA8B,CACjD,WAAW,EACX,SAAS,EACT,EAAE,CACH;SACE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACrE,IAAI,OAAO,CAAC,IAAI,KAAK,2BAAW,CAAC,GAAG,EAAE;YACpC,IAAI,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE;gBACpC,MAAM,cAAc,GAAG,IAAA,qBAAY,EACjC,IAAA,WAAI,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAC9C,CAAC;gBAEF,OAAO;oBACL,IAAI,EAAE,cAAc,CAAC,IAAI;oBACzB,OAAO,EAAE,IAAA,2CAAmC,EAC1C;wBACE,SAAS,EAAE,EAAE;wBACb,MAAM,EAAE;4BACN,OAAO,EAAE,WAAW;4BACpB,MAAM,EAAE,UAAU;4BAClB,aAAa,EAAE,iBAAiB;yBACjC;qBACF,EACD,OAAO,CACR;oBACD,IAAI,EAAE,OAAO;iBACd,CAAC;aACH;iBAAM;gBACL,wBAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpC;SACF;aAAM,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;YACjC,OAAO;gBACL,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,WAAW;gBAC9B,OAAO,EAAE,EAAE;gBACX,IAAI,EAAE,OAAO;aACd,CAAC;SACH;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,wBAAwB,EAAE,CAAC;AAC5D,CAAC;AAzDD,oEAyDC;AAED,SAAS,8BAA8B,CACrC,OAAe,EACf,SAAuB,EACvB,GAAa;IAEb,CAAC,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAC7D,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;YACzC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAC5B,8BAA8B,CAAC,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;SACnE;IACH,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,6BAA6B,CACpC,QAAgB,EAChB,qBAA6B,EAC7B,YAA6C;IAE7C,MAAM,iBAAiB,GAAQ,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;IACvD,iBAAiB,CAAC,OAAO,GAAG,IAAA,eAAQ,EAClC,IAAA,cAAO,EAAC,qBAAqB,CAAC,EAC9B,QAAQ,CACT,CAAC;IACF,iBAAiB,CAAC,eAAe,CAAC,KAAK,GAAG,2BAA2B,CACnE,QAAQ,EACR,YAAY,CACb,CAAC;IAEF,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM,EAAE;QAC7C,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,+CAA+C;SACvD,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CACjE,CAAC;KACH;IACD,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,SAAgB,2BAA2B,CACzC,QAAgB,EAChB,YAA6C;IAE7C,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACxC,WAAW,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IACjC,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,kEAOC;AAED,SAAS,SAAS,CAAC,QAAgB;IACjC,IAAI;QACF,MAAM,cAAc,GAAG,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;QAC3E,IACE,cAAc,CAAC,eAAe;YAC9B,cAAc,CAAC,eAAe,CAAC,KAAK,EACpC;YACA,OAAO,cAAc,CAAC,eAAe,CAAC,KAAK,CAAC;SAC7C;aAAM,IAAI,cAAc,CAAC,OAAO,EAAE;YACjC,OAAO,SAAS,CAAC,IAAA,cAAO,EAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;SACtE;aAAM;YACL,OAAO,IAAI,CAAC;SACb;KACF;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAED,SAAgB,iBAAiB,CAC/B,YAAoB,EACpB,aAAqB,EACrB,WAAmB,EACnB,YAA6C;IAE7C,MAAM,eAAe,GAAG,IAAA,WAAI,EAC1B,aAAa,EACb,KAAK,EACL,WAAW,EACX,yBAAyB,CAC1B,CAAC;IACF,MAAM,cAAc,GAAG,6BAA6B,CAClD,YAAY,EACZ,eAAe,EACf,YAAY,CACb,CAAC;IACF,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,sBAAsB,CAAC,eAAe,CAAC,CAAC,CAAC;IAClE,IAAA,sBAAa,EAAC,eAAe,EAAE,cAAc,CAAC,CAAC;IAC/C,OAAO,IAAA,WAAI,EAAC,eAAe,CAAC,CAAC;AAC/B,CAAC;AApBD,8CAoBC;AAED,SAAS,sBAAsB,CAAC,eAAe;IAC7C,IAAI;QACF,IAAI,eAAe,EAAE;YACnB,IAAA,eAAU,EAAC,eAAe,CAAC,CAAC;SAC7B;KACF;IAAC,OAAO,CAAC,EAAE,GAAE;AAChB,CAAC;AAED,SAAgB,mCAAmC,CACjD,IAAY,EACZ,WAAmB,EACnB,UAAkB,EAClB,mBAAoD;IAEpD,MAAM,OAAO,GAAG,4BAA4B,CAC1C,IAAI,EACJ,WAAW,EACX,UAAU,EACV,mBAAmB,CACpB,CAAC;IACF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,OAAO,CAAC,KAAK,CAAC,IAAA,qBAAY,EAAA;4BACF,WAAW;QAC/B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;oBAEtC,WAAW,IAAI,UAAU;KACxC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;KACd;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAvBD,kFAuBC;AAED,SAAgB,4BAA4B,CAC1C,IAAY,EACZ,WAAmB,EACnB,UAAkB,EAClB,mBAAoD;IAEpD,MAAM,mBAAmB,GAAoC,EAAE,CAAC;IAEhE,yDAAyD;IACzD,mBAAmB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAClC,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,2BAAW,CAAC,GAAG,EAAE;YACrC,OAAO;SACR;QAED,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,2BAAe,CAAC,EAAE;YAChC,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC/B;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAtBD,oEAsBC;AAED,SAAgB,WAAW,CACzB,YAA6C,EAC7C,KAA+B;IAE/B,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC3B,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACzC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC;YAC9B,0EAA0E;YAC1E,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;gBAC5B,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE;oBACnC,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;oBAClD,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC;iBAC5D;aACF;SACF;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAjBD,kCAiBC;AAED;;;GAGG;AACH,SAAgB,6CAA6C,CAC3D,IAAY,EACZ,WAAmB,EACnB,UAAkB,EAClB,iBAAyB,EACzB,IAAsB,EACtB,YAA6C,EAC7C,mBAAwD,cAAc;IAEtE,MAAM,OAAO,GAAG,IAAA,2CAAmC,EACjD;QACE,SAAS,EAAE,EAAE;QACb,MAAM,EAAE;YACN,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,UAAU;YAClB,aAAa,EAAE,iBAAiB;SACjC;KACF,EACD,IAAI,CACL,CAAC;IAEF,MAAM,eAAe,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;IACrD,IAAI,WAAW,CAAC;IAChB,IAAI,oBAAoB,CAAC;IACzB,IAAI;QACF,WAAW,GAAG,IAAA,qBAAY,EAAC,eAAe,CAAC,CAAC;QAC5C,oBAAoB,GAAG,IAAA,qBAAY,EAAC,GAAG,IAAI,eAAe,CAAC,CAAC;KAC7D;IAAC,OAAO,CAAC,EAAE;QACV,sCAAsC;QACtC,OAAO;KACR;IAED,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;IAC1D,WAAW,CAAC,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,IAAI,EAAE,CAAC;IAElE,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,YAAY,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;QAC7B,MAAM,WAAW,GAAG,IAAA,4BAAY,EAAC,KAAK,CAAC,IAAI,CAAC;YAC1C,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW;YAC7B,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;QAEf,IACE,CAAC,aAAa,CAAC,WAAW,EAAE,cAAc,EAAE,WAAW,CAAC;YACxD,CAAC,aAAa,CAAC,WAAW,EAAE,iBAAiB,EAAE,WAAW,CAAC;YAC3D,CAAC,aAAa,CAAC,WAAW,EAAE,kBAAkB,EAAE,WAAW,CAAC,EAC5D;YACA,IAAI;gBACF,IAAI,UAAU,CAAC;gBACf,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,2BAAW,CAAC,GAAG,EAAE;oBACvC,MAAM,OAAO,GAAG,IAAA,2CAAmC,EACjD;wBACE,SAAS,EAAE,EAAE;wBACb,MAAM,EAAE;4BACN,OAAO,EAAE,WAAW;4BACpB,MAAM,EAAE,UAAU;4BAClB,aAAa,EAAE,iBAAiB;yBACjC;qBACF,EACD,KAAK,CAAC,IAAI,CACX,CAAC;oBAEF,MAAM,kBAAkB,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;oBAClE,UAAU,GAAG,IAAA,qBAAY,EAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC;oBAEtD,WAAW,CAAC,gBAAgB,CAAC,CAAC,WAAW,CAAC,GAAG,UAAU,CAAC;iBACzD;qBAAM,IAAI,IAAA,4BAAY,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE;oBACnC,wFAAwF;oBACxF,IACE,CAAC,CAAC,CAAA,MAAA,oBAAoB,CAAC,eAAe,0CACpC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAC5B,CAAA,EACD;wBACA,OAAO;qBACR;oBAED,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;oBAErC,WAAW,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;wBACxD,UAAU,CAAC;iBACd;gBACD,iBAAiB,GAAG,IAAI,CAAC;aAC1B;YAAC,OAAO,CAAC,EAAE;gBACV,mCAAmC;aACpC;SACF;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,iBAAiB,EAAE;QACrB,IAAA,sBAAa,EAAC,eAAe,EAAE,WAAW,CAAC,CAAC;KAC7C;AACH,CAAC;AA1FD,sGA0FC;AAED,4DAA4D;AAC5D,SAAS,aAAa,CAAC,UAAU,EAAE,aAAqB,EAAE,WAAmB;IAC3E,IAAI,UAAU,CAAC,aAAa,CAAC,EAAE;QAC7B,OAAO,UAAU,CAAC,aAAa,CAAC,CAAC,WAAW,CAAC,CAAC;KAC/C;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare function readCacheDirectoryProperty(root: string):
|
1
|
+
export declare function readCacheDirectoryProperty(root: string): string | undefined;
|
2
2
|
export declare function cacheDirectory(root: string, cacheDirectory: string): string;
|
@@ -1,14 +1,14 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.cacheDirectory = exports.readCacheDirectoryProperty = void 0;
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
4
5
|
const path_1 = require("path");
|
5
|
-
const fileutils_1 = require("./fileutils");
|
6
6
|
function readCacheDirectoryProperty(root) {
|
7
7
|
try {
|
8
|
-
const nxJson = (0,
|
8
|
+
const nxJson = (0, devkit_1.readJsonFile)((0, path_1.join)(root, 'nx.json'));
|
9
9
|
return nxJson.tasksRunnerOptions.default.options.cacheDirectory;
|
10
10
|
}
|
11
|
-
catch (
|
11
|
+
catch (_a) {
|
12
12
|
return undefined;
|
13
13
|
}
|
14
14
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/cache-directory.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/cache-directory.ts"],"names":[],"mappings":";;;AAAA,yCAAiE;AACjE,+BAA4B;AAE5B,SAAgB,0BAA0B,CAAC,IAAY;IACrD,IAAI;QACF,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAsB,IAAA,WAAI,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;KACjE;IAAC,WAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAPD,gEAOC;AAED,SAAgB,cAAc,CAAC,IAAY,EAAE,cAAsB;IACjE,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;IACvD,IAAI,eAAe,EAAE;QACnB,cAAc,GAAG,eAAe,CAAC;KAClC;IACD,IAAI,cAAc,EAAE;QAClB,IAAI,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACnC,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;SACnC;aAAM;YACL,OAAO,cAAc,CAAC;SACvB;KACF;SAAM;QACL,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;KACnD;AACH,CAAC;AAdD,wCAcC"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.createPackageJson = void 0;
|
4
|
-
const
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
5
5
|
/**
|
6
6
|
* Creates a package.json in the output directory for support to install dependencies within containers.
|
7
7
|
*
|
@@ -17,7 +17,7 @@ function createPackageJson(projectName, graph, options) {
|
|
17
17
|
devDependencies: {},
|
18
18
|
};
|
19
19
|
try {
|
20
|
-
packageJson = (0,
|
20
|
+
packageJson = (0, devkit_1.readJsonFile)(`${options.projectRoot}/package.json`);
|
21
21
|
if (!packageJson.dependencies) {
|
22
22
|
packageJson.dependencies = {};
|
23
23
|
}
|
@@ -26,7 +26,7 @@ function createPackageJson(projectName, graph, options) {
|
|
26
26
|
}
|
27
27
|
}
|
28
28
|
catch (e) { }
|
29
|
-
const rootPackageJson = (0,
|
29
|
+
const rootPackageJson = (0, devkit_1.readJsonFile)(`${options.root}/package.json`);
|
30
30
|
Object.entries(npmDeps).forEach(([packageName, version]) => {
|
31
31
|
var _a;
|
32
32
|
if ((_a = rootPackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[packageName]) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"create-package-json.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/create-package-json.ts"],"names":[],"mappings":";;;AACA,
|
1
|
+
{"version":3,"file":"create-package-json.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/create-package-json.ts"],"names":[],"mappings":"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"}
|
@@ -1,6 +1,4 @@
|
|
1
1
|
/// <reference types="node" />
|
2
|
-
import { serializeJson, readJsonFile, writeJsonFile } from '@nrwl/devkit';
|
3
|
-
export { readJsonFile, writeJsonFile, serializeJson };
|
4
2
|
export declare function writeToFile(filePath: string, str: string): void;
|
5
3
|
/**
|
6
4
|
* This method is specifically for updating a JSON file using the filesystem
|
@@ -1,13 +1,10 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.resolve = exports.isRelativePath = exports.renameSync = exports.createDirectory = exports.fileExists = exports.directoryExists = exports.copyFile = exports.updateJsonFile = exports.writeToFile =
|
3
|
+
exports.resolve = exports.isRelativePath = exports.renameSync = exports.createDirectory = exports.fileExists = exports.directoryExists = exports.copyFile = exports.updateJsonFile = exports.writeToFile = void 0;
|
4
4
|
const fs_1 = require("fs");
|
5
5
|
const fs_extra_1 = require("fs-extra");
|
6
6
|
const path_1 = require("path");
|
7
7
|
const devkit_1 = require("@nrwl/devkit");
|
8
|
-
Object.defineProperty(exports, "serializeJson", { enumerable: true, get: function () { return devkit_1.serializeJson; } });
|
9
|
-
Object.defineProperty(exports, "readJsonFile", { enumerable: true, get: function () { return devkit_1.readJsonFile; } });
|
10
|
-
Object.defineProperty(exports, "writeJsonFile", { enumerable: true, get: function () { return devkit_1.writeJsonFile; } });
|
11
8
|
function writeToFile(filePath, str) {
|
12
9
|
(0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(filePath));
|
13
10
|
(0, fs_1.writeFileSync)(filePath, str);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"fileutils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/fileutils.ts"],"names":[],"mappings":";;;AAAA,2BAQY;AACZ,uCAAyC;AACzC,+BAAiE;AACjE,
|
1
|
+
{"version":3,"file":"fileutils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/fileutils.ts"],"names":[],"mappings":"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"}
|
@@ -2,12 +2,12 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.listInstalledPlugins = exports.getInstalledPluginsFromPackageJson = void 0;
|
4
4
|
const chalk = require("chalk");
|
5
|
-
const
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
6
6
|
const output_1 = require("../output");
|
7
7
|
const plugin_capabilities_1 = require("./plugin-capabilities");
|
8
8
|
const shared_1 = require("./shared");
|
9
9
|
function getInstalledPluginsFromPackageJson(workspaceRoot, corePlugins, communityPlugins = []) {
|
10
|
-
const packageJson = (0,
|
10
|
+
const packageJson = (0, devkit_1.readJsonFile)(`${workspaceRoot}/package.json`);
|
11
11
|
const plugins = new Set([
|
12
12
|
...corePlugins.map((p) => p.name),
|
13
13
|
...communityPlugins.map((p) => p.name),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"installed-plugins.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/installed-plugins.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,
|
1
|
+
{"version":3,"file":"installed-plugins.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/installed-plugins.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,yCAA4C;AAC5C,sCAAmC;AAEnC,+DAA8D;AAC9D,qCAAuC;AAEvC,SAAgB,kCAAkC,CAChD,aAAqB,EACrB,WAAyB,EACzB,mBAAsC,EAAE;IAExC,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,GAAG,aAAa,eAAe,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;QACtB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACjC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACtC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;QAC9C,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;KAClD,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;SACvB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACf,IAAI;YACF,4EAA4E;YAC5E,qEAAqE;YACrE,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,eAAe,EAAE,EAAE,KAAK,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC;SACb;QAAC,WAAM;YACN,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC;SACD,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,2CAAqB,EAAC,aAAa,EAAE,IAAI,CAAC,CAAC;SACzD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AACzD,CAAC;AA5BD,gFA4BC;AAED,SAAgB,oBAAoB,CAAC,gBAAsC;IACzE,eAAM,CAAC,GAAG,CAAC;QACT,KAAK,EAAE,oBAAoB;QAC3B,SAAS,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACpC,MAAM,YAAY,GAAG,EAAE,CAAC;YACxB,IAAI,IAAA,oBAAW,EAAC,CAAC,CAAC,SAAS,CAAC,EAAE;gBAC5B,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAC/B;YACD,IAAI,IAAA,oBAAW,EAAC,CAAC,CAAC,UAAU,CAAC,EAAE;gBAC7B,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;aACjC;YACD,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC;QAC1D,CAAC,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAdD,oDAcC"}
|
@@ -1,7 +1,7 @@
|
|
1
|
-
import { ProjectGraph, ProjectGraphNode } from '@nrwl/devkit';
|
1
|
+
import { ProjectGraph, ProjectGraphNode, TargetConfiguration } from '@nrwl/devkit';
|
2
2
|
export declare function projectHasTarget(project: ProjectGraphNode, target: string): any;
|
3
3
|
export declare function projectHasTargetAndConfiguration(project: ProjectGraphNode, target: string, configuration: string): any;
|
4
|
-
export declare function mergeNpmScriptsWithTargets(projectRoot: string, targets: any):
|
4
|
+
export declare function mergeNpmScriptsWithTargets(projectRoot: string, targets: any): Record<string, TargetConfiguration>;
|
5
5
|
export declare function getSourceDirOfDependentProjects(projectName: string, projectGraph?: ProjectGraph<any>): string[];
|
6
6
|
/**
|
7
7
|
* Finds the project node name by a file that lives within it's src root
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"project-graph-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/project-graph-utils.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"project-graph-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/project-graph-utils.ts"],"names":[],"mappings":"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"}
|
@@ -19,4 +19,4 @@ export interface TypescriptWatchChangeEvent {
|
|
19
19
|
export declare function compileTypeScript(options: TypeScriptCompilationOptions): {
|
20
20
|
success: boolean;
|
21
21
|
};
|
22
|
-
export declare function compileTypeScriptWatcher(options: TypeScriptCompilationOptions, callback: (diagnostic: Diagnostic, newLine: string, options: ts.CompilerOptions, errorCount: number) => void | Promise<void>):
|
22
|
+
export declare function compileTypeScriptWatcher(options: TypeScriptCompilationOptions, callback: (diagnostic: Diagnostic, newLine: string, options: ts.CompilerOptions, errorCount: number) => void | Promise<void>): ts.WatchOfConfigFile<ts.BuilderProgram>;
|
@@ -27,8 +27,8 @@ function compileTypeScriptWatcher(options, callback) {
|
|
27
27
|
const originalProgramEmit = builderProgram.emit;
|
28
28
|
builderProgram.emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
|
29
29
|
var _a;
|
30
|
-
const
|
31
|
-
const mergedCustomTransformers = mergeCustomTransformers(customTransformers,
|
30
|
+
const consumerCustomTransformers = (_a = options.getCustomTransformers) === null || _a === void 0 ? void 0 : _a.call(options, builderProgram.getProgram());
|
31
|
+
const mergedCustomTransformers = mergeCustomTransformers(customTransformers, consumerCustomTransformers);
|
32
32
|
return originalProgramEmit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, mergedCustomTransformers);
|
33
33
|
};
|
34
34
|
if (originalAfterProgramCreate)
|
@@ -39,35 +39,34 @@ function compileTypeScriptWatcher(options, callback) {
|
|
39
39
|
originalOnWatchStatusChange === null || originalOnWatchStatusChange === void 0 ? void 0 : originalOnWatchStatusChange(a, b, c, d);
|
40
40
|
yield (callback === null || callback === void 0 ? void 0 : callback(a, b, c, d));
|
41
41
|
});
|
42
|
-
ts.createWatchProgram(host);
|
43
|
-
return new Promise(() => { });
|
42
|
+
return ts.createWatchProgram(host);
|
44
43
|
}
|
45
44
|
exports.compileTypeScriptWatcher = compileTypeScriptWatcher;
|
46
|
-
function mergeCustomTransformers(
|
45
|
+
function mergeCustomTransformers(originalCustomTransformers, consumerCustomTransformers) {
|
47
46
|
if (!consumerCustomTransformers)
|
48
|
-
return
|
47
|
+
return originalCustomTransformers;
|
49
48
|
const mergedCustomTransformers = {};
|
50
49
|
if (consumerCustomTransformers.before) {
|
51
|
-
mergedCustomTransformers.before = (
|
50
|
+
mergedCustomTransformers.before = (originalCustomTransformers === null || originalCustomTransformers === void 0 ? void 0 : originalCustomTransformers.before)
|
52
51
|
? [
|
53
|
-
...
|
52
|
+
...originalCustomTransformers.before,
|
54
53
|
...consumerCustomTransformers.before,
|
55
54
|
]
|
56
55
|
: consumerCustomTransformers.before;
|
57
56
|
}
|
58
57
|
if (consumerCustomTransformers.after) {
|
59
|
-
mergedCustomTransformers.after = (
|
58
|
+
mergedCustomTransformers.after = (originalCustomTransformers === null || originalCustomTransformers === void 0 ? void 0 : originalCustomTransformers.after)
|
60
59
|
? [
|
61
|
-
...
|
60
|
+
...originalCustomTransformers.after,
|
62
61
|
...consumerCustomTransformers.after,
|
63
62
|
]
|
64
63
|
: consumerCustomTransformers.after;
|
65
64
|
}
|
66
65
|
if (consumerCustomTransformers.afterDeclarations) {
|
67
66
|
mergedCustomTransformers.afterDeclarations =
|
68
|
-
(
|
67
|
+
(originalCustomTransformers === null || originalCustomTransformers === void 0 ? void 0 : originalCustomTransformers.afterDeclarations)
|
69
68
|
? [
|
70
|
-
...
|
69
|
+
...originalCustomTransformers.afterDeclarations,
|
71
70
|
...consumerCustomTransformers.afterDeclarations,
|
72
71
|
]
|
73
72
|
: consumerCustomTransformers.afterDeclarations;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"compilation.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/compilation.ts"],"names":[],"mappings":";;;;AAAA,yCAAsC;AACtC,uCAAsC;AACtC,iCAAiC;AAEjC,8CAA6C;AAoB7C,SAAgB,iBAAiB,CAAC,OAAqC;IAGrE,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IAE1D,IAAI,iBAAiB,CAAC,gBAAgB,EAAE;QACtC,IAAA,qBAAU,EAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;KAC1C;IAED,OAAO,aAAa,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;AACpD,CAAC;AAXD,8CAWC;AAED,SAAgB,wBAAwB,CACtC,OAAqC,EACrC,QAKyB;IAEzB,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IAE1D,IAAI,iBAAiB,CAAC,gBAAgB,EAAE;QACtC,IAAA,qBAAU,EAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;KAC1C;IAED,MAAM,IAAI,GAAG,EAAE,CAAC,uBAAuB,CACrC,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,OAAO,EAChB,EAAE,CAAC,GAAG,CACP,CAAC;IAEF,MAAM,0BAA0B,GAAG,IAAI,CAAC,kBAAkB,CAAC;IAC3D,IAAI,CAAC,kBAAkB,GAAG,CAAC,cAAc,EAAE,EAAE;QAC3C,MAAM,mBAAmB,GAAG,cAAc,CAAC,IAAI,CAAC;QAChD,cAAc,CAAC,IAAI,GAAG,CACpB,gBAAgB,EAChB,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,EAAE;;YACF,MAAM,
|
1
|
+
{"version":3,"file":"compilation.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/compilation.ts"],"names":[],"mappings":"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"}
|
package/src/utils/fileutils.d.ts
CHANGED
@@ -1,5 +1,3 @@
|
|
1
|
-
import { serializeJson, readJsonFile, writeJsonFile } from '@nrwl/devkit';
|
2
|
-
export { serializeJson, readJsonFile, writeJsonFile };
|
3
1
|
export declare function writeToFile(filePath: string, str: string): void;
|
4
2
|
/**
|
5
3
|
* This method is specifically for updating a JSON file using the filesystem
|
package/src/utils/fileutils.js
CHANGED
@@ -1,13 +1,10 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.isRelativePath = exports.renameSync = exports.createDirectory = exports.fileExists = exports.directoryExists = exports.copyFile = exports.updateJsonFile = exports.writeToFile =
|
3
|
+
exports.isRelativePath = exports.renameSync = exports.createDirectory = exports.fileExists = exports.directoryExists = exports.copyFile = exports.updateJsonFile = exports.writeToFile = void 0;
|
4
4
|
const fs_1 = require("fs");
|
5
5
|
const fs_extra_1 = require("fs-extra");
|
6
6
|
const path_1 = require("path");
|
7
7
|
const devkit_1 = require("@nrwl/devkit");
|
8
|
-
Object.defineProperty(exports, "serializeJson", { enumerable: true, get: function () { return devkit_1.serializeJson; } });
|
9
|
-
Object.defineProperty(exports, "readJsonFile", { enumerable: true, get: function () { return devkit_1.readJsonFile; } });
|
10
|
-
Object.defineProperty(exports, "writeJsonFile", { enumerable: true, get: function () { return devkit_1.writeJsonFile; } });
|
11
8
|
function writeToFile(filePath, str) {
|
12
9
|
(0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(filePath));
|
13
10
|
(0, fs_1.writeFileSync)(filePath, str);
|