@nrwl/workspace 15.8.0-beta.0 → 15.8.0-beta.1
Sign up to get free protection for your applications and to get access to all the features.
- package/index.d.ts +1 -1
- package/index.js +2 -2
- package/index.js.map +1 -1
- package/migrations.json +1 -1
- package/package.json +30 -31
- package/src/generators/{new/files-integrated-repo → library/files/root}/tsconfig.base.json +0 -0
- package/src/generators/library/library.js +21 -10
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.d.ts +1 -1
- package/src/generators/move/lib/update-imports.js +21 -12
- package/src/generators/move/lib/update-imports.js.map +1 -1
- package/src/generators/remove/lib/update-jest-config.js +9 -5
- package/src/generators/remove/lib/update-jest-config.js.map +1 -1
- package/src/generators/remove/lib/update-tsconfig.js +2 -2
- package/src/generators/remove/lib/update-tsconfig.js.map +1 -1
- package/src/generators/utils/insert-import.js +9 -5
- package/src/generators/utils/insert-import.js.map +1 -1
- package/src/generators/utils/insert-statement.js +7 -3
- package/src/generators/utils/insert-statement.js.map +1 -1
- package/src/utilities/ast-utils.d.ts +1 -1
- package/src/utilities/ast-utils.js +28 -13
- package/src/utilities/ast-utils.js.map +1 -1
- package/src/utilities/buildable-libs-utils.d.ts +1 -1
- package/src/utilities/buildable-libs-utils.js +6 -3
- package/src/utilities/buildable-libs-utils.js.map +1 -1
- package/src/utilities/ts-config.d.ts +6 -0
- package/src/utilities/ts-config.js +44 -0
- package/src/utilities/ts-config.js.map +1 -0
- package/src/utilities/typescript/compilation.d.ts +1 -1
- package/src/utilities/typescript/compilation.js +19 -13
- package/src/utilities/typescript/compilation.js.map +1 -1
- package/src/utilities/typescript/get-source-nodes.d.ts +1 -1
- package/src/utilities/typescript.d.ts +0 -7
- package/src/utilities/typescript.js +3 -41
- package/src/utilities/typescript.js.map +1 -1
- package/src/utils/ast-utils.d.ts +1 -1
- package/src/utils/ast-utils.js +28 -13
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/rules/to-js.js +8 -4
- package/src/utils/rules/to-js.js.map +1 -1
- package/src/utils/create-ts-config.d.ts +0 -17
- package/src/utils/create-ts-config.js +0 -48
- package/src/utils/create-ts-config.js.map +0 -1
package/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { readTsConfig } from './src/utilities/
|
|
1
|
+
export { readTsConfig } from './src/utilities/ts-config';
|
|
2
2
|
export { ProjectType, projectRootDir } from './src/utils/project-type';
|
|
3
3
|
export { renameSync, updateJsonFile, copyFile, createDirectory, } from './src/utilities/fileutils';
|
|
4
4
|
export { names } from '@nrwl/devkit';
|
package/index.js
CHANGED
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateKarmaConf = exports.deleteFile = exports.formatFiles = exports.addInstallTask = exports.generateProjectLint = exports.addLintFiles = exports.addUpdateTask = exports.updateBuilderConfig = exports.updateWorkspace = exports.getWorkspace = exports.serializeTarget = exports.parseTarget = exports.editTarget = exports.replaceAppNameWithPath = exports.getWorkspacePath = exports.getNpmScope = exports.RemoveChange = exports.ReplaceChange = exports.InsertChange = exports.readNxJsonInTree = exports.updateNxJsonInTree = exports.renameDirSyncInTree = exports.renameSyncInTree = exports.readWorkspace = exports.updatePackageJsonDependencies = exports.findNodes = exports.createOrUpdate = exports.addParameterToConstructor = exports.getProjectConfig = exports.addGlobal = exports.addIncludeToTsConfig = exports.addMethod = exports.addDepsToPackageJson = exports.replaceNodeValue = exports.insert = exports.updateWorkspaceInTree = exports.updateJsonInTree = exports.readJsonInTree = exports.readPackageJson = exports.readWorkspaceConfig = exports.output = exports.resolveUserExistingPrettierConfig = exports.names = exports.createDirectory = exports.copyFile = exports.updateJsonFile = exports.renameSync = exports.projectRootDir = exports.ProjectType = exports.readTsConfig = void 0;
|
|
4
4
|
exports.stringUtils = exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.libraryGenerator = exports.updatePackagesInPackageJson = exports.checkAndCleanWithSemver = exports.visitNotIgnoredFiles = void 0;
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
|
-
var
|
|
7
|
-
Object.defineProperty(exports, "readTsConfig", { enumerable: true, get: function () { return
|
|
6
|
+
var ts_config_1 = require("./src/utilities/ts-config");
|
|
7
|
+
Object.defineProperty(exports, "readTsConfig", { enumerable: true, get: function () { return ts_config_1.readTsConfig; } });
|
|
8
8
|
var project_type_1 = require("./src/utils/project-type");
|
|
9
9
|
Object.defineProperty(exports, "ProjectType", { enumerable: true, get: function () { return project_type_1.ProjectType; } });
|
|
10
10
|
Object.defineProperty(exports, "projectRootDir", { enumerable: true, get: function () { return project_type_1.projectRootDir; } });
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/workspace/index.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/workspace/index.ts"],"names":[],"mappings":";;;;;AAAA,uDAAyD;AAAhD,yGAAA,YAAY,OAAA;AACrB,yDAAuE;AAA9D,2GAAA,WAAW,OAAA;AAAE,8GAAA,cAAc,OAAA;AACpC,uDAKmC;AAJjC,uGAAA,UAAU,OAAA;AACV,2GAAA,cAAc,OAAA;AACd,qGAAA,QAAQ,OAAA;AACR,4GAAA,eAAe,OAAA;AAGjB,uCAAqC;AAA5B,+FAAA,KAAK,OAAA;AAEd,qDAGkC;AADhC,6HAAA,iCAAiC,OAAA;AAGnC,iDAAgD;AAAvC,gGAAA,MAAM,OAAA;AAEf,8DAGyC;AAFvC,iHAAA,mBAAmB,OAAA;AACnB,6GAAA,eAAe,OAAA;AAGjB,mDAuB+B;AAtB7B,2GAAA,cAAc,OAAA;AACd,6GAAA,gBAAgB,OAAA;AAChB,kHAAA,qBAAqB,OAAA;AACrB,mGAAA,MAAM,OAAA;AACN,6GAAA,gBAAgB,OAAA;AAChB,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,6GAAA,gBAAgB,OAAA;AAChB,sHAAA,yBAAyB,OAAA;AACzB,2GAAA,cAAc,OAAA;AACd,sGAAA,SAAS,OAAA;AACT,0HAAA,6BAA6B,OAAA;AAC7B,0GAAA,aAAa,OAAA;AACb,6GAAA,gBAAgB,OAAA;AAChB,gHAAA,mBAAmB,OAAA;AACnB,+GAAA,kBAAkB,OAAA;AAClB,6GAAA,gBAAgB,OAAA;AAChB,yGAAA,YAAY,OAAA;AACZ,0GAAA,aAAa,OAAA;AACb,yGAAA,YAAY,OAAA;AAGd,iEAOsC;AANpC,+GAAA,WAAW,OAAA;AACX,oHAAA,gBAAgB,OAAA;AAChB,0HAAA,sBAAsB,OAAA;AACtB,8GAAA,UAAU,OAAA;AACV,+GAAA,WAAW,OAAA;AACX,mHAAA,eAAe,OAAA;AAGjB,mDAI+B;AAH7B,yGAAA,YAAY,OAAA;AACZ,4GAAA,eAAe,OAAA;AACf,gHAAA,mBAAmB,OAAA;AAErB,uDAAwD;AAA/C,4GAAA,aAAa,OAAA;AACtB,yCAA6E;AAApE,oGAAA,YAAY,OAAA;AAAE,2GAAA,mBAAmB,OAAA;AAE1C,uEAAoE;AAA3D,kHAAA,cAAc,OAAA;AACvB,+DAA6D;AAApD,2GAAA,WAAW,OAAA;AACpB,2DAA0D;AAAjD,wGAAA,UAAU,OAAA;AACnB,mEAAyC;AACzC,yEAAsE;AAA7D,oHAAA,eAAe,OAAA;AACxB,qFAAiF;AAAxE,+HAAA,oBAAoB,OAAA;AAC7B,+CAA+C;AAC/C,2DAAoE;AAA3D,wHAAA,uBAAuB,OAAA;AAChC,+FAA0F;AAAjF,8IAAA,2BAA2B,OAAA;AAEpC,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yDAAiE;AAAxD,yGAAA,eAAe,OAAA;AACxB,2EAAkF;AAAzE,oHAAA,oBAAoB,OAAA;AAC7B,sGAGsE;AAFpE,oIAAA,2BAA2B,OAAA;AAC3B,oIAAA,2BAA2B,OAAA;AAGhB,QAAA,WAAW,GAAG,OAAO,CAAC"}
|
package/migrations.json
CHANGED
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
},
|
|
51
51
|
"13-10-0-update-tasks-runner": {
|
|
52
52
|
"version": "13.10.0-beta.0",
|
|
53
|
-
"description": "Update the tasks runner property to import it from the nx package instead of @nrwl/
|
|
53
|
+
"description": "Update the tasks runner property to import it from the nx package instead of @nrwl/workspace",
|
|
54
54
|
"cli": "nx",
|
|
55
55
|
"implementation": "./src/migrations/update-13-10-0/update-tasks-runner"
|
|
56
56
|
},
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "15.8.0-beta.
|
|
3
|
+
"version": "15.8.0-beta.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
|
|
6
6
|
"repository": {
|
|
@@ -33,32 +33,32 @@
|
|
|
33
33
|
"requirements": {},
|
|
34
34
|
"migrations": "./migrations.json",
|
|
35
35
|
"packageGroup": {
|
|
36
|
-
"@nrwl/jest": "15.8.0-beta.
|
|
37
|
-
"@nrwl/linter": "15.8.0-beta.
|
|
38
|
-
"@nrwl/angular": "15.8.0-beta.
|
|
39
|
-
"@nrwl/cli": "15.8.0-beta.
|
|
40
|
-
"@nrwl/cypress": "15.8.0-beta.
|
|
41
|
-
"@nrwl/detox": "15.8.0-beta.
|
|
42
|
-
"@nrwl/devkit": "15.8.0-beta.
|
|
43
|
-
"@nrwl/esbuild": "15.8.0-beta.
|
|
44
|
-
"@nrwl/eslint-plugin-nx": "15.8.0-beta.
|
|
45
|
-
"@nrwl/expo": "15.8.0-beta.
|
|
46
|
-
"@nrwl/express": "15.8.0-beta.
|
|
47
|
-
"@nrwl/js": "15.8.0-beta.
|
|
48
|
-
"@nrwl/nest": "15.8.0-beta.
|
|
49
|
-
"@nrwl/next": "15.8.0-beta.
|
|
50
|
-
"@nrwl/node": "15.8.0-beta.
|
|
36
|
+
"@nrwl/jest": "15.8.0-beta.1",
|
|
37
|
+
"@nrwl/linter": "15.8.0-beta.1",
|
|
38
|
+
"@nrwl/angular": "15.8.0-beta.1",
|
|
39
|
+
"@nrwl/cli": "15.8.0-beta.1",
|
|
40
|
+
"@nrwl/cypress": "15.8.0-beta.1",
|
|
41
|
+
"@nrwl/detox": "15.8.0-beta.1",
|
|
42
|
+
"@nrwl/devkit": "15.8.0-beta.1",
|
|
43
|
+
"@nrwl/esbuild": "15.8.0-beta.1",
|
|
44
|
+
"@nrwl/eslint-plugin-nx": "15.8.0-beta.1",
|
|
45
|
+
"@nrwl/expo": "15.8.0-beta.1",
|
|
46
|
+
"@nrwl/express": "15.8.0-beta.1",
|
|
47
|
+
"@nrwl/js": "15.8.0-beta.1",
|
|
48
|
+
"@nrwl/nest": "15.8.0-beta.1",
|
|
49
|
+
"@nrwl/next": "15.8.0-beta.1",
|
|
50
|
+
"@nrwl/node": "15.8.0-beta.1",
|
|
51
51
|
"@nrwl/nx-cloud": "latest",
|
|
52
|
-
"@nrwl/nx-plugin": "15.8.0-beta.
|
|
53
|
-
"@nrwl/react-native": "15.8.0-beta.
|
|
54
|
-
"@nrwl/react": "15.8.0-beta.
|
|
55
|
-
"@nrwl/rollup": "15.8.0-beta.
|
|
56
|
-
"@nrwl/storybook": "15.8.0-beta.
|
|
57
|
-
"@nrwl/tao": "15.8.0-beta.
|
|
58
|
-
"@nrwl/vite": "15.8.0-beta.
|
|
59
|
-
"@nrwl/web": "15.8.0-beta.
|
|
60
|
-
"@nrwl/webpack": "15.8.0-beta.
|
|
61
|
-
"nx": "15.8.0-beta.
|
|
52
|
+
"@nrwl/nx-plugin": "15.8.0-beta.1",
|
|
53
|
+
"@nrwl/react-native": "15.8.0-beta.1",
|
|
54
|
+
"@nrwl/react": "15.8.0-beta.1",
|
|
55
|
+
"@nrwl/rollup": "15.8.0-beta.1",
|
|
56
|
+
"@nrwl/storybook": "15.8.0-beta.1",
|
|
57
|
+
"@nrwl/tao": "15.8.0-beta.1",
|
|
58
|
+
"@nrwl/vite": "15.8.0-beta.1",
|
|
59
|
+
"@nrwl/web": "15.8.0-beta.1",
|
|
60
|
+
"@nrwl/webpack": "15.8.0-beta.1",
|
|
61
|
+
"nx": "15.8.0-beta.1"
|
|
62
62
|
}
|
|
63
63
|
},
|
|
64
64
|
"peerDependencies": {
|
|
@@ -70,8 +70,8 @@
|
|
|
70
70
|
}
|
|
71
71
|
},
|
|
72
72
|
"dependencies": {
|
|
73
|
-
"@nrwl/devkit": "15.8.0-beta.
|
|
74
|
-
"@nrwl/linter": "15.8.0-beta.
|
|
73
|
+
"@nrwl/devkit": "15.8.0-beta.1",
|
|
74
|
+
"@nrwl/linter": "15.8.0-beta.1",
|
|
75
75
|
"@parcel/watcher": "2.0.4",
|
|
76
76
|
"chalk": "^4.1.0",
|
|
77
77
|
"chokidar": "^3.5.1",
|
|
@@ -80,12 +80,11 @@
|
|
|
80
80
|
"dotenv": "~10.0.0",
|
|
81
81
|
"figures": "3.2.0",
|
|
82
82
|
"flat": "^5.0.2",
|
|
83
|
-
"fs-extra": "^11.1.0",
|
|
84
83
|
"glob": "7.1.4",
|
|
85
84
|
"ignore": "^5.0.4",
|
|
86
85
|
"minimatch": "3.0.5",
|
|
87
86
|
"npm-run-path": "^4.0.1",
|
|
88
|
-
"nx": "15.8.0-beta.
|
|
87
|
+
"nx": "15.8.0-beta.1",
|
|
89
88
|
"open": "^8.4.0",
|
|
90
89
|
"rxjs": "^6.5.4",
|
|
91
90
|
"semver": "7.3.4",
|
|
@@ -98,5 +97,5 @@
|
|
|
98
97
|
"access": "public"
|
|
99
98
|
},
|
|
100
99
|
"types": "./index.d.ts",
|
|
101
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "347d6dd92077b793139c77a7a6bd9baf7a1f975c"
|
|
102
101
|
}
|
|
File without changes
|
|
@@ -6,7 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const path_1 = require("nx/src/utils/path");
|
|
7
7
|
const path_2 = require("path");
|
|
8
8
|
const run_tasks_in_serial_1 = require("../../utilities/run-tasks-in-serial");
|
|
9
|
-
const
|
|
9
|
+
const ts_config_1 = require("../../utilities/ts-config");
|
|
10
10
|
const versions_1 = require("../../utils/versions");
|
|
11
11
|
function addProject(tree, options) {
|
|
12
12
|
const projectConfiguration = {
|
|
@@ -35,7 +35,7 @@ function addProject(tree, options) {
|
|
|
35
35
|
}
|
|
36
36
|
function addLint(tree, options) {
|
|
37
37
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
38
|
-
|
|
38
|
+
(0, devkit_1.ensurePackage)(tree, '@nrwl/linter', versions_1.nxVersion);
|
|
39
39
|
const { lintProjectGenerator } = require('@nrwl/linter');
|
|
40
40
|
return lintProjectGenerator(tree, {
|
|
41
41
|
project: options.name,
|
|
@@ -62,7 +62,7 @@ function updateTsConfig(tree, options) {
|
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
64
|
function updateRootTsConfig(host, options) {
|
|
65
|
-
(0, devkit_1.updateJson)(host, (0,
|
|
65
|
+
(0, devkit_1.updateJson)(host, (0, ts_config_1.getRootTsConfigPathInTree)(host), (json) => {
|
|
66
66
|
const c = json.compilerOptions;
|
|
67
67
|
c.paths = c.paths || {};
|
|
68
68
|
delete c.paths[options.name];
|
|
@@ -80,7 +80,7 @@ function createFiles(tree, options) {
|
|
|
80
80
|
const rootOffset = (0, devkit_1.offsetFromRoot)(options.projectRoot);
|
|
81
81
|
(0, devkit_1.generateFiles)(tree, (0, path_2.join)(__dirname, './files/lib'), options.projectRoot, Object.assign(Object.assign({}, options), { dot: '.', className,
|
|
82
82
|
name,
|
|
83
|
-
propertyName, js: !!options.js, cliCommand: 'nx', strict: undefined, tmpl: '', offsetFromRoot: rootOffset, rootTsConfigPath: (0,
|
|
83
|
+
propertyName, js: !!options.js, cliCommand: 'nx', strict: undefined, tmpl: '', offsetFromRoot: rootOffset, rootTsConfigPath: (0, ts_config_1.getRelativePathToRootTsConfig)(tree, options.projectRoot), hasUnitTestRunner: options.unitTestRunner !== 'none', hasLinter: options.linter !== 'none' }));
|
|
84
84
|
if (options.unitTestRunner === 'none') {
|
|
85
85
|
tree.delete((0, path_2.join)(options.projectRoot, 'src/lib', `${options.fileName}.spec.ts`));
|
|
86
86
|
}
|
|
@@ -97,20 +97,27 @@ function createFiles(tree, options) {
|
|
|
97
97
|
}
|
|
98
98
|
function addJest(tree, options) {
|
|
99
99
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
100
|
-
|
|
100
|
+
(0, devkit_1.ensurePackage)(tree, '@nrwl/jest', versions_1.nxVersion);
|
|
101
101
|
const { jestProjectGenerator } = require('@nrwl/jest');
|
|
102
102
|
return yield jestProjectGenerator(tree, Object.assign(Object.assign({}, options), { project: options.name, setupFile: 'none', supportTsx: true, babelJest: options.babelJest, skipSerializers: true, testEnvironment: options.testEnvironment, skipFormat: true }));
|
|
103
103
|
});
|
|
104
104
|
}
|
|
105
|
+
function addTypescript(tree, options) {
|
|
106
|
+
if (!options.js) {
|
|
107
|
+
(0, devkit_1.ensurePackage)(tree, 'typescript', versions_1.typescriptVersion);
|
|
108
|
+
}
|
|
109
|
+
// add tsconfig.base.json
|
|
110
|
+
if (!options.skipTsConfig && !(0, ts_config_1.getRootTsConfigFileName)()) {
|
|
111
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/root'), '.', {});
|
|
112
|
+
}
|
|
113
|
+
}
|
|
105
114
|
function libraryGenerator(tree, schema) {
|
|
106
115
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
107
116
|
const options = normalizeOptions(tree, schema);
|
|
117
|
+
const tasks = [];
|
|
118
|
+
addTypescript(tree, options);
|
|
108
119
|
createFiles(tree, options);
|
|
109
|
-
if (!options.skipTsConfig) {
|
|
110
|
-
updateRootTsConfig(tree, options);
|
|
111
|
-
}
|
|
112
120
|
addProject(tree, options);
|
|
113
|
-
const tasks = [];
|
|
114
121
|
if (options.linter !== 'none') {
|
|
115
122
|
const lintCallback = yield addLint(tree, options);
|
|
116
123
|
tasks.push(lintCallback);
|
|
@@ -119,6 +126,9 @@ function libraryGenerator(tree, schema) {
|
|
|
119
126
|
const jestCallback = yield addJest(tree, options);
|
|
120
127
|
tasks.push(jestCallback);
|
|
121
128
|
}
|
|
129
|
+
if (!options.skipTsConfig) {
|
|
130
|
+
updateRootTsConfig(tree, options);
|
|
131
|
+
}
|
|
122
132
|
if (!options.skipFormat) {
|
|
123
133
|
yield (0, devkit_1.formatFiles)(tree);
|
|
124
134
|
}
|
|
@@ -135,7 +145,8 @@ function normalizeOptions(tree, options) {
|
|
|
135
145
|
options.unitTestRunner = 'jest';
|
|
136
146
|
}
|
|
137
147
|
if (!options.linter) {
|
|
138
|
-
|
|
148
|
+
const { Linter } = require('@nrwl/linter');
|
|
149
|
+
options.linter = Linter.EsLint;
|
|
139
150
|
}
|
|
140
151
|
const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
|
|
141
152
|
const fileName = getCaseAwareFileName({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAiBsB;AACtB,4CAAkD;AAClD,+BAA4B;AAC5B,6EAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateImports = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
6
|
-
const typescript_1 = require("
|
|
7
|
-
const typescript_2 = require("nx/src/utils/typescript");
|
|
5
|
+
const ts_config_1 = require("../../../utilities/ts-config");
|
|
6
|
+
const typescript_1 = require("nx/src/utils/typescript");
|
|
8
7
|
const utils_1 = require("./utils");
|
|
9
8
|
const path_1 = require("path");
|
|
9
|
+
let tsModule;
|
|
10
10
|
/**
|
|
11
11
|
* Updates all the imports in the workspace and modifies the tsconfig appropriately.
|
|
12
12
|
*
|
|
@@ -21,7 +21,7 @@ function updateImports(tree, schema, project) {
|
|
|
21
21
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
22
22
|
// use the source root to find the from location
|
|
23
23
|
// this attempts to account for libs that have been created with --importPath
|
|
24
|
-
const tsConfigPath = (0,
|
|
24
|
+
const tsConfigPath = (0, ts_config_1.getRootTsConfigPathInTree)(tree);
|
|
25
25
|
let tsConfig;
|
|
26
26
|
let fromPath;
|
|
27
27
|
if (tree.exists(tsConfigPath)) {
|
|
@@ -77,8 +77,11 @@ exports.updateImports = updateImports;
|
|
|
77
77
|
* Changes imports in a file from one import to another
|
|
78
78
|
*/
|
|
79
79
|
function updateImportPaths(tree, path, from, to) {
|
|
80
|
+
if (!tsModule) {
|
|
81
|
+
tsModule = require('typescript');
|
|
82
|
+
}
|
|
80
83
|
const contents = tree.read(path, 'utf-8');
|
|
81
|
-
const sourceFile =
|
|
84
|
+
const sourceFile = tsModule.createSourceFile(path, contents, tsModule.ScriptTarget.Latest, true);
|
|
82
85
|
// Apply changes on the various types of imports
|
|
83
86
|
const newContents = (0, devkit_1.applyChangesToString)(contents, [
|
|
84
87
|
...updateImportDeclarations(sourceFile, from, to),
|
|
@@ -90,10 +93,13 @@ function updateImportPaths(tree, path, from, to) {
|
|
|
90
93
|
* Update the module specifiers on static imports
|
|
91
94
|
*/
|
|
92
95
|
function updateImportDeclarations(sourceFile, from, to) {
|
|
93
|
-
|
|
96
|
+
if (!tsModule) {
|
|
97
|
+
tsModule = require('typescript');
|
|
98
|
+
}
|
|
99
|
+
const importDecls = (0, typescript_1.findNodes)(sourceFile, tsModule.SyntaxKind.ImportDeclaration);
|
|
94
100
|
const changes = [];
|
|
95
101
|
for (const { moduleSpecifier } of importDecls) {
|
|
96
|
-
if (
|
|
102
|
+
if (tsModule.isStringLiteral(moduleSpecifier)) {
|
|
97
103
|
changes.push(...updateModuleSpecifier(moduleSpecifier, from, to));
|
|
98
104
|
}
|
|
99
105
|
}
|
|
@@ -103,21 +109,24 @@ function updateImportDeclarations(sourceFile, from, to) {
|
|
|
103
109
|
* Update the module specifiers on dynamic imports and require statements
|
|
104
110
|
*/
|
|
105
111
|
function updateDynamicImports(sourceFile, from, to) {
|
|
106
|
-
|
|
112
|
+
if (!tsModule) {
|
|
113
|
+
tsModule = require('typescript');
|
|
114
|
+
}
|
|
115
|
+
const expressions = (0, typescript_1.findNodes)(sourceFile, tsModule.SyntaxKind.CallExpression);
|
|
107
116
|
const changes = [];
|
|
108
117
|
for (const { expression, arguments: args } of expressions) {
|
|
109
118
|
const moduleSpecifier = args[0];
|
|
110
119
|
// handle dynamic import statements
|
|
111
|
-
if (expression.kind ===
|
|
120
|
+
if (expression.kind === tsModule.SyntaxKind.ImportKeyword &&
|
|
112
121
|
moduleSpecifier &&
|
|
113
|
-
|
|
122
|
+
tsModule.isStringLiteral(moduleSpecifier)) {
|
|
114
123
|
changes.push(...updateModuleSpecifier(moduleSpecifier, from, to));
|
|
115
124
|
}
|
|
116
125
|
// handle require statements
|
|
117
|
-
if (
|
|
126
|
+
if (tsModule.isIdentifier(expression) &&
|
|
118
127
|
expression.text === 'require' &&
|
|
119
128
|
moduleSpecifier &&
|
|
120
|
-
|
|
129
|
+
tsModule.isStringLiteral(moduleSpecifier)) {
|
|
121
130
|
changes.push(...updateModuleSpecifier(moduleSpecifier, from, to));
|
|
122
131
|
}
|
|
123
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":";;;AAAA,yCAasB;
|
|
1
|
+
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateJestConfig = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const get_source_nodes_1 = require("../../../utilities/typescript/get-source-nodes");
|
|
6
|
-
const typescript_1 = require("typescript");
|
|
7
6
|
const path_1 = require("path");
|
|
7
|
+
let tsModule;
|
|
8
8
|
function isUsingUtilityFunction(host) {
|
|
9
9
|
return host.read('jest.config.ts').toString().includes('getJestProjects()');
|
|
10
10
|
}
|
|
@@ -12,6 +12,10 @@ function isUsingUtilityFunction(host) {
|
|
|
12
12
|
* Updates the root jest config projects array and removes the project.
|
|
13
13
|
*/
|
|
14
14
|
function updateJestConfig(tree, schema, projectConfig) {
|
|
15
|
+
if (!tsModule) {
|
|
16
|
+
tsModule = require('typescript');
|
|
17
|
+
}
|
|
18
|
+
const { createSourceFile, ScriptTarget, isPropertyAssignment, isArrayLiteralExpression, isStringLiteral, } = tsModule;
|
|
15
19
|
const projectToRemove = schema.projectName;
|
|
16
20
|
if (!tree.exists('jest.config.ts') ||
|
|
17
21
|
!tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.ts')) ||
|
|
@@ -19,16 +23,16 @@ function updateJestConfig(tree, schema, projectConfig) {
|
|
|
19
23
|
return;
|
|
20
24
|
}
|
|
21
25
|
const contents = tree.read('jest.config.ts', 'utf-8');
|
|
22
|
-
const sourceFile =
|
|
26
|
+
const sourceFile = createSourceFile('jest.config.ts', contents, ScriptTarget.Latest);
|
|
23
27
|
const sourceNodes = (0, get_source_nodes_1.getSourceNodes)(sourceFile);
|
|
24
|
-
const projectsAssignment = sourceNodes.find((node) =>
|
|
28
|
+
const projectsAssignment = sourceNodes.find((node) => isPropertyAssignment(node) &&
|
|
25
29
|
node.name.getText(sourceFile) === 'projects' &&
|
|
26
|
-
|
|
30
|
+
isArrayLiteralExpression(node.initializer));
|
|
27
31
|
if (!projectsAssignment) {
|
|
28
32
|
throw Error(`Could not remove ${projectToRemove} from projects in /jest.config.ts. Please remove ${projectToRemove} from your projects.`);
|
|
29
33
|
}
|
|
30
34
|
const projectsArray = projectsAssignment.initializer;
|
|
31
|
-
const project = projectsArray.elements.find((item) =>
|
|
35
|
+
const project = projectsArray.elements.find((item) => isStringLiteral(item) &&
|
|
32
36
|
item.text.startsWith(`<rootDir>/${projectConfig.root}`));
|
|
33
37
|
if (!project) {
|
|
34
38
|
console.warn(`Could not find ${projectToRemove} in projects in /jest.config.ts.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-jest-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-jest-config.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,qFAAgF;
|
|
1
|
+
{"version":3,"file":"update-jest-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-jest-config.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,qFAAgF;AAQhF,+BAA4B;AAE5B,IAAI,QAAqC,CAAC;AAE1C,SAAS,sBAAsB,CAAC,IAAU;IACxC,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;AAC9E,CAAC;AAED;;GAEG;AACH,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAc,EACd,aAAmC;IAEnC,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IACD,MAAM,EACJ,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,EACpB,wBAAwB,EACxB,eAAe,GAChB,GAAG,QAAQ,CAAC;IACb,MAAM,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC;IAE3C,IACE,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAC9B,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACxD,sBAAsB,CAAC,IAAI,CAAC,EAC5B;QACA,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,gBAAgB,CACjC,gBAAgB,EAChB,QAAQ,EACR,YAAY,CAAC,MAAM,CACpB,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;IAE/C,MAAM,kBAAkB,GAAG,WAAW,CAAC,IAAI,CACzC,CAAC,IAAI,EAAE,EAAE,CACP,oBAAoB,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,UAAU;QAC5C,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CACvB,CAAC;IAExB,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,KAAK,CACT,oBAAoB,eAAe,oDAAoD,eAAe,sBAAsB,CAC7H,CAAC;KACH;IACD,MAAM,aAAa,GACjB,kBAAkB,CAAC,WAAqC,CAAC;IAE3D,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CACzC,CAAC,IAAI,EAAE,EAAE,CACP,eAAe,CAAC,IAAI,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,aAAa,CAAC,IAAI,EAAE,CAAC,CACzC,CAAC;IAEnB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,CAAC,IAAI,CACV,kBAAkB,eAAe,kCAAkC,CACpE,CAAC;QACF,OAAO;KACR;IAED,MAAM,eAAe,GACnB,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAEtE,MAAM,KAAK,GAAG,eAAe;QAC3B,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE;QAC1B,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAEjC,IAAI,CAAC,KAAK,CACR,gBAAgB,EAChB,IAAA,6BAAoB,EAAC,QAAQ,EAAE;QAC7B;YACE,IAAI,EAAE,mBAAU,CAAC,MAAM;YACvB,KAAK;YACL,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,KAAK;SACjC;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AA/ED,4CA+EC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateTsconfig = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const
|
|
6
|
+
const ts_config_1 = require("../../../utilities/ts-config");
|
|
7
7
|
const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
|
|
8
8
|
/**
|
|
9
9
|
* Updates the tsconfig paths to remove the project.
|
|
@@ -12,7 +12,7 @@ const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project
|
|
|
12
12
|
*/
|
|
13
13
|
function updateTsconfig(tree, schema) {
|
|
14
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
|
-
const tsConfigPath = (0,
|
|
15
|
+
const tsConfigPath = (0, ts_config_1.getRootTsConfigPathInTree)(tree);
|
|
16
16
|
if (tree.exists(tsConfigPath)) {
|
|
17
17
|
const graph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
18
18
|
const projectMapping = (0, find_project_for_path_1.createProjectRootMappings)(graph.nodes);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,
|
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,4DAAyE;AAEzE,4FAG0D;AAE1D;;;;GAIG;AACH,SAAsB,cAAc,CAAC,IAAU,EAAE,MAAc;;QAC7D,MAAM,YAAY,GAAG,IAAA,qCAAyB,EAAC,IAAI,CAAC,CAAC;QAErD,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;YAC7B,MAAM,KAAK,GAAiB,MAAM,IAAA,gCAAuB,GAAE,CAAC;YAC5D,MAAM,cAAc,GAAG,IAAA,iDAAyB,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC9D,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;gBACtC,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;oBACnD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;wBACzD,MAAM,OAAO,GAAG,IAAA,0CAAkB,EAChC,IAAA,sBAAa,EAAC,IAAI,CAAC,EACnB,cAAc,CACf,CAAC;wBACF,IAAI,OAAO,KAAK,MAAM,CAAC,WAAW,EAAE;4BAClC,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;4BAC9C,MAAM;yBACP;qBACF;iBACF;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAtBD,wCAsBC"}
|
|
@@ -3,18 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.insertImport = void 0;
|
|
4
4
|
const insert_statement_1 = require("./insert-statement");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
|
|
6
|
+
let tsModule;
|
|
7
7
|
function insertImport(tree, path, name, modulePath) {
|
|
8
|
+
if (!tsModule) {
|
|
9
|
+
tsModule = require('typescript');
|
|
10
|
+
}
|
|
11
|
+
const { createSourceFile, ScriptTarget, isStringLiteral, isImportDeclaration, isNamedImports, } = tsModule;
|
|
8
12
|
const contents = tree.read(path, 'utf-8');
|
|
9
|
-
const sourceFile =
|
|
10
|
-
const importStatements = sourceFile.statements.filter(
|
|
11
|
-
const existingImport = importStatements.find((statement) =>
|
|
13
|
+
const sourceFile = createSourceFile(path, contents, ScriptTarget.ESNext);
|
|
14
|
+
const importStatements = sourceFile.statements.filter(isImportDeclaration);
|
|
15
|
+
const existingImport = importStatements.find((statement) => isStringLiteral(statement.moduleSpecifier) &&
|
|
12
16
|
statement.moduleSpecifier
|
|
13
17
|
.getText(sourceFile)
|
|
14
18
|
.replace(/['"`]/g, '')
|
|
15
19
|
.trim() === modulePath &&
|
|
16
20
|
statement.importClause.namedBindings &&
|
|
17
|
-
|
|
21
|
+
isNamedImports(statement.importClause.namedBindings));
|
|
18
22
|
if (!existingImport) {
|
|
19
23
|
(0, insert_statement_1.insertStatement)(tree, path, `import { ${name} } from '${modulePath}';`);
|
|
20
24
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert-import.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/insert-import.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AACrD,yCAAsE;
|
|
1
|
+
{"version":3,"file":"insert-import.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/insert-import.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AACrD,yCAAsE;AAGtE,IAAI,QAAqC,CAAC;AAE1C,SAAgB,YAAY,CAC1B,IAAU,EACV,IAAY,EACZ,IAAY,EACZ,UAAkB;IAElB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IACD,MAAM,EACJ,gBAAgB,EAChB,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,cAAc,GACf,GAAG,QAAQ,CAAC;IAEb,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAEzE,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAE3E,MAAM,cAAc,GAAG,gBAAgB,CAAC,IAAI,CAC1C,CAAC,SAAS,EAAE,EAAE,CACZ,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC;QAC1C,SAAS,CAAC,eAAe;aACtB,OAAO,CAAC,UAAU,CAAC;aACnB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;aACrB,IAAI,EAAE,KAAK,UAAU;QACxB,SAAS,CAAC,YAAY,CAAC,aAAa;QACpC,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,aAAa,CAAC,CACvD,CAAC;IACF,IAAI,CAAC,cAAc,EAAE;QACnB,IAAA,kCAAe,EAAC,IAAI,EAAE,IAAI,EAAE,YAAY,IAAI,YAAY,UAAU,IAAI,CAAC,CAAC;QACxE,OAAO;KACR;IAED,qDAAqD;IACrD,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY;SAC7C,aAA6B,CAAC;IAEjC,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAExC,IAAI,IAAY,CAAC;IACjB,IAAI,YAAY,CAAC,QAAQ,CAAC,gBAAgB,EAAE;QAC1C,IAAI,GAAG,GAAG,IAAI,GAAG,CAAC;KACnB;SAAM;QACL,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;KACnB;IAED,MAAM,WAAW,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE;QACjD;YACE,IAAI,EAAE,mBAAU,CAAC,MAAM;YACvB,KAAK;YACL,IAAI;SACL;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;AAChC,CAAC;AA5DD,oCA4DC"}
|
|
@@ -2,14 +2,18 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.insertStatement = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
|
|
5
|
+
let tsModule;
|
|
6
6
|
/**
|
|
7
7
|
* Insert a statement after the last import statement in a file
|
|
8
8
|
*/
|
|
9
9
|
function insertStatement(tree, path, statement) {
|
|
10
|
+
if (!tsModule) {
|
|
11
|
+
tsModule = require('typescript');
|
|
12
|
+
}
|
|
13
|
+
const { createSourceFile, isImportDeclaration, ScriptTarget } = tsModule;
|
|
10
14
|
const contents = tree.read(path, 'utf-8');
|
|
11
|
-
const sourceFile =
|
|
12
|
-
const importStatements = sourceFile.statements.filter(
|
|
15
|
+
const sourceFile = createSourceFile(path, contents, ScriptTarget.ESNext);
|
|
16
|
+
const importStatements = sourceFile.statements.filter(isImportDeclaration);
|
|
13
17
|
const index = importStatements.length > 0
|
|
14
18
|
? importStatements[importStatements.length - 1].getEnd()
|
|
15
19
|
: 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert-statement.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/insert-statement.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;
|
|
1
|
+
{"version":3,"file":"insert-statement.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/insert-statement.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AAEtE,IAAI,QAAqC,CAAC;AAE1C;;GAEG;AACH,SAAgB,eAAe,CAAC,IAAU,EAAE,IAAY,EAAE,SAAiB;IACzE,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IACD,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IAEzE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAEzE,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC3E,MAAM,KAAK,GACT,gBAAgB,CAAC,MAAM,GAAG,CAAC;QACzB,CAAC,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE;QACxD,CAAC,CAAC,CAAC,CAAC;IAER,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;QAC/B,SAAS,GAAG,KAAK,SAAS,EAAE,CAAC;KAC9B;IAED,MAAM,WAAW,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE;QACjD;YACE,IAAI,EAAE,mBAAU,CAAC,MAAM;YACvB,KAAK;YACL,IAAI,EAAE,SAAS;SAChB;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;AAChC,CAAC;AA7BD,0CA6BC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Tree } from '@nrwl/devkit';
|
|
2
|
-
import * as ts from 'typescript';
|
|
2
|
+
import type * as ts from 'typescript';
|
|
3
3
|
export declare function insertChange(host: Tree, sourceFile: ts.SourceFile, filePath: string, insertPosition: number, contentToInsert: string): ts.SourceFile;
|
|
4
4
|
export declare function replaceChange(host: Tree, sourceFile: ts.SourceFile, filePath: string, insertPosition: number, contentToInsert: string, oldContent: string): ts.SourceFile;
|
|
5
5
|
export declare function removeChange(host: Tree, sourceFile: ts.SourceFile, filePath: string, removePosition: number, contentToRemove: string): ts.SourceFile;
|