@nrwl/workspace 15.2.1 → 15.3.0-beta.1
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +1 -1
- package/index.d.ts +2 -1
- package/package.json +30 -30
- package/presets/npm.json +0 -3
- package/src/generators/ci-workflow/ci-workflow.d.ts +1 -1
- package/src/generators/ci-workflow/ci-workflow.js +13 -0
- package/src/generators/ci-workflow/ci-workflow.js.map +1 -1
- package/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__ +37 -0
- package/src/generators/ci-workflow/schema.json +3 -2
- package/src/generators/move/lib/update-imports.js +3 -3
- package/src/generators/move/lib/update-imports.js.map +1 -1
- package/src/generators/new/files-readme/README.md.template +21 -0
- package/src/generators/new/files-root-app/__dot__vscode/extensions.json__tmpl__ +2 -4
- package/src/generators/new/files-root-app/package.json__tmpl__ +3 -3
- package/src/generators/new/generate-preset.js +4 -3
- package/src/generators/new/generate-preset.js.map +1 -1
- package/src/generators/new/generate-workspace-files.d.ts +1 -1
- package/src/generators/new/generate-workspace-files.js +46 -35
- package/src/generators/new/generate-workspace-files.js.map +1 -1
- package/src/generators/preset/preset.js +15 -3
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/utils/presets.d.ts +4 -3
- package/src/generators/utils/presets.js +4 -3
- package/src/generators/utils/presets.js.map +1 -1
- package/src/utilities/ast-utils.js +10 -10
- package/src/utilities/generate-globs.js +6 -1
- package/src/utilities/generate-globs.js.map +1 -1
- package/src/utilities/typescript/find-nodes.d.ts +5 -2
- package/src/utilities/typescript/find-nodes.js +7 -25
- package/src/utilities/typescript/find-nodes.js.map +1 -1
- package/src/utilities/typescript.js +1 -1
- package/src/utilities/typescript.js.map +1 -1
- package/src/utils/ast-utils.js +12 -12
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/rules/rename-package-imports.js +2 -1
- package/src/utils/rules/rename-package-imports.js.map +1 -1
- package/src/generators/workspace/schema.json +0 -71
- package/src/utilities/create-package-json.d.ts +0 -10
- package/src/utilities/create-package-json.js +0 -90
- package/src/utilities/create-package-json.js.map +0 -1
- package/src/utils/graph-utils.d.ts +0 -5
- package/src/utils/graph-utils.js +0 -116
- package/src/utils/graph-utils.js.map +0 -1
- package/src/utils/runtime-lint-utils.d.ts +0 -80
- package/src/utils/runtime-lint-utils.js +0 -309
- package/src/utils/runtime-lint-utils.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AAEtB,gEAA4D;AAC5D,8CAA0C;AAE1C,SAAsB,eAAe,CAAC,IAAU,EAAE,OAAe;;QAC/D,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACxB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AAPD,0CAOC;AACD,kBAAe,eAAe,CAAC;AAE/B,SAAe,YAAY,CAAC,IAAU,EAAE,OAAe;;QACrD,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI,EAAE;YACrE,OAAO;SACR;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,10 @@ export declare enum Preset {
|
|
|
5
5
|
NPM = "npm",
|
|
6
6
|
TS = "ts",
|
|
7
7
|
WebComponents = "web-components",
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
AngularMonorepo = "angular-monorepo",
|
|
9
|
+
AngularStandalone = "angular-standalone",
|
|
10
|
+
ReactMonorepo = "react-monorepo",
|
|
11
|
+
ReactStandalone = "react-standalone",
|
|
11
12
|
ReactNative = "react-native",
|
|
12
13
|
Expo = "expo",
|
|
13
14
|
NextJs = "next",
|
|
@@ -9,9 +9,10 @@ var Preset;
|
|
|
9
9
|
Preset["NPM"] = "npm";
|
|
10
10
|
Preset["TS"] = "ts";
|
|
11
11
|
Preset["WebComponents"] = "web-components";
|
|
12
|
-
Preset["
|
|
13
|
-
Preset["
|
|
14
|
-
Preset["
|
|
12
|
+
Preset["AngularMonorepo"] = "angular-monorepo";
|
|
13
|
+
Preset["AngularStandalone"] = "angular-standalone";
|
|
14
|
+
Preset["ReactMonorepo"] = "react-monorepo";
|
|
15
|
+
Preset["ReactStandalone"] = "react-standalone";
|
|
15
16
|
Preset["ReactNative"] = "react-native";
|
|
16
17
|
Preset["Expo"] = "expo";
|
|
17
18
|
Preset["NextJs"] = "next";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/presets.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/presets.ts"],"names":[],"mappings":";;;AAAA,IAAY,MAgBX;AAhBD,WAAY,MAAM;IAChB,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,qBAAW,CAAA;IACX,mBAAS,CAAA;IACT,0CAAgC,CAAA;IAChC,8CAAoC,CAAA;IACpC,kDAAwC,CAAA;IACxC,0CAAgC,CAAA;IAChC,8CAAoC,CAAA;IACpC,sCAA4B,CAAA;IAC5B,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,6BAAmB,CAAA;AACrB,CAAC,EAhBW,MAAM,GAAN,cAAM,KAAN,cAAM,QAgBjB"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.findClass = exports.addMethod = exports.addParameterToConstructor = exports.replaceNodeValue = exports.getImport = exports.addGlobal = exports.insertImport = exports.removeChange = exports.replaceChange = exports.insertChange = void 0;
|
|
4
4
|
const ts = require("typescript");
|
|
5
5
|
const typescript_1 = require("./typescript");
|
|
6
|
-
const
|
|
6
|
+
const typescript_2 = require("nx/src/utils/typescript");
|
|
7
7
|
function nodesByPosition(first, second) {
|
|
8
8
|
return first.getStart() - second.getStart();
|
|
9
9
|
}
|
|
@@ -47,7 +47,7 @@ function removeChange(host, sourceFile, filePath, removePosition, contentToRemov
|
|
|
47
47
|
exports.removeChange = removeChange;
|
|
48
48
|
function insertImport(host, source, fileToEdit, symbolName, fileName, isDefault = false) {
|
|
49
49
|
const rootNode = source;
|
|
50
|
-
const allImports = (0,
|
|
50
|
+
const allImports = (0, typescript_2.findNodes)(rootNode, ts.SyntaxKind.ImportDeclaration);
|
|
51
51
|
// get nodes that map to import statements from the file fileName
|
|
52
52
|
const relevantImports = allImports.filter((node) => {
|
|
53
53
|
// StringLiteral of the ImportDeclaration is the import file (fileName in this case).
|
|
@@ -62,8 +62,8 @@ function insertImport(host, source, fileToEdit, symbolName, fileName, isDefault
|
|
|
62
62
|
// imports from import file
|
|
63
63
|
const imports = [];
|
|
64
64
|
relevantImports.forEach((n) => {
|
|
65
|
-
Array.prototype.push.apply(imports, (0,
|
|
66
|
-
if ((0,
|
|
65
|
+
Array.prototype.push.apply(imports, (0, typescript_2.findNodes)(n, ts.SyntaxKind.Identifier));
|
|
66
|
+
if ((0, typescript_2.findNodes)(n, ts.SyntaxKind.AsteriskToken).length > 0) {
|
|
67
67
|
importsAsterisk = true;
|
|
68
68
|
}
|
|
69
69
|
});
|
|
@@ -74,14 +74,14 @@ function insertImport(host, source, fileToEdit, symbolName, fileName, isDefault
|
|
|
74
74
|
const importTextNodes = imports.filter((n) => n.text === symbolName);
|
|
75
75
|
// insert import if it's not there
|
|
76
76
|
if (importTextNodes.length === 0) {
|
|
77
|
-
const fallbackPos = (0,
|
|
78
|
-
(0,
|
|
77
|
+
const fallbackPos = (0, typescript_2.findNodes)(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
|
|
78
|
+
(0, typescript_2.findNodes)(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();
|
|
79
79
|
return insertAfterLastOccurrence(host, source, imports, `, ${symbolName}`, fileToEdit, fallbackPos);
|
|
80
80
|
}
|
|
81
81
|
return source;
|
|
82
82
|
}
|
|
83
83
|
// no such import declaration exists
|
|
84
|
-
const useStrict = (0,
|
|
84
|
+
const useStrict = (0, typescript_2.findNodes)(rootNode, ts.SyntaxKind.StringLiteral).filter((n) => n.text === 'use strict');
|
|
85
85
|
let fallbackPos = 0;
|
|
86
86
|
if (useStrict.length > 0) {
|
|
87
87
|
fallbackPos = useStrict[0].end;
|
|
@@ -103,7 +103,7 @@ function insertAfterLastOccurrence(host, sourceFile, nodes, toInsert, pathToFile
|
|
|
103
103
|
throw new Error();
|
|
104
104
|
}
|
|
105
105
|
if (syntaxKind) {
|
|
106
|
-
lastItem = (0,
|
|
106
|
+
lastItem = (0, typescript_2.findNodes)(lastItem, syntaxKind).sort(nodesByPosition).pop();
|
|
107
107
|
}
|
|
108
108
|
if (!lastItem && fallbackPos == undefined) {
|
|
109
109
|
throw new Error(`tried to insert ${toInsert} as first occurrence with no fallback position`);
|
|
@@ -112,7 +112,7 @@ function insertAfterLastOccurrence(host, sourceFile, nodes, toInsert, pathToFile
|
|
|
112
112
|
return insertChange(host, sourceFile, pathToFile, lastItemPosition, toInsert);
|
|
113
113
|
}
|
|
114
114
|
function addGlobal(host, source, modulePath, statement) {
|
|
115
|
-
const allImports = (0,
|
|
115
|
+
const allImports = (0, typescript_2.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
|
|
116
116
|
if (allImports.length > 0) {
|
|
117
117
|
const lastImport = allImports[allImports.length - 1];
|
|
118
118
|
return insertChange(host, source, modulePath, lastImport.end + 1, `\n${statement}\n`);
|
|
@@ -123,7 +123,7 @@ function addGlobal(host, source, modulePath, statement) {
|
|
|
123
123
|
}
|
|
124
124
|
exports.addGlobal = addGlobal;
|
|
125
125
|
function getImport(source, predicate) {
|
|
126
|
-
const allImports = (0,
|
|
126
|
+
const allImports = (0, typescript_2.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
|
|
127
127
|
const matching = allImports.filter((i) => predicate(i.moduleSpecifier.getText()));
|
|
128
128
|
return matching.map((i) => {
|
|
129
129
|
const moduleSpec = i.moduleSpecifier
|
|
@@ -8,6 +8,7 @@ const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
|
8
8
|
const project_graph_utils_1 = require("nx/src/utils/project-graph-utils");
|
|
9
9
|
const fs_1 = require("fs");
|
|
10
10
|
const ignore_1 = require("ignore");
|
|
11
|
+
const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
|
|
11
12
|
function configureIgnore() {
|
|
12
13
|
let ig;
|
|
13
14
|
const pathToGitIgnore = (0, path_1.join)(workspace_root_1.workspaceRoot, '.gitignore');
|
|
@@ -26,10 +27,14 @@ function createGlobPatternsForDependencies(dirPath, fileGlobPattern) {
|
|
|
26
27
|
let ig = configureIgnore();
|
|
27
28
|
const filenameRelativeToWorkspaceRoot = (0, path_1.relative)(workspace_root_1.workspaceRoot, dirPath);
|
|
28
29
|
const projectGraph = (0, project_graph_1.readCachedProjectGraph)();
|
|
30
|
+
const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(projectGraph.nodes);
|
|
29
31
|
// find the project
|
|
30
32
|
let projectName;
|
|
31
33
|
try {
|
|
32
|
-
projectName = (0,
|
|
34
|
+
projectName = (0, find_project_for_path_1.findProjectForPath)(filenameRelativeToWorkspaceRoot, projectRootMappings);
|
|
35
|
+
if (!projectName) {
|
|
36
|
+
throw new Error(`Could not find any project containing the file "${filenameRelativeToWorkspaceRoot}" among it's project files`);
|
|
37
|
+
}
|
|
33
38
|
}
|
|
34
39
|
catch (e) {
|
|
35
40
|
throw new Error(`createGlobPatternsForDependencies: Error when trying to determine main project.\n${e === null || e === void 0 ? void 0 : e.message}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-globs.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/generate-globs.ts"],"names":[],"mappings":";;;AAAA,yCAAyD;AACzD,gEAA4D;AAC5D,+BAAwD;AACxD,sEAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"generate-globs.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/generate-globs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
1
|
+
import type { Node, SyntaxKind } from 'typescript';
|
|
2
|
+
/**
|
|
3
|
+
* @deprecated This function is deprecated and no longer supported.
|
|
4
|
+
*/
|
|
5
|
+
export declare function findNodes(node: Node, kind: SyntaxKind | SyntaxKind[], max?: number): Node[];
|
|
@@ -1,32 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.findNodes = void 0;
|
|
4
|
+
const typescript_1 = require("nx/src/utils/typescript");
|
|
5
|
+
// TODO(v16): This should be removed.
|
|
6
|
+
/**
|
|
7
|
+
* @deprecated This function is deprecated and no longer supported.
|
|
8
|
+
*/
|
|
4
9
|
function findNodes(node, kind, max = Infinity) {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
}
|
|
8
|
-
const arr = [];
|
|
9
|
-
const hasMatch = Array.isArray(kind)
|
|
10
|
-
? kind.includes(node.kind)
|
|
11
|
-
: node.kind === kind;
|
|
12
|
-
if (hasMatch) {
|
|
13
|
-
arr.push(node);
|
|
14
|
-
max--;
|
|
15
|
-
}
|
|
16
|
-
if (max > 0) {
|
|
17
|
-
for (const child of node.getChildren()) {
|
|
18
|
-
findNodes(child, kind, max).forEach((node) => {
|
|
19
|
-
if (max > 0) {
|
|
20
|
-
arr.push(node);
|
|
21
|
-
}
|
|
22
|
-
max--;
|
|
23
|
-
});
|
|
24
|
-
if (max <= 0) {
|
|
25
|
-
break;
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
return arr;
|
|
10
|
+
console.warn('"findNodes" is deprecated and no longer supported.');
|
|
11
|
+
return (0, typescript_1.findNodes)(node, kind, max);
|
|
30
12
|
}
|
|
31
13
|
exports.findNodes = findNodes;
|
|
32
14
|
//# sourceMappingURL=find-nodes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-nodes.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/find-nodes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"find-nodes.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/find-nodes.ts"],"names":[],"mappings":";;;AAAA,wDAAkE;AAGlE,qCAAqC;AAErC;;GAEG;AACH,SAAgB,SAAS,CACvB,IAAU,EACV,IAA+B,EAC/B,GAAG,GAAG,QAAQ;IAEd,OAAO,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;IACnE,OAAO,IAAA,sBAAU,EAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;AACrC,CAAC;AAPD,8BAOC"}
|
|
@@ -7,7 +7,7 @@ const fs_1 = require("fs");
|
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
var compilation_1 = require("./typescript/compilation");
|
|
9
9
|
Object.defineProperty(exports, "compileTypeScript", { enumerable: true, get: function () { return compilation_1.compileTypeScript; } });
|
|
10
|
-
var find_nodes_1 = require("./typescript/find-nodes");
|
|
10
|
+
var find_nodes_1 = require("./typescript/find-nodes"); // TODO(v16): remove this
|
|
11
11
|
Object.defineProperty(exports, "findNodes", { enumerable: true, get: function () { return find_nodes_1.findNodes; } });
|
|
12
12
|
var get_source_nodes_1 = require("./typescript/get-source-nodes");
|
|
13
13
|
Object.defineProperty(exports, "getSourceNodes", { enumerable: true, get: function () { return get_source_nodes_1.getSourceNodes; } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/typescript.ts"],"names":[],"mappings":";;;AAAA,yCAAoD;AACpD,yCAA6C;AAC7C,2BAAgC;AAChC,+BAAqC;AAErC,wDAA6D;AAApD,gHAAA,iBAAiB,OAAA;AAE1B,sDAAoD;
|
|
1
|
+
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/typescript.ts"],"names":[],"mappings":"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"}
|
package/src/utils/ast-utils.js
CHANGED
|
@@ -14,7 +14,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
14
14
|
const cli_config_utils_1 = require("./cli-config-utils");
|
|
15
15
|
const core_1 = require("@angular-devkit/core");
|
|
16
16
|
const add_install_task_1 = require("./rules/add-install-task");
|
|
17
|
-
const
|
|
17
|
+
const typescript_1 = require("nx/src/utils/typescript");
|
|
18
18
|
const get_source_nodes_1 = require("../utilities/typescript/get-source-nodes");
|
|
19
19
|
function nodesByPosition(first, second) {
|
|
20
20
|
return first.getStart() - second.getStart();
|
|
@@ -26,7 +26,7 @@ function insertAfterLastOccurrence(nodes, toInsert, file, fallbackPos, syntaxKin
|
|
|
26
26
|
throw new Error();
|
|
27
27
|
}
|
|
28
28
|
if (syntaxKind) {
|
|
29
|
-
lastItem = (0,
|
|
29
|
+
lastItem = (0, typescript_1.findNodes)(lastItem, syntaxKind).sort(nodesByPosition).pop();
|
|
30
30
|
}
|
|
31
31
|
if (!lastItem && fallbackPos == undefined) {
|
|
32
32
|
throw new Error(`tried to insert ${toInsert} as first occurrence with no fallback position`);
|
|
@@ -42,8 +42,8 @@ function sortObjectByKeys(obj) {
|
|
|
42
42
|
}, {});
|
|
43
43
|
}
|
|
44
44
|
exports.sortObjectByKeys = sortObjectByKeys;
|
|
45
|
-
var
|
|
46
|
-
Object.defineProperty(exports, "findNodes", { enumerable: true, get: function () { return
|
|
45
|
+
var find_nodes_1 = require("../utilities/typescript/find-nodes"); // TODO(v16): Remove this
|
|
46
|
+
Object.defineProperty(exports, "findNodes", { enumerable: true, get: function () { return find_nodes_1.findNodes; } });
|
|
47
47
|
var get_source_nodes_2 = require("../utilities/typescript/get-source-nodes");
|
|
48
48
|
Object.defineProperty(exports, "getSourceNodes", { enumerable: true, get: function () { return get_source_nodes_2.getSourceNodes; } });
|
|
49
49
|
class NoopChange {
|
|
@@ -193,7 +193,7 @@ function addIncludeToTsConfig(tsConfigPath, source, include) {
|
|
|
193
193
|
}
|
|
194
194
|
exports.addIncludeToTsConfig = addIncludeToTsConfig;
|
|
195
195
|
function getImport(source, predicate) {
|
|
196
|
-
const allImports = (0,
|
|
196
|
+
const allImports = (0, typescript_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
|
|
197
197
|
const matching = allImports.filter((i) => predicate(i.moduleSpecifier.getText()));
|
|
198
198
|
return matching.map((i) => {
|
|
199
199
|
const moduleSpec = i.moduleSpecifier
|
|
@@ -210,7 +210,7 @@ function getImport(source, predicate) {
|
|
|
210
210
|
}
|
|
211
211
|
exports.getImport = getImport;
|
|
212
212
|
function addGlobal(source, modulePath, statement) {
|
|
213
|
-
const allImports = (0,
|
|
213
|
+
const allImports = (0, typescript_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
|
|
214
214
|
if (allImports.length > 0) {
|
|
215
215
|
const lastImport = allImports[allImports.length - 1];
|
|
216
216
|
return [
|
|
@@ -436,7 +436,7 @@ function createOrUpdate(host, path, content) {
|
|
|
436
436
|
exports.createOrUpdate = createOrUpdate;
|
|
437
437
|
function insertImport(source, fileToEdit, symbolName, fileName, isDefault = false) {
|
|
438
438
|
const rootNode = source;
|
|
439
|
-
const allImports = (0,
|
|
439
|
+
const allImports = (0, typescript_1.findNodes)(rootNode, ts.SyntaxKind.ImportDeclaration);
|
|
440
440
|
// get nodes that map to import statements from the file fileName
|
|
441
441
|
const relevantImports = allImports.filter((node) => {
|
|
442
442
|
// StringLiteral of the ImportDeclaration is the import file (fileName in this case).
|
|
@@ -451,8 +451,8 @@ function insertImport(source, fileToEdit, symbolName, fileName, isDefault = fals
|
|
|
451
451
|
// imports from import file
|
|
452
452
|
const imports = [];
|
|
453
453
|
relevantImports.forEach((n) => {
|
|
454
|
-
Array.prototype.push.apply(imports, (0,
|
|
455
|
-
if ((0,
|
|
454
|
+
Array.prototype.push.apply(imports, (0, typescript_1.findNodes)(n, ts.SyntaxKind.Identifier));
|
|
455
|
+
if ((0, typescript_1.findNodes)(n, ts.SyntaxKind.AsteriskToken).length > 0) {
|
|
456
456
|
importsAsterisk = true;
|
|
457
457
|
}
|
|
458
458
|
});
|
|
@@ -463,14 +463,14 @@ function insertImport(source, fileToEdit, symbolName, fileName, isDefault = fals
|
|
|
463
463
|
const importTextNodes = imports.filter((n) => n.text === symbolName);
|
|
464
464
|
// insert import if it's not there
|
|
465
465
|
if (importTextNodes.length === 0) {
|
|
466
|
-
const fallbackPos = (0,
|
|
467
|
-
(0,
|
|
466
|
+
const fallbackPos = (0, typescript_1.findNodes)(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
|
|
467
|
+
(0, typescript_1.findNodes)(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();
|
|
468
468
|
return insertAfterLastOccurrence(imports, `, ${symbolName}`, fileToEdit, fallbackPos);
|
|
469
469
|
}
|
|
470
470
|
return new NoopChange();
|
|
471
471
|
}
|
|
472
472
|
// no such import declaration exists
|
|
473
|
-
const useStrict = (0,
|
|
473
|
+
const useStrict = (0, typescript_1.findNodes)(rootNode, ts.SyntaxKind.StringLiteral).filter((n) => n.text === 'use strict');
|
|
474
474
|
let fallbackPos = 0;
|
|
475
475
|
if (useStrict.length > 0) {
|
|
476
476
|
fallbackPos = useStrict[0].end;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
7
7
|
const workspace_1 = require("../workspace");
|
|
8
8
|
const visit_not_ignored_files_1 = require("./visit-not-ignored-files");
|
|
9
9
|
const ast_utils_1 = require("../ast-utils");
|
|
10
|
+
const typescript_1 = require("nx/src/utils/typescript");
|
|
10
11
|
const core_1 = require("@angular-devkit/core");
|
|
11
12
|
/**
|
|
12
13
|
* Updates all the imports found in the workspace
|
|
@@ -32,7 +33,7 @@ function renamePackageImports(packageNameMapping) {
|
|
|
32
33
|
const astSource = ts.createSourceFile(file, contents, ts.ScriptTarget.Latest, true);
|
|
33
34
|
const changes = Object.entries(packageNameMapping)
|
|
34
35
|
.map(([packageName, newPackageName]) => {
|
|
35
|
-
const nodes = (0,
|
|
36
|
+
const nodes = (0, typescript_1.findNodes)(astSource, ts.SyntaxKind.ImportDeclaration);
|
|
36
37
|
return nodes
|
|
37
38
|
.filter((node) => {
|
|
38
39
|
return (
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rename-package-imports.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/rename-package-imports.ts"],"names":[],"mappings":";;;;AAAA,iCAAiC;AACjC,2DAKoC;AACpC,4CAA4C;AAC5C,uEAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"rename-package-imports.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/rename-package-imports.ts"],"names":[],"mappings":";;;;AAAA,iCAAiC;AACjC,2DAKoC;AACpC,4CAA4C;AAC5C,uEAAiE;AACjE,4CAAqD;AACrD,wDAAoD;AACpD,+CAAiD;AAMjD;;;;GAIG;AACH,SAAgB,oBAAoB,CAClC,kBAAsC;IAEtC,OAAO,CAAO,IAAU,EAAE,QAA0B,EAAE,EAAE;QACtD,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAE3C,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACrC,KAAK,CAAC,IAAI,CACR,IAAA,8CAAoB,EAAC,CAAC,IAAI,EAAE,EAAE;gBAC5B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBAC5B,OAAO;iBACR;gBAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACnD,MAAM,2BAA2B,GAAG,MAAM,CAAC,IAAI,CAC7C,kBAAkB,CACnB,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;oBACrB,OAAO,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,2BAA2B,EAAE;oBAChC,OAAO;iBACR;gBAED,MAAM,SAAS,GAAG,EAAE,CAAC,gBAAgB,CACnC,IAAI,EACJ,QAAQ,EACR,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;gBACF,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC;qBAC/C,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,EAAE;oBACrC,MAAM,KAAK,GAAG,IAAA,sBAAS,EACrB,SAAS,EACT,EAAE,CAAC,UAAU,CAAC,iBAAiB,CACN,CAAC;oBAE5B,OAAO,KAAK;yBACT,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;wBACf,OAAO;wBACL,iCAAiC;wBACjC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;4BACpD,WAAW,CACZ,CAAC;oBACJ,CAAC,CAAC;yBACD,GAAG,CACF,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,yBAAa,CACf,IAAI,EACJ,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,EAC/B,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,EAC9B,IAAI,cAAc,GAAG,CACtB,CACJ,CAAC;gBACN,CAAC,CAAC;oBACF,8DAA8D;qBAC7D,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;gBAE7C,kEAAkE;gBAClE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBACtB,8BAA8B;oBAC9B,IAAA,kBAAM,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;iBAC7B;YACH,CAAC,EAAE,IAAA,gBAAS,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAC5B,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAA,CAAC;AACJ,CAAC;AAtED,oDAsEC"}
|
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"$schema": "http://json-schema.org/schema",
|
|
3
|
-
"$id": "SchematicsNxNgNew",
|
|
4
|
-
"cli": "nx",
|
|
5
|
-
"title": "Create an empty workspace",
|
|
6
|
-
"description": "Create an empty workspace.",
|
|
7
|
-
"type": "object",
|
|
8
|
-
"properties": {
|
|
9
|
-
"name": {
|
|
10
|
-
"description": "The name of the workspace.",
|
|
11
|
-
"type": "string",
|
|
12
|
-
"$default": {
|
|
13
|
-
"$source": "argv",
|
|
14
|
-
"index": 0
|
|
15
|
-
},
|
|
16
|
-
"x-prompt": "What name would you like to use for the workspace?"
|
|
17
|
-
},
|
|
18
|
-
"style": {
|
|
19
|
-
"description": "The file extension to be used for style files.",
|
|
20
|
-
"type": "string",
|
|
21
|
-
"default": "css",
|
|
22
|
-
"x-prompt": {
|
|
23
|
-
"message": "Which stylesheet format would you like to use?",
|
|
24
|
-
"type": "list",
|
|
25
|
-
"items": [
|
|
26
|
-
{ "value": "css", "label": "CSS" },
|
|
27
|
-
{
|
|
28
|
-
"value": "scss",
|
|
29
|
-
"label": "SASS(.scss) [ http://sass-lang.com ]"
|
|
30
|
-
},
|
|
31
|
-
{
|
|
32
|
-
"value": "styl",
|
|
33
|
-
"label": "Stylus(.styl)[ http://stylus-lang.com ]"
|
|
34
|
-
},
|
|
35
|
-
{
|
|
36
|
-
"value": "less",
|
|
37
|
-
"label": "LESS [ http://lesscss.org ]"
|
|
38
|
-
}
|
|
39
|
-
]
|
|
40
|
-
}
|
|
41
|
-
},
|
|
42
|
-
"directory": {
|
|
43
|
-
"type": "string",
|
|
44
|
-
"format": "path",
|
|
45
|
-
"description": "The directory name to create the workspace in.",
|
|
46
|
-
"default": ""
|
|
47
|
-
},
|
|
48
|
-
"preset": {
|
|
49
|
-
"type": "string",
|
|
50
|
-
"description": "Preset of the workspace."
|
|
51
|
-
},
|
|
52
|
-
"npmScope": {
|
|
53
|
-
"type": "string",
|
|
54
|
-
"description": "Npm scope for importing libs."
|
|
55
|
-
},
|
|
56
|
-
"defaultBase": {
|
|
57
|
-
"type": "string",
|
|
58
|
-
"description": "Default base branch for affected."
|
|
59
|
-
},
|
|
60
|
-
"skipInstall": {
|
|
61
|
-
"description": "Skip installing dependency packages.",
|
|
62
|
-
"type": "boolean",
|
|
63
|
-
"default": false
|
|
64
|
-
},
|
|
65
|
-
"packageManager": {
|
|
66
|
-
"description": "The package manager used to install dependencies.",
|
|
67
|
-
"type": "string",
|
|
68
|
-
"enum": ["npm", "yarn", "pnpm"]
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
}
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import type { ProjectGraph } from '@nrwl/devkit';
|
|
2
|
-
/**
|
|
3
|
-
* Creates a package.json in the output directory for support to install dependencies within containers.
|
|
4
|
-
*
|
|
5
|
-
* If a package.json exists in the project, it will reuse that.
|
|
6
|
-
*/
|
|
7
|
-
export declare function createPackageJson(projectName: string, graph: ProjectGraph, options: {
|
|
8
|
-
projectRoot?: string;
|
|
9
|
-
root?: string;
|
|
10
|
-
}): any;
|