@nrwl/workspace 13.2.2 → 13.3.0-beta.12
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/executors.json +0 -10
- package/migrations.json +6 -0
- package/package.json +5 -5
- package/src/command-line/affected.js +1 -3
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/examples.js +0 -20
- package/src/command-line/examples.js.map +1 -1
- package/src/command-line/format.js +12 -7
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/run-many.js +1 -3
- package/src/command-line/run-many.js.map +1 -1
- package/src/command-line/run-one.js +1 -3
- package/src/command-line/run-one.js.map +1 -1
- package/src/core/dep-graph/index.html +41 -1
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/core/dep-graph/styles.css +1 -1
- package/src/core/file-utils.js +6 -3
- package/src/core/file-utils.js.map +1 -1
- package/src/core/nx-deps/nx-deps-cache.js +1 -1
- package/src/core/nx-deps/nx-deps-cache.js.map +1 -1
- package/src/core/project-graph/build-project-graph.js +0 -1
- package/src/core/project-graph/build-project-graph.js.map +1 -1
- package/src/core/project-graph/daemon/server/logger.d.ts +0 -1
- package/src/core/project-graph/daemon/server/logger.js +0 -3
- package/src/core/project-graph/daemon/server/logger.js.map +1 -1
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.d.ts +3 -0
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js +28 -21
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/core/project-graph/daemon/server/server.js +65 -34
- package/src/core/project-graph/daemon/server/server.js.map +1 -1
- package/src/core/project-graph/daemon/server/shutdown-utils.js +10 -6
- package/src/core/project-graph/daemon/server/shutdown-utils.js.map +1 -1
- package/src/core/project-graph/project-graph.js +21 -7
- package/src/core/project-graph/project-graph.js.map +1 -1
- package/src/core/shared-interfaces.d.ts +6 -2
- package/src/generators/library/library.js +3 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/npm-package/npm-package.js +6 -3
- package/src/generators/npm-package/npm-package.js.map +1 -1
- package/src/migrations/update-13-3-0/update-tsc-executor-location.d.ts +3 -0
- package/src/migrations/update-13-3-0/update-tsc-executor-location.js +31 -0
- package/src/migrations/update-13-3-0/update-tsc-executor-location.js.map +1 -0
- package/src/tasks-runner/default-reporter.d.ts +4 -0
- package/src/tasks-runner/default-reporter.js +4 -0
- package/src/tasks-runner/default-reporter.js.map +1 -1
- package/src/tasks-runner/default-tasks-runner.d.ts +2 -12
- package/src/tasks-runner/default-tasks-runner.js +15 -42
- package/src/tasks-runner/default-tasks-runner.js.map +1 -1
- package/src/tasks-runner/empty-reporter.d.ts +4 -0
- package/src/tasks-runner/empty-reporter.js +4 -0
- package/src/tasks-runner/empty-reporter.js.map +1 -1
- package/src/tasks-runner/empty-terminal-output-life-cycle.d.ts +6 -0
- package/src/tasks-runner/empty-terminal-output-life-cycle.js +16 -0
- package/src/tasks-runner/empty-terminal-output-life-cycle.js.map +1 -0
- package/src/tasks-runner/forked-process-task-runner.js +3 -9
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/life-cycle.d.ts +43 -0
- package/src/tasks-runner/life-cycle.js +72 -0
- package/src/tasks-runner/life-cycle.js.map +1 -0
- package/src/tasks-runner/reporter.d.ts +4 -0
- package/src/tasks-runner/reporter.js +4 -0
- package/src/tasks-runner/reporter.js.map +1 -1
- package/src/tasks-runner/run-command.d.ts +4 -4
- package/src/tasks-runner/run-command.js +66 -54
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/run-many-terminal-output-life-cycle.d.ts +25 -0
- package/src/tasks-runner/run-many-terminal-output-life-cycle.js +91 -0
- package/src/tasks-runner/run-many-terminal-output-life-cycle.js.map +1 -0
- package/src/tasks-runner/run-one-reporter.d.ts +4 -0
- package/src/tasks-runner/run-one-reporter.js +4 -0
- package/src/tasks-runner/run-one-reporter.js.map +1 -1
- package/src/tasks-runner/run-one-terminal-output-life-cycle.d.ts +25 -0
- package/src/tasks-runner/run-one-terminal-output-life-cycle.js +84 -0
- package/src/tasks-runner/run-one-terminal-output-life-cycle.js.map +1 -0
- package/src/tasks-runner/task-orchestrator.d.ts +5 -15
- package/src/tasks-runner/task-orchestrator.js +18 -111
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/task-timings-life-cycle.d.ts +13 -0
- package/src/tasks-runner/task-timings-life-cycle.js +33 -0
- package/src/tasks-runner/task-timings-life-cycle.js.map +1 -0
- package/src/tasks-runner/tasks-runner-v2.d.ts +17 -3
- package/src/tasks-runner/tasks-runner-v2.js +32 -3
- package/src/tasks-runner/tasks-runner-v2.js.map +1 -1
- package/src/tasks-runner/tasks-runner.d.ts +23 -2
- package/src/tasks-runner/tasks-runner.js +5 -0
- package/src/tasks-runner/tasks-runner.js.map +1 -1
- package/src/tasks-runner/tasks-schedule.d.ts +5 -2
- package/src/tasks-runner/tasks-schedule.js +32 -15
- package/src/tasks-runner/tasks-schedule.js.map +1 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.d.ts +3 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.js +8 -4
- package/src/tslint/nxEnforceModuleBoundariesRule.js.map +1 -1
- package/src/utils/ast-utils.d.ts +1 -1
- package/src/utils/graph-utils.js +1 -1
- package/src/utils/graph-utils.js.map +1 -1
- package/src/utils/rules/format-files.js +7 -11
- package/src/utils/rules/format-files.js.map +1 -1
- package/src/utils/runtime-lint-utils.d.ts +6 -2
- package/src/utils/runtime-lint-utils.js +30 -9
- package/src/utils/runtime-lint-utils.js.map +1 -1
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +4 -4
- package/src/utils/versions.js.map +1 -1
- package/src/command-line/workspace-results.d.ts +0 -13
- package/src/command-line/workspace-results.js +0 -66
- package/src/command-line/workspace-results.js.map +0 -1
- package/src/executors/tsc/compat.d.ts +0 -2
- package/src/executors/tsc/compat.js +0 -6
- package/src/executors/tsc/compat.js.map +0 -1
- package/src/executors/tsc/schema.d.ts +0 -6
- package/src/executors/tsc/schema.json +0 -65
- package/src/executors/tsc/tsc.impl.d.ts +0 -6
- package/src/executors/tsc/tsc.impl.js +0 -64
- package/src/executors/tsc/tsc.impl.js.map +0 -1
- package/src/generators/init/files/prettier/.prettierignore +0 -1
|
@@ -11,17 +11,19 @@ const target_project_locator_1 = require("../core/target-project-locator");
|
|
|
11
11
|
const graph_utils_1 = require("../utils/graph-utils");
|
|
12
12
|
const fileutils_1 = require("../utilities/fileutils");
|
|
13
13
|
class Rule extends Lint.Rules.AbstractRule {
|
|
14
|
-
constructor(options, projectPath, npmScope, projectGraph, targetProjectLocator) {
|
|
14
|
+
constructor(options, projectPath, npmScope, projectGraph, targetProjectLocator, workspaceLayout) {
|
|
15
15
|
super(options);
|
|
16
16
|
this.projectPath = projectPath;
|
|
17
17
|
this.npmScope = npmScope;
|
|
18
18
|
this.projectGraph = projectGraph;
|
|
19
19
|
this.targetProjectLocator = targetProjectLocator;
|
|
20
|
+
this.workspaceLayout = workspaceLayout;
|
|
20
21
|
if (!projectPath) {
|
|
21
22
|
this.projectPath = (0, path_1.normalize)(app_root_1.appRootPath);
|
|
22
23
|
if (!global.projectGraph) {
|
|
23
24
|
const nxJson = (0, file_utils_1.readNxJson)();
|
|
24
25
|
global.npmScope = nxJson.npmScope;
|
|
26
|
+
global.workspaceLayout = nxJson.workspaceLayout;
|
|
25
27
|
/**
|
|
26
28
|
* Because there are a number of ways in which the rule can be invoked (executor vs TSLint CLI vs IDE Plugin),
|
|
27
29
|
* the ProjectGraph may or may not exist by the time the lint rule is invoked for the first time.
|
|
@@ -32,6 +34,7 @@ class Rule extends Lint.Rules.AbstractRule {
|
|
|
32
34
|
catch (_a) { }
|
|
33
35
|
}
|
|
34
36
|
this.npmScope = global.npmScope;
|
|
37
|
+
this.workspaceLayout = global.workspaceLayout;
|
|
35
38
|
this.projectGraph = global.projectGraph;
|
|
36
39
|
if (!global.targetProjectLocator && this.projectGraph) {
|
|
37
40
|
global.targetProjectLocator = new target_project_locator_1.TargetProjectLocator(this.projectGraph.nodes, this.projectGraph.externalNodes);
|
|
@@ -42,17 +45,18 @@ class Rule extends Lint.Rules.AbstractRule {
|
|
|
42
45
|
apply(sourceFile) {
|
|
43
46
|
if (!this.projectGraph)
|
|
44
47
|
return [];
|
|
45
|
-
return this.applyWithWalker(new EnforceModuleBoundariesWalker(sourceFile, this.getOptions(), this.projectPath, this.npmScope, this.projectGraph, this.targetProjectLocator));
|
|
48
|
+
return this.applyWithWalker(new EnforceModuleBoundariesWalker(sourceFile, this.getOptions(), this.projectPath, this.npmScope, this.projectGraph, this.targetProjectLocator, this.workspaceLayout));
|
|
46
49
|
}
|
|
47
50
|
}
|
|
48
51
|
exports.Rule = Rule;
|
|
49
52
|
class EnforceModuleBoundariesWalker extends Lint.RuleWalker {
|
|
50
|
-
constructor(sourceFile, options, projectPath, npmScope, projectGraph, targetProjectLocator) {
|
|
53
|
+
constructor(sourceFile, options, projectPath, npmScope, projectGraph, targetProjectLocator, workspaceLayout) {
|
|
51
54
|
super(sourceFile, options);
|
|
52
55
|
this.projectPath = projectPath;
|
|
53
56
|
this.npmScope = npmScope;
|
|
54
57
|
this.projectGraph = projectGraph;
|
|
55
58
|
this.targetProjectLocator = targetProjectLocator;
|
|
59
|
+
this.workspaceLayout = workspaceLayout;
|
|
56
60
|
this.enforceBuildableLibDependency = false; // for backwards compat
|
|
57
61
|
this.allowCircularSelfDependency = false;
|
|
58
62
|
this.allow = Array.isArray(this.getOptions()[0].allow)
|
|
@@ -79,7 +83,7 @@ class EnforceModuleBoundariesWalker extends Lint.RuleWalker {
|
|
|
79
83
|
const sourceProject = (0, runtime_lint_utils_1.findSourceProject)(this.projectGraph, filePath);
|
|
80
84
|
// check for relative and absolute imports
|
|
81
85
|
if ((0, runtime_lint_utils_1.isRelativeImportIntoAnotherProject)(imp, this.projectPath, this.projectGraph, filePath, sourceProject) ||
|
|
82
|
-
(0, runtime_lint_utils_1.isAbsoluteImportIntoAnotherProject)(imp)) {
|
|
86
|
+
(0, runtime_lint_utils_1.isAbsoluteImportIntoAnotherProject)(imp, this.workspaceLayout)) {
|
|
83
87
|
this.addFailureAt(node.getStart(), node.getWidth(), `libraries cannot be imported by a relative or absolute path, and must begin with a npm scope`);
|
|
84
88
|
return;
|
|
85
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nxEnforceModuleBoundariesRule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAI/B,
|
|
1
|
+
{"version":3,"file":"nxEnforceModuleBoundariesRule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts"],"names":[],"mappings":"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"}
|
package/src/utils/ast-utils.d.ts
CHANGED
|
@@ -99,7 +99,7 @@ export declare function allFilesInDirInHost(host: Tree, path: Path, options?: {
|
|
|
99
99
|
*/
|
|
100
100
|
export declare function updateJsonInTree<T extends object = any, O extends object = T>(path: string, callback: (json: T, context: SchematicContext) => O): Rule;
|
|
101
101
|
export declare function updateWorkspaceInTree<T extends object = any, O extends object = T>(callback: (json: T, context: SchematicContext, host: Tree) => O): Rule;
|
|
102
|
-
export declare function readNxJsonInTree(host: Tree): NxJsonConfiguration<string[]
|
|
102
|
+
export declare function readNxJsonInTree(host: Tree): NxJsonConfiguration<"*" | string[]>;
|
|
103
103
|
export declare function libsDir(host: Tree): string;
|
|
104
104
|
export declare function appsDir(host: Tree): string;
|
|
105
105
|
export declare function updateNxJsonInTree(callback: (json: NxJsonConfiguration, context: SchematicContext) => NxJsonConfiguration): Rule;
|
package/src/utils/graph-utils.js
CHANGED
|
@@ -89,7 +89,7 @@ function findFilesInCircularPath(circularPath) {
|
|
|
89
89
|
const next = circularPath[i + 1].name;
|
|
90
90
|
const files = circularPath[i].data.files;
|
|
91
91
|
filePathChain.push(Object.keys(files)
|
|
92
|
-
.filter((key) =>
|
|
92
|
+
.filter((key) => files[key].deps && files[key].deps.indexOf(next) !== -1)
|
|
93
93
|
.map((key) => files[key].file));
|
|
94
94
|
}
|
|
95
95
|
return filePathChain;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/graph-utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"graph-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/graph-utils.ts"],"names":[],"mappings":";;;AASA,MAAM,KAAK,GAAU;IACnB,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;CACd,CAAC;AAEF,SAAS,WAAW,CAAC,KAAmB;IACtC,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QACnD,uCACK,GAAG,KACN,CAAC,KAAK,CAAC,EAAE,KAAK,IACd;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACrB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,qBAAQ,gBAAgB,CAAE,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,KAAK,IAAI,IAAI,IAAI,YAAY,EAAE;QAC7B,KAAK,IAAI,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE;YAClC,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAC3B,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;aAChC;SACF;KACF;IAED,MAAM,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACxB,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QAEpB,KAAK,IAAI,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;gBAC5B,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;aAClB;SACF;IACH,CAAC,CAAC;IAEF,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACrB,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,MAAM;QACN,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAgB,OAAO,CACrB,KAAmB,EACnB,iBAAyB,EACzB,iBAAyB;IAEzB,IAAI,iBAAiB,KAAK,iBAAiB;QAAE,OAAO,EAAE,CAAC;IAEvD,IAAI,KAAK,CAAC,KAAK,KAAK,KAAK,EAAE;QACzB,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QAClC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;QACpB,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;KAChC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAE9B,IAAI,IAAI,GAAa,EAAE,CAAC;IACxB,MAAM,KAAK,GAA8B,CAAC,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC;IACrE,MAAM,OAAO,GAAa,CAAC,iBAAiB,CAAC,CAAC;IAE9C,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QACjC,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;QAEvB,IAAI,OAAO,KAAK,iBAAiB;YAAE,MAAM;QAEzC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;YAAE,MAAM;QAE7B,OAAO,CAAC,OAAO,CAAC;aACb,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;aAC5C,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,iBAAiB,CAAC,CAAC;aACrD,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAClB,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;KACN;IAED,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACxC;SAAM;QACL,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AA1CD,0BA0CC;AAED,SAAgB,iBAAiB,CAC/B,KAAmB,EACnB,aAA+B,EAC/B,aAA+B;IAE/B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAEhD,OAAO,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;AAChE,CAAC;AARD,8CAQC;AAED,SAAgB,uBAAuB,CACrC,YAAgC;IAEhC,MAAM,aAAa,GAAG,EAAE,CAAC;IAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QAChD,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;QACtC,MAAM,KAAK,GAAe,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;QACrD,aAAa,CAAC,IAAI,CAChB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,MAAM,CACL,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CACjE;aACA,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CACjC,CAAC;KACH;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAlBD,0DAkBC"}
|
|
@@ -19,7 +19,7 @@ function formatFiles(options = { skipFormat: false }, directory = '') {
|
|
|
19
19
|
return (0, schematics_1.noop)();
|
|
20
20
|
}
|
|
21
21
|
return (host, context) => {
|
|
22
|
-
updateWorkspaceJsonToMatchFormatVersion(host
|
|
22
|
+
updateWorkspaceJsonToMatchFormatVersion(host);
|
|
23
23
|
if (!prettier) {
|
|
24
24
|
return host;
|
|
25
25
|
}
|
|
@@ -55,23 +55,19 @@ function formatFiles(options = { skipFormat: false }, directory = '') {
|
|
|
55
55
|
};
|
|
56
56
|
}
|
|
57
57
|
exports.formatFiles = formatFiles;
|
|
58
|
-
function updateWorkspaceJsonToMatchFormatVersion(host
|
|
59
|
-
const
|
|
60
|
-
`${directory}/workspace.json`,
|
|
61
|
-
`${directory}/angular.json`,
|
|
62
|
-
];
|
|
63
|
-
const path = possibleFiles.filter((path) => host.exists(path))[0];
|
|
58
|
+
function updateWorkspaceJsonToMatchFormatVersion(host) {
|
|
59
|
+
const workspaceConfigPath = (0, workspace_1.workspaceConfigName)(app_root_1.appRootPath);
|
|
64
60
|
try {
|
|
65
|
-
if (
|
|
66
|
-
const workspaceJson = (0, devkit_1.parseJson)(host.read(
|
|
61
|
+
if (workspaceConfigPath) {
|
|
62
|
+
const workspaceJson = (0, devkit_1.parseJson)(host.read(workspaceConfigPath).toString());
|
|
67
63
|
const reformatted = (0, workspace_1.reformattedWorkspaceJsonOrNull)(workspaceJson);
|
|
68
64
|
if (reformatted) {
|
|
69
|
-
host.overwrite(
|
|
65
|
+
host.overwrite(workspaceConfigPath, (0, devkit_1.serializeJson)(reformatted));
|
|
70
66
|
}
|
|
71
67
|
}
|
|
72
68
|
}
|
|
73
69
|
catch (e) {
|
|
74
|
-
console.error(`Failed to format: ${
|
|
70
|
+
console.error(`Failed to format workspace config: ${workspaceConfigPath}`);
|
|
75
71
|
console.error(e);
|
|
76
72
|
}
|
|
77
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/format-files.ts"],"names":[],"mappings":";;;;AAAA,2DAOoC;AACpC,+BAA4B;AAC5B,8CAAuD;AACvD,6BAA6B;AAC7B,2DAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"format-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/format-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FileData } from '../core/file-utils';
|
|
2
|
-
import { ProjectGraph, ProjectGraphDependency, ProjectGraphNode, ProjectGraphProjectNode } from '@nrwl/devkit';
|
|
2
|
+
import { ProjectGraph, ProjectGraphDependency, ProjectGraphNode, ProjectGraphProjectNode, ProjectGraphExternalNode } from '@nrwl/devkit';
|
|
3
3
|
import { TargetProjectLocator } from '../core/target-project-locator';
|
|
4
4
|
export declare type MappedProjectGraphNode<T = any> = ProjectGraphProjectNode<T> & {
|
|
5
5
|
data: {
|
|
@@ -24,12 +24,16 @@ export declare function isRelativeImportIntoAnotherProject(imp: string, projectP
|
|
|
24
24
|
export declare function findProjectUsingFile<T>(projectGraph: MappedProjectGraph<T>, file: string): MappedProjectGraphNode;
|
|
25
25
|
export declare function findSourceProject(projectGraph: MappedProjectGraph, sourceFilePath: string): MappedProjectGraphNode<any>;
|
|
26
26
|
export declare function findTargetProject(projectGraph: MappedProjectGraph, targetFile: string): MappedProjectGraphNode<any>;
|
|
27
|
-
export declare function isAbsoluteImportIntoAnotherProject(imp: string
|
|
27
|
+
export declare function isAbsoluteImportIntoAnotherProject(imp: string, workspaceLayout?: {
|
|
28
|
+
libsDir: string;
|
|
29
|
+
appsDir: string;
|
|
30
|
+
}): boolean;
|
|
28
31
|
export declare function findProjectUsingImport(projectGraph: ProjectGraph, targetProjectLocator: TargetProjectLocator, filePath: string, imp: string, npmScope: string): ProjectGraphNode<any>;
|
|
29
32
|
export declare function findConstraintsFor(depConstraints: DepConstraint[], sourceProject: ProjectGraphNode): DepConstraint[];
|
|
30
33
|
export declare function onlyLoadChildren(graph: ProjectGraph, sourceProjectName: string, targetProjectName: string, visited: string[]): any;
|
|
31
34
|
export declare function getSourceFilePath(sourceFileName: string, projectPath: string): string;
|
|
32
35
|
export declare function hasBannedImport(source: ProjectGraphNode, target: ProjectGraphNode, depConstraints: DepConstraint[]): DepConstraint | null;
|
|
36
|
+
export declare function isDirectDependency(target: ProjectGraphExternalNode): boolean;
|
|
33
37
|
/**
|
|
34
38
|
* Verifies whether the given node has an architect builder attached
|
|
35
39
|
* @param projectGraph the node to verify
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mapProjectGraphFiles = exports.hasBuildExecutor = exports.hasBannedImport = exports.getSourceFilePath = exports.onlyLoadChildren = exports.findConstraintsFor = exports.findProjectUsingImport = exports.isAbsoluteImportIntoAnotherProject = exports.findTargetProject = exports.findSourceProject = exports.findProjectUsingFile = exports.isRelativeImportIntoAnotherProject = exports.isRelative = exports.matchImportWithWildcard = exports.hasNoneOfTheseTags = void 0;
|
|
3
|
+
exports.mapProjectGraphFiles = exports.hasBuildExecutor = exports.isDirectDependency = exports.hasBannedImport = exports.getSourceFilePath = exports.onlyLoadChildren = exports.findConstraintsFor = exports.findProjectUsingImport = exports.isAbsoluteImportIntoAnotherProject = exports.findTargetProject = exports.findSourceProject = exports.findProjectUsingFile = exports.isRelativeImportIntoAnotherProject = exports.isRelative = exports.matchImportWithWildcard = exports.hasNoneOfTheseTags = void 0;
|
|
4
4
|
const path = require("path");
|
|
5
|
+
const file_utils_1 = require("../core/file-utils");
|
|
5
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
|
+
const path_1 = require("path");
|
|
8
|
+
const app_root_1 = require("./app-root");
|
|
6
9
|
function hasNoneOfTheseTags(proj, tags) {
|
|
7
10
|
return tags.filter((allowedTag) => hasTag(proj, allowedTag)).length === 0;
|
|
8
11
|
}
|
|
@@ -67,12 +70,11 @@ function findTargetProject(projectGraph, targetFile) {
|
|
|
67
70
|
return targetProject;
|
|
68
71
|
}
|
|
69
72
|
exports.findTargetProject = findTargetProject;
|
|
70
|
-
function isAbsoluteImportIntoAnotherProject(imp) {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
imp.startsWith(
|
|
74
|
-
imp.startsWith(
|
|
75
|
-
imp.startsWith('/apps/'));
|
|
73
|
+
function isAbsoluteImportIntoAnotherProject(imp, workspaceLayout = { libsDir: 'libs', appsDir: 'apps' }) {
|
|
74
|
+
return (imp.startsWith(`${workspaceLayout.libsDir}/`) ||
|
|
75
|
+
imp.startsWith(`/${workspaceLayout.libsDir}/`) ||
|
|
76
|
+
imp.startsWith(`${workspaceLayout.appsDir}/`) ||
|
|
77
|
+
imp.startsWith(`/${workspaceLayout.appsDir}/`));
|
|
76
78
|
}
|
|
77
79
|
exports.isAbsoluteImportIntoAnotherProject = isAbsoluteImportIntoAnotherProject;
|
|
78
80
|
function findProjectUsingImport(projectGraph, targetProjectLocator, filePath, imp, npmScope) {
|
|
@@ -112,6 +114,25 @@ function hasBannedImport(source, target, depConstraints) {
|
|
|
112
114
|
return depConstraints.find((constraint) => constraint.bannedExternalImports.some((importDefinition) => parseImportWildcards(importDefinition).test(target.data.packageName)));
|
|
113
115
|
}
|
|
114
116
|
exports.hasBannedImport = hasBannedImport;
|
|
117
|
+
function isDirectDependency(target) {
|
|
118
|
+
const fileName = 'package.json';
|
|
119
|
+
const content = (0, file_utils_1.readFileIfExisting)((0, path_1.join)(app_root_1.appRootPath, fileName));
|
|
120
|
+
if (content) {
|
|
121
|
+
const { dependencies, devDependencies, peerDependencies } = (0, devkit_1.parseJson)(content);
|
|
122
|
+
if (dependencies && dependencies[target.data.packageName]) {
|
|
123
|
+
return true;
|
|
124
|
+
}
|
|
125
|
+
if (peerDependencies && peerDependencies[target.data.packageName]) {
|
|
126
|
+
return true;
|
|
127
|
+
}
|
|
128
|
+
if (devDependencies && devDependencies[target.data.packageName]) {
|
|
129
|
+
return true;
|
|
130
|
+
}
|
|
131
|
+
return false;
|
|
132
|
+
}
|
|
133
|
+
return true;
|
|
134
|
+
}
|
|
135
|
+
exports.isDirectDependency = isDirectDependency;
|
|
115
136
|
/**
|
|
116
137
|
* Maps import with wildcards to regex pattern
|
|
117
138
|
* @param importDefinition
|
|
@@ -140,8 +161,8 @@ function mapProjectGraphFiles(projectGraph) {
|
|
|
140
161
|
const nodes = {};
|
|
141
162
|
Object.entries(projectGraph.nodes).forEach(([name, node]) => {
|
|
142
163
|
const files = {};
|
|
143
|
-
node.data.files.forEach(({ file, hash }) => {
|
|
144
|
-
files[removeExt(file)] = { file, hash };
|
|
164
|
+
node.data.files.forEach(({ file, hash, deps }) => {
|
|
165
|
+
files[removeExt(file)] = Object.assign({ file, hash }, (deps && { deps }));
|
|
145
166
|
});
|
|
146
167
|
const data = Object.assign(Object.assign({}, node.data), { files });
|
|
147
168
|
nodes[name] = Object.assign(Object.assign({}, node), { data });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-lint-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/runtime-lint-utils.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;
|
|
1
|
+
{"version":3,"file":"runtime-lint-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/runtime-lint-utils.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ export declare const nxVersion = "*";
|
|
|
2
2
|
export declare const angularCliVersion = "~13.0.0";
|
|
3
3
|
export declare const typescriptVersion = "~4.4.3";
|
|
4
4
|
export declare const prettierVersion = "^2.3.1";
|
|
5
|
-
export declare const typescriptESLintVersion = "4.33.0";
|
|
6
5
|
export declare const tslintVersion = "~6.1.0";
|
|
7
|
-
export declare const
|
|
6
|
+
export declare const typescriptESLintVersion = "~5.3.0";
|
|
7
|
+
export declare const eslintVersion = "8.2.0";
|
|
8
8
|
export declare const eslintConfigPrettierVersion = "8.1.0";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.
|
|
4
|
-
exports.nxVersion = '13.
|
|
3
|
+
exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
|
4
|
+
exports.nxVersion = '13.3.0-beta.12';
|
|
5
5
|
exports.angularCliVersion = '~13.0.0';
|
|
6
6
|
exports.typescriptVersion = '~4.4.3';
|
|
7
7
|
exports.prettierVersion = '^2.3.1';
|
|
8
|
-
exports.typescriptESLintVersion = '4.33.0';
|
|
9
8
|
exports.tslintVersion = '~6.1.0';
|
|
10
|
-
exports.
|
|
9
|
+
exports.typescriptESLintVersion = '~5.3.0';
|
|
10
|
+
exports.eslintVersion = '8.2.0';
|
|
11
11
|
exports.eslintConfigPrettierVersion = '8.1.0';
|
|
12
12
|
//# sourceMappingURL=versions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,aAAa,GAAG,OAAO,CAAC;AACxB,QAAA,2BAA2B,GAAG,OAAO,CAAC"}
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
import type { ProjectGraphNode } from '@nrwl/devkit';
|
|
2
|
-
export declare class WorkspaceResults {
|
|
3
|
-
private command;
|
|
4
|
-
private projects;
|
|
5
|
-
startedWithFailedProjects: boolean;
|
|
6
|
-
private commandResults;
|
|
7
|
-
get hasFailure(): boolean;
|
|
8
|
-
constructor(command: string, projects: Record<string, ProjectGraphNode>);
|
|
9
|
-
getResult(projectName: string): boolean;
|
|
10
|
-
saveResults(): void;
|
|
11
|
-
setResult(projectName: string, result: boolean): void;
|
|
12
|
-
private invalidateOldResults;
|
|
13
|
-
}
|
|
@@ -1,66 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.WorkspaceResults = void 0;
|
|
4
|
-
const fileutils_1 = require("../utilities/fileutils");
|
|
5
|
-
const fs_1 = require("fs");
|
|
6
|
-
const fs_extra_1 = require("fs-extra");
|
|
7
|
-
const path_1 = require("path");
|
|
8
|
-
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
9
|
-
const cache_directory_1 = require("../utilities/cache-directory");
|
|
10
|
-
const resultsDir = (0, cache_directory_1.cacheDirectory)(app_root_1.appRootPath, (0, cache_directory_1.readCacheDirectoryProperty)(app_root_1.appRootPath));
|
|
11
|
-
const resultsFile = (0, path_1.join)(resultsDir, 'results.json');
|
|
12
|
-
class WorkspaceResults {
|
|
13
|
-
constructor(command, projects) {
|
|
14
|
-
this.command = command;
|
|
15
|
-
this.projects = projects;
|
|
16
|
-
this.commandResults = {
|
|
17
|
-
command: this.command,
|
|
18
|
-
results: {},
|
|
19
|
-
};
|
|
20
|
-
this.startedWithFailedProjects = false;
|
|
21
|
-
if ((0, fs_1.existsSync)(resultsFile)) {
|
|
22
|
-
try {
|
|
23
|
-
const commandResults = (0, fileutils_1.readJsonFile)(resultsFile);
|
|
24
|
-
this.startedWithFailedProjects = commandResults.command === command;
|
|
25
|
-
if (this.startedWithFailedProjects) {
|
|
26
|
-
this.commandResults = commandResults;
|
|
27
|
-
this.invalidateOldResults();
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
catch (_a) {
|
|
31
|
-
/**
|
|
32
|
-
* If we got here it is likely that RESULTS_FILE is not valid JSON.
|
|
33
|
-
* It is safe to continue, and it does not make much sense to give the
|
|
34
|
-
* user feedback as the file will be updated automatically.
|
|
35
|
-
*/
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
get hasFailure() {
|
|
40
|
-
return Object.values(this.commandResults.results).some((result) => !result);
|
|
41
|
-
}
|
|
42
|
-
getResult(projectName) {
|
|
43
|
-
return this.commandResults.results[projectName];
|
|
44
|
-
}
|
|
45
|
-
saveResults() {
|
|
46
|
-
(0, fs_extra_1.ensureDirSync)(resultsDir);
|
|
47
|
-
if (this.hasFailure) {
|
|
48
|
-
(0, fileutils_1.writeJsonFile)(resultsFile, this.commandResults);
|
|
49
|
-
}
|
|
50
|
-
else if ((0, fs_1.existsSync)(resultsFile)) {
|
|
51
|
-
(0, fs_1.unlinkSync)(resultsFile);
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
setResult(projectName, result) {
|
|
55
|
-
this.commandResults.results[projectName] = result;
|
|
56
|
-
}
|
|
57
|
-
invalidateOldResults() {
|
|
58
|
-
Object.keys(this.commandResults.results).forEach((projectName) => {
|
|
59
|
-
if (!this.projects[projectName]) {
|
|
60
|
-
delete this.commandResults.results[projectName];
|
|
61
|
-
}
|
|
62
|
-
});
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
exports.WorkspaceResults = WorkspaceResults;
|
|
66
|
-
//# sourceMappingURL=workspace-results.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-results.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/workspace-results.ts"],"names":[],"mappings":";;;AAAA,sDAAqE;AACrE,2BAA4C;AAC5C,uCAAyC;AAEzC,+BAA4B;AAC5B,2DAA2D;AAC3D,kEAGsC;AAEtC,MAAM,UAAU,GAAG,IAAA,gCAAc,EAC/B,sBAAW,EACX,IAAA,4CAA0B,EAAC,sBAAW,CAAC,CACxC,CAAC;AACF,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;AAOrD,MAAa,gBAAgB;IAW3B,YACU,OAAe,EACf,QAA0C;QAD1C,YAAO,GAAP,OAAO,CAAQ;QACf,aAAQ,GAAR,QAAQ,CAAkC;QAX5C,mBAAc,GAAc;YAClC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,OAAO,EAAE,EAAE;SACZ,CAAC;QAUA,IAAI,CAAC,yBAAyB,GAAG,KAAK,CAAC;QACvC,IAAI,IAAA,eAAU,EAAC,WAAW,CAAC,EAAE;YAC3B,IAAI;gBACF,MAAM,cAAc,GAAG,IAAA,wBAAY,EAAC,WAAW,CAAC,CAAC;gBACjD,IAAI,CAAC,yBAAyB,GAAG,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC;gBACpE,IAAI,IAAI,CAAC,yBAAyB,EAAE;oBAClC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;oBACrC,IAAI,CAAC,oBAAoB,EAAE,CAAC;iBAC7B;aACF;YAAC,WAAM;gBACN;;;;mBAIG;aACJ;SACF;IACH,CAAC;IAzBD,IAAW,UAAU;QACnB,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IAC9E,CAAC;IAyBD,SAAS,CAAC,WAAmB;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAED,WAAW;QACT,IAAA,wBAAa,EAAC,UAAU,CAAC,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAA,yBAAa,EAAC,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;SACjD;aAAM,IAAI,IAAA,eAAU,EAAC,WAAW,CAAC,EAAE;YAClC,IAAA,eAAU,EAAC,WAAW,CAAC,CAAC;SACzB;IACH,CAAC;IAED,SAAS,CAAC,WAAmB,EAAE,MAAe;QAC5C,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC;IACpD,CAAC;IAEO,oBAAoB;QAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YAC/D,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;gBAC/B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;aACjD;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA1DD,4CA0DC"}
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
4
|
-
const tsc_impl_1 = require("./tsc.impl");
|
|
5
|
-
exports.default = (0, devkit_1.convertNxExecutor)(tsc_impl_1.tscExecutor);
|
|
6
|
-
//# sourceMappingURL=compat.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/executors/tsc/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AAEjD,yCAAyC;AAEzC,kBAAe,IAAA,0BAAiB,EAAC,sBAAW,CAAC,CAAC"}
|
|
@@ -1,65 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"title": "Typescript Build Target",
|
|
3
|
-
"description": "Builds using TypeScript",
|
|
4
|
-
"cli": "nx",
|
|
5
|
-
"type": "object",
|
|
6
|
-
"properties": {
|
|
7
|
-
"main": {
|
|
8
|
-
"type": "string",
|
|
9
|
-
"description": "The name of the main entry-point file."
|
|
10
|
-
},
|
|
11
|
-
"outputPath": {
|
|
12
|
-
"type": "string",
|
|
13
|
-
"description": "The output path of the generated files."
|
|
14
|
-
},
|
|
15
|
-
"tsConfig": {
|
|
16
|
-
"type": "string",
|
|
17
|
-
"description": "The path to the Typescript configuration file."
|
|
18
|
-
},
|
|
19
|
-
"assets": {
|
|
20
|
-
"type": "array",
|
|
21
|
-
"description": "List of static assets.",
|
|
22
|
-
"default": [],
|
|
23
|
-
"items": {
|
|
24
|
-
"$ref": "#/definitions/assetPattern"
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
},
|
|
28
|
-
"required": ["main", "outputPath", "tsConfig"],
|
|
29
|
-
|
|
30
|
-
"definitions": {
|
|
31
|
-
"assetPattern": {
|
|
32
|
-
"oneOf": [
|
|
33
|
-
{
|
|
34
|
-
"type": "object",
|
|
35
|
-
"properties": {
|
|
36
|
-
"glob": {
|
|
37
|
-
"type": "string",
|
|
38
|
-
"description": "The pattern to match."
|
|
39
|
-
},
|
|
40
|
-
"input": {
|
|
41
|
-
"type": "string",
|
|
42
|
-
"description": "The input directory path in which to apply 'glob'. Defaults to the project root."
|
|
43
|
-
},
|
|
44
|
-
"ignore": {
|
|
45
|
-
"description": "An array of globs to ignore.",
|
|
46
|
-
"type": "array",
|
|
47
|
-
"items": {
|
|
48
|
-
"type": "string"
|
|
49
|
-
}
|
|
50
|
-
},
|
|
51
|
-
"output": {
|
|
52
|
-
"type": "string",
|
|
53
|
-
"description": "Absolute path within the output."
|
|
54
|
-
}
|
|
55
|
-
},
|
|
56
|
-
"additionalProperties": false,
|
|
57
|
-
"required": ["glob", "input", "output"]
|
|
58
|
-
},
|
|
59
|
-
{
|
|
60
|
-
"type": "string"
|
|
61
|
-
}
|
|
62
|
-
]
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
}
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
import { ExecutorContext } from '@nrwl/devkit';
|
|
2
|
-
import { TypeScriptExecutorOptions } from './schema';
|
|
3
|
-
export declare function tscExecutor(options: TypeScriptExecutorOptions, context: ExecutorContext): Promise<{
|
|
4
|
-
success: boolean;
|
|
5
|
-
}>;
|
|
6
|
-
export default tscExecutor;
|
|
@@ -1,64 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.tscExecutor = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const path_1 = require("path");
|
|
7
|
-
const project_graph_1 = require("../../core/project-graph");
|
|
8
|
-
const assets_1 = require("../../utilities/assets");
|
|
9
|
-
const buildable_libs_utils_1 = require("../../utilities/buildable-libs-utils");
|
|
10
|
-
const fileutils_1 = require("../../utilities/fileutils");
|
|
11
|
-
const compilation_1 = require("../../utilities/typescript/compilation");
|
|
12
|
-
function tscExecutor(options, context) {
|
|
13
|
-
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
14
|
-
const normalizedOptions = normalizeOptions(options, context);
|
|
15
|
-
// const projectRoot = context.workspace.projects[context.projectName].root;
|
|
16
|
-
const projectGraph = (0, project_graph_1.readCachedProjectGraph)();
|
|
17
|
-
const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)(projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
|
|
18
|
-
const projectRoot = target.data.root;
|
|
19
|
-
if (dependencies.length > 0) {
|
|
20
|
-
const areDependentProjectsBuilt = (0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies);
|
|
21
|
-
if (!areDependentProjectsBuilt) {
|
|
22
|
-
return { success: false };
|
|
23
|
-
}
|
|
24
|
-
normalizedOptions.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, options.tsConfig), context.root, projectRoot, dependencies);
|
|
25
|
-
}
|
|
26
|
-
// this has to happen first so the folder is created where the assets are copied into
|
|
27
|
-
const result = (0, compilation_1.compileTypeScript)({
|
|
28
|
-
outputPath: normalizedOptions.outputPath,
|
|
29
|
-
projectName: context.projectName,
|
|
30
|
-
projectRoot,
|
|
31
|
-
tsConfig: normalizedOptions.tsConfig,
|
|
32
|
-
});
|
|
33
|
-
yield (0, assets_1.copyAssets)(normalizedOptions.assets, context.root, normalizedOptions.outputPath);
|
|
34
|
-
updatePackageJson(normalizedOptions, projectRoot);
|
|
35
|
-
return result;
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
exports.tscExecutor = tscExecutor;
|
|
39
|
-
function getMainFileDirRelativeToProjectRoot(main, projectRoot) {
|
|
40
|
-
const mainFileDir = (0, path_1.dirname)(main);
|
|
41
|
-
const relativeDir = (0, devkit_1.normalizePath)((0, path_1.relative)(projectRoot, mainFileDir));
|
|
42
|
-
const relativeMainFile = relativeDir === '' ? `./` : `./${relativeDir}/`;
|
|
43
|
-
return relativeMainFile;
|
|
44
|
-
}
|
|
45
|
-
function normalizeOptions(options, context) {
|
|
46
|
-
return Object.assign(Object.assign({}, options), { outputPath: (0, path_1.join)(context.root, options.outputPath), tsConfig: (0, path_1.join)(context.root, options.tsConfig) });
|
|
47
|
-
}
|
|
48
|
-
function updatePackageJson(options, projectRoot) {
|
|
49
|
-
var _a, _b;
|
|
50
|
-
const packageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(projectRoot, 'package.json'));
|
|
51
|
-
if (packageJson.main && packageJson.typings) {
|
|
52
|
-
return;
|
|
53
|
-
}
|
|
54
|
-
const mainFile = (0, path_1.basename)(options.main).replace(/\.[tj]s$/, '');
|
|
55
|
-
const relativeMainFileDir = getMainFileDirRelativeToProjectRoot(options.main, projectRoot);
|
|
56
|
-
const mainJsFile = `${relativeMainFileDir}${mainFile}.js`;
|
|
57
|
-
const typingsFile = `${relativeMainFileDir}${mainFile}.d.ts`;
|
|
58
|
-
packageJson.main = (_a = packageJson.main) !== null && _a !== void 0 ? _a : mainJsFile;
|
|
59
|
-
packageJson.typings = (_b = packageJson.typings) !== null && _b !== void 0 ? _b : typingsFile;
|
|
60
|
-
const outputPackageJson = (0, path_1.join)(options.outputPath, 'package.json');
|
|
61
|
-
(0, fileutils_1.writeJsonFile)(outputPackageJson, packageJson);
|
|
62
|
-
}
|
|
63
|
-
exports.default = tscExecutor;
|
|
64
|
-
//# sourceMappingURL=tsc.impl.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tsc.impl.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
# Add files here to ignore them from prettier formatting
|