@nrwl/angular 13.10.2 → 14.0.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/generators.d.ts +0 -2
- package/generators.js +0 -2
- package/generators.js.map +1 -1
- package/generators.json +0 -20
- package/module-federation/index.d.ts +1 -0
- package/module-federation/index.js +2 -0
- package/module-federation/index.js.map +1 -1
- package/package.json +6 -6
- package/src/generators/add-linting/schema.json +1 -0
- package/src/generators/application/schema.json +11 -5
- package/src/generators/component/schema.json +1 -1
- package/src/generators/component-cypress-spec/schema.json +1 -0
- package/src/generators/component-story/schema.json +1 -0
- package/src/generators/convert-to-with-mf/schema.json +1 -1
- package/src/generators/convert-tslint-to-eslint/schema.json +1 -1
- package/src/generators/downgrade-module/schema.json +1 -1
- package/src/generators/init/schema.json +1 -1
- package/src/generators/mfe-host/schema.json +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +27 -8
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/utilities/app.migrator.d.ts +2 -1
- package/src/generators/ng-add/utilities/app.migrator.js +82 -15
- package/src/generators/ng-add/utilities/app.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/e2e-project.migrator.d.ts +5 -1
- package/src/generators/ng-add/utilities/e2e-project.migrator.js +146 -55
- package/src/generators/ng-add/utilities/e2e-project.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/logger.d.ts +8 -0
- package/src/generators/ng-add/utilities/logger.js +21 -0
- package/src/generators/ng-add/utilities/logger.js.map +1 -0
- package/src/generators/ng-add/utilities/project.migrator.d.ts +2 -0
- package/src/generators/ng-add/utilities/project.migrator.js +2 -0
- package/src/generators/ng-add/utilities/project.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/types.d.ts +4 -0
- package/src/generators/ng-add/utilities/workspace.d.ts +4 -2
- package/src/generators/ng-add/utilities/workspace.js +92 -50
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/scam/schema.json +1 -1
- package/src/generators/scam-directive/schema.json +1 -1
- package/src/generators/scam-pipe/schema.json +1 -1
- package/src/generators/stories/schema.json +1 -1
- package/src/utils/versions.js +1 -1
- package/src/generators/ng-add/utilities/e2e-utils.d.ts +0 -7
- package/src/generators/ng-add/utilities/e2e-utils.js +0 -46
- package/src/generators/ng-add/utilities/e2e-utils.js.map +0 -1
- package/src/generators/storybook-migrate-defaults-5-to-6/compat.d.ts +0 -2
- package/src/generators/storybook-migrate-defaults-5-to-6/compat.js +0 -6
- package/src/generators/storybook-migrate-defaults-5-to-6/compat.js.map +0 -1
- package/src/generators/storybook-migrate-defaults-5-to-6/schema.d.ts +0 -5
- package/src/generators/storybook-migrate-defaults-5-to-6/schema.json +0 -30
- package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.d.ts +0 -4
- package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js +0 -14
- package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js.map +0 -1
- package/src/generators/storybook-migrate-stories-to-6-2/compat.d.ts +0 -2
- package/src/generators/storybook-migrate-stories-to-6-2/compat.js +0 -6
- package/src/generators/storybook-migrate-stories-to-6-2/compat.js.map +0 -1
- package/src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2.d.ts +0 -3
- package/src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2.js +0 -13
- package/src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2.js.map +0 -1
- package/src/generators/storybook-migrate-stories-to-6-2/schema.json +0 -11
package/README.md
CHANGED
|
@@ -79,6 +79,6 @@ A few links to help you get started:
|
|
|
79
79
|
- [Official Nx YouTube Channel](https://www.youtube.com/c/Nrwl_io)
|
|
80
80
|
- [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
|
|
81
81
|
|
|
82
|
-
<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg"
|
|
82
|
+
<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg"
|
|
83
83
|
width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
|
|
84
84
|
|
package/generators.d.ts
CHANGED
|
@@ -11,8 +11,6 @@ export * from './src/generators/ngrx/ngrx';
|
|
|
11
11
|
export * from './src/generators/setup-tailwind/setup-tailwind';
|
|
12
12
|
export * from './src/generators/stories/stories';
|
|
13
13
|
export * from './src/generators/storybook-configuration/storybook-configuration';
|
|
14
|
-
export * from './src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6';
|
|
15
|
-
export * from './src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2';
|
|
16
14
|
export * from './src/generators/upgrade-module/upgrade-module';
|
|
17
15
|
export * from './src/generators/setup-mfe/setup-mfe';
|
|
18
16
|
export * from './src/generators/mfe-host/mfe-host';
|
package/generators.js
CHANGED
|
@@ -14,8 +14,6 @@ tslib_1.__exportStar(require("./src/generators/ngrx/ngrx"), exports);
|
|
|
14
14
|
tslib_1.__exportStar(require("./src/generators/setup-tailwind/setup-tailwind"), exports);
|
|
15
15
|
tslib_1.__exportStar(require("./src/generators/stories/stories"), exports);
|
|
16
16
|
tslib_1.__exportStar(require("./src/generators/storybook-configuration/storybook-configuration"), exports);
|
|
17
|
-
tslib_1.__exportStar(require("./src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6"), exports);
|
|
18
|
-
tslib_1.__exportStar(require("./src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2"), exports);
|
|
19
17
|
tslib_1.__exportStar(require("./src/generators/upgrade-module/upgrade-module"), exports);
|
|
20
18
|
tslib_1.__exportStar(require("./src/generators/setup-mfe/setup-mfe"), exports);
|
|
21
19
|
tslib_1.__exportStar(require("./src/generators/mfe-host/mfe-host"), exports);
|
package/generators.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,6GAAmF;AACnF,6FAAmE;AACnE,qEAA2C;AAC3C,uEAA6C;AAC7C,uFAA6D;AAC7D,2EAAiD;AACjD,uHAA6F;AAC7F,qEAA2C;AAC3C,qEAA2C;AAC3C,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF
|
|
1
|
+
{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,6GAAmF;AACnF,6FAAmE;AACnE,qEAA2C;AAC3C,uEAA6C;AAC7C,uFAA6D;AAC7D,2EAAiD;AACjD,uHAA6F;AAC7F,qEAA2C;AAC3C,qEAA2C;AAC3C,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF,yFAA+D;AAC/D,+EAAqD;AACrD,6EAAmD;AACnD,qEAA2C;AAC3C,yFAA+D;AAC/D,+EAAqD;AACrD,mFAAyD;AACzD,yGAA+E;AAC/E,2FAAiE;AACjE,iFAAuD;AACvD,iFAAuD"}
|
package/generators.json
CHANGED
|
@@ -140,16 +140,6 @@
|
|
|
140
140
|
"schema": "./src/generators/storybook-configuration/schema.json",
|
|
141
141
|
"description": "Adds Storybook configuration to a project."
|
|
142
142
|
},
|
|
143
|
-
"storybook-migrate-defaults-5-to-6": {
|
|
144
|
-
"factory": "./src/generators/storybook-migrate-defaults-5-to-6/compat",
|
|
145
|
-
"schema": "./src/generators/storybook-migrate-defaults-5-to-6/schema.json",
|
|
146
|
-
"description": "Generates default Storybook configuration files using Storybook version `>=6.x` specs, for projects that already have Storybook instances and configurations of versions `<6.x`."
|
|
147
|
-
},
|
|
148
|
-
"storybook-migrate-stories-to-6-2": {
|
|
149
|
-
"factory": "./src/generators/storybook-migrate-stories-to-6-2/compat",
|
|
150
|
-
"schema": "./src/generators/storybook-migrate-stories-to-6-2/schema.json",
|
|
151
|
-
"description": "Migrates stories to match the new syntax in `v6.2` where the component declaration should be in the default export."
|
|
152
|
-
},
|
|
153
143
|
"upgrade-module": {
|
|
154
144
|
"factory": "./src/generators/upgrade-module/compat",
|
|
155
145
|
"schema": "./src/generators/upgrade-module/schema.json",
|
|
@@ -299,16 +289,6 @@
|
|
|
299
289
|
"schema": "./src/generators/storybook-configuration/schema.json",
|
|
300
290
|
"description": "Adds Storybook configuration to a project."
|
|
301
291
|
},
|
|
302
|
-
"storybook-migrate-defaults-5-to-6": {
|
|
303
|
-
"factory": "./src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6",
|
|
304
|
-
"schema": "./src/generators/storybook-migrate-defaults-5-to-6/schema.json",
|
|
305
|
-
"description": "Generates default Storybook configuration files using Storybook version `>=6.x` specs, for projects that already have Storybook instances and configurations of versions `<6.x`."
|
|
306
|
-
},
|
|
307
|
-
"storybook-migrate-stories-to-6-2": {
|
|
308
|
-
"factory": "./src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2",
|
|
309
|
-
"schema": "./src/generators/storybook-migrate-stories-to-6-2/schema.json",
|
|
310
|
-
"description": "Migrates stories to match the new syntax in `v6.2` where the component declaration should be in the default export."
|
|
311
|
-
},
|
|
312
292
|
"upgrade-module": {
|
|
313
293
|
"factory": "./src/generators/upgrade-module/upgrade-module",
|
|
314
294
|
"schema": "./src/generators/upgrade-module/schema.json",
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.withModuleFederation = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
var with_module_federation_1 = require("../src/utils/mfe/with-module-federation");
|
|
5
6
|
Object.defineProperty(exports, "withModuleFederation", { enumerable: true, get: function () { return with_module_federation_1.withModuleFederation; } });
|
|
7
|
+
tslib_1.__exportStar(require("../src/utils/mfe/mfe-webpack"), exports);
|
|
6
8
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/angular/module-federation/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/angular/module-federation/index.ts"],"names":[],"mappings":";;;;AAAA,kFAA+E;AAAtE,8HAAA,oBAAoB,OAAA;AAC7B,uEAA6C"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "14.0.0-beta.0",
|
|
4
4
|
"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.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -65,11 +65,11 @@
|
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
67
|
"@angular-devkit/schematics": "~13.3.0",
|
|
68
|
-
"@nrwl/cypress": "
|
|
69
|
-
"@nrwl/devkit": "
|
|
70
|
-
"@nrwl/jest": "
|
|
71
|
-
"@nrwl/linter": "
|
|
72
|
-
"@nrwl/storybook": "
|
|
68
|
+
"@nrwl/cypress": "14.0.0-beta.0",
|
|
69
|
+
"@nrwl/devkit": "14.0.0-beta.0",
|
|
70
|
+
"@nrwl/jest": "14.0.0-beta.0",
|
|
71
|
+
"@nrwl/linter": "14.0.0-beta.0",
|
|
72
|
+
"@nrwl/storybook": "14.0.0-beta.0",
|
|
73
73
|
"@schematics/angular": "~13.3.0",
|
|
74
74
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
75
75
|
"ignore": "^5.0.4",
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
"$schema": "http://json-schema.org/schema",
|
|
3
3
|
"$id": "GeneratorNxApp",
|
|
4
4
|
"title": "Creates an Angular application.",
|
|
5
|
+
"description": "Creates an Angular application.",
|
|
5
6
|
"type": "object",
|
|
6
7
|
"cli": "nx",
|
|
7
8
|
"properties": {
|
|
@@ -130,19 +131,22 @@
|
|
|
130
131
|
"mfe": {
|
|
131
132
|
"description": "Generate a Module Federation configuration for the application",
|
|
132
133
|
"type": "boolean",
|
|
133
|
-
"default": false
|
|
134
|
+
"default": false,
|
|
135
|
+
"x-deprecated": "Use the `mfe-host` or `mfe-remote` generators instead. Support for generating MFE applications using the application generator will be removed in an upcoming version."
|
|
134
136
|
},
|
|
135
137
|
"mfeType": {
|
|
136
138
|
"type": "string",
|
|
137
139
|
"enum": ["host", "remote"],
|
|
138
140
|
"description": "Type of application to generate the Module Federation configuration for.",
|
|
139
|
-
"default": "remote"
|
|
141
|
+
"default": "remote",
|
|
142
|
+
"x-deprecated": "Use the `mfe-host` or `mfe-remote` generators instead. Support for generating MFE applications using the application generator will be removed in an upcoming version."
|
|
140
143
|
},
|
|
141
144
|
"federationType": {
|
|
142
145
|
"type": "string",
|
|
143
146
|
"enum": ["static", "dynamic"],
|
|
144
147
|
"description": "Use either Static or Dynamic Module Federation pattern for the application.",
|
|
145
|
-
"default": "static"
|
|
148
|
+
"default": "static",
|
|
149
|
+
"x-deprecated": "Use the `mfe-host` or `mfe-remote` generators instead. Support for generating MFE applications using the application generator will be removed in an upcoming version."
|
|
146
150
|
},
|
|
147
151
|
"port": {
|
|
148
152
|
"type": "number",
|
|
@@ -150,11 +154,13 @@
|
|
|
150
154
|
},
|
|
151
155
|
"remotes": {
|
|
152
156
|
"type": "array",
|
|
153
|
-
"description": "A list of remote application names that the host application should consume."
|
|
157
|
+
"description": "A list of remote application names that the host application should consume.",
|
|
158
|
+
"x-deprecated": "Use the `mfe-host` or `mfe-remote` generators instead. Support for generating MFE applications using the application generator will be removed in an upcoming version."
|
|
154
159
|
},
|
|
155
160
|
"host": {
|
|
156
161
|
"type": "string",
|
|
157
|
-
"description": "The name of the host application that the remote application will be consumed by."
|
|
162
|
+
"description": "The name of the host application that the remote application will be consumed by.",
|
|
163
|
+
"x-deprecated": "Use the `mfe-host` or `mfe-remote` generators instead. Support for generating MFE applications using the application generator will be removed in an upcoming version."
|
|
158
164
|
},
|
|
159
165
|
"setParserOptionsProject": {
|
|
160
166
|
"type": "boolean",
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"title": "Angular Component Schema",
|
|
5
5
|
"cli": "nx",
|
|
6
6
|
"type": "object",
|
|
7
|
-
"description": "Creates a new, generic component definition in the given or default project.",
|
|
7
|
+
"description": "Creates a new, generic Angular component definition in the given or default project.",
|
|
8
8
|
"additionalProperties": false,
|
|
9
9
|
"properties": {
|
|
10
10
|
"path": {
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"cli": "nx",
|
|
5
5
|
"title": "Convert to withModuleFederation Generator Options Schema",
|
|
6
6
|
"type": "object",
|
|
7
|
-
"description": "Converts an old micro frontend configuration to use the new withModuleFederation helper. It will run successfully if the following conditions are met: \n - Is either a host or remote application \n - Shared npm package configurations have not been modified \n - Name used to identify the Micro Frontend application matches the project name \n\n _**Note:** This generator will overwrite your webpack config. If you have additional custom configuration in your config file, it will be lost!_",
|
|
7
|
+
"description": "Converts an old micro frontend configuration to use the new withModuleFederation helper. It will run successfully if the following conditions are met: \n - Is either a host or remote application \n - Shared npm package configurations have not been modified \n - Name used to identify the Micro Frontend application matches the project name \n\n _**Note:** This generator will overwrite your webpack config. If you have additional custom configuration in your config file, it will be lost!_.",
|
|
8
8
|
"additionalProperties": false,
|
|
9
9
|
"properties": {
|
|
10
10
|
"project": {
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"$id": "NxAngularConvertTSLintToESLintGenerator",
|
|
4
4
|
"cli": "nx",
|
|
5
5
|
"title": "Convert an Angular project from TSLint to ESLint",
|
|
6
|
-
"description": "Convert an Angular project from TSLint to ESLint. NOTE: Does not work in `--dry-run mode
|
|
6
|
+
"description": "Convert an Angular project from TSLint to ESLint. NOTE: Does not work in `--dry-run mode`.",
|
|
7
7
|
"examples": [
|
|
8
8
|
{
|
|
9
9
|
"command": "nx g convert-tslint-to-eslint myapp",
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"$schema": "http://json-schema.org/schema",
|
|
3
3
|
"$id": "NxDowngradeModuleGenerator",
|
|
4
4
|
"title": "Generates downgradeModule setup.",
|
|
5
|
-
"description": "Sets up a Downgrade Module.",
|
|
5
|
+
"description": "Sets up a Downgrade Module for using AngularJS and Angular.",
|
|
6
6
|
"cli": "nx",
|
|
7
7
|
"type": "object",
|
|
8
8
|
"properties": {
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"$id": "SchematicsAngularModuleInit",
|
|
4
4
|
"cli": "nx",
|
|
5
5
|
"title": "Init Angular Plugin",
|
|
6
|
-
"description": "Initializes the `@nrwl/angular` plugin. NOTE: Does not work in the `--dry-run` mode",
|
|
6
|
+
"description": "Initializes the `@nrwl/angular` plugin. NOTE: Does not work in the `--dry-run` mode.",
|
|
7
7
|
"type": "object",
|
|
8
8
|
"properties": {
|
|
9
9
|
"unitTestRunner": {
|
|
@@ -26,8 +26,21 @@ function migrateFromAngularCli(tree, rawOptions) {
|
|
|
26
26
|
...projects.apps.map((app) => new app_migrator_1.AppMigrator(tree, options, app)),
|
|
27
27
|
// TODO: add libraries migrator when support for libs is added
|
|
28
28
|
];
|
|
29
|
-
//
|
|
30
|
-
|
|
29
|
+
// validate all projects
|
|
30
|
+
for (const migrator of migrators) {
|
|
31
|
+
// TODO: validator will throw on their own until multiple project are supported
|
|
32
|
+
migrator.validate();
|
|
33
|
+
}
|
|
34
|
+
const workspaceCapabilities = (0, workspace_1.getWorkspaceCapabilities)(tree, projects);
|
|
35
|
+
/**
|
|
36
|
+
* Keep a copy of the root eslint config to restore it later. We need to
|
|
37
|
+
* do this because the root config can also be the config for the app at
|
|
38
|
+
* the root of the Angular CLI workspace and it will be moved as part of
|
|
39
|
+
* the app migration.
|
|
40
|
+
*/
|
|
41
|
+
let eslintConfig = workspaceCapabilities.eslint && tree.exists('.eslintrc.json')
|
|
42
|
+
? (0, devkit_1.readJson)(tree, '.eslintrc.json')
|
|
43
|
+
: undefined;
|
|
31
44
|
// create and update root files and configurations
|
|
32
45
|
(0, devkit_1.updateJson)(tree, 'angular.json', (json) => (Object.assign(Object.assign({}, json), { version: 2, $schema: undefined })));
|
|
33
46
|
(0, workspace_1.createNxJson)(tree, options);
|
|
@@ -35,17 +48,23 @@ function migrateFromAngularCli(tree, rawOptions) {
|
|
|
35
48
|
(0, workspace_1.updateRootTsConfig)(tree);
|
|
36
49
|
(0, workspace_1.updatePackageJson)(tree);
|
|
37
50
|
(0, workspace_1.decorateAngularCli)(tree);
|
|
38
|
-
// TODO: check later if it's still needed
|
|
39
|
-
(0, workspace_1.updateTsLint)(tree);
|
|
40
51
|
yield (0, workspace_1.createWorkspaceFiles)(tree);
|
|
41
52
|
// migrate all projects
|
|
42
53
|
for (const migrator of migrators) {
|
|
43
54
|
yield migrator.migrate();
|
|
44
55
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
56
|
+
/**
|
|
57
|
+
* This needs to be done last because the Angular CLI workspace can have
|
|
58
|
+
* these files in the root for the root application, so we wait until
|
|
59
|
+
* those root config files are moved when the projects are migrated.
|
|
60
|
+
*/
|
|
61
|
+
if (workspaceCapabilities.karma) {
|
|
62
|
+
(0, workspace_1.createRootKarmaConfig)(tree);
|
|
63
|
+
}
|
|
64
|
+
if (workspaceCapabilities.eslint) {
|
|
65
|
+
(0, workspace_1.updateRootEsLintConfig)(tree, eslintConfig);
|
|
66
|
+
(0, workspace_1.cleanupEsLintPackages)(tree);
|
|
67
|
+
}
|
|
49
68
|
yield (0, devkit_1.formatFiles)(tree);
|
|
50
69
|
}
|
|
51
70
|
if (!options.skipInstall) {
|
|
@@ -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":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,mDAAiD;AAEjD,2DAAuD;AACvD,mEAA8D;AAC9D,qEAAiE;AAEjE,qDAY+B;AAE/B,SAAsB,qBAAqB,CACzC,IAAU,EACV,UAA4B;;QAE5B,MAAM,QAAQ,GAAG,IAAA,iCAAc,EAAC,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE7D,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,IAAA,6BAAiB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAElC,MAAM,SAAS,GAAsB;gBACnC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,0BAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAClE,8DAA8D;aAC/D,CAAC;YAEF,wBAAwB;YACxB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,+EAA+E;gBAC/E,QAAQ,CAAC,QAAQ,EAAE,CAAC;aACrB;YAED,MAAM,qBAAqB,GAAG,IAAA,oCAAwB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEvE;;;;;eAKG;YACH,IAAI,YAAY,GACd,qBAAqB,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBAC3D,CAAC,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,gBAAgB,CAAC;gBAClC,CAAC,CAAC,SAAS,CAAC;YAEhB,kDAAkD;YAClD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACtC,IAAI,KACP,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,SAAS,IAClB,CAAC,CAAC;YACJ,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC5B,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;YACpC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;YACxB,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,MAAM,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;YAEjC,uBAAuB;YACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC1B;YAED;;;;eAIG;YACH,IAAI,qBAAqB,CAAC,KAAK,EAAE;gBAC/B,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;aAC7B;YACD,IAAI,qBAAqB,CAAC,MAAM,EAAE;gBAChC,IAAA,kCAAsB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBAC3C,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;aAC7B;YAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YACxB,OAAO,GAAG,EAAE;gBACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;YAC5B,CAAC,CAAC;SACH;IACH,CAAC;CAAA;AApFD,sDAoFC"}
|
|
@@ -10,7 +10,8 @@ export declare class AppMigrator extends ProjectMigrator {
|
|
|
10
10
|
private moveProjectFiles;
|
|
11
11
|
private updateProjectConfiguration;
|
|
12
12
|
private updateTsConfigs;
|
|
13
|
-
private
|
|
13
|
+
private updateEsLintConfig;
|
|
14
|
+
private convertEsLintConfigExtendToNewPath;
|
|
14
15
|
private convertBuildOptions;
|
|
15
16
|
private convertServerOptions;
|
|
16
17
|
private convertAsset;
|
|
@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.AppMigrator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const linter_1 = require("@nrwl/linter");
|
|
6
7
|
const generators_1 = require("@nrwl/workspace/generators");
|
|
7
8
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
9
|
+
const path_1 = require("path");
|
|
8
10
|
const e2e_project_migrator_1 = require("./e2e-project.migrator");
|
|
9
11
|
const project_migrator_1 = require("./project.migrator");
|
|
10
12
|
class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
@@ -18,15 +20,24 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
18
20
|
this.moveProjectFiles();
|
|
19
21
|
yield this.updateProjectConfiguration();
|
|
20
22
|
this.updateTsConfigs();
|
|
21
|
-
|
|
22
|
-
this.updateProjectTsLint();
|
|
23
|
+
this.updateEsLintConfig();
|
|
23
24
|
});
|
|
24
25
|
}
|
|
25
26
|
validate() {
|
|
26
|
-
// TODO:
|
|
27
|
+
// TODO: properly return the validation results once we support multiple projects
|
|
28
|
+
if (this.projectConfig.targets.lint &&
|
|
29
|
+
this.projectConfig.targets.lint.executor !==
|
|
30
|
+
'@angular-eslint/builder:lint') {
|
|
31
|
+
throw new Error(`The "${this.project.name}" project is using an unsupported executor "${this.projectConfig.targets.lint.executor}".`);
|
|
32
|
+
}
|
|
33
|
+
const result = this.e2eMigrator.validate();
|
|
34
|
+
if (result) {
|
|
35
|
+
throw new Error(result);
|
|
36
|
+
}
|
|
27
37
|
return null;
|
|
28
38
|
}
|
|
29
39
|
moveProjectFiles() {
|
|
40
|
+
var _a;
|
|
30
41
|
// it is not required to have a browserslist
|
|
31
42
|
this.moveProjectRootFile((0, devkit_1.joinPathFragments)(this.project.oldRoot, 'browserslist'), false);
|
|
32
43
|
this.moveProjectRootFile((0, devkit_1.joinPathFragments)(this.project.oldRoot, '.browserslistrc'), false);
|
|
@@ -38,17 +49,31 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
38
49
|
else {
|
|
39
50
|
// there could still be a karma.conf.js file in the root
|
|
40
51
|
// so move to new location
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
this.
|
|
52
|
+
const karmaConfig = (0, devkit_1.joinPathFragments)(this.project.oldRoot, 'karma.conf.js');
|
|
53
|
+
if (this.tree.exists(karmaConfig)) {
|
|
54
|
+
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.');
|
|
55
|
+
this.moveProjectRootFile(karmaConfig);
|
|
44
56
|
}
|
|
45
57
|
}
|
|
46
58
|
if (this.projectConfig.targets.server) {
|
|
47
59
|
this.moveProjectRootFile(this.projectConfig.targets.server.options.tsConfig);
|
|
48
60
|
}
|
|
61
|
+
if (this.projectConfig.targets.lint) {
|
|
62
|
+
this.moveProjectRootFile((_a = this.projectConfig.targets.lint.options.eslintConfig) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(this.project.oldRoot, '.eslintrc.json'));
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
// there could still be a .eslintrc.json file in the root
|
|
66
|
+
// so move to new location
|
|
67
|
+
const eslintConfig = (0, devkit_1.joinPathFragments)(this.project.oldRoot, '.eslintrc.json');
|
|
68
|
+
if (this.tree.exists(eslintConfig)) {
|
|
69
|
+
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.');
|
|
70
|
+
this.moveProjectRootFile(eslintConfig);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
49
73
|
this.moveDir(this.project.oldSourceRoot, this.project.newSourceRoot);
|
|
50
74
|
}
|
|
51
75
|
updateProjectConfiguration() {
|
|
76
|
+
var _a;
|
|
52
77
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
53
78
|
this.projectConfig.root = this.project.newRoot;
|
|
54
79
|
this.projectConfig.sourceRoot = this.project.newSourceRoot;
|
|
@@ -73,10 +98,19 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
73
98
|
testOptions.scripts.map((script) => this.convertAsset(script));
|
|
74
99
|
}
|
|
75
100
|
if (this.projectConfig.targets.lint) {
|
|
76
|
-
this.projectConfig.targets.lint.
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
101
|
+
this.projectConfig.targets.lint.executor = '@nrwl/linter:eslint';
|
|
102
|
+
const lintOptions = this.projectConfig.targets.lint.options;
|
|
103
|
+
lintOptions.eslintConfig =
|
|
104
|
+
lintOptions.eslintConfig &&
|
|
105
|
+
(0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(lintOptions.eslintConfig));
|
|
106
|
+
lintOptions.lintFilePatterns =
|
|
107
|
+
lintOptions.lintFilePatterns &&
|
|
108
|
+
lintOptions.lintFilePatterns.map((pattern) => this.convertAsset(pattern));
|
|
109
|
+
const eslintConfigPath = (_a = lintOptions.eslintConfig) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(this.project.newRoot, '.eslintrc.json');
|
|
110
|
+
const eslintConfig = (0, devkit_1.readJson)(this.tree, eslintConfigPath);
|
|
111
|
+
if ((0, linter_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
|
|
112
|
+
lintOptions.hasTypeAwareRules = true;
|
|
113
|
+
}
|
|
80
114
|
}
|
|
81
115
|
if (this.projectConfig.targets.server) {
|
|
82
116
|
const serverOptions = this.projectConfig.targets.server.options;
|
|
@@ -118,13 +152,46 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
118
152
|
});
|
|
119
153
|
}
|
|
120
154
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
155
|
+
updateEsLintConfig() {
|
|
156
|
+
var _a, _b, _c;
|
|
157
|
+
const eslintConfigPath = (_c = (_b = (_a = this.projectConfig.targets.lint) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.eslintConfig) !== null && _c !== void 0 ? _c : (0, devkit_1.joinPathFragments)(this.project.newRoot, '.eslintrc.json');
|
|
158
|
+
if (!this.tree.exists(eslintConfigPath)) {
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
(0, devkit_1.updateJson)(this.tree, eslintConfigPath, (json) => {
|
|
162
|
+
var _a;
|
|
163
|
+
delete json.root;
|
|
164
|
+
json.ignorePatterns = ['!**/*'];
|
|
165
|
+
const rootEsLintConfigRelativePath = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(this.projectConfig.root), '.eslintrc.json');
|
|
166
|
+
if (Array.isArray(json.extends)) {
|
|
167
|
+
json.extends = json.extends.map((extend) => this.convertEsLintConfigExtendToNewPath(extend));
|
|
168
|
+
// it might have not been extending from the root config, make sure it does
|
|
169
|
+
if (!json.extends.includes(rootEsLintConfigRelativePath)) {
|
|
170
|
+
json.extends.push(rootEsLintConfigRelativePath);
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
else {
|
|
174
|
+
json.extends = rootEsLintConfigRelativePath;
|
|
175
|
+
}
|
|
176
|
+
(_a = json.overrides) === null || _a === void 0 ? void 0 : _a.forEach((override) => {
|
|
177
|
+
var _a;
|
|
178
|
+
if (!((_a = override.parserOptions) === null || _a === void 0 ? void 0 : _a.project)) {
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
181
|
+
override.parserOptions.project = [
|
|
182
|
+
`${this.projectConfig.root}/tsconfig.*?.json`,
|
|
183
|
+
];
|
|
126
184
|
});
|
|
185
|
+
return json;
|
|
186
|
+
});
|
|
187
|
+
}
|
|
188
|
+
convertEsLintConfigExtendToNewPath(pathToFile) {
|
|
189
|
+
if (!pathToFile.startsWith('..')) {
|
|
190
|
+
// we only need to adjust paths that are on a different directory,
|
|
191
|
+
// files in the same directory should be moved together
|
|
192
|
+
return pathToFile;
|
|
127
193
|
}
|
|
194
|
+
return (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(this.projectConfig.root), (0, path_1.basename)(pathToFile));
|
|
128
195
|
}
|
|
129
196
|
convertBuildOptions(buildOptions) {
|
|
130
197
|
buildOptions.outputPath =
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/app.migrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/app.migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,11 @@ import { MigrationProjectConfiguration, ValidationResult } from './types';
|
|
|
5
5
|
export declare class E2eProjectMigrator extends ProjectMigrator {
|
|
6
6
|
private appConfig;
|
|
7
7
|
private appName;
|
|
8
|
+
private isProjectUsingEsLint;
|
|
8
9
|
constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration);
|
|
9
10
|
migrate(): Promise<void>;
|
|
10
11
|
validate(): ValidationResult;
|
|
11
|
-
private
|
|
12
|
+
private initialize;
|
|
12
13
|
private migrateProtractorE2eProject;
|
|
13
14
|
private migrateCypressE2eProject;
|
|
14
15
|
private updateOrCreateCypressConfigFile;
|
|
@@ -16,4 +17,7 @@ export declare class E2eProjectMigrator extends ProjectMigrator {
|
|
|
16
17
|
private updateE2eCypressTarget;
|
|
17
18
|
private updateCypressConfigFilePaths;
|
|
18
19
|
private replaceCypressGlobConfig;
|
|
20
|
+
private getCypressConfigFile;
|
|
21
|
+
private isCypressE2eProject;
|
|
22
|
+
private isProtractorE2eProject;
|
|
19
23
|
}
|