@nrwl/angular 15.1.0-beta.0 → 15.1.0-beta.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/CHANGELOG.md +1 -1
- package/package.json +9 -9
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +11 -7
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/generators/library/library.js +2 -0
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +4 -4
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.d.ts +10 -0
- package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js +88 -0
- package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js.map +1 -0
- package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js +1 -1
- package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.d.ts +13 -0
- package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js +128 -0
- package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js.map +1 -0
- package/src/generators/ng-add/migrators/builders/builder.migrator.d.ts +5 -3
- package/src/generators/ng-add/migrators/builders/builder.migrator.js +5 -1
- package/src/generators/ng-add/migrators/builders/builder.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/index.d.ts +2 -0
- package/src/generators/ng-add/migrators/builders/index.js +2 -0
- package/src/generators/ng-add/migrators/builders/index.js.map +1 -1
- package/src/generators/ng-add/migrators/migrator.d.ts +9 -1
- package/src/generators/ng-add/migrators/migrator.js +83 -0
- package/src/generators/ng-add/migrators/migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/app.migrator.d.ts +1 -8
- package/src/generators/ng-add/migrators/projects/app.migrator.js +22 -177
- package/src/generators/ng-add/migrators/projects/app.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/lib.migrator.d.ts +1 -10
- package/src/generators/ng-add/migrators/projects/lib.migrator.js +3 -145
- package/src/generators/ng-add/migrators/projects/lib.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/project.migrator.d.ts +3 -10
- package/src/generators/ng-add/migrators/projects/project.migrator.js +9 -85
- package/src/generators/ng-add/migrators/projects/project.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/types.d.ts +2 -4
- package/src/generators/ng-add/utilities/workspace.d.ts +3 -2
- package/src/generators/ng-add/utilities/workspace.js +20 -23
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/migrations/update-14-2-0/update-router-initial-navigation.js +5 -1
- package/src/migrations/update-14-2-0/update-router-initial-navigation.js.map +1 -1
- package/src/migrations/update-14-2-0/update-tsconfig-target.js +1 -1
- package/src/migrations/update-14-2-0/update-tsconfig-target.js.map +1 -1
- package/src/migrations/update-15-0-0/switch-to-jasmine-marbles.js +1 -1
- package/src/migrations/update-15-0-0/switch-to-jasmine-marbles.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
# [15.1.0-beta.
|
|
6
|
+
# [15.1.0-beta.2](https://github.com/nrwl/nx/compare/15.0.7...15.1.0-beta.2) (2022-11-14)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.1.0-beta.
|
|
3
|
+
"version": "15.1.0-beta.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
6
6
|
"repository": {
|
|
@@ -67,13 +67,13 @@
|
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
69
|
"@angular-devkit/schematics": "~14.2.0",
|
|
70
|
-
"@nrwl/cypress": "15.1.0-beta.
|
|
71
|
-
"@nrwl/devkit": "15.1.0-beta.
|
|
72
|
-
"@nrwl/jest": "15.1.0-beta.
|
|
73
|
-
"@nrwl/linter": "15.1.0-beta.
|
|
74
|
-
"@nrwl/storybook": "15.1.0-beta.
|
|
75
|
-
"@nrwl/webpack": "15.1.0-beta.
|
|
76
|
-
"@nrwl/workspace": "15.1.0-beta.
|
|
70
|
+
"@nrwl/cypress": "15.1.0-beta.2",
|
|
71
|
+
"@nrwl/devkit": "15.1.0-beta.2",
|
|
72
|
+
"@nrwl/jest": "15.1.0-beta.2",
|
|
73
|
+
"@nrwl/linter": "15.1.0-beta.2",
|
|
74
|
+
"@nrwl/storybook": "15.1.0-beta.2",
|
|
75
|
+
"@nrwl/webpack": "15.1.0-beta.2",
|
|
76
|
+
"@nrwl/workspace": "15.1.0-beta.2",
|
|
77
77
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
78
78
|
"@schematics/angular": "~14.2.0",
|
|
79
79
|
"chalk": "4.1.0",
|
|
@@ -99,5 +99,5 @@
|
|
|
99
99
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
100
100
|
"typings": "index.d.ts",
|
|
101
101
|
"sideEffects": false,
|
|
102
|
-
"gitHead": "
|
|
102
|
+
"gitHead": "1a8bf7791bbbc7b512646a6fe31d3111927b9aee"
|
|
103
103
|
}
|
|
@@ -9,7 +9,7 @@ const path_1 = require("path");
|
|
|
9
9
|
const webpack_dev_server_impl_1 = require("../webpack-dev-server/webpack-dev-server.impl");
|
|
10
10
|
const fs_1 = require("fs");
|
|
11
11
|
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
12
|
-
function getDynamicRemotes(project, context, workspaceProjects) {
|
|
12
|
+
function getDynamicRemotes(project, context, workspaceProjects, remotesToSkip) {
|
|
13
13
|
// check for dynamic remotes
|
|
14
14
|
// we should only check for dynamic based on what we generate
|
|
15
15
|
// and fallback to empty array
|
|
@@ -29,7 +29,9 @@ function getDynamicRemotes(project, context, workspaceProjects) {
|
|
|
29
29
|
if (!Object.keys(parsedManifest).every((key) => typeof key === 'string' && typeof parsedManifest[key] === 'string')) {
|
|
30
30
|
return [];
|
|
31
31
|
}
|
|
32
|
-
const dynamicRemotes = Object.entries(parsedManifest)
|
|
32
|
+
const dynamicRemotes = Object.entries(parsedManifest)
|
|
33
|
+
.map(([remoteName]) => remoteName)
|
|
34
|
+
.filter((r) => !remotesToSkip.has(r));
|
|
33
35
|
const invalidDynamicRemotes = dynamicRemotes.filter((remote) => !workspaceProjects[remote]);
|
|
34
36
|
if (invalidDynamicRemotes.length) {
|
|
35
37
|
throw new Error(invalidDynamicRemotes.length === 1
|
|
@@ -38,7 +40,7 @@ function getDynamicRemotes(project, context, workspaceProjects) {
|
|
|
38
40
|
}
|
|
39
41
|
return dynamicRemotes;
|
|
40
42
|
}
|
|
41
|
-
function getStaticRemotes(project, context, workspaceProjects) {
|
|
43
|
+
function getStaticRemotes(project, context, workspaceProjects, remotesToSkip) {
|
|
42
44
|
const mfConfigPath = (0, path_1.join)(context.workspaceRoot, project.root, 'module-federation.config.js');
|
|
43
45
|
let mfeConfig;
|
|
44
46
|
try {
|
|
@@ -48,7 +50,9 @@ function getStaticRemotes(project, context, workspaceProjects) {
|
|
|
48
50
|
throw new Error(`Could not load ${mfConfigPath}. Was this project generated with "@nrwl/angular:host"?`);
|
|
49
51
|
}
|
|
50
52
|
const remotesConfig = mfeConfig.remotes.length > 0 ? mfeConfig.remotes : [];
|
|
51
|
-
const staticRemotes = remotesConfig
|
|
53
|
+
const staticRemotes = remotesConfig
|
|
54
|
+
.map((remoteDefinition) => Array.isArray(remoteDefinition) ? remoteDefinition[0] : remoteDefinition)
|
|
55
|
+
.filter((r) => !remotesToSkip.has(r));
|
|
52
56
|
const invalidStaticRemotes = staticRemotes.filter((remote) => !workspaceProjects[remote]);
|
|
53
57
|
if (invalidStaticRemotes.length) {
|
|
54
58
|
throw new Error(invalidStaticRemotes.length === 1
|
|
@@ -74,10 +78,10 @@ function executeModuleFederationDevServerBuilder(schema, context) {
|
|
|
74
78
|
const ws = new devkit_1.Workspaces(devkit_1.workspaceRoot);
|
|
75
79
|
const project = workspaceProjects[context.target.project];
|
|
76
80
|
validateDevRemotes(options, workspaceProjects);
|
|
77
|
-
const staticRemotes = getStaticRemotes(project, context, workspaceProjects);
|
|
78
|
-
const dynamicRemotes = getDynamicRemotes(project, context, workspaceProjects);
|
|
79
81
|
const remotesToSkip = new Set((_a = options.skipRemotes) !== null && _a !== void 0 ? _a : []);
|
|
80
|
-
const
|
|
82
|
+
const staticRemotes = getStaticRemotes(project, context, workspaceProjects, remotesToSkip);
|
|
83
|
+
const dynamicRemotes = getDynamicRemotes(project, context, workspaceProjects, remotesToSkip);
|
|
84
|
+
const remotes = [...staticRemotes, ...dynamicRemotes];
|
|
81
85
|
const devServeRemotes = !options.devRemotes
|
|
82
86
|
? []
|
|
83
87
|
: Array.isArray(options.devRemotes)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AACtB,gEAA8D;AAC9D,yDAA0E;AAE1E,+BAA4B;AAC5B,2FAA+F;AAC/F,2BAA8C;AAC9C,sEAA+F;AAE/F,SAAS,iBAAiB,CACxB,OAA6B,EAC7B,OAAuB,EACvB,iBAAuD;
|
|
1
|
+
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -98,6 +98,7 @@ function addUnitTestRunner(host, options) {
|
|
|
98
98
|
supportTsx: false,
|
|
99
99
|
skipSerializers: false,
|
|
100
100
|
skipFormat: true,
|
|
101
|
+
skipPackageJson: options.skipPackageJson,
|
|
101
102
|
});
|
|
102
103
|
}
|
|
103
104
|
else if (options.unitTestRunner === 'karma') {
|
|
@@ -133,6 +134,7 @@ function addLinting(host, options) {
|
|
|
133
134
|
unitTestRunner: options.unitTestRunner,
|
|
134
135
|
setParserOptionsProject: options.setParserOptionsProject,
|
|
135
136
|
skipFormat: true,
|
|
137
|
+
skipPackageJson: options.skipPackageJson,
|
|
136
138
|
});
|
|
137
139
|
});
|
|
138
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,14 +27,14 @@ function migrateFromAngularCli(tree, rawOptions) {
|
|
|
27
27
|
];
|
|
28
28
|
// validate all projects
|
|
29
29
|
(0, utilities_1.validateProjects)(migrators);
|
|
30
|
-
const
|
|
30
|
+
const workspaceRootFileTypesInfo = (0, utilities_1.getWorkspaceRootFileTypesInfo)(tree, migrators);
|
|
31
31
|
/**
|
|
32
32
|
* Keep a copy of the root eslint config to restore it later. We need to
|
|
33
33
|
* do this because the root config can also be the config for the app at
|
|
34
34
|
* the root of the Angular CLI workspace and it will be moved as part of
|
|
35
35
|
* the app migration.
|
|
36
36
|
*/
|
|
37
|
-
let eslintConfig =
|
|
37
|
+
let eslintConfig = workspaceRootFileTypesInfo.eslint && tree.exists('.eslintrc.json')
|
|
38
38
|
? (0, devkit_1.readJson)(tree, '.eslintrc.json')
|
|
39
39
|
: undefined;
|
|
40
40
|
// create and update root files and configurations
|
|
@@ -54,10 +54,10 @@ function migrateFromAngularCli(tree, rawOptions) {
|
|
|
54
54
|
* these files in the root for the root application, so we wait until
|
|
55
55
|
* those root config files are moved when the projects are migrated.
|
|
56
56
|
*/
|
|
57
|
-
if (
|
|
57
|
+
if (workspaceRootFileTypesInfo.karma) {
|
|
58
58
|
(0, utilities_1.createRootKarmaConfig)(tree);
|
|
59
59
|
}
|
|
60
|
-
if (
|
|
60
|
+
if (workspaceRootFileTypesInfo.eslint) {
|
|
61
61
|
(0, utilities_1.updateRootEsLintConfig)(tree, eslintConfig, options.unitTestRunner);
|
|
62
62
|
(0, utilities_1.cleanupEsLintPackages)(tree);
|
|
63
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AACA,yCAQsB;AACtB,mDAAiD;AAEjD,2CAAuD;AAEvD,2CAeqB;AAErB,SAAsB,qBAAqB,CACzC,IAAU,EACV,UAA4B;;QAE5B,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,4BAAgB,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE7D,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;QAE3E,IAAI,OAAO,CAAC,wBAAwB,EAAE;YACpC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,EAAE,EAAE,oBAAS;gBACb,iBAAiB,EAAE,oBAAS;aAC7B,CACF,CAAC;YACF,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAClC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;SAC1B;aAAM;YACL,MAAM,SAAS,GAAsB;gBACnC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,uBAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAClE,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,uBAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;aACnE,CAAC;YAEF,wBAAwB;YACxB,IAAA,4BAAgB,EAAC,SAAS,CAAC,CAAC;YAE5B,MAAM,
|
|
1
|
+
{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
|
+
import type { Logger, ProjectMigrationInfo, ValidationResult } from '../../utilities';
|
|
3
|
+
import { BuilderMigrator } from './builder.migrator';
|
|
4
|
+
export declare class AngularDevkitKarmaMigrator extends BuilderMigrator {
|
|
5
|
+
constructor(tree: Tree, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
|
|
6
|
+
migrate(): void;
|
|
7
|
+
validate(): ValidationResult;
|
|
8
|
+
private updateTargetConfiguration;
|
|
9
|
+
private updateTsConfigFileUsedByTestTarget;
|
|
10
|
+
}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AngularDevkitKarmaMigrator = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const devkit_2 = require("@nrwl/devkit");
|
|
6
|
+
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
7
|
+
const path_1 = require("path");
|
|
8
|
+
const utilities_1 = require("../../utilities");
|
|
9
|
+
const builder_migrator_1 = require("./builder.migrator");
|
|
10
|
+
class AngularDevkitKarmaMigrator extends builder_migrator_1.BuilderMigrator {
|
|
11
|
+
constructor(tree, project, projectConfig, logger) {
|
|
12
|
+
super(tree, '@angular-devkit/build-angular:karma', 'karma', project, projectConfig, logger);
|
|
13
|
+
}
|
|
14
|
+
migrate() {
|
|
15
|
+
for (const [name, target] of this.targets) {
|
|
16
|
+
this.moveFilePathsFromTargetToProjectRoot(target, [
|
|
17
|
+
'karmaConfig',
|
|
18
|
+
'tsConfig',
|
|
19
|
+
'webWorkerTsConfig',
|
|
20
|
+
]);
|
|
21
|
+
this.updateTargetConfiguration(name, target);
|
|
22
|
+
this.updateTsConfigFileUsedByTestTarget(name, target);
|
|
23
|
+
this.updateCacheableOperations([name]);
|
|
24
|
+
}
|
|
25
|
+
if (!this.targets.size && this.projectConfig.root === '') {
|
|
26
|
+
// there could still be a karma.conf.js file in the root
|
|
27
|
+
// so move to new location
|
|
28
|
+
const karmaConfig = 'karma.conf.js';
|
|
29
|
+
if (this.tree.exists(karmaConfig)) {
|
|
30
|
+
this.logger.info('No "test" target was found, but a root Karma config file was found in the project root. The file will be moved to the new location.');
|
|
31
|
+
this.moveProjectRootFile(karmaConfig);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
validate() {
|
|
36
|
+
const errors = [];
|
|
37
|
+
// TODO(leo): keeping restriction until the full refactor is done and we start
|
|
38
|
+
// expanding what's supported.
|
|
39
|
+
if (this.targets.size > 1) {
|
|
40
|
+
errors.push({
|
|
41
|
+
message: `There is more than one target using a builder that is used to build the project (${(0, utilities_1.arrayToString)([...this.targets.keys()])}).`,
|
|
42
|
+
hint: `Make sure the project only has one target with a builder that is used to build the project.`,
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
return errors.length ? errors : null;
|
|
46
|
+
}
|
|
47
|
+
updateTargetConfiguration(targetName, target) {
|
|
48
|
+
if (!target.options) {
|
|
49
|
+
this.logger.warn(`The target "${targetName}" is not specifying any options. Skipping updating the target configuration.`);
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
target.options.main =
|
|
53
|
+
target.options.main && this.convertAsset(target.options.main);
|
|
54
|
+
target.options.polyfills =
|
|
55
|
+
target.options.polyfills && this.convertAsset(target.options.polyfills);
|
|
56
|
+
target.options.tsConfig =
|
|
57
|
+
target.options.tsConfig &&
|
|
58
|
+
(0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(target.options.tsConfig));
|
|
59
|
+
target.options.karmaConfig =
|
|
60
|
+
target.options.karmaConfig &&
|
|
61
|
+
(0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(target.options.karmaConfig));
|
|
62
|
+
target.options.assets =
|
|
63
|
+
target.options.assets &&
|
|
64
|
+
target.options.assets.map((asset) => this.convertAsset(asset));
|
|
65
|
+
target.options.styles =
|
|
66
|
+
target.options.styles &&
|
|
67
|
+
target.options.styles.map((style) => this.convertAsset(style));
|
|
68
|
+
target.options.scripts =
|
|
69
|
+
target.options.scripts &&
|
|
70
|
+
target.options.scripts.map((script) => this.convertAsset(script));
|
|
71
|
+
(0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
|
|
72
|
+
}
|
|
73
|
+
updateTsConfigFileUsedByTestTarget(targetName, target) {
|
|
74
|
+
var _a;
|
|
75
|
+
if (!((_a = target.options) === null || _a === void 0 ? void 0 : _a.tsConfig)) {
|
|
76
|
+
this.logger.warn(`The "${targetName}" target does not have the "tsConfig" option configured. Skipping updating the tsConfig file.`);
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
if (!this.tree.exists(target.options.tsConfig)) {
|
|
80
|
+
const originalTsConfigPath = this.originalProjectConfig.targets[targetName].options.tsConfig;
|
|
81
|
+
this.logger.warn(`The tsConfig file "${originalTsConfigPath}" specified in the "${targetName}" target could not be found. Skipping updating the tsConfig file.`);
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
this.updateTsConfigFile(target.options.tsConfig, (0, typescript_1.getRootTsConfigPathInTree)(this.tree), (0, devkit_2.offsetFromRoot)(this.projectConfig.root));
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
exports.AngularDevkitKarmaMigrator = AngularDevkitKarmaMigrator;
|
|
88
|
+
//# sourceMappingURL=angular-devkit-karma.migrator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"angular-devkit-karma.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,yCAA8C;AAC9C,yEAAqF;AACrF,+BAAgC;AAOhC,+CAAgD;AAChD,yDAAqD;AAErD,MAAa,0BAA2B,SAAQ,kCAAe;IAC7D,YACE,IAAU,EACV,OAA6B,EAC7B,aAAmC,EACnC,MAAc;QAEd,KAAK,CACH,IAAI,EACJ,qCAAqC,EACrC,OAAO,EACP,OAAO,EACP,aAAa,EACb,MAAM,CACP,CAAC;IACJ,CAAC;IAEQ,OAAO;QACd,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;YACzC,IAAI,CAAC,oCAAoC,CAAC,MAAM,EAAE;gBAChD,aAAa;gBACb,UAAU;gBACV,mBAAmB;aACpB,CAAC,CAAC;YACH,IAAI,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC7C,IAAI,CAAC,kCAAkC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACtD,IAAI,CAAC,yBAAyB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;SACxC;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,KAAK,EAAE,EAAE;YACxD,wDAAwD;YACxD,0BAA0B;YAC1B,MAAM,WAAW,GAAG,eAAe,CAAC;YACpC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;gBACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,qIAAqI,CACtI,CAAC;gBACF,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;aACvC;SACF;IACH,CAAC;IAEQ,QAAQ;QACf,MAAM,MAAM,GAAsB,EAAE,CAAC;QACrC,8EAA8E;QAC9E,8BAA8B;QAC9B,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE;YACzB,MAAM,CAAC,IAAI,CAAC;gBACV,OAAO,EAAE,oFAAoF,IAAA,yBAAa,EACxG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CACzB,IAAI;gBACL,IAAI,EAAE,6FAA6F;aACpG,CAAC,CAAC;SACJ;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACvC,CAAC;IAEO,yBAAyB,CAC/B,UAAkB,EAClB,MAA2B;QAE3B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,eAAe,UAAU,8EAA8E,CACxG,CAAC;YACF,OAAO;SACR;QAED,MAAM,CAAC,OAAO,CAAC,IAAI;YACjB,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChE,MAAM,CAAC,OAAO,CAAC,SAAS;YACtB,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1E,MAAM,CAAC,OAAO,CAAC,QAAQ;YACrB,MAAM,CAAC,OAAO,CAAC,QAAQ;gBACvB,IAAA,0BAAiB,EACf,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAA,eAAQ,EAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAClC,CAAC;QACJ,MAAM,CAAC,OAAO,CAAC,WAAW;YACxB,MAAM,CAAC,OAAO,CAAC,WAAW;gBAC1B,IAAA,0BAAiB,EACf,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAA,eAAQ,EAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CACrC,CAAC;QACJ,MAAM,CAAC,OAAO,CAAC,MAAM;YACnB,MAAM,CAAC,OAAO,CAAC,MAAM;gBACrB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,OAAO,CAAC,MAAM;YACnB,MAAM,CAAC,OAAO,CAAC,MAAM;gBACrB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,OAAO,CAAC,OAAO;YACpB,MAAM,CAAC,OAAO,CAAC,OAAO;gBACtB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;QAEpE,IAAA,mCAA0B,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,oBAClD,IAAI,CAAC,aAAa,EACrB,CAAC;IACL,CAAC;IAEO,kCAAkC,CACxC,UAAkB,EAClB,MAA2B;;QAE3B,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,QAAQ,CAAA,EAAE;YAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,QAAQ,UAAU,+FAA+F,CAClH,CAAC;YACF,OAAO;SACR;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC9C,MAAM,oBAAoB,GACxB,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;YAClE,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,sBAAsB,oBAAoB,uBAAuB,UAAU,mEAAmE,CAC/I,CAAC;YACF,OAAO;SACR;QAED,IAAI,CAAC,kBAAkB,CACrB,MAAM,CAAC,OAAO,CAAC,QAAQ,EACvB,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,EACpC,IAAA,uBAAc,EAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CACxC,CAAC;IACJ,CAAC;CACF;AA7HD,gEA6HC"}
|
|
@@ -9,7 +9,7 @@ const utilities_1 = require("../../utilities");
|
|
|
9
9
|
const builder_migrator_1 = require("./builder.migrator");
|
|
10
10
|
class AngularDevkitNgPackagrMigrator extends builder_migrator_1.BuilderMigrator {
|
|
11
11
|
constructor(tree, project, projectConfig, logger) {
|
|
12
|
-
super(tree, '@angular-devkit/build-angular:ng-packagr', project, projectConfig, logger);
|
|
12
|
+
super(tree, '@angular-devkit/build-angular:ng-packagr', undefined, project, projectConfig, logger);
|
|
13
13
|
}
|
|
14
14
|
migrate() {
|
|
15
15
|
if (!this.targets.size) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-devkit-ng-packagr.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"angular-devkit-ng-packagr.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
|
+
import type { Logger, ProjectMigrationInfo, ValidationResult } from '../../utilities';
|
|
3
|
+
import { BuilderMigrator } from './builder.migrator';
|
|
4
|
+
export declare class AngularEslintLintMigrator extends BuilderMigrator {
|
|
5
|
+
private oldEsLintConfigPath;
|
|
6
|
+
private newEsLintConfigPath;
|
|
7
|
+
constructor(tree: Tree, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
|
|
8
|
+
migrate(): void;
|
|
9
|
+
validate(): ValidationResult;
|
|
10
|
+
private updateTargetConfiguration;
|
|
11
|
+
private updateEsLintConfig;
|
|
12
|
+
private convertEsLintConfigExtendToNewPath;
|
|
13
|
+
}
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AngularEslintLintMigrator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const devkit_2 = require("@nrwl/devkit");
|
|
7
|
+
const linter_1 = require("@nrwl/linter");
|
|
8
|
+
const path_1 = require("path");
|
|
9
|
+
const utilities_1 = require("../../utilities");
|
|
10
|
+
const builder_migrator_1 = require("./builder.migrator");
|
|
11
|
+
class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
|
|
12
|
+
constructor(tree, project, projectConfig, logger) {
|
|
13
|
+
super(tree, '@angular-eslint/builder:lint', 'eslint', project, projectConfig, logger);
|
|
14
|
+
}
|
|
15
|
+
migrate() {
|
|
16
|
+
var _a, _b;
|
|
17
|
+
for (const [name, target] of this.targets) {
|
|
18
|
+
this.oldEsLintConfigPath =
|
|
19
|
+
(_b = (_a = target.options) === null || _a === void 0 ? void 0 : _a.eslintConfig) !== null && _b !== void 0 ? _b : (0, devkit_2.joinPathFragments)(this.project.oldRoot, '.eslintrc.json');
|
|
20
|
+
this.newEsLintConfigPath = this.convertRootPath(this.oldEsLintConfigPath);
|
|
21
|
+
this.moveProjectRootFile(this.oldEsLintConfigPath);
|
|
22
|
+
this.updateTargetConfiguration(name, target);
|
|
23
|
+
this.updateEsLintConfig();
|
|
24
|
+
this.updateCacheableOperations([name]);
|
|
25
|
+
}
|
|
26
|
+
if (!this.targets.size && this.projectConfig.root === '') {
|
|
27
|
+
// there could still be a .eslintrc.json file in the root
|
|
28
|
+
// so move to new location
|
|
29
|
+
const eslintConfig = '.eslintrc.json';
|
|
30
|
+
if (this.tree.exists(eslintConfig)) {
|
|
31
|
+
this.logger.info('No "lint" target was found, but an ESLint config file was found in the project root. The file will be moved to the new location.');
|
|
32
|
+
this.moveProjectRootFile(eslintConfig);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
validate() {
|
|
37
|
+
const errors = [];
|
|
38
|
+
// TODO(leo): keeping restriction until the full refactor is done and we start
|
|
39
|
+
// expanding what's supported.
|
|
40
|
+
if (this.targets.size > 1) {
|
|
41
|
+
errors.push({
|
|
42
|
+
message: `There is more than one target using a builder that is used to lint the project (${(0, utilities_1.arrayToString)([...this.targets.keys()])}).`,
|
|
43
|
+
hint: `Make sure the project only has one target with a builder that is used to lint the project.`,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
return errors.length ? errors : null;
|
|
47
|
+
}
|
|
48
|
+
updateTargetConfiguration(targetName, target) {
|
|
49
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
50
|
+
target.executor = '@nrwl/linter:eslint';
|
|
51
|
+
if (!target.options) {
|
|
52
|
+
this.logger.warn(`The target "${targetName}" is not specifying any options. Skipping updating the target configuration.`);
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
const existEsLintConfigPath = this.tree.exists(this.newEsLintConfigPath);
|
|
56
|
+
if (!existEsLintConfigPath) {
|
|
57
|
+
this.logger.warn(`The ESLint config file "${this.oldEsLintConfigPath}" could not be found. Skipping updating the file.`);
|
|
58
|
+
}
|
|
59
|
+
target.options.eslintConfig =
|
|
60
|
+
target.options.eslintConfig && this.newEsLintConfigPath;
|
|
61
|
+
target.options.lintFilePatterns =
|
|
62
|
+
target.options.lintFilePatterns &&
|
|
63
|
+
target.options.lintFilePatterns.map((pattern) => {
|
|
64
|
+
// replace the old source root with the new root, we want to lint all
|
|
65
|
+
// matching files in the project, not just the ones in the source root
|
|
66
|
+
if (pattern.startsWith(this.project.oldSourceRoot)) {
|
|
67
|
+
return (0, devkit_2.joinPathFragments)(this.project.newRoot, pattern.replace(this.project.oldSourceRoot, ''));
|
|
68
|
+
}
|
|
69
|
+
// replace the old root with the new root
|
|
70
|
+
if (pattern.startsWith(this.project.oldRoot)) {
|
|
71
|
+
return (0, devkit_2.joinPathFragments)(this.project.newRoot, pattern.replace(this.project.oldRoot, ''));
|
|
72
|
+
}
|
|
73
|
+
// do nothing, warn about the pattern
|
|
74
|
+
this.logger.warn(`The lint file pattern "${pattern}" specified in the "${targetName}" target is not contained in the project root or source root. The pattern will not be updated.`);
|
|
75
|
+
return pattern;
|
|
76
|
+
});
|
|
77
|
+
if (existEsLintConfigPath) {
|
|
78
|
+
const eslintConfig = (0, devkit_2.readJson)(this.tree, this.newEsLintConfigPath);
|
|
79
|
+
if ((0, linter_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
|
|
80
|
+
target.options.hasTypeAwareRules = true;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
(0, devkit_2.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
updateEsLintConfig() {
|
|
87
|
+
if (!this.tree.exists(this.newEsLintConfigPath)) {
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
(0, devkit_1.updateJson)(this.tree, this.newEsLintConfigPath, (json) => {
|
|
91
|
+
var _a;
|
|
92
|
+
delete json.root;
|
|
93
|
+
json.ignorePatterns = ['!**/*'];
|
|
94
|
+
const rootEsLintConfigRelativePath = (0, devkit_2.joinPathFragments)((0, devkit_2.offsetFromRoot)(this.projectConfig.root), '.eslintrc.json');
|
|
95
|
+
if (Array.isArray(json.extends)) {
|
|
96
|
+
json.extends = json.extends.map((extend) => this.convertEsLintConfigExtendToNewPath(this.oldEsLintConfigPath, extend));
|
|
97
|
+
// it might have not been extending from the root config, make sure it does
|
|
98
|
+
if (!json.extends.includes(rootEsLintConfigRelativePath)) {
|
|
99
|
+
json.extends.unshift(rootEsLintConfigRelativePath);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
json.extends = rootEsLintConfigRelativePath;
|
|
104
|
+
}
|
|
105
|
+
(_a = json.overrides) === null || _a === void 0 ? void 0 : _a.forEach((override) => {
|
|
106
|
+
var _a;
|
|
107
|
+
if (!((_a = override.parserOptions) === null || _a === void 0 ? void 0 : _a.project)) {
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
override.parserOptions.project = [
|
|
111
|
+
`${this.projectConfig.root}/tsconfig.*?.json`,
|
|
112
|
+
];
|
|
113
|
+
});
|
|
114
|
+
return json;
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
convertEsLintConfigExtendToNewPath(eslintConfigPath, extendPath) {
|
|
118
|
+
if (!extendPath.startsWith('..')) {
|
|
119
|
+
// we only need to adjust paths that are on a different directory, files
|
|
120
|
+
// in the same directory are moved together so their relative paths are
|
|
121
|
+
// not changed
|
|
122
|
+
return extendPath;
|
|
123
|
+
}
|
|
124
|
+
return (0, devkit_2.joinPathFragments)((0, devkit_2.offsetFromRoot)(this.project.newRoot), (0, path_1.dirname)(eslintConfigPath), extendPath);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
exports.AngularEslintLintMigrator = AngularEslintLintMigrator;
|
|
128
|
+
//# sourceMappingURL=angular-eslint-lint.migrator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"angular-eslint-lint.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import type { ProjectConfiguration, TargetConfiguration, Tree } from '@nrwl/devkit';
|
|
2
|
-
import type { Logger, ProjectMigrationInfo } from '../../utilities';
|
|
2
|
+
import type { Logger, ProjectMigrationInfo, WorkspaceRootFileType } from '../../utilities';
|
|
3
3
|
import { Migrator } from '../migrator';
|
|
4
4
|
export declare abstract class BuilderMigrator extends Migrator {
|
|
5
5
|
readonly builderName: string;
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
readonly rootFileType: WorkspaceRootFileType | undefined;
|
|
7
|
+
targets: Map<string, TargetConfiguration>;
|
|
8
|
+
constructor(tree: Tree, builderName: string, rootFileType: WorkspaceRootFileType | undefined, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
|
|
9
|
+
isBuilderUsed(): boolean;
|
|
8
10
|
protected collectBuilderTargets(): void;
|
|
9
11
|
}
|
|
@@ -3,14 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BuilderMigrator = void 0;
|
|
4
4
|
const migrator_1 = require("../migrator");
|
|
5
5
|
class BuilderMigrator extends migrator_1.Migrator {
|
|
6
|
-
constructor(tree, builderName, project, projectConfig, logger) {
|
|
6
|
+
constructor(tree, builderName, rootFileType, project, projectConfig, logger) {
|
|
7
7
|
super(tree, projectConfig, logger);
|
|
8
8
|
this.builderName = builderName;
|
|
9
|
+
this.rootFileType = rootFileType;
|
|
9
10
|
this.targets = new Map();
|
|
10
11
|
this.project = project;
|
|
11
12
|
this.projectConfig = projectConfig;
|
|
12
13
|
this.collectBuilderTargets();
|
|
13
14
|
}
|
|
15
|
+
isBuilderUsed() {
|
|
16
|
+
return this.targets.size > 0;
|
|
17
|
+
}
|
|
14
18
|
collectBuilderTargets() {
|
|
15
19
|
var _a;
|
|
16
20
|
for (const [name, target] of Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {})) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/builder.migrator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"builder.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/builder.migrator.ts"],"names":[],"mappings":";;;AAUA,0CAAuC;AAEvC,MAAsB,eAAgB,SAAQ,mBAAQ;IAGpD,YACE,IAAU,EACM,WAAmB,EACnB,YAA+C,EAC/D,OAA6B,EAC7B,aAAmC,EACnC,MAAc;QAEd,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QANnB,gBAAW,GAAX,WAAW,CAAQ;QACnB,iBAAY,GAAZ,YAAY,CAAmC;QALjE,YAAO,GAAqC,IAAI,GAAG,EAAE,CAAC;QAYpD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAEnC,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;IAC/B,CAAC;IAES,qBAAqB;;QAC7B,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CACzC,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,mCAAI,EAAE,CACjC,EAAE;YACD,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC,WAAW,EAAE;gBACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAChC;SACF;IACH,CAAC;CACF;AAhCD,0CAgCC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
+
tslib_1.__exportStar(require("./angular-devkit-karma.migrator"), exports);
|
|
4
5
|
tslib_1.__exportStar(require("./angular-devkit-ng-packagr.migrator"), exports);
|
|
6
|
+
tslib_1.__exportStar(require("./angular-eslint-lint.migrator"), exports);
|
|
5
7
|
tslib_1.__exportStar(require("./builder-migrator-class.type"), exports);
|
|
6
8
|
tslib_1.__exportStar(require("./builder.migrator"), exports);
|
|
7
9
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/index.ts"],"names":[],"mappings":";;;AAAA,+EAAqD;AACrD,wEAA8C;AAC9C,6DAAmC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/index.ts"],"names":[],"mappings":";;;AAAA,0EAAgD;AAChD,+EAAqD;AACrD,yEAA+C;AAC/C,wEAA8C;AAC9C,6DAAmC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
1
|
+
import type { ProjectConfiguration, TargetConfiguration, Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { Logger } from '../utilities/logger';
|
|
3
3
|
import type { ProjectMigrationInfo, ValidationResult } from '../utilities/types';
|
|
4
4
|
export declare abstract class Migrator {
|
|
@@ -10,6 +10,14 @@ export declare abstract class Migrator {
|
|
|
10
10
|
constructor(tree: Tree, projectConfig: ProjectConfiguration, logger: Logger);
|
|
11
11
|
abstract migrate(): Promise<void> | void;
|
|
12
12
|
abstract validate(): ValidationResult;
|
|
13
|
+
protected convertAsset(asset: string | any): string | any;
|
|
14
|
+
protected convertRootPath(originalPath: string): string;
|
|
15
|
+
protected moveFile(from: string, to: string, required?: boolean): void;
|
|
16
|
+
protected moveFilePathsFromTargetToProjectRoot(target: TargetConfiguration, options: string[]): void;
|
|
17
|
+
protected moveProjectRootFile(filePath: string, isRequired?: boolean): void;
|
|
13
18
|
protected updateCacheableOperations(targetNames: string[]): void;
|
|
14
19
|
protected updateTsConfigFile(tsConfigPath: string, rootTsConfigFile: string, projectOffsetFromRoot: string): void;
|
|
20
|
+
private convertSourceRootPath;
|
|
21
|
+
private getTargetValuesForOption;
|
|
22
|
+
private getValueForOption;
|
|
15
23
|
}
|