@nrwl/workspace 13.8.8-beta.0 → 13.9.0-beta.0
Sign up to get free protection for your applications and to get access to all the features.
- package/migrations.json +6 -287
- package/package.json +6 -7
- package/src/command-line/dep-graph.js +1 -1
- package/src/command-line/dep-graph.js.map +1 -1
- package/src/command-line/format.d.ts +1 -1
- package/src/command-line/format.js +3 -3
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/list.js +1 -1
- package/src/command-line/list.js.map +1 -1
- package/src/command-line/nx-commands.js +7 -7
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/report.js +1 -3
- package/src/command-line/report.js.map +1 -1
- package/src/command-line/workspace-generators.js +2 -2
- package/src/command-line/workspace-generators.js.map +1 -1
- package/src/core/dep-graph/3rdpartylicenses.txt +23 -0
- package/src/core/file-utils.d.ts +1 -1
- package/src/core/file-utils.js +2 -2
- package/src/core/file-utils.js.map +1 -1
- package/src/core/hasher/file-hasher-base.d.ts +1 -1
- package/src/core/hasher/file-hasher-base.js +1 -1
- package/src/core/hasher/file-hasher-base.js.map +1 -1
- package/src/core/hasher/file-hasher.js +1 -1
- package/src/core/hasher/file-hasher.js.map +1 -1
- package/src/core/hasher/git-based-file-hasher.js +1 -1
- package/src/core/hasher/git-based-file-hasher.js.map +1 -1
- package/src/core/hasher/hasher.d.ts +7 -1
- package/src/core/hasher/hasher.js +14 -10
- package/src/core/hasher/hasher.js.map +1 -1
- package/src/core/hasher/node-based-file-hasher.js +1 -1
- package/src/core/hasher/node-based-file-hasher.js.map +1 -1
- package/src/core/project-graph/build-nodes/npm-packages.js +1 -1
- package/src/core/project-graph/build-nodes/npm-packages.js.map +1 -1
- package/src/core/project-graph/build-nodes/workspace-projects.js +2 -2
- package/src/core/project-graph/build-nodes/workspace-projects.js.map +1 -1
- package/src/core/project-graph/build-project-graph.js +2 -2
- package/src/core/project-graph/build-project-graph.js.map +1 -1
- package/src/core/project-graph/daemon/client/client.js +1 -1
- package/src/core/project-graph/daemon/client/client.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/shutdown-utils.js +1 -1
- package/src/core/project-graph/daemon/server/shutdown-utils.js.map +1 -1
- package/src/core/project-graph/daemon/server/watcher.js +1 -1
- package/src/core/project-graph/daemon/server/watcher.js.map +1 -1
- package/src/core/target-project-locator.d.ts +6 -1
- package/src/core/target-project-locator.js +6 -1
- package/src/core/target-project-locator.js.map +1 -1
- package/src/generators/move/lib/update-cypress-json.d.ts +1 -1
- package/src/generators/move/lib/update-project-root-files.js +1 -1
- package/src/generators/move/lib/update-project-root-files.js.map +1 -1
- package/src/generators/move/lib/update-storybook-config.js +1 -1
- package/src/generators/move/lib/update-storybook-config.js.map +1 -1
- package/src/generators/new/new.js +1 -1
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/utils/decorate-angular-cli.js__tmpl__ +1 -1
- package/src/generators/workspace/files/package.json__tmpl__ +1 -2
- package/src/generators/workspace/workspace.js +1 -1
- package/src/generators/workspace/workspace.js.map +1 -1
- package/src/migrations/update-13-9-0/update-decorate-cli.d.ts +3 -0
- package/src/migrations/update-13-9-0/update-decorate-cli.js +12 -0
- package/src/migrations/update-13-9-0/update-decorate-cli.js.map +1 -0
- package/src/tasks-runner/batch/run-batch.js +3 -3
- package/src/tasks-runner/batch/run-batch.js.map +1 -1
- package/src/tasks-runner/cache.js +1 -1
- package/src/tasks-runner/cache.js.map +1 -1
- package/src/tasks-runner/forked-process-task-runner.js +1 -1
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/run-command.js +2 -2
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +2 -2
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/tasks-schedule.d.ts +1 -1
- package/src/tasks-runner/utils.d.ts +2 -2
- package/src/tasks-runner/utils.js +2 -2
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.js +4 -2
- package/src/tslint/nxEnforceModuleBoundariesRule.js.map +1 -1
- package/src/utilities/buildable-libs-utils.d.ts +2 -2
- package/src/utilities/buildable-libs-utils.js +6 -4
- package/src/utilities/buildable-libs-utils.js.map +1 -1
- package/src/utilities/cache-directory.js +1 -1
- package/src/utilities/cache-directory.js.map +1 -1
- package/src/utilities/generate-globs.js +1 -1
- package/src/utilities/generate-globs.js.map +1 -1
- package/src/utilities/plugins/plugin-capabilities.js +1 -1
- package/src/utilities/plugins/plugin-capabilities.js.map +1 -1
- package/src/utilities/project-graph-utils.js +1 -1
- package/src/utilities/project-graph-utils.js.map +1 -1
- package/src/utilities/typescript.js +1 -1
- package/src/utilities/typescript.js.map +1 -1
- package/src/utils/app-root.d.ts +1 -1
- package/src/utils/app-root.js +1 -1
- package/src/utils/app-root.js.map +1 -1
- package/src/utils/rules/format-files.js +2 -2
- package/src/utils/rules/format-files.js.map +1 -1
- package/src/utils/runtime-lint-utils.d.ts +7 -0
- package/src/utils/runtime-lint-utils.js +15 -1
- package/src/utils/runtime-lint-utils.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/src/migrations/update-10-0-0/solution-tsconfigs.d.ts +0 -2
- package/src/migrations/update-10-0-0/solution-tsconfigs.js +0 -104
- package/src/migrations/update-10-0-0/solution-tsconfigs.js.map +0 -1
- package/src/migrations/update-10-0-0/update-10-0-0.d.ts +0 -1
- package/src/migrations/update-10-0-0/update-10-0-0.js +0 -18
- package/src/migrations/update-10-0-0/update-10-0-0.js.map +0 -1
- package/src/migrations/update-10-0-1/migrate-eslintrc.d.ts +0 -2
- package/src/migrations/update-10-0-1/migrate-eslintrc.js +0 -40
- package/src/migrations/update-10-0-1/migrate-eslintrc.js.map +0 -1
- package/src/migrations/update-10-1-0/migrate-eslintrc-tsconfig-wildcard.d.ts +0 -2
- package/src/migrations/update-10-1-0/migrate-eslintrc-tsconfig-wildcard.js +0 -29
- package/src/migrations/update-10-1-0/migrate-eslintrc-tsconfig-wildcard.js.map +0 -1
- package/src/migrations/update-10-3-0/add-buildable-project-deps-in-package-json-type.d.ts +0 -2
- package/src/migrations/update-10-3-0/add-buildable-project-deps-in-package-json-type.js +0 -24
- package/src/migrations/update-10-3-0/add-buildable-project-deps-in-package-json-type.js.map +0 -1
- package/src/migrations/update-10-3-0/add-cli-dependency.d.ts +0 -2
- package/src/migrations/update-10-3-0/add-cli-dependency.js +0 -22
- package/src/migrations/update-10-3-0/add-cli-dependency.js.map +0 -1
- package/src/migrations/update-10-3-0/add-vscode-extensions.d.ts +0 -2
- package/src/migrations/update-10-3-0/add-vscode-extensions.js +0 -32
- package/src/migrations/update-10-3-0/add-vscode-extensions.js.map +0 -1
- package/src/migrations/update-10-3-0/update-typescript.d.ts +0 -1
- package/src/migrations/update-10-3-0/update-typescript.js +0 -12
- package/src/migrations/update-10-3-0/update-typescript.js.map +0 -1
- package/src/migrations/update-10-4-0/add-explicit-dep-on-tao.d.ts +0 -2
- package/src/migrations/update-10-4-0/add-explicit-dep-on-tao.js +0 -24
- package/src/migrations/update-10-4-0/add-explicit-dep-on-tao.js.map +0 -1
- package/src/migrations/update-10-4-0/update-script-to-invoke-nx-migrate.d.ts +0 -2
- package/src/migrations/update-10-4-0/update-script-to-invoke-nx-migrate.js +0 -13
- package/src/migrations/update-10-4-0/update-script-to-invoke-nx-migrate.js.map +0 -1
- package/src/migrations/update-11-0-0/add-outputs-in-workspace.d.ts +0 -2
- package/src/migrations/update-11-0-0/add-outputs-in-workspace.js +0 -34
- package/src/migrations/update-11-0-0/add-outputs-in-workspace.js.map +0 -1
- package/src/migrations/update-11-0-0/rename-workspace-schematic-script.d.ts +0 -1
- package/src/migrations/update-11-0-0/rename-workspace-schematic-script.js +0 -14
- package/src/migrations/update-11-0-0/rename-workspace-schematic-script.js.map +0 -1
- package/src/migrations/update-11-0-0/rename-workspace-schematics.d.ts +0 -2
- package/src/migrations/update-11-0-0/rename-workspace-schematics.js +0 -13
- package/src/migrations/update-11-0-0/rename-workspace-schematics.js.map +0 -1
- package/src/migrations/update-11-0-0/update-command-check.d.ts +0 -1
- package/src/migrations/update-11-0-0/update-command-check.js +0 -26
- package/src/migrations/update-11-0-0/update-command-check.js.map +0 -1
- package/src/migrations/update-11-0-0/update-decorate-angular-cli.d.ts +0 -2
- package/src/migrations/update-11-0-0/update-decorate-angular-cli.js +0 -14
- package/src/migrations/update-11-0-0/update-decorate-angular-cli.js.map +0 -1
- package/src/migrations/update-11-0-0/update-node-types.d.ts +0 -1
- package/src/migrations/update-11-0-0/update-node-types.js +0 -12
- package/src/migrations/update-11-0-0/update-node-types.js.map +0 -1
- package/src/migrations/update-11-1-2/update-11-1-2.d.ts +0 -1
- package/src/migrations/update-11-1-2/update-11-1-2.js +0 -11
- package/src/migrations/update-11-1-2/update-11-1-2.js.map +0 -1
- package/src/utilities/app-root.d.ts +0 -4
- package/src/utilities/app-root.js +0 -23
- package/src/utilities/app-root.js.map +0 -1
@@ -7,7 +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("
|
10
|
+
const nx_plugin_1 = require("nx/src/shared/nx-plugin");
|
11
11
|
function getCommandAsString(task) {
|
12
12
|
const execCommand = (0, devkit_1.getPackageManagerCommand)().exec;
|
13
13
|
const args = getCommandArgsForTask(task);
|
@@ -177,7 +177,7 @@ function calculateReverseDeps(taskGraph) {
|
|
177
177
|
}
|
178
178
|
exports.calculateReverseDeps = calculateReverseDeps;
|
179
179
|
function getCliPath(workspaceRoot) {
|
180
|
-
const cli = require.resolve(
|
180
|
+
const cli = require.resolve(`nx/src/cli/run-cli.js`, {
|
181
181
|
paths: [workspaceRoot],
|
182
182
|
});
|
183
183
|
return `${cli}`;
|
@@ -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;AAC5B,
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/utils.ts"],"names":[],"mappings":"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"}
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Rule = void 0;
|
4
4
|
const Lint = require("tslint");
|
5
5
|
const project_graph_1 = require("../core/project-graph");
|
6
|
-
const app_root_1 = require("
|
6
|
+
const app_root_1 = require("nx/src/utils/app-root");
|
7
7
|
const runtime_lint_utils_1 = require("../utils/runtime-lint-utils");
|
8
8
|
const path_1 = require("path");
|
9
9
|
const file_utils_1 = require("../core/file-utils");
|
@@ -102,7 +102,9 @@ class EnforceModuleBoundariesWalker extends Lint.RuleWalker {
|
|
102
102
|
}
|
103
103
|
// same project => allow
|
104
104
|
if (sourceProject === targetProject) {
|
105
|
-
if (!this.allowCircularSelfDependency &&
|
105
|
+
if (!this.allowCircularSelfDependency &&
|
106
|
+
!(0, fileutils_1.isRelativePath)(imp) &&
|
107
|
+
!(0, runtime_lint_utils_1.isAngularSecondaryEntrypoint)(this.targetProjectLocator, imp)) {
|
106
108
|
const error = `Projects should use relative imports to import from other files within the same project. Use "./path/to/file" instead of import from "${imp}"`;
|
107
109
|
this.addFailureAt(node.getStart(), node.getWidth(), error);
|
108
110
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"nxEnforceModuleBoundariesRule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAO/B,yDAA4E;AAC5E,
|
1
|
+
{"version":3,"file":"nxEnforceModuleBoundariesRule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts"],"names":[],"mappings":"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"}
|
@@ -1,11 +1,11 @@
|
|
1
|
-
import { ProjectGraphExternalNode } from '@nrwl/devkit';
|
2
1
|
import type { ProjectGraph, ProjectGraphProjectNode } from '@nrwl/devkit';
|
2
|
+
import { ProjectGraphExternalNode } from '@nrwl/devkit';
|
3
3
|
export declare type DependentBuildableProjectNode = {
|
4
4
|
name: string;
|
5
5
|
outputs: string[];
|
6
6
|
node: ProjectGraphProjectNode | ProjectGraphExternalNode;
|
7
7
|
};
|
8
|
-
export declare function calculateProjectDependencies(projGraph: ProjectGraph, root: string, projectName: string, targetName: string, configurationName: string): {
|
8
|
+
export declare function calculateProjectDependencies(projGraph: ProjectGraph, root: string, projectName: string, targetName: string, configurationName: string, shallow?: boolean): {
|
9
9
|
target: ProjectGraphProjectNode;
|
10
10
|
dependencies: DependentBuildableProjectNode[];
|
11
11
|
nonBuildableDependencies: string[];
|
@@ -14,11 +14,11 @@ function isBuildable(target, node) {
|
|
14
14
|
node.data.targets[target] &&
|
15
15
|
node.data.targets[target].executor !== '');
|
16
16
|
}
|
17
|
-
function calculateProjectDependencies(projGraph, root, projectName, targetName, configurationName) {
|
17
|
+
function calculateProjectDependencies(projGraph, root, projectName, targetName, configurationName, shallow) {
|
18
18
|
const target = projGraph.nodes[projectName];
|
19
19
|
// gather the library dependencies
|
20
20
|
const nonBuildableDependencies = [];
|
21
|
-
const dependencies =
|
21
|
+
const dependencies = collectDependencies(projectName, projGraph, [], shallow)
|
22
22
|
.map((dep) => {
|
23
23
|
const depNode = projGraph.nodes[dep] || projGraph.externalNodes[dep];
|
24
24
|
if (depNode.type === project_graph_1.ProjectType.lib) {
|
@@ -56,11 +56,13 @@ function calculateProjectDependencies(projGraph, root, projectName, targetName,
|
|
56
56
|
return { target, dependencies, nonBuildableDependencies };
|
57
57
|
}
|
58
58
|
exports.calculateProjectDependencies = calculateProjectDependencies;
|
59
|
-
function
|
59
|
+
function collectDependencies(project, projGraph, acc, shallow) {
|
60
60
|
(projGraph.dependencies[project] || []).forEach((dependency) => {
|
61
61
|
if (acc.indexOf(dependency.target) === -1) {
|
62
62
|
acc.push(dependency.target);
|
63
|
-
|
63
|
+
if (!shallow) {
|
64
|
+
collectDependencies(dependency.target, projGraph, acc);
|
65
|
+
}
|
64
66
|
}
|
65
67
|
});
|
66
68
|
return acc;
|
@@ -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,2CAA8C;
|
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;AAE9C,yCAKsB;AACtB,iDAA4E;AAC5E,iCAAiC;AACjC,2BAAgC;AAChC,qCAAkC;AAElC,SAAS,WAAW,CAAC,MAAc,EAAE,IAA6B;IAChE,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,EACzB,OAAiB;IAMjB,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC5C,kCAAkC;IAClC,MAAM,wBAAwB,GAAG,EAAE,CAAC;IACpC,MAAM,YAAY,GAAG,mBAAmB,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,CAAC;SAC1E,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;AAtDD,oEAsDC;AAED,SAAS,mBAAmB,CAC1B,OAAe,EACf,SAAuB,EACvB,GAAa,EACb,OAAiB;IAEjB,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,IAAI,CAAC,OAAO,EAAE;gBACZ,mBAAmB,CAAC,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;aACxD;SACF;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,gCAAgC,KAAK,MAAM,EAAE;QAC3D,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,IAA6B,EAC7B,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"}
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.cacheDir = void 0;
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
5
|
const path_1 = require("path");
|
6
|
-
const app_root_1 = require("
|
6
|
+
const app_root_1 = require("nx/src/utils/app-root");
|
7
7
|
function readCacheDirectoryProperty(root) {
|
8
8
|
try {
|
9
9
|
const nxJson = (0, devkit_1.readJsonFile)((0, path_1.join)(root, 'nx.json'));
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/cache-directory.ts"],"names":[],"mappings":";;;AAAA,yCAAiE;AACjE,+BAAwC;AACxC,
|
1
|
+
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/cache-directory.ts"],"names":[],"mappings":";;;AAAA,yCAAiE;AACjE,+BAAwC;AACxC,oDAAoD;AAEpD,SAAS,0BAA0B,CAAC,IAAY;IAC9C,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;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,cAAsB;IAC1D,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,IAAA,iBAAU,EAAC,cAAc,CAAC,EAAE;YAC9B,OAAO,cAAc,CAAC;SACvB;aAAM;YACL,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;SACnC;KACF;SAAM;QACL,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;KACnD;AACH,CAAC;AAEY,QAAA,QAAQ,GAAG,cAAc,CACpC,sBAAW,EACX,0BAA0B,CAAC,sBAAW,CAAC,CACxC,CAAC"}
|
@@ -2,7 +2,7 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.createGlobPatternsForDependencies = void 0;
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
|
-
const app_root_1 = require("
|
5
|
+
const app_root_1 = require("nx/src/utils/app-root");
|
6
6
|
const path_1 = require("path");
|
7
7
|
const project_graph_1 = require("../core/project-graph");
|
8
8
|
const project_graph_utils_1 = require("./project-graph-utils");
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"generate-globs.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/generate-globs.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,
|
1
|
+
{"version":3,"file":"generate-globs.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/generate-globs.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,oDAAoD;AACpD,+BAAyC;AACzC,yDAA+D;AAC/D,+DAG+B;AAE/B;;;;GAIG;AACH,SAAgB,iCAAiC,CAC/C,OAAe,EACf,eAAuB;IAEvB,MAAM,+BAA+B,GAAG,IAAA,eAAQ,EAAC,sBAAW,EAAE,OAAO,CAAC,CAAC;IACvE,MAAM,YAAY,GAAG,IAAA,sCAAsB,GAAE,CAAC;IAE9C,mBAAmB;IACnB,IAAI,WAAW,CAAC;IAChB,IAAI;QACF,WAAW,GAAG,IAAA,+CAAyB,EACrC,+BAA+B,EAC/B,YAAY,CACb,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,oFAAoF,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,EAAE,CACjG,CAAC;KACH;IAED,oBAAoB;IACpB,IAAI;QACF,MAAM,WAAW,GAAG,IAAA,qDAA+B,EACjD,WAAW,EACX,YAAY,CACb,CAAC;QAEF,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACnC,IAAA,cAAO,EAAC,sBAAW,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CACpE,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,oEAAoE,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,EAAE,CACjF,CAAC;KACH;AACH,CAAC;AAnCD,8EAmCC"}
|
@@ -2,7 +2,7 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.listPluginCapabilities = exports.getPluginCapabilities = void 0;
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
|
-
const app_root_1 = require("
|
5
|
+
const app_root_1 = require("nx/src/utils/app-root");
|
6
6
|
const chalk = require("chalk");
|
7
7
|
const path_1 = require("path");
|
8
8
|
const output_1 = require("../output");
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"plugin-capabilities.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/plugin-capabilities.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AACtE,
|
1
|
+
{"version":3,"file":"plugin-capabilities.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/plugin-capabilities.ts"],"names":[],"mappings":"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"}
|
@@ -2,7 +2,7 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.getProjectNameFromDirPath = exports.getSourceDirOfDependentProjects = exports.mergeNpmScriptsWithTargets = exports.projectHasTargetAndConfiguration = exports.projectHasTarget = void 0;
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
|
-
const package_json_1 = require("
|
5
|
+
const package_json_1 = require("nx/src/shared/package-json");
|
6
6
|
const path_1 = require("path");
|
7
7
|
const project_graph_1 = require("../core/project-graph");
|
8
8
|
function projectHasTarget(project, target) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"project-graph-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/project-graph-utils.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,
|
1
|
+
{"version":3,"file":"project-graph-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/project-graph-utils.ts"],"names":[],"mappings":"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"}
|
@@ -2,7 +2,7 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.getRootTsConfigPath = exports.getRootTsConfigFileName = exports.getRelativePathToRootTsConfig = exports.getRootTsConfigPathInTree = exports.resolveModuleByImport = exports.readTsConfig = exports.getSourceNodes = exports.findNodes = exports.compileTypeScript = void 0;
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
|
-
const app_root_1 = require("
|
5
|
+
const app_root_1 = require("nx/src/utils/app-root");
|
6
6
|
const fs_1 = require("fs");
|
7
7
|
const path_1 = require("path");
|
8
8
|
var compilation_1 = require("./typescript/compilation");
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/typescript.ts"],"names":[],"mappings":";;;AAAA,yCAAoD;AACpD,
|
1
|
+
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/typescript.ts"],"names":[],"mappings":"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"}
|
package/src/utils/app-root.d.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export { appRootPath } from '
|
1
|
+
export { appRootPath } from 'nx/src/utils/app-root';
|
package/src/utils/app-root.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.appRootPath = void 0;
|
4
|
-
var app_root_1 = require("
|
4
|
+
var app_root_1 = require("nx/src/utils/app-root");
|
5
5
|
Object.defineProperty(exports, "appRootPath", { enumerable: true, get: function () { return app_root_1.appRootPath; } });
|
6
6
|
//# sourceMappingURL=app-root.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"app-root.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/app-root.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"app-root.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/app-root.ts"],"names":[],"mappings":";;;AAAA,kDAAoD;AAA3C,uGAAA,WAAW,OAAA"}
|
@@ -6,8 +6,8 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
6
6
|
const rxjs_1 = require("rxjs");
|
7
7
|
const operators_1 = require("rxjs/operators");
|
8
8
|
const path = require("path");
|
9
|
-
const app_root_1 = require("
|
10
|
-
const workspace_1 = require("
|
9
|
+
const app_root_1 = require("nx/src/utils/app-root");
|
10
|
+
const workspace_1 = require("nx/src/shared/workspace");
|
11
11
|
const devkit_1 = require("@nrwl/devkit");
|
12
12
|
function formatFiles(options = { skipFormat: false }, directory = '') {
|
13
13
|
let prettier;
|
@@ -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,
|
1
|
+
{"version":3,"file":"format-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/format-files.ts"],"names":[],"mappings":"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"}
|
@@ -61,3 +61,10 @@ export declare function groupImports(importsToRemap: {
|
|
61
61
|
member: string;
|
62
62
|
importPath: string;
|
63
63
|
}[]): string;
|
64
|
+
/**
|
65
|
+
* Checks if import points to a secondary entry point in Angular project
|
66
|
+
* @param targetProjectLocator
|
67
|
+
* @param importExpr
|
68
|
+
* @returns
|
69
|
+
*/
|
70
|
+
export declare function isAngularSecondaryEntrypoint(targetProjectLocator: TargetProjectLocator, importExpr: string): boolean;
|
@@ -1,12 +1,13 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.groupImports = exports.isTerminalRun = 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.getTargetProjectBasedOnRelativeImport = exports.isRelative = exports.matchImportWithWildcard = exports.findDependenciesWithTags = exports.hasNoneOfTheseTags = exports.stringifyTags = void 0;
|
3
|
+
exports.isAngularSecondaryEntrypoint = exports.groupImports = exports.isTerminalRun = 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.getTargetProjectBasedOnRelativeImport = exports.isRelative = exports.matchImportWithWildcard = exports.findDependenciesWithTags = exports.hasNoneOfTheseTags = exports.stringifyTags = void 0;
|
4
4
|
const path = require("path");
|
5
5
|
const file_utils_1 = require("../core/file-utils");
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
7
7
|
const path_1 = require("path");
|
8
8
|
const app_root_1 = require("./app-root");
|
9
9
|
const graph_utils_1 = require("./graph-utils");
|
10
|
+
const fs_1 = require("fs");
|
10
11
|
function stringifyTags(tags) {
|
11
12
|
return tags.map((t) => `"${t}"`).join(', ');
|
12
13
|
}
|
@@ -225,4 +226,17 @@ function groupImports(importsToRemap) {
|
|
225
226
|
.join('\n');
|
226
227
|
}
|
227
228
|
exports.groupImports = groupImports;
|
229
|
+
/**
|
230
|
+
* Checks if import points to a secondary entry point in Angular project
|
231
|
+
* @param targetProjectLocator
|
232
|
+
* @param importExpr
|
233
|
+
* @returns
|
234
|
+
*/
|
235
|
+
function isAngularSecondaryEntrypoint(targetProjectLocator, importExpr) {
|
236
|
+
const targetFiles = targetProjectLocator.findPaths(importExpr);
|
237
|
+
return (targetFiles &&
|
238
|
+
targetFiles.some((file) => file.endsWith('src/index.ts') &&
|
239
|
+
(0, fs_1.existsSync)((0, devkit_1.joinPathFragments)(file, '../../', 'ng-package.json'))));
|
240
|
+
}
|
241
|
+
exports.isAngularSecondaryEntrypoint = isAngularSecondaryEntrypoint;
|
228
242
|
//# sourceMappingURL=runtime-lint-utils.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"runtime-lint-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/runtime-lint-utils.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,mDAAkE;AAClE,
|
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.js
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
4
|
-
exports.nxVersion = '13.
|
4
|
+
exports.nxVersion = '13.9.0-beta.0';
|
5
5
|
exports.angularCliVersion = '~13.2.0';
|
6
6
|
exports.typescriptVersion = '~4.5.2';
|
7
7
|
exports.prettierVersion = '^2.5.1';
|
@@ -1,104 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const core_1 = require("@angular-devkit/core");
|
4
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
5
|
-
const workspace_1 = require("@nrwl/workspace");
|
6
|
-
const path_1 = require("path");
|
7
|
-
const visit_not_ignored_files_1 = require("../../utils/rules/visit-not-ignored-files");
|
8
|
-
function renameRootTsconfig(host) {
|
9
|
-
if (!host.exists('tsconfig.json')) {
|
10
|
-
throw new Error('Root tsconfig.json does not exist');
|
11
|
-
}
|
12
|
-
host.rename('tsconfig.json', 'tsconfig.base.json');
|
13
|
-
}
|
14
|
-
function moveIncludesToProjectTsconfig(file, extendedTsconfigPath, extendedTsconfig) {
|
15
|
-
return (0, workspace_1.updateJsonInTree)(file, (json) => {
|
16
|
-
var _a, _b;
|
17
|
-
json.files =
|
18
|
-
json.files ||
|
19
|
-
((_a = extendedTsconfig.files) === null || _a === void 0 ? void 0 : _a.map((p) => (0, path_1.relative)((0, core_1.dirname)(file), (0, core_1.join)((0, core_1.dirname)(extendedTsconfigPath), p))));
|
20
|
-
json.include =
|
21
|
-
json.include ||
|
22
|
-
((_b = extendedTsconfig.include) === null || _b === void 0 ? void 0 : _b.map((p) => (0, path_1.relative)((0, core_1.dirname)(file), (0, core_1.join)((0, core_1.dirname)(extendedTsconfigPath), p))));
|
23
|
-
return json;
|
24
|
-
});
|
25
|
-
}
|
26
|
-
function convertToSolutionTsconfig(tsconfigPath) {
|
27
|
-
return (0, workspace_1.updateJsonInTree)(tsconfigPath, (json) => {
|
28
|
-
json.files = [];
|
29
|
-
json.include = [];
|
30
|
-
return json;
|
31
|
-
});
|
32
|
-
}
|
33
|
-
function addReference(extendedTsconfigPath, file) {
|
34
|
-
return (0, workspace_1.updateJsonInTree)(extendedTsconfigPath, (json, context) => {
|
35
|
-
json.references = json.references || [];
|
36
|
-
const relativePath = `${(0, path_1.relative)((0, core_1.dirname)(extendedTsconfigPath), file).startsWith('../')
|
37
|
-
? ''
|
38
|
-
: './'}${(0, path_1.relative)((0, core_1.dirname)(extendedTsconfigPath), file)}`;
|
39
|
-
context.logger.info(`Referencing ${file} in ${extendedTsconfigPath}`);
|
40
|
-
json.references.push({
|
41
|
-
path: relativePath,
|
42
|
-
});
|
43
|
-
return json;
|
44
|
-
});
|
45
|
-
}
|
46
|
-
function updateExtend(file) {
|
47
|
-
return (0, workspace_1.updateJsonInTree)(file, (json) => {
|
48
|
-
json.extends = json.extends.replace(/tsconfig.json$/, 'tsconfig.base.json');
|
49
|
-
return json;
|
50
|
-
});
|
51
|
-
}
|
52
|
-
const originalExtendedTsconfigMap = new Map();
|
53
|
-
const changeImplicitDependency = (0, workspace_1.updateJsonInTree)('nx.json', (json) => {
|
54
|
-
if (!json.implicitDependencies ||
|
55
|
-
!json.implicitDependencies['tsconfig.json']) {
|
56
|
-
return json;
|
57
|
-
}
|
58
|
-
json.implicitDependencies['tsconfig.base.json'] =
|
59
|
-
json.implicitDependencies['tsconfig.json'];
|
60
|
-
delete json.implicitDependencies['tsconfig.json'];
|
61
|
-
return json;
|
62
|
-
});
|
63
|
-
function default_1(schema) {
|
64
|
-
return (0, schematics_1.chain)([
|
65
|
-
renameRootTsconfig,
|
66
|
-
changeImplicitDependency,
|
67
|
-
(0, visit_not_ignored_files_1.visitNotIgnoredFiles)((file, host, context) => {
|
68
|
-
if (!file.endsWith('.json')) {
|
69
|
-
return;
|
70
|
-
}
|
71
|
-
try {
|
72
|
-
const json = (0, workspace_1.readJsonInTree)(host, file);
|
73
|
-
if (!json.extends) {
|
74
|
-
return;
|
75
|
-
}
|
76
|
-
const extendedTsconfigPath = (0, core_1.join)((0, core_1.dirname)(file), json.extends);
|
77
|
-
if (extendedTsconfigPath === (0, core_1.normalize)('tsconfig.json')) {
|
78
|
-
return updateExtend(file);
|
79
|
-
}
|
80
|
-
else if ((0, core_1.basename)(json.extends) === 'tsconfig.json') {
|
81
|
-
let extendedTsconfig = originalExtendedTsconfigMap.get(extendedTsconfigPath);
|
82
|
-
if (!extendedTsconfig) {
|
83
|
-
extendedTsconfig = (0, workspace_1.readJsonInTree)(host, extendedTsconfigPath);
|
84
|
-
originalExtendedTsconfigMap.set(extendedTsconfigPath, extendedTsconfig);
|
85
|
-
}
|
86
|
-
return (0, schematics_1.chain)([
|
87
|
-
moveIncludesToProjectTsconfig(file, extendedTsconfigPath, extendedTsconfig),
|
88
|
-
convertToSolutionTsconfig(extendedTsconfigPath),
|
89
|
-
addReference(extendedTsconfigPath, file),
|
90
|
-
]);
|
91
|
-
}
|
92
|
-
else {
|
93
|
-
return;
|
94
|
-
}
|
95
|
-
}
|
96
|
-
catch (e) {
|
97
|
-
context.logger.warn(`Could not update ${file}: Invalid JSON`);
|
98
|
-
}
|
99
|
-
}),
|
100
|
-
(0, workspace_1.formatFiles)(),
|
101
|
-
]);
|
102
|
-
}
|
103
|
-
exports.default = default_1;
|
104
|
-
//# sourceMappingURL=solution-tsconfigs.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"solution-tsconfigs.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-0-0/solution-tsconfigs.ts"],"names":[],"mappings":"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"}
|
@@ -1 +0,0 @@
|
|
1
|
-
export default function (): import("@angular-devkit/schematics").Rule;
|