@nrwl/angular 15.3.3 → 15.4.0-beta.1
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 +8 -8
- package/plugins/component-testing.js +8 -7
- package/plugins/component-testing.js.map +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +0 -2
- 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 +2 -3
- package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js +3 -13
- package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.d.ts +1 -2
- package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js +3 -13
- 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 +2 -3
- package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js +10 -21
- package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/builder.migrator.d.ts +3 -1
- package/src/generators/ng-add/migrators/builders/builder.migrator.js +17 -0
- package/src/generators/ng-add/migrators/builders/builder.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/app.migrator.d.ts +1 -0
- package/src/generators/ng-add/migrators/projects/app.migrator.js +34 -6
- package/src/generators/ng-add/migrators/projects/app.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js +28 -18
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/lib.migrator.js +7 -0
- package/src/generators/ng-add/migrators/projects/lib.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/project.migrator.d.ts +7 -3
- package/src/generators/ng-add/migrators/projects/project.migrator.js +49 -15
- package/src/generators/ng-add/migrators/projects/project.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/index.d.ts +0 -1
- package/src/generators/ng-add/utilities/index.js +0 -1
- package/src/generators/ng-add/utilities/index.js.map +1 -1
- package/src/generators/ng-add/utilities/validation-logging.d.ts +2 -1
- package/src/generators/ng-add/utilities/validation-logging.js +21 -2
- package/src/generators/ng-add/utilities/validation-logging.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.js +1 -2
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/migrations/update-15-2-0/update-workspace-config.js +2 -2
- package/src/migrations/update-15-2-0/update-workspace-config.js.map +1 -1
- package/src/utils/get-generator-directory-for-ng-version.js +3 -3
- package/src/utils/get-generator-directory-for-ng-version.js.map +1 -1
- package/src/generators/ng-add/utilities/validate-projects.d.ts +0 -2
- package/src/generators/ng-add/utilities/validate-projects.js +0 -47
- package/src/generators/ng-add/utilities/validate-projects.js.map +0 -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
|
-
|
|
6
|
+
# [15.4.0-beta.1](https://github.com/nrwl/nx/compare/15.3.3...15.4.0-beta.1) (2022-12-16)
|
|
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.
|
|
3
|
+
"version": "15.4.0-beta.1",
|
|
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": {
|
|
@@ -68,12 +68,12 @@
|
|
|
68
68
|
"dependencies": {
|
|
69
69
|
"@angular-devkit/schematics": "~15.0.1",
|
|
70
70
|
"@nguniversal/builders": "~15.0.0",
|
|
71
|
-
"@nrwl/cypress": "15.
|
|
72
|
-
"@nrwl/devkit": "15.
|
|
73
|
-
"@nrwl/jest": "15.
|
|
74
|
-
"@nrwl/linter": "15.
|
|
75
|
-
"@nrwl/webpack": "15.
|
|
76
|
-
"@nrwl/workspace": "15.
|
|
71
|
+
"@nrwl/cypress": "15.4.0-beta.1",
|
|
72
|
+
"@nrwl/devkit": "15.4.0-beta.1",
|
|
73
|
+
"@nrwl/jest": "15.4.0-beta.1",
|
|
74
|
+
"@nrwl/linter": "15.4.0-beta.1",
|
|
75
|
+
"@nrwl/webpack": "15.4.0-beta.1",
|
|
76
|
+
"@nrwl/workspace": "15.4.0-beta.1",
|
|
77
77
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
78
78
|
"@schematics/angular": "~15.0.1",
|
|
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": "b94c7e58706ce3b2e70876b648c0b19bf649e01c"
|
|
103
103
|
}
|
|
@@ -25,7 +25,7 @@ const path_1 = require("path");
|
|
|
25
25
|
* @param options override options
|
|
26
26
|
*/
|
|
27
27
|
function nxComponentTestingPreset(pathToConfig, options) {
|
|
28
|
-
var _a, _b, _c, _d;
|
|
28
|
+
var _a, _b, _c, _d, _e;
|
|
29
29
|
let graph;
|
|
30
30
|
try {
|
|
31
31
|
graph = (0, devkit_1.readCachedProjectGraph)();
|
|
@@ -52,7 +52,7 @@ ${e.stack ? e.stack : e}`);
|
|
|
52
52
|
? (0, path_1.dirname)(fromWorkspaceRoot)
|
|
53
53
|
: fromWorkspaceRoot;
|
|
54
54
|
const offset = (0, devkit_1.offsetFromRoot)(normalizedFromWorkspaceRootPath);
|
|
55
|
-
const buildContext = (0, ct_helpers_1.createExecutorContext)(graph, graph.nodes[buildTarget.project].data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
|
|
55
|
+
const buildContext = (0, ct_helpers_1.createExecutorContext)(graph, (_e = graph.nodes[buildTarget.project]) === null || _e === void 0 ? void 0 : _e.data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
|
|
56
56
|
const buildableProjectConfig = normalizeBuildTargetOptions(buildContext, ctContext, offset);
|
|
57
57
|
return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), {
|
|
58
58
|
// NOTE: cannot use a glob pattern since it will break cypress generated tsconfig.
|
|
@@ -65,8 +65,8 @@ ${e.stack ? e.stack : e}`);
|
|
|
65
65
|
}
|
|
66
66
|
exports.nxComponentTestingPreset = nxComponentTestingPreset;
|
|
67
67
|
function getBuildableTarget(ctContext) {
|
|
68
|
-
var _a;
|
|
69
|
-
const targets = (_a = ctContext.projectGraph.nodes[ctContext.projectName]
|
|
68
|
+
var _a, _b;
|
|
69
|
+
const targets = (_b = (_a = ctContext.projectGraph.nodes[ctContext.projectName]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.targets;
|
|
70
70
|
const targetConfig = targets === null || targets === void 0 ? void 0 : targets[ctContext.targetName];
|
|
71
71
|
if (!targetConfig) {
|
|
72
72
|
throw new Error((0, devkit_1.stripIndents) `Unable to find component testing target configuration in project '${ctContext.projectName}'.
|
|
@@ -86,7 +86,7 @@ function getBuildableTarget(ctContext) {
|
|
|
86
86
|
return (0, devkit_1.parseTargetString)(cypressCtOptions.devServerTarget);
|
|
87
87
|
}
|
|
88
88
|
function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
|
|
89
|
-
var _a;
|
|
89
|
+
var _a, _b;
|
|
90
90
|
const options = (0, devkit_1.readTargetOptions)({
|
|
91
91
|
project: buildContext.projectName,
|
|
92
92
|
target: buildContext.targetName,
|
|
@@ -145,7 +145,7 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
|
|
|
145
145
|
buildOptions.scripts = [];
|
|
146
146
|
buildOptions.stylePreprocessorOptions = { includePaths: [] };
|
|
147
147
|
}
|
|
148
|
-
const { root, sourceRoot } = buildContext.projectGraph.nodes[buildContext.projectName].data;
|
|
148
|
+
const { root, sourceRoot } = (_b = buildContext.projectGraph.nodes[buildContext.projectName]) === null || _b === void 0 ? void 0 : _b.data;
|
|
149
149
|
return {
|
|
150
150
|
root: (0, devkit_1.joinPathFragments)(offset, root),
|
|
151
151
|
sourceRoot: (0, devkit_1.joinPathFragments)(offset, sourceRoot),
|
|
@@ -188,7 +188,8 @@ function withSchemaDefaults(options) {
|
|
|
188
188
|
* this file should get cleaned up via the cypress executor
|
|
189
189
|
*/
|
|
190
190
|
function getTempStylesForTailwind(ctExecutorContext) {
|
|
191
|
-
|
|
191
|
+
var _a;
|
|
192
|
+
const ctProjectConfig = (_a = ctExecutorContext.projectGraph.nodes[ctExecutorContext.projectName]) === null || _a === void 0 ? void 0 : _a.data;
|
|
192
193
|
// angular only supports `tailwind.config.{js,cjs}`
|
|
193
194
|
const ctProjectTailwindConfig = (0, path_1.join)(ctExecutorContext.root, ctProjectConfig.root, 'tailwind.config');
|
|
194
195
|
const isTailWindInCtProject = (0, fs_1.existsSync)(ctProjectTailwindConfig + '.js') ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":";;;AAAA,yEAG8C;AAC9C,mEAK4C;AAC5C,yCAYsB;AACtB,2BAAqE;AACrE,+BAA+C;AAG/C;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAgB,wBAAwB,CACtC,YAAoB,EACpB,OAAmC;;IAEnC,IAAI,KAAmB,CAAC;IACxB,IAAI;QACF,KAAK,GAAG,IAAA,+BAAsB,GAAE,CAAC;KAClC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK;QACb,qEAAqE;QACrE;;;EAGJ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CACpB,CAAC;KACH;IAED,MAAM,eAAe,GAAG,IAAA,mCAAsB,EAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACpE,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;IACxE,MAAM,SAAS,GAAG,IAAA,kCAAqB,EACrC,KAAK,EACL,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,IAAI,EACpB,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,KAAI,gBAAgB,EACzC,mBAAmB,CACpB,CAAC;IAEF,MAAM,WAAW,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAElD,IAAI,CAAC,WAAW,CAAC,OAAO,IAAI,CAAC,CAAA,MAAA,MAAA,KAAK,CAAC,KAAK,0CAAG,WAAW,CAAC,OAAO,CAAC,0CAAE,IAAI,CAAA,EAAE;QACrE,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA;oBACZ,WAAW,CAAC,OAAO;0BACb,CAAC,CAAC,CAAA,MAAA,MAAA,KAAK,CAAC,KAAK,0CAAG,WAAW,CAAC,OAAO,CAAC,0CAAE,IAAI,CAAA,EAAE,CAAC,CAAC;KACrE;IAED,MAAM,iBAAiB,GAAG,IAAA,eAAQ,EAAC,sBAAa,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,+BAA+B,GAAG,IAAA,cAAS,EAAC,YAAY,CAAC,CAAC,MAAM,EAAE;QACtE,CAAC,CAAC,IAAA,cAAO,EAAC,iBAAiB,CAAC;QAC5B,CAAC,CAAC,iBAAiB,CAAC;IACtB,MAAM,MAAM,GAAG,IAAA,uBAAc,EAAC,+BAA+B,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG,IAAA,kCAAqB,EACxC,KAAK,EACL,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,8 +32,6 @@ function migrateFromAngularCli(tree, rawOptions) {
|
|
|
32
32
|
...projects.apps.map((app) => new migrators_1.AppMigrator(tree, options, app)),
|
|
33
33
|
...projects.libs.map((lib) => new migrators_1.LibMigrator(tree, options, lib)),
|
|
34
34
|
];
|
|
35
|
-
// validate all projects
|
|
36
|
-
(0, utilities_1.validateProjects)(migrators);
|
|
37
35
|
const workspaceRootFileTypesInfo = (0, utilities_1.getWorkspaceRootFileTypesInfo)(tree, migrators);
|
|
38
36
|
/**
|
|
39
37
|
* Keep a copy of the root eslint config to restore it later. We need to
|
|
@@ -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,yCAKsB;AACtB,2DAAyE;AACzE,iEAAqE;AACrE,mDAAiD;AAEjD,2CAAuD;AAEvD,
|
|
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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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
|
-
import type { Logger, ProjectMigrationInfo
|
|
1
|
+
import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
|
+
import type { Logger, ProjectMigrationInfo } from '../../utilities';
|
|
3
3
|
import { BuilderMigrator } from './builder.migrator';
|
|
4
4
|
export declare class AngularDevkitKarmaMigrator extends BuilderMigrator {
|
|
5
5
|
constructor(tree: Tree, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
|
|
6
6
|
migrate(): void;
|
|
7
|
-
validate(): ValidationResult;
|
|
8
7
|
private updateTargetConfiguration;
|
|
9
8
|
private updateTsConfigFileUsedByTestTarget;
|
|
10
9
|
}
|
|
@@ -4,13 +4,15 @@ exports.AngularDevkitKarmaMigrator = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const utilities_1 = require("../../utilities");
|
|
8
7
|
const builder_migrator_1 = require("./builder.migrator");
|
|
9
8
|
class AngularDevkitKarmaMigrator extends builder_migrator_1.BuilderMigrator {
|
|
10
9
|
constructor(tree, project, projectConfig, logger) {
|
|
11
10
|
super(tree, '@angular-devkit/build-angular:karma', 'karma', project, projectConfig, logger);
|
|
12
11
|
}
|
|
13
12
|
migrate() {
|
|
13
|
+
if (this.skipMigration) {
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
14
16
|
for (const [name, target] of this.targets) {
|
|
15
17
|
this.moveFilePathsFromTargetToProjectRoot(target, [
|
|
16
18
|
'karmaConfig',
|
|
@@ -31,18 +33,6 @@ class AngularDevkitKarmaMigrator extends builder_migrator_1.BuilderMigrator {
|
|
|
31
33
|
}
|
|
32
34
|
}
|
|
33
35
|
}
|
|
34
|
-
validate() {
|
|
35
|
-
const errors = [];
|
|
36
|
-
// TODO(leo): keeping restriction until the full refactor is done and we start
|
|
37
|
-
// expanding what's supported.
|
|
38
|
-
if (this.targets.size > 1) {
|
|
39
|
-
errors.push({
|
|
40
|
-
message: `There is more than one target using a builder that is used to build the project (${(0, utilities_1.arrayToString)([...this.targets.keys()])}).`,
|
|
41
|
-
hint: `Make sure the project only has one target with a builder that is used to build the project.`,
|
|
42
|
-
});
|
|
43
|
-
}
|
|
44
|
-
return errors.length ? errors : null;
|
|
45
|
-
}
|
|
46
36
|
updateTargetConfiguration(targetName, target) {
|
|
47
37
|
if (!target.options) {
|
|
48
38
|
this.logger.warn(`The target "${targetName}" is not specifying any options. Skipping updating the target configuration.`);
|
|
@@ -1 +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":";;;
|
|
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":"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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
|
-
import type { Logger, ProjectMigrationInfo
|
|
2
|
+
import type { Logger, ProjectMigrationInfo } from '../../utilities';
|
|
3
3
|
import { BuilderMigrator } from './builder.migrator';
|
|
4
4
|
export declare class AngularDevkitNgPackagrMigrator extends BuilderMigrator {
|
|
5
5
|
constructor(tree: Tree, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
|
|
6
6
|
migrate(): void;
|
|
7
|
-
validate(): ValidationResult;
|
|
8
7
|
private updateTargetConfiguration;
|
|
9
8
|
private updateNgPackageJson;
|
|
10
9
|
private updateTsConfigs;
|
|
@@ -5,13 +5,15 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const dependencies_1 = require("../../../utils/dependencies");
|
|
8
|
-
const utilities_1 = require("../../utilities");
|
|
9
8
|
const builder_migrator_1 = require("./builder.migrator");
|
|
10
9
|
class AngularDevkitNgPackagrMigrator extends builder_migrator_1.BuilderMigrator {
|
|
11
10
|
constructor(tree, project, projectConfig, logger) {
|
|
12
11
|
super(tree, '@angular-devkit/build-angular:ng-packagr', undefined, project, projectConfig, logger);
|
|
13
12
|
}
|
|
14
13
|
migrate() {
|
|
14
|
+
if (this.skipMigration) {
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
15
17
|
if (!this.targets.size) {
|
|
16
18
|
this.logger.warn(`There is no target in the project configuration using the ${this.builderName} builder. This might not be an issue. ` +
|
|
17
19
|
`Skipping updating the build configuration.`);
|
|
@@ -25,18 +27,6 @@ class AngularDevkitNgPackagrMigrator extends builder_migrator_1.BuilderMigrator
|
|
|
25
27
|
(0, dependencies_1.addBuildableLibrariesPostCssDependencies)(this.tree);
|
|
26
28
|
}
|
|
27
29
|
}
|
|
28
|
-
validate() {
|
|
29
|
-
const errors = [];
|
|
30
|
-
// TODO(leo): keeping restriction until the full refactor is done and we start
|
|
31
|
-
// expanding what's supported.
|
|
32
|
-
if (this.targets.size > 1) {
|
|
33
|
-
errors.push({
|
|
34
|
-
message: `There is more than one target using a builder that is used to build the project (${(0, utilities_1.arrayToString)([...this.targets.keys()])}).`,
|
|
35
|
-
hint: `Make sure the project only has one target with a builder that is used to build the project.`,
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
return errors.length ? errors : null;
|
|
39
|
-
}
|
|
40
30
|
updateTargetConfiguration(targetName, target) {
|
|
41
31
|
target.executor = '@nrwl/angular:package';
|
|
42
32
|
if (!target.options &&
|
|
@@ -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":";;;AAKA,yCAKsB;AACtB,yEAAqF;AACrF,+BAAgC;AAChC,8DAAuF;
|
|
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,12 +1,11 @@
|
|
|
1
|
-
import { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
|
-
import type { Logger, ProjectMigrationInfo
|
|
1
|
+
import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
|
+
import type { Logger, ProjectMigrationInfo } from '../../utilities';
|
|
3
3
|
import { BuilderMigrator } from './builder.migrator';
|
|
4
4
|
export declare class AngularEslintLintMigrator extends BuilderMigrator {
|
|
5
5
|
private oldEsLintConfigPath;
|
|
6
6
|
private newEsLintConfigPath;
|
|
7
7
|
constructor(tree: Tree, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
|
|
8
8
|
migrate(): void;
|
|
9
|
-
validate(): ValidationResult;
|
|
10
9
|
private updateTargetConfiguration;
|
|
11
10
|
private updateEsLintConfig;
|
|
12
11
|
private convertEsLintConfigExtendToNewPath;
|
|
@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.AngularEslintLintMigrator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const devkit_2 = require("@nrwl/devkit");
|
|
7
6
|
const linter_1 = require("@nrwl/linter");
|
|
8
7
|
const path_1 = require("path");
|
|
9
|
-
const utilities_1 = require("../../utilities");
|
|
10
8
|
const builder_migrator_1 = require("./builder.migrator");
|
|
11
9
|
class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
|
|
12
10
|
constructor(tree, project, projectConfig, logger) {
|
|
@@ -14,9 +12,12 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
|
|
|
14
12
|
}
|
|
15
13
|
migrate() {
|
|
16
14
|
var _a, _b;
|
|
15
|
+
if (this.skipMigration) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
17
18
|
for (const [name, target] of this.targets) {
|
|
18
19
|
this.oldEsLintConfigPath =
|
|
19
|
-
(_b = (_a = target.options) === null || _a === void 0 ? void 0 : _a.eslintConfig) !== null && _b !== void 0 ? _b : (0,
|
|
20
|
+
(_b = (_a = target.options) === null || _a === void 0 ? void 0 : _a.eslintConfig) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(this.project.oldRoot, '.eslintrc.json');
|
|
20
21
|
this.newEsLintConfigPath = this.convertRootPath(this.oldEsLintConfigPath);
|
|
21
22
|
this.moveProjectRootFile(this.oldEsLintConfigPath);
|
|
22
23
|
this.updateTargetConfiguration(name, target);
|
|
@@ -33,18 +34,6 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
|
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
36
|
}
|
|
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
37
|
updateTargetConfiguration(targetName, target) {
|
|
49
38
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
50
39
|
target.executor = '@nrwl/linter:eslint';
|
|
@@ -64,23 +53,23 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
|
|
|
64
53
|
// replace the old source root with the new root, we want to lint all
|
|
65
54
|
// matching files in the project, not just the ones in the source root
|
|
66
55
|
if (pattern.startsWith(this.project.oldSourceRoot)) {
|
|
67
|
-
return (0,
|
|
56
|
+
return (0, devkit_1.joinPathFragments)(this.project.newRoot, pattern.replace(this.project.oldSourceRoot, ''));
|
|
68
57
|
}
|
|
69
58
|
// replace the old root with the new root
|
|
70
59
|
if (pattern.startsWith(this.project.oldRoot)) {
|
|
71
|
-
return (0,
|
|
60
|
+
return (0, devkit_1.joinPathFragments)(this.project.newRoot, pattern.replace(this.project.oldRoot, ''));
|
|
72
61
|
}
|
|
73
62
|
// do nothing, warn about the pattern
|
|
74
63
|
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
64
|
return pattern;
|
|
76
65
|
});
|
|
77
66
|
if (existEsLintConfigPath) {
|
|
78
|
-
const eslintConfig = (0,
|
|
67
|
+
const eslintConfig = (0, devkit_1.readJson)(this.tree, this.newEsLintConfigPath);
|
|
79
68
|
if ((0, linter_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
|
|
80
69
|
target.options.hasTypeAwareRules = true;
|
|
81
70
|
}
|
|
82
71
|
}
|
|
83
|
-
(0,
|
|
72
|
+
(0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
|
|
84
73
|
});
|
|
85
74
|
}
|
|
86
75
|
updateEsLintConfig() {
|
|
@@ -91,7 +80,7 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
|
|
|
91
80
|
var _a;
|
|
92
81
|
delete json.root;
|
|
93
82
|
json.ignorePatterns = ['!**/*'];
|
|
94
|
-
const rootEsLintConfigRelativePath = (0,
|
|
83
|
+
const rootEsLintConfigRelativePath = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(this.projectConfig.root), '.eslintrc.json');
|
|
95
84
|
if (Array.isArray(json.extends)) {
|
|
96
85
|
json.extends = json.extends.map((extend) => this.convertEsLintConfigExtendToNewPath(this.oldEsLintConfigPath, extend));
|
|
97
86
|
// it might have not been extending from the root config, make sure it does
|
|
@@ -121,7 +110,7 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
|
|
|
121
110
|
// not changed
|
|
122
111
|
return extendPath;
|
|
123
112
|
}
|
|
124
|
-
return (0,
|
|
113
|
+
return (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(this.project.newRoot), (0, path_1.dirname)(eslintConfigPath), extendPath);
|
|
125
114
|
}
|
|
126
115
|
}
|
|
127
116
|
exports.AngularEslintLintMigrator = AngularEslintLintMigrator;
|
|
@@ -1 +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":";;;;
|
|
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,11 +1,13 @@
|
|
|
1
1
|
import type { ProjectConfiguration, TargetConfiguration, Tree } from '@nrwl/devkit';
|
|
2
|
-
import type { Logger, ProjectMigrationInfo, WorkspaceRootFileType } from '../../utilities';
|
|
2
|
+
import type { Logger, ProjectMigrationInfo, ValidationResult, WorkspaceRootFileType } from '../../utilities';
|
|
3
3
|
import { Migrator } from '../migrator';
|
|
4
4
|
export declare abstract class BuilderMigrator extends Migrator {
|
|
5
5
|
readonly builderName: string;
|
|
6
6
|
readonly rootFileType: WorkspaceRootFileType | undefined;
|
|
7
7
|
targets: Map<string, TargetConfiguration>;
|
|
8
|
+
protected skipMigration: boolean;
|
|
8
9
|
constructor(tree: Tree, builderName: string, rootFileType: WorkspaceRootFileType | undefined, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
|
|
10
|
+
validate(): ValidationResult;
|
|
9
11
|
isBuilderUsed(): boolean;
|
|
10
12
|
protected collectBuilderTargets(): void;
|
|
11
13
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BuilderMigrator = void 0;
|
|
4
|
+
const utilities_1 = require("../../utilities");
|
|
4
5
|
const migrator_1 = require("../migrator");
|
|
5
6
|
class BuilderMigrator extends migrator_1.Migrator {
|
|
6
7
|
constructor(tree, builderName, rootFileType, project, projectConfig, logger) {
|
|
@@ -8,10 +9,26 @@ class BuilderMigrator extends migrator_1.Migrator {
|
|
|
8
9
|
this.builderName = builderName;
|
|
9
10
|
this.rootFileType = rootFileType;
|
|
10
11
|
this.targets = new Map();
|
|
12
|
+
this.skipMigration = false;
|
|
11
13
|
this.project = project;
|
|
12
14
|
this.projectConfig = projectConfig;
|
|
13
15
|
this.collectBuilderTargets();
|
|
14
16
|
}
|
|
17
|
+
validate() {
|
|
18
|
+
const errors = [];
|
|
19
|
+
// TODO(leo): keeping restriction until the full refactor is done and we start
|
|
20
|
+
// expanding what's supported.
|
|
21
|
+
if (this.targets.size > 1) {
|
|
22
|
+
errors.push({
|
|
23
|
+
message: `There is more than one target using the builder "${this.builderName}": ${(0, utilities_1.arrayToString)([
|
|
24
|
+
...this.targets.keys(),
|
|
25
|
+
])}. This is not currently supported by the automated migration. These targets will be skipped.`,
|
|
26
|
+
hint: 'Make sure to manually migrate their configuration and any possible associated files.',
|
|
27
|
+
});
|
|
28
|
+
this.skipMigration = true;
|
|
29
|
+
}
|
|
30
|
+
return errors.length ? errors : null;
|
|
31
|
+
}
|
|
15
32
|
isBuilderUsed() {
|
|
16
33
|
return this.targets.size > 0;
|
|
17
34
|
}
|
|
@@ -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":";;;AAYA,+CAAgD;AAChD,0CAAuC;AAEvC,MAAsB,eAAgB,SAAQ,mBAAQ;IAKpD,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;QAPjE,YAAO,GAAqC,IAAI,GAAG,EAAE,CAAC;QAE5C,kBAAa,GAAY,KAAK,CAAC;QAYvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAEnC,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,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,oDACP,IAAI,CAAC,WACP,MAAM,IAAA,yBAAa,EAAC;oBAClB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;iBACvB,CAAC,8FAA8F;gBAChG,IAAI,EAAE,sFAAsF;aAC7F,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;SAC3B;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACvC,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;AArDD,0CAqDC"}
|
|
@@ -9,6 +9,7 @@ export declare class AppMigrator extends ProjectMigrator<SupportedTargets> {
|
|
|
9
9
|
migrate(): Promise<void>;
|
|
10
10
|
validate(): ValidationResult;
|
|
11
11
|
private moveProjectFiles;
|
|
12
|
+
private setCacheableOperations;
|
|
12
13
|
private updateProjectConfiguration;
|
|
13
14
|
private updateTsConfigs;
|
|
14
15
|
private convertBuildOptions;
|
|
@@ -38,8 +38,15 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
38
38
|
: undefined);
|
|
39
39
|
}
|
|
40
40
|
migrate() {
|
|
41
|
+
const _super = Object.create(null, {
|
|
42
|
+
migrate: { get: () => super.migrate }
|
|
43
|
+
});
|
|
41
44
|
var _a;
|
|
42
45
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
46
|
+
if (this.skipMigration === true) {
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
yield _super.migrate.call(this);
|
|
43
50
|
yield this.e2eMigrator.migrate();
|
|
44
51
|
this.moveProjectFiles();
|
|
45
52
|
yield this.updateProjectConfiguration();
|
|
@@ -47,7 +54,7 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
47
54
|
yield builderMigrator.migrate();
|
|
48
55
|
}
|
|
49
56
|
this.updateTsConfigs();
|
|
50
|
-
this.
|
|
57
|
+
this.setCacheableOperations();
|
|
51
58
|
});
|
|
52
59
|
}
|
|
53
60
|
validate() {
|
|
@@ -79,6 +86,19 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
79
86
|
}
|
|
80
87
|
this.moveDir(this.project.oldSourceRoot, this.project.newSourceRoot);
|
|
81
88
|
}
|
|
89
|
+
setCacheableOperations() {
|
|
90
|
+
const toCache = [];
|
|
91
|
+
if (this.targetNames.build &&
|
|
92
|
+
!this.shouldSkipTargetTypeMigration('build')) {
|
|
93
|
+
toCache.push(this.targetNames.build);
|
|
94
|
+
}
|
|
95
|
+
if (this.targetNames.e2e && !this.shouldSkipTargetTypeMigration('e2e')) {
|
|
96
|
+
toCache.push(this.targetNames.e2e);
|
|
97
|
+
}
|
|
98
|
+
if (toCache.length) {
|
|
99
|
+
this.updateCacheableOperations(toCache);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
82
102
|
updateProjectConfiguration() {
|
|
83
103
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
84
104
|
this.projectConfig.root = this.project.newRoot;
|
|
@@ -160,6 +180,9 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
160
180
|
this.logger.warn('There is no build target in the project configuration. Skipping updating the build target configuration.');
|
|
161
181
|
return;
|
|
162
182
|
}
|
|
183
|
+
if (this.shouldSkipTargetTypeMigration('build')) {
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
163
186
|
const buildTarget = this.projectConfig.targets[this.targetNames.build];
|
|
164
187
|
if (!buildTarget.options &&
|
|
165
188
|
(!buildTarget.configurations ||
|
|
@@ -181,7 +204,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
181
204
|
Object.values((_f = buildTarget.configurations) !== null && _f !== void 0 ? _f : {}).forEach((config) => this.convertBuildOptions(config));
|
|
182
205
|
}
|
|
183
206
|
updatePrerenderTargetConfiguration() {
|
|
184
|
-
if (!this.targetNames.prerender
|
|
207
|
+
if (!this.targetNames.prerender ||
|
|
208
|
+
this.shouldSkipTargetTypeMigration('prerender')) {
|
|
185
209
|
return;
|
|
186
210
|
}
|
|
187
211
|
const prerenderTarget = this.projectConfig.targets[this.targetNames.prerender];
|
|
@@ -195,7 +219,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
195
219
|
}
|
|
196
220
|
updateServerTargetConfiguration() {
|
|
197
221
|
var _a, _b, _c, _d, _e, _f;
|
|
198
|
-
if (!this.targetNames.server
|
|
222
|
+
if (!this.targetNames.server ||
|
|
223
|
+
this.shouldSkipTargetTypeMigration('server')) {
|
|
199
224
|
return;
|
|
200
225
|
}
|
|
201
226
|
const serverTarget = this.projectConfig.targets[this.targetNames.server];
|
|
@@ -219,7 +244,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
219
244
|
Object.values((_f = serverTarget.configurations) !== null && _f !== void 0 ? _f : {}).forEach((config) => this.convertServerOptions(config));
|
|
220
245
|
}
|
|
221
246
|
updateServeSsrTargetConfiguration() {
|
|
222
|
-
if (!this.targetNames.serveSsr
|
|
247
|
+
if (!this.targetNames.serveSsr ||
|
|
248
|
+
this.shouldSkipTargetTypeMigration('serveSsr')) {
|
|
223
249
|
return;
|
|
224
250
|
}
|
|
225
251
|
const serveSsrTarget = this.projectConfig.targets[this.targetNames.serveSsr];
|
|
@@ -245,7 +271,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
245
271
|
}
|
|
246
272
|
updateTsConfigFileUsedByBuildTarget(rootTsConfigFile, projectOffsetFromRoot) {
|
|
247
273
|
var _a, _b, _c, _d;
|
|
248
|
-
if (!this.targetNames.build
|
|
274
|
+
if (!this.targetNames.build ||
|
|
275
|
+
this.shouldSkipTargetTypeMigration('build')) {
|
|
249
276
|
return;
|
|
250
277
|
}
|
|
251
278
|
const tsConfigPath = (_b = (_a = this.projectConfig.targets[this.targetNames.build].options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = this.projectConfig.targets[this.targetNames.build].configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
|
|
@@ -257,7 +284,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
257
284
|
}
|
|
258
285
|
updateTsConfigFileUsedByServerTarget(projectOffsetFromRoot) {
|
|
259
286
|
var _a, _b, _c, _d;
|
|
260
|
-
if (!this.targetNames.server
|
|
287
|
+
if (!this.targetNames.server ||
|
|
288
|
+
this.shouldSkipTargetTypeMigration('server')) {
|
|
261
289
|
return;
|
|
262
290
|
}
|
|
263
291
|
const tsConfigPath = (_b = (_a = this.projectConfig.targets[this.targetNames.server].options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = this.projectConfig.targets[this.targetNames.server].configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
|