@nrwl/workspace 13.3.0-beta.3 → 13.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +11 -7
- package/src/command-line/format.js +12 -7
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/utils.js +2 -4
- package/src/command-line/utils.js.map +1 -1
- package/src/core/assert-workspace-validity.js +6 -22
- package/src/core/assert-workspace-validity.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/hasher/file-hasher.js +2 -0
- package/src/core/hasher/file-hasher.js.map +1 -1
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js +27 -4
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -1
- package/src/core/project-graph/build-nodes/workspace-projects.d.ts +0 -1
- package/src/core/project-graph/build-nodes/workspace-projects.js +6 -25
- package/src/core/project-graph/build-nodes/workspace-projects.js.map +1 -1
- package/src/core/project-graph/build-project-graph.js +8 -4
- package/src/core/project-graph/build-project-graph.js.map +1 -1
- package/src/core/project-graph/daemon/client/client.d.ts +1 -1
- package/src/core/project-graph/daemon/client/client.js +40 -17
- package/src/core/project-graph/daemon/client/client.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 +90 -42
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/core/project-graph/daemon/server/server.js +86 -63
- package/src/core/project-graph/daemon/server/server.js.map +1 -1
- package/src/core/project-graph/daemon/server/shutdown-utils.d.ts +1 -2
- 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/daemon/server/start.js +2 -0
- package/src/core/project-graph/daemon/server/start.js.map +1 -1
- package/src/core/project-graph/daemon/server/watcher.js +3 -1
- package/src/core/project-graph/daemon/server/watcher.js.map +1 -1
- package/src/core/project-graph/project-graph.js +31 -6
- package/src/core/project-graph/project-graph.js.map +1 -1
- package/src/generators/move/lib/update-build-targets.js +7 -4
- package/src/generators/move/lib/update-build-targets.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/tasks-runner/forked-process-task-runner.d.ts +3 -1
- package/src/tasks-runner/forked-process-task-runner.js +8 -1
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/life-cycle.d.ts +10 -11
- package/src/tasks-runner/life-cycle.js.map +1 -1
- package/src/tasks-runner/run-command/components/no-targets-run.d.ts +7 -0
- package/src/tasks-runner/run-command/components/no-targets-run.js +20 -0
- package/src/tasks-runner/run-command/components/no-targets-run.js.map +1 -0
- package/src/tasks-runner/run-command/components/nx-output-row-title.d.ts +7 -0
- package/src/tasks-runner/run-command/components/nx-output-row-title.js +17 -0
- package/src/tasks-runner/run-command/components/nx-output-row-title.js.map +1 -0
- package/src/tasks-runner/run-command/components/run-command.d.ts +16 -0
- package/src/tasks-runner/run-command/components/run-command.js +55 -0
- package/src/tasks-runner/run-command/components/run-command.js.map +1 -0
- package/src/tasks-runner/run-command/components/run-many.d.ts +15 -0
- package/src/tasks-runner/run-command/components/run-many.js +123 -0
- package/src/tasks-runner/run-command/components/run-many.js.map +1 -0
- package/src/tasks-runner/run-command/components/task-list.d.ts +7 -0
- package/src/tasks-runner/run-command/components/task-list.js +29 -0
- package/src/tasks-runner/run-command/components/task-list.js.map +1 -0
- package/src/tasks-runner/run-command/components/task-row.d.ts +12 -0
- package/src/tasks-runner/run-command/components/task-row.js +52 -0
- package/src/tasks-runner/run-command/components/task-row.js.map +1 -0
- package/src/tasks-runner/{run-command.d.ts → run-command/index.d.ts} +4 -7
- package/src/tasks-runner/{run-command.js → run-command/index.js} +45 -28
- package/src/tasks-runner/run-command/index.js.map +1 -0
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.d.ts +30 -0
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.js +34 -0
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.js.map +1 -0
- package/src/tasks-runner/task-orchestrator.js +3 -2
- package/src/tasks-runner/task-orchestrator.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 +5 -3
- package/src/tasks-runner/utils.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/utilities/plugins/plugin-capabilities.js +10 -11
- package/src/utilities/plugins/plugin-capabilities.js.map +1 -1
- package/src/utilities/project-graph-utils.d.ts +1 -0
- package/src/utilities/project-graph-utils.js +17 -1
- package/src/utilities/project-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 +28 -7
- package/src/utils/runtime-lint-utils.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/src/tasks-runner/run-command.js.map +0 -1
|
@@ -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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"}
|
|
@@ -1,20 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.listPluginCapabilities = exports.getPluginCapabilities = void 0;
|
|
4
|
-
const chalk = require("chalk");
|
|
5
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
5
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
6
|
+
const chalk = require("chalk");
|
|
7
|
+
const path_1 = require("path");
|
|
7
8
|
const output_1 = require("../output");
|
|
8
9
|
const shared_1 = require("./shared");
|
|
9
|
-
function tryGetCollection(
|
|
10
|
-
if (!
|
|
10
|
+
function tryGetCollection(packageJsonPath, collectionFile, propName) {
|
|
11
|
+
if (!collectionFile) {
|
|
11
12
|
return null;
|
|
12
13
|
}
|
|
13
14
|
try {
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
});
|
|
17
|
-
return (0, devkit_1.readJsonFile)(jsonFilePath)[propName];
|
|
15
|
+
const collectionFilePath = (0, path_1.join)((0, path_1.dirname)(packageJsonPath), collectionFile);
|
|
16
|
+
return (0, devkit_1.readJsonFile)(collectionFilePath)[propName];
|
|
18
17
|
}
|
|
19
18
|
catch (_a) {
|
|
20
19
|
return null;
|
|
@@ -28,10 +27,10 @@ function getPluginCapabilities(workspaceRoot, pluginName) {
|
|
|
28
27
|
const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
|
|
29
28
|
return {
|
|
30
29
|
name: pluginName,
|
|
31
|
-
generators: tryGetCollection(
|
|
32
|
-
tryGetCollection(
|
|
33
|
-
executors: tryGetCollection(
|
|
34
|
-
tryGetCollection(
|
|
30
|
+
generators: tryGetCollection(packageJsonPath, packageJson.generators, 'generators') ||
|
|
31
|
+
tryGetCollection(packageJsonPath, packageJson.schematics, 'schematics'),
|
|
32
|
+
executors: tryGetCollection(packageJsonPath, packageJson.executors, 'executors') ||
|
|
33
|
+
tryGetCollection(packageJsonPath, packageJson.builders, 'builders'),
|
|
35
34
|
};
|
|
36
35
|
}
|
|
37
36
|
catch (_a) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-capabilities.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/plugin-capabilities.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B
|
|
1
|
+
{"version":3,"file":"plugin-capabilities.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/plugin-capabilities.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ProjectGraph, ProjectGraphNode } 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): any;
|
|
4
5
|
export declare function getSourceDirOfDependentProjects(projectName: string, projectGraph?: ProjectGraph<any>): string[];
|
|
5
6
|
/**
|
|
6
7
|
* Finds the project node name by a file that lives within it's src root
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getProjectNameFromDirPath = exports.getSourceDirOfDependentProjects = exports.projectHasTargetAndConfiguration = exports.projectHasTarget = void 0;
|
|
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("@nrwl/tao/src/shared/package-json");
|
|
5
6
|
const path_1 = require("path");
|
|
6
7
|
const project_graph_1 = require("../core/project-graph");
|
|
7
8
|
function projectHasTarget(project, target) {
|
|
@@ -14,6 +15,21 @@ function projectHasTargetAndConfiguration(project, target, configuration) {
|
|
|
14
15
|
project.data.targets[target].configurations[configuration]);
|
|
15
16
|
}
|
|
16
17
|
exports.projectHasTargetAndConfiguration = projectHasTargetAndConfiguration;
|
|
18
|
+
function mergeNpmScriptsWithTargets(projectRoot, targets) {
|
|
19
|
+
try {
|
|
20
|
+
const { scripts, nx } = (0, devkit_1.readJsonFile)(`${projectRoot}/package.json`);
|
|
21
|
+
const res = {};
|
|
22
|
+
// handle no scripts
|
|
23
|
+
Object.keys(scripts || {}).forEach((script) => {
|
|
24
|
+
res[script] = (0, package_json_1.buildTargetFromScript)(script, nx);
|
|
25
|
+
});
|
|
26
|
+
return Object.assign(Object.assign({}, res), (targets || {}));
|
|
27
|
+
}
|
|
28
|
+
catch (e) {
|
|
29
|
+
return undefined;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
exports.mergeNpmScriptsWithTargets = mergeNpmScriptsWithTargets;
|
|
17
33
|
function getSourceDirOfDependentProjects(projectName, projectGraph = (0, project_graph_1.readCachedProjectGraph)()) {
|
|
18
34
|
if (!projectGraph.nodes[projectName]) {
|
|
19
35
|
throw new Error(`Couldn't find project "${projectName}" in this Nx workspace`);
|
|
@@ -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,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
|
|
@@ -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.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.3.0
|
|
4
|
+
exports.nxVersion = '13.3.0';
|
|
5
5
|
exports.angularCliVersion = '~13.0.0';
|
|
6
6
|
exports.typescriptVersion = '~4.4.3';
|
|
7
7
|
exports.prettierVersion = '^2.3.1';
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|