@nx/js 16.0.0 → 16.0.2
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/README.md +3 -3
- package/package.json +5 -5
- package/src/index.d.ts +0 -1
- package/src/index.js +1 -5
- package/src/index.js.map +1 -1
- package/src/internal.d.ts +1 -1
- package/src/internal.js +2 -3
- package/src/internal.js.map +1 -1
- package/src/utils/typescript/ast-utils.d.ts +10 -0
- package/src/utils/typescript/ast-utils.js +80 -12
- package/src/utils/typescript/ast-utils.js.map +1 -1
- package/src/utils/typescript/ts-config.d.ts +1 -0
- package/src/utils/typescript/ts-config.js +6 -1
- package/src/utils/typescript/ts-config.js.map +1 -1
package/README.md
CHANGED
|
@@ -3,12 +3,12 @@
|
|
|
3
3
|
<div style="text-align: center;">
|
|
4
4
|
|
|
5
5
|
[](https://circleci.com/gh/nrwl/nx)
|
|
6
|
-
[](https://www.npmjs.com/@
|
|
6
|
+
[]()
|
|
7
|
+
[](https://www.npmjs.com/@nx/workspace)
|
|
8
8
|
[]()
|
|
9
9
|
[](http://commitizen.github.io/cz-cli/)
|
|
10
10
|
[](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
|
11
|
-
[](https://join.slack.com/t/nrwlcommunity/shared_invite/enQtNzU5MTE4OTQwOTk0LTgxY2E0ZWYzMWE0YzA5ZDA2MWM1NDVhNmI2ZWMyYmZhNWJiODk3MjkxZjY3MzU5ZjRmM2NmNWU1OTgyZmE4Mzc)
|
|
12
12
|
|
|
13
13
|
</div>
|
|
14
14
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/js",
|
|
3
|
-
"version": "16.0.
|
|
3
|
+
"version": "16.0.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
|
|
6
6
|
"repository": {
|
|
@@ -39,9 +39,9 @@
|
|
|
39
39
|
"@babel/preset-env": "^7.15.0",
|
|
40
40
|
"@babel/preset-typescript": "^7.15.0",
|
|
41
41
|
"@babel/runtime": "^7.14.8",
|
|
42
|
-
"@nrwl/js": "16.0.
|
|
43
|
-
"@nx/devkit": "16.0.
|
|
44
|
-
"@nx/workspace": "16.0.
|
|
42
|
+
"@nrwl/js": "16.0.2",
|
|
43
|
+
"@nx/devkit": "16.0.2",
|
|
44
|
+
"@nx/workspace": "16.0.2",
|
|
45
45
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
46
46
|
"babel-plugin-const-enum": "^1.0.1",
|
|
47
47
|
"babel-plugin-macros": "^2.8.0",
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
"access": "public"
|
|
61
61
|
},
|
|
62
62
|
"types": "./src/index.d.ts",
|
|
63
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "e48d7d1835c13b23df9515bea186722d47a15ba5"
|
|
64
64
|
}
|
package/src/index.d.ts
CHANGED
|
@@ -13,4 +13,3 @@ export { libraryGenerator } from './generators/library/library';
|
|
|
13
13
|
export { initGenerator } from './generators/init/init';
|
|
14
14
|
export { createLockFile, getLockFileName, } from 'nx/src/plugins/js/lock-file/lock-file';
|
|
15
15
|
export { createPackageJson } from 'nx/src/plugins/js/package-json/create-package-json';
|
|
16
|
-
export { findNodes, getRootTsConfigPath, } from 'nx/src/plugins/js/utils/typescript';
|
package/src/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.createPackageJson = exports.getLockFileName = exports.createLockFile = exports.initGenerator = exports.libraryGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
tslib_1.__exportStar(require("./utils/typescript/load-ts-transformers"), exports);
|
|
6
6
|
tslib_1.__exportStar(require("./utils/typescript/print-diagnostics"), exports);
|
|
@@ -24,8 +24,4 @@ Object.defineProperty(exports, "getLockFileName", { enumerable: true, get: funct
|
|
|
24
24
|
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
|
|
25
25
|
var create_package_json_1 = require("nx/src/plugins/js/package-json/create-package-json");
|
|
26
26
|
Object.defineProperty(exports, "createPackageJson", { enumerable: true, get: function () { return create_package_json_1.createPackageJson; } });
|
|
27
|
-
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
|
|
28
|
-
var typescript_1 = require("nx/src/plugins/js/utils/typescript");
|
|
29
|
-
Object.defineProperty(exports, "findNodes", { enumerable: true, get: function () { return typescript_1.findNodes; } });
|
|
30
|
-
Object.defineProperty(exports, "getRootTsConfigPath", { enumerable: true, get: function () { return typescript_1.getRootTsConfigPath; } });
|
|
31
27
|
//# sourceMappingURL=index.js.map
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/js/src/index.ts"],"names":[],"mappings":";;;;AAAA,kFAAwD;AACxD,+EAAqD;AACrD,4EAAkD;AAClD,8EAAoD;AACpD,6EAAmD;AACnD,uEAA6C;AAC7C,8EAAoD;AACpD,uEAA6C;AAC7C,+DAAqC;AACrC,yDAA+B;AAC/B,mFAAyD;AACzD,wDAAgE;AAAvD,2GAAA,gBAAgB,OAAA;AACzB,+CAAuD;AAA9C,qGAAA,aAAa,OAAA;AAEtB,oEAAoE;AACpE,mEAG+C;AAF7C,2GAAA,cAAc,OAAA;AACd,4GAAA,eAAe,OAAA;AAEjB,oEAAoE;AACpE,0FAAuF;AAA9E,wHAAA,iBAAiB,OAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/js/src/index.ts"],"names":[],"mappings":";;;;AAAA,kFAAwD;AACxD,+EAAqD;AACrD,4EAAkD;AAClD,8EAAoD;AACpD,6EAAmD;AACnD,uEAA6C;AAC7C,8EAAoD;AACpD,uEAA6C;AAC7C,+DAAqC;AACrC,yDAA+B;AAC/B,mFAAyD;AACzD,wDAAgE;AAAvD,2GAAA,gBAAgB,OAAA;AACzB,+CAAuD;AAA9C,qGAAA,aAAa,OAAA;AAEtB,oEAAoE;AACpE,mEAG+C;AAF7C,2GAAA,cAAc,OAAA;AACd,4GAAA,eAAe,OAAA;AAEjB,oEAAoE;AACpE,0FAAuF;AAA9E,wHAAA,iBAAiB,OAAA"}
|
package/src/internal.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export { resolveModuleByImport } from '
|
|
1
|
+
export { resolveModuleByImport } from './utils/typescript/ast-utils';
|
|
2
2
|
export { registerTsProject, registerTsConfigPaths, } from 'nx/src/plugins/js/utils/register';
|
|
3
3
|
export { TargetProjectLocator } from 'nx/src/plugins/js/project-graph/build-dependencies/target-project-locator';
|
package/src/internal.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TargetProjectLocator = exports.registerTsConfigPaths = exports.registerTsProject = exports.resolveModuleByImport = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
Object.defineProperty(exports, "resolveModuleByImport", { enumerable: true, get: function () { return typescript_1.resolveModuleByImport; } });
|
|
4
|
+
var ast_utils_1 = require("./utils/typescript/ast-utils");
|
|
5
|
+
Object.defineProperty(exports, "resolveModuleByImport", { enumerable: true, get: function () { return ast_utils_1.resolveModuleByImport; } });
|
|
7
6
|
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
|
|
8
7
|
var register_1 = require("nx/src/plugins/js/utils/register");
|
|
9
8
|
Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return register_1.registerTsProject; } });
|
package/src/internal.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../packages/js/src/internal.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../packages/js/src/internal.ts"],"names":[],"mappings":";;;AAAA,0DAAqE;AAA5D,kHAAA,qBAAqB,OAAA;AAC9B,oEAAoE;AACpE,6DAG0C;AAFxC,6GAAA,iBAAiB,OAAA;AACjB,iHAAA,qBAAqB,OAAA;AAEvB,oEAAoE;AACpE,oHAAiH;AAAxG,8HAAA,oBAAoB,OAAA"}
|
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
import type { Tree } from '@nx/devkit';
|
|
2
2
|
import type * as ts from 'typescript';
|
|
3
|
+
import { Node, SyntaxKind } from 'typescript';
|
|
4
|
+
/**
|
|
5
|
+
* Find a module based on its import
|
|
6
|
+
*
|
|
7
|
+
* @param importExpr Import used to resolve to a module
|
|
8
|
+
* @param filePath
|
|
9
|
+
* @param tsConfigPath
|
|
10
|
+
*/
|
|
11
|
+
export declare function resolveModuleByImport(importExpr: string, filePath: string, tsConfigPath: string): string;
|
|
3
12
|
export declare function insertChange(host: Tree, sourceFile: ts.SourceFile, filePath: string, insertPosition: number, contentToInsert: string): ts.SourceFile;
|
|
4
13
|
export declare function replaceChange(host: Tree, sourceFile: ts.SourceFile, filePath: string, insertPosition: number, contentToInsert: string, oldContent: string): ts.SourceFile;
|
|
5
14
|
export declare function removeChange(host: Tree, sourceFile: ts.SourceFile, filePath: string, removePosition: number, contentToRemove: string): ts.SourceFile;
|
|
@@ -20,3 +29,4 @@ export declare function addMethod(tree: Tree, source: ts.SourceFile, modulePath:
|
|
|
20
29
|
body?: string;
|
|
21
30
|
}): ts.SourceFile;
|
|
22
31
|
export declare function findClass(source: ts.SourceFile, className: string, silent?: boolean): ts.ClassDeclaration;
|
|
32
|
+
export declare function findNodes(node: Node, kind: SyntaxKind | SyntaxKind[], max?: number): Node[];
|
|
@@ -1,12 +1,52 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.findClass = exports.addMethod = exports.addParameterToConstructor = exports.replaceNodeValue = exports.getImport = exports.addGlobal = exports.insertImport = exports.removeChange = exports.replaceChange = exports.insertChange = void 0;
|
|
3
|
+
exports.findNodes = exports.findClass = exports.addMethod = exports.addParameterToConstructor = exports.replaceNodeValue = exports.getImport = exports.addGlobal = exports.insertImport = exports.removeChange = exports.replaceChange = exports.insertChange = exports.resolveModuleByImport = void 0;
|
|
4
4
|
// TODO(colum): replace when https://github.com/nrwl/nx/pull/15497 is merged
|
|
5
5
|
const typescript_1 = require("@nx/workspace/src/utilities/typescript");
|
|
6
|
-
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
|
|
7
|
-
const typescript_2 = require("nx/src/plugins/js/utils/typescript");
|
|
8
6
|
const ensure_typescript_1 = require("./ensure-typescript");
|
|
7
|
+
const devkit_1 = require("@nx/devkit");
|
|
8
|
+
const path_1 = require("path");
|
|
9
|
+
const normalizedAppRoot = devkit_1.workspaceRoot.replace(/\\/g, '/');
|
|
9
10
|
let tsModule;
|
|
11
|
+
let compilerHost;
|
|
12
|
+
/**
|
|
13
|
+
* Find a module based on its import
|
|
14
|
+
*
|
|
15
|
+
* @param importExpr Import used to resolve to a module
|
|
16
|
+
* @param filePath
|
|
17
|
+
* @param tsConfigPath
|
|
18
|
+
*/
|
|
19
|
+
function resolveModuleByImport(importExpr, filePath, tsConfigPath) {
|
|
20
|
+
compilerHost = compilerHost || getCompilerHost(tsConfigPath);
|
|
21
|
+
const { options, host, moduleResolutionCache } = compilerHost;
|
|
22
|
+
const { resolvedModule } = tsModule.resolveModuleName(importExpr, filePath, options, host, moduleResolutionCache);
|
|
23
|
+
if (!resolvedModule) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
return resolvedModule.resolvedFileName.replace(`${normalizedAppRoot}/`, '');
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
exports.resolveModuleByImport = resolveModuleByImport;
|
|
31
|
+
function getCompilerHost(tsConfigPath) {
|
|
32
|
+
const options = readTsConfigOptions(tsConfigPath);
|
|
33
|
+
const host = tsModule.createCompilerHost(options, true);
|
|
34
|
+
const moduleResolutionCache = tsModule.createModuleResolutionCache(devkit_1.workspaceRoot, host.getCanonicalFileName);
|
|
35
|
+
return { options, host, moduleResolutionCache };
|
|
36
|
+
}
|
|
37
|
+
function readTsConfigOptions(tsConfigPath) {
|
|
38
|
+
if (!tsModule) {
|
|
39
|
+
tsModule = require('typescript');
|
|
40
|
+
}
|
|
41
|
+
const readResult = tsModule.readConfigFile(tsConfigPath, tsModule.sys.readFile);
|
|
42
|
+
// we don't need to scan the files, we only care about options
|
|
43
|
+
const host = {
|
|
44
|
+
readDirectory: () => [],
|
|
45
|
+
readFile: () => '',
|
|
46
|
+
fileExists: tsModule.sys.fileExists,
|
|
47
|
+
};
|
|
48
|
+
return tsModule.parseJsonConfigFileContent(readResult.config, host, (0, path_1.dirname)(tsConfigPath)).options;
|
|
49
|
+
}
|
|
10
50
|
function nodesByPosition(first, second) {
|
|
11
51
|
return first.getStart() - second.getStart();
|
|
12
52
|
}
|
|
@@ -53,7 +93,7 @@ function insertImport(host, source, fileToEdit, symbolName, fileName, isDefault
|
|
|
53
93
|
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
54
94
|
}
|
|
55
95
|
const rootNode = source;
|
|
56
|
-
const allImports =
|
|
96
|
+
const allImports = findNodes(rootNode, tsModule.SyntaxKind.ImportDeclaration);
|
|
57
97
|
// get nodes that map to import statements from the file fileName
|
|
58
98
|
const relevantImports = allImports.filter((node) => {
|
|
59
99
|
// StringLiteral of the ImportDeclaration is the import file (fileName in this case).
|
|
@@ -68,8 +108,8 @@ function insertImport(host, source, fileToEdit, symbolName, fileName, isDefault
|
|
|
68
108
|
// imports from import file
|
|
69
109
|
const imports = [];
|
|
70
110
|
relevantImports.forEach((n) => {
|
|
71
|
-
Array.prototype.push.apply(imports,
|
|
72
|
-
if (
|
|
111
|
+
Array.prototype.push.apply(imports, findNodes(n, tsModule.SyntaxKind.Identifier));
|
|
112
|
+
if (findNodes(n, tsModule.SyntaxKind.AsteriskToken).length > 0) {
|
|
73
113
|
importsAsterisk = true;
|
|
74
114
|
}
|
|
75
115
|
});
|
|
@@ -80,14 +120,14 @@ function insertImport(host, source, fileToEdit, symbolName, fileName, isDefault
|
|
|
80
120
|
const importTextNodes = imports.filter((n) => n.text === symbolName);
|
|
81
121
|
// insert import if it's not there
|
|
82
122
|
if (importTextNodes.length === 0) {
|
|
83
|
-
const fallbackPos =
|
|
84
|
-
|
|
123
|
+
const fallbackPos = findNodes(relevantImports[0], tsModule.SyntaxKind.CloseBraceToken)[0].getStart() ||
|
|
124
|
+
findNodes(relevantImports[0], tsModule.SyntaxKind.FromKeyword)[0].getStart();
|
|
85
125
|
return insertAfterLastOccurrence(host, source, imports, `, ${symbolName}`, fileToEdit, fallbackPos);
|
|
86
126
|
}
|
|
87
127
|
return source;
|
|
88
128
|
}
|
|
89
129
|
// no such import declaration exists
|
|
90
|
-
const useStrict =
|
|
130
|
+
const useStrict = findNodes(rootNode, tsModule.SyntaxKind.StringLiteral).filter((n) => n.text === 'use strict');
|
|
91
131
|
let fallbackPos = 0;
|
|
92
132
|
if (useStrict.length > 0) {
|
|
93
133
|
fallbackPos = useStrict[0].end;
|
|
@@ -109,7 +149,7 @@ function insertAfterLastOccurrence(host, sourceFile, nodes, toInsert, pathToFile
|
|
|
109
149
|
throw new Error();
|
|
110
150
|
}
|
|
111
151
|
if (syntaxKind) {
|
|
112
|
-
lastItem =
|
|
152
|
+
lastItem = findNodes(lastItem, syntaxKind).sort(nodesByPosition).pop();
|
|
113
153
|
}
|
|
114
154
|
if (!lastItem && fallbackPos == undefined) {
|
|
115
155
|
throw new Error(`tried to insert ${toInsert} as first occurrence with no fallback position`);
|
|
@@ -121,7 +161,7 @@ function addGlobal(host, source, modulePath, statement) {
|
|
|
121
161
|
if (!tsModule) {
|
|
122
162
|
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
123
163
|
}
|
|
124
|
-
const allImports =
|
|
164
|
+
const allImports = findNodes(source, tsModule.SyntaxKind.ImportDeclaration);
|
|
125
165
|
if (allImports.length > 0) {
|
|
126
166
|
const lastImport = allImports[allImports.length - 1];
|
|
127
167
|
return insertChange(host, source, modulePath, lastImport.end + 1, `\n${statement}\n`);
|
|
@@ -135,7 +175,7 @@ function getImport(source, predicate) {
|
|
|
135
175
|
if (!tsModule) {
|
|
136
176
|
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
137
177
|
}
|
|
138
|
-
const allImports =
|
|
178
|
+
const allImports = findNodes(source, tsModule.SyntaxKind.ImportDeclaration);
|
|
139
179
|
const matching = allImports.filter((i) => predicate(i.moduleSpecifier.getText()));
|
|
140
180
|
return matching.map((i) => {
|
|
141
181
|
const moduleSpec = i.moduleSpecifier
|
|
@@ -197,4 +237,32 @@ function findClass(source, className, silent = false) {
|
|
|
197
237
|
return clazz;
|
|
198
238
|
}
|
|
199
239
|
exports.findClass = findClass;
|
|
240
|
+
function findNodes(node, kind, max = Infinity) {
|
|
241
|
+
if (!node || max == 0) {
|
|
242
|
+
return [];
|
|
243
|
+
}
|
|
244
|
+
const arr = [];
|
|
245
|
+
const hasMatch = Array.isArray(kind)
|
|
246
|
+
? kind.includes(node.kind)
|
|
247
|
+
: node.kind === kind;
|
|
248
|
+
if (hasMatch) {
|
|
249
|
+
arr.push(node);
|
|
250
|
+
max--;
|
|
251
|
+
}
|
|
252
|
+
if (max > 0) {
|
|
253
|
+
for (const child of node.getChildren()) {
|
|
254
|
+
findNodes(child, kind, max).forEach((node) => {
|
|
255
|
+
if (max > 0) {
|
|
256
|
+
arr.push(node);
|
|
257
|
+
}
|
|
258
|
+
max--;
|
|
259
|
+
});
|
|
260
|
+
if (max <= 0) {
|
|
261
|
+
break;
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
return arr;
|
|
266
|
+
}
|
|
267
|
+
exports.findNodes = findNodes;
|
|
200
268
|
//# sourceMappingURL=ast-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,6 @@ import { Tree } from '@nx/devkit';
|
|
|
2
2
|
export declare function readTsConfig(tsConfigPath: string): import("typescript").ParsedCommandLine;
|
|
3
3
|
export declare function getRootTsConfigPathInTree(tree: Tree): string | null;
|
|
4
4
|
export declare function getRelativePathToRootTsConfig(tree: Tree, targetPath: string): string;
|
|
5
|
+
export declare function getRootTsConfigPath(): string | null;
|
|
5
6
|
export declare function getRootTsConfigFileName(tree?: Tree): string | null;
|
|
6
7
|
export declare function addTsConfigPath(tree: Tree, importPath: string, lookupPaths: string[]): void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.addTsConfigPath = exports.getRootTsConfigFileName = exports.getRelativePathToRootTsConfig = exports.getRootTsConfigPathInTree = exports.readTsConfig = void 0;
|
|
3
|
+
exports.addTsConfigPath = exports.getRootTsConfigFileName = exports.getRootTsConfigPath = exports.getRelativePathToRootTsConfig = exports.getRootTsConfigPathInTree = exports.readTsConfig = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const fs_1 = require("fs");
|
|
6
6
|
const path_1 = require("path");
|
|
@@ -26,6 +26,11 @@ function getRelativePathToRootTsConfig(tree, targetPath) {
|
|
|
26
26
|
return (0, devkit_1.offsetFromRoot)(targetPath) + getRootTsConfigPathInTree(tree);
|
|
27
27
|
}
|
|
28
28
|
exports.getRelativePathToRootTsConfig = getRelativePathToRootTsConfig;
|
|
29
|
+
function getRootTsConfigPath() {
|
|
30
|
+
const tsConfigFileName = getRootTsConfigFileName();
|
|
31
|
+
return tsConfigFileName ? (0, path_1.join)(devkit_1.workspaceRoot, tsConfigFileName) : null;
|
|
32
|
+
}
|
|
33
|
+
exports.getRootTsConfigPath = getRootTsConfigPath;
|
|
29
34
|
function getRootTsConfigFileName(tree) {
|
|
30
35
|
for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
|
|
31
36
|
const pathExists = tree
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ts-config.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ts-config.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"ts-config.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ts-config.ts"],"names":[],"mappings":";;;AAAA,uCAA6E;AAC7E,2BAAgC;AAChC,+BAAqC;AAErC,IAAI,QAAqC,CAAC;AAE1C,SAAgB,YAAY,CAAC,YAAoB;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IACD,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CACxC,YAAY,EACZ,QAAQ,CAAC,GAAG,CAAC,QAAQ,CACtB,CAAC;IACF,OAAO,QAAQ,CAAC,0BAA0B,CACxC,UAAU,CAAC,MAAM,EACjB,QAAQ,CAAC,GAAG,EACZ,IAAA,cAAO,EAAC,YAAY,CAAC,CACtB,CAAC;AACJ,CAAC;AAbD,oCAaC;AAED,SAAgB,yBAAyB,CAAC,IAAU;IAClD,KAAK,MAAM,IAAI,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAC1D,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AARD,8DAQC;AAED,SAAgB,6BAA6B,CAC3C,IAAU,EACV,UAAkB;IAElB,OAAO,IAAA,uBAAc,EAAC,UAAU,CAAC,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AALD,sEAKC;AAED,SAAgB,mBAAmB;IACjC,MAAM,gBAAgB,GAAG,uBAAuB,EAAE,CAAC;IAEnD,OAAO,gBAAgB,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACzE,CAAC;AAJD,kDAIC;AAED,SAAgB,uBAAuB,CAAC,IAAW;IACjD,KAAK,MAAM,YAAY,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAClE,MAAM,UAAU,GAAG,IAAI;YACrB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;YAC3B,CAAC,CAAC,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,YAAY,CAAC,CAAC,CAAC;QAElD,IAAI,UAAU,EAAE;YACd,OAAO,YAAY,CAAC;SACrB;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAZD,0DAYC;AAED,SAAgB,eAAe,CAC7B,IAAU,EACV,UAAkB,EAClB,WAAqB;IAErB,IAAA,mBAAU,EAAC,IAAI,EAAE,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,MAAA,CAAC,CAAC,KAAK,oCAAP,CAAC,CAAC,KAAK,GAAK,EAAE,EAAC;QAEf,IAAI,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;YACvB,MAAM,IAAI,KAAK,CACb,qDAAqD,UAAU,uCAAuC,CACvG,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC;QAElC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAnBD,0CAmBC"}
|