@nrwl/angular 13.10.0-beta.9 → 13.10.0-rc.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/package.json +6 -6
- package/src/generators/add-linting/compat.d.ts +1 -1
- package/src/generators/application/application.compat.d.ts +1 -1
- package/src/generators/component/component.compat.d.ts +1 -1
- package/src/generators/component/component.js +1 -1
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/schema.d.ts +1 -0
- package/src/generators/component/schema.json +5 -0
- package/src/generators/component-cypress-spec/compat.d.ts +1 -1
- package/src/generators/component-story/compat.d.ts +1 -1
- package/src/generators/convert-to-with-mf/convert-to-with-mf.compat.d.ts +1 -1
- package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.d.ts +1 -1
- package/src/generators/downgrade-module/compat.d.ts +1 -1
- package/src/generators/init/init.compat.d.ts +1 -1
- package/src/generators/karma/compat.d.ts +1 -1
- package/src/generators/karma-project/compat.d.ts +1 -1
- package/src/generators/library/library.compat.d.ts +1 -1
- package/src/generators/library-secondary-entry-point/compat.d.ts +1 -1
- package/src/generators/mfe-host/mfe-host.compat.d.ts +1 -1
- package/src/generators/mfe-remote/mfe-remote.compat.d.ts +1 -1
- package/src/generators/move/move.d.ts +1 -1
- package/src/generators/ng-add/compat.d.ts +1 -1
- package/src/generators/ng-add/compat.js +1 -1
- package/src/generators/ng-add/compat.js.map +1 -1
- package/src/generators/ng-add/files/prettier/__dot__prettierignore +3 -0
- package/src/generators/ng-add/files/root/tools/{schematics → generators}/__dot__gitkeep +0 -0
- package/src/generators/ng-add/migrate-from-angular-cli.js +2 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/utilities/app.migrator.js +43 -36
- package/src/generators/ng-add/utilities/app.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/e2e-project.migrator.js +2 -2
- package/src/generators/ng-add/utilities/e2e-project.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/normalize-options.d.ts +2 -1
- package/src/generators/ng-add/utilities/normalize-options.js +15 -10
- package/src/generators/ng-add/utilities/normalize-options.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.js +23 -25
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/ngrx/compat.d.ts +1 -1
- package/src/generators/scam/scam.compat.d.ts +1 -1
- package/src/generators/scam-directive/scam-directive.compat.d.ts +1 -1
- package/src/generators/scam-pipe/scam-pipe.compat.d.ts +1 -1
- package/src/generators/setup-mfe/setup-mfe.compat.d.ts +1 -1
- package/src/generators/setup-tailwind/setup-tailwind.compat.d.ts +1 -1
- package/src/generators/stories/compat.d.ts +1 -1
- package/src/generators/storybook-configuration/compat.d.ts +1 -1
- package/src/generators/storybook-configuration/schema.d.ts +1 -0
- package/src/generators/storybook-configuration/schema.json +4 -0
- package/src/generators/storybook-migrate-defaults-5-to-6/compat.d.ts +1 -1
- package/src/generators/storybook-migrate-stories-to-6-2/compat.d.ts +1 -1
- package/src/generators/upgrade-module/compat.d.ts +1 -1
- package/src/generators/web-worker/compat.d.ts +1 -1
- package/src/utils/mfe/with-module-federation.js +1 -1
- package/src/utils/mfe/with-module-federation.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "13.10.0-
|
|
3
|
+
"version": "13.10.0-rc.2",
|
|
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": "13.10.0-
|
|
69
|
-
"@nrwl/devkit": "13.10.0-
|
|
70
|
-
"@nrwl/jest": "13.10.0-
|
|
71
|
-
"@nrwl/linter": "13.10.0-
|
|
72
|
-
"@nrwl/storybook": "13.10.0-
|
|
68
|
+
"@nrwl/cypress": "13.10.0-rc.2",
|
|
69
|
+
"@nrwl/devkit": "13.10.0-rc.2",
|
|
70
|
+
"@nrwl/jest": "13.10.0-rc.2",
|
|
71
|
+
"@nrwl/linter": "13.10.0-rc.2",
|
|
72
|
+
"@nrwl/storybook": "13.10.0-rc.2",
|
|
73
73
|
"@schematics/angular": "~13.3.0",
|
|
74
74
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
75
75
|
"ignore": "^5.0.4",
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").AddLintingGeneratorSchema) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const applicationSchematic: (
|
|
1
|
+
export declare const applicationSchematic: (generatorOptions: Partial<import("./schema").Schema>) => (tree: any, context: any) => Promise<any>;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").Schema) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -10,7 +10,7 @@ function componentGenerator(tree, schema) {
|
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
11
|
checkPathUnderProjectRoot(tree, schema);
|
|
12
12
|
const angularComponentSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
|
|
13
|
-
yield angularComponentSchematic(tree, Object.assign(
|
|
13
|
+
yield angularComponentSchematic(tree, Object.assign({}, schema));
|
|
14
14
|
exportComponent(tree, schema);
|
|
15
15
|
yield (0, devkit_2.formatFiles)(tree);
|
|
16
16
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AAAA,yCAAgF;AAEhF,8DAAwE;AACxE,yCAKsB;
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,6 +60,11 @@
|
|
|
60
60
|
"default": "Default",
|
|
61
61
|
"alias": "c"
|
|
62
62
|
},
|
|
63
|
+
"module": {
|
|
64
|
+
"type": "string",
|
|
65
|
+
"description": "The filename or path to the NgModule that will declare this component.",
|
|
66
|
+
"alias": "m"
|
|
67
|
+
},
|
|
63
68
|
"style": {
|
|
64
69
|
"description": "The file extension or preprocessor to use for style files, or `none` to skip generating the style file.",
|
|
65
70
|
"type": "string",
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").ComponentCypressSpecGeneratorOptions) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").ComponentStoryGeneratorOptions) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").Schema) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
|
2
2
|
import { ConvertTSLintToESLintSchema } from '@nrwl/linter';
|
|
3
3
|
export declare function conversionGenerator(host: Tree, options: ConvertTSLintToESLintSchema): Promise<() => Promise<void>>;
|
|
4
|
-
export declare const conversionSchematic: (
|
|
4
|
+
export declare const conversionSchematic: (generatorOptions: ConvertTSLintToESLintSchema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").DowngradeModuleGeneratorOptions) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const initSchematic: (
|
|
1
|
+
export declare const initSchematic: (generatorOptions: import("./schema").Schema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").GeneratorOptions) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").KarmaProjectOptions) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const librarySchematic: (
|
|
1
|
+
export declare const librarySchematic: (generatorOptions: Partial<import("./schema").Schema>) => (tree: any, context: any) => Promise<any>;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").GeneratorOptions) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").Schema) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").Schema) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -8,4 +8,4 @@ import { Schema } from './schema';
|
|
|
8
8
|
* to get the before and after names and paths.
|
|
9
9
|
*/
|
|
10
10
|
export declare function angularMoveGenerator(tree: Tree, schema: Schema): Promise<void>;
|
|
11
|
-
export declare const angularMoveSchematic: (
|
|
11
|
+
export declare const angularMoveSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").GeneratorOptions) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const devkit_1 = require("@nrwl/devkit");
|
|
4
4
|
const ng_add_1 = require("./ng-add");
|
|
5
|
-
exports.default = (0, devkit_1.convertNxGenerator)(ng_add_1.ngAddGenerator);
|
|
5
|
+
exports.default = (0, devkit_1.convertNxGenerator)(ng_add_1.ngAddGenerator, true);
|
|
6
6
|
//# sourceMappingURL=compat.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/compat.ts"],"names":[],"mappings":";;AAAA,yCAAkD;AAClD,qCAA0C;AAE1C,kBAAe,IAAA,2BAAkB,EAAC,uBAAc,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/compat.ts"],"names":[],"mappings":";;AAAA,yCAAkD;AAClD,qCAA0C;AAE1C,kBAAe,IAAA,2BAAkB,EAAC,uBAAc,EAAE,IAAI,CAAC,CAAC"}
|
|
File without changes
|
|
@@ -11,7 +11,7 @@ const workspace_1 = require("./utilities/workspace");
|
|
|
11
11
|
function migrateFromAngularCli(tree, rawOptions) {
|
|
12
12
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
13
|
const projects = (0, get_all_projects_1.getAllProjects)(tree);
|
|
14
|
-
const options = (0, normalize_options_1.normalizeOptions)(rawOptions, projects);
|
|
14
|
+
const options = (0, normalize_options_1.normalizeOptions)(tree, rawOptions, projects);
|
|
15
15
|
if (options.preserveAngularCliLayout) {
|
|
16
16
|
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
17
17
|
nx: versions_1.nxVersion,
|
|
@@ -29,6 +29,7 @@ function migrateFromAngularCli(tree, rawOptions) {
|
|
|
29
29
|
// TODO: validate all projects and collect errors before migrating when
|
|
30
30
|
// multiple projects are supported
|
|
31
31
|
// create and update root files and configurations
|
|
32
|
+
(0, devkit_1.updateJson)(tree, 'angular.json', (json) => (Object.assign(Object.assign({}, json), { version: 2, $schema: undefined })));
|
|
32
33
|
(0, workspace_1.createNxJson)(tree, options);
|
|
33
34
|
(0, workspace_1.updateWorkspaceConfigDefaults)(tree);
|
|
34
35
|
(0, workspace_1.updateRootTsConfig)(tree);
|
|
@@ -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,yCAMsB;AACtB,mDAAiD;AAEjD,2DAAuD;AACvD,mEAA8D;AAC9D,qEAAiE;AAEjE,qDAU+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,uEAAuE;YACvE,kCAAkC;YAElC,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,yCAAyC;YACzC,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;YACnB,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,uEAAuE;YACvE,yEAAyE;YACzE,0EAA0E;YAC1E,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;YAE5B,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;AA9DD,sDA8DC"}
|
|
@@ -3,6 +3,7 @@ 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 generators_1 = require("@nrwl/workspace/generators");
|
|
6
7
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
7
8
|
const e2e_project_migrator_1 = require("./e2e-project.migrator");
|
|
8
9
|
const project_migrator_1 = require("./project.migrator");
|
|
@@ -13,9 +14,9 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
13
14
|
}
|
|
14
15
|
migrate() {
|
|
15
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
-
this.e2eMigrator.migrate();
|
|
17
|
+
yield this.e2eMigrator.migrate();
|
|
17
18
|
this.moveProjectFiles();
|
|
18
|
-
this.updateProjectConfiguration();
|
|
19
|
+
yield this.updateProjectConfiguration();
|
|
19
20
|
this.updateTsConfigs();
|
|
20
21
|
// TODO: check later if it's still needed
|
|
21
22
|
this.updateProjectTsLint();
|
|
@@ -48,40 +49,46 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
48
49
|
this.moveDir(this.project.oldSourceRoot, this.project.newSourceRoot);
|
|
49
50
|
}
|
|
50
51
|
updateProjectConfiguration() {
|
|
51
|
-
this
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
testOptions.main
|
|
59
|
-
|
|
60
|
-
testOptions.polyfills
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
testOptions.assets
|
|
65
|
-
testOptions.assets
|
|
66
|
-
|
|
67
|
-
testOptions.styles
|
|
68
|
-
testOptions.styles
|
|
69
|
-
|
|
70
|
-
testOptions.scripts
|
|
71
|
-
testOptions.scripts
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
this.projectConfig.targets.lint
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
52
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
53
|
+
this.projectConfig.root = this.project.newRoot;
|
|
54
|
+
this.projectConfig.sourceRoot = this.project.newSourceRoot;
|
|
55
|
+
this.convertBuildOptions(this.projectConfig.targets.build.options);
|
|
56
|
+
Object.values(this.projectConfig.targets.build.configurations).forEach((config) => this.convertBuildOptions(config));
|
|
57
|
+
if (this.projectConfig.targets.test) {
|
|
58
|
+
const testOptions = this.projectConfig.targets.test.options;
|
|
59
|
+
testOptions.main =
|
|
60
|
+
testOptions.main && this.convertAsset(testOptions.main);
|
|
61
|
+
testOptions.polyfills =
|
|
62
|
+
testOptions.polyfills && this.convertAsset(testOptions.polyfills);
|
|
63
|
+
testOptions.tsConfig = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.spec.json');
|
|
64
|
+
testOptions.karmaConfig = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'karma.conf.js');
|
|
65
|
+
testOptions.assets =
|
|
66
|
+
testOptions.assets &&
|
|
67
|
+
testOptions.assets.map((asset) => this.convertAsset(asset));
|
|
68
|
+
testOptions.styles =
|
|
69
|
+
testOptions.styles &&
|
|
70
|
+
testOptions.styles.map((style) => this.convertAsset(style));
|
|
71
|
+
testOptions.scripts =
|
|
72
|
+
testOptions.scripts &&
|
|
73
|
+
testOptions.scripts.map((script) => this.convertAsset(script));
|
|
74
|
+
}
|
|
75
|
+
if (this.projectConfig.targets.lint) {
|
|
76
|
+
this.projectConfig.targets.lint.options.tsConfig = [
|
|
77
|
+
(0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.app.json'),
|
|
78
|
+
(0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.spec.json'),
|
|
79
|
+
];
|
|
80
|
+
}
|
|
81
|
+
if (this.projectConfig.targets.server) {
|
|
82
|
+
const serverOptions = this.projectConfig.targets.server.options;
|
|
83
|
+
this.convertServerOptions(serverOptions);
|
|
84
|
+
Object.values(this.projectConfig.targets.server.configurations).forEach((config) => this.convertServerOptions(config));
|
|
85
|
+
}
|
|
86
|
+
(0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
|
|
87
|
+
yield (0, generators_1.convertToNxProjectGenerator)(this.tree, {
|
|
88
|
+
project: this.project.name,
|
|
89
|
+
skipFormat: true,
|
|
90
|
+
});
|
|
91
|
+
});
|
|
85
92
|
}
|
|
86
93
|
updateTsConfigs() {
|
|
87
94
|
const tsConfigPath = (0, typescript_1.getRootTsConfigPathInTree)(this.tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/app.migrator.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,yEAAqF;AAErF,iEAA4D;AAC5D,yDAAqD;AAGrD,MAAa,WAAY,SAAQ,kCAAe;IAG9C,YACE,IAAU,EACV,OAAyB,EACzB,OAAsC;QAEtC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAEtC,IAAI,CAAC,WAAW,GAAG,IAAI,yCAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IAEK,OAAO;;YACX,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;
|
|
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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"}
|
|
@@ -71,7 +71,7 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
71
71
|
implicitDependencies: [this.appName],
|
|
72
72
|
tags: [],
|
|
73
73
|
};
|
|
74
|
-
(0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
|
|
74
|
+
(0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig), true);
|
|
75
75
|
// remove e2e target from the app config
|
|
76
76
|
delete this.appConfig.targets.e2e;
|
|
77
77
|
(0, devkit_1.updateProjectConfiguration)(this.tree, this.appName, Object.assign({}, this.appConfig));
|
|
@@ -124,7 +124,7 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
124
124
|
if (this.appConfig.targets['cypress-open']) {
|
|
125
125
|
this.projectConfig.targets['cypress-open'] = this.updateE2eCypressTarget(this.appConfig.targets['cypress-open'], cypressConfigPath);
|
|
126
126
|
}
|
|
127
|
-
(0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
|
|
127
|
+
(0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig), true);
|
|
128
128
|
delete this.appConfig.targets['cypress-run'];
|
|
129
129
|
delete this.appConfig.targets['cypress-open'];
|
|
130
130
|
delete this.appConfig.targets.e2e;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e-project.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/e2e-project.migrator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"e2e-project.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/e2e-project.migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Tree } from '@nrwl/devkit';
|
|
1
2
|
import { GeneratorOptions } from '../schema';
|
|
2
3
|
import { WorkspaceProjects } from './types';
|
|
3
|
-
export declare function normalizeOptions(options: GeneratorOptions, projects: WorkspaceProjects): GeneratorOptions;
|
|
4
|
+
export declare function normalizeOptions(tree: Tree, options: GeneratorOptions, projects: WorkspaceProjects): GeneratorOptions;
|
|
@@ -2,21 +2,26 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
function normalizeOptions(options, projects) {
|
|
5
|
+
function normalizeOptions(tree, options, projects) {
|
|
6
6
|
var _a;
|
|
7
|
-
// TODO: this restrictions will be removed, it's here temporarily to
|
|
8
|
-
// execute for both a full migration and a minimal one to maintain
|
|
9
|
-
// the current behavior
|
|
10
|
-
const hasLibraries = projects.libs.length > 0;
|
|
11
|
-
if (projects.apps.length > 2 || hasLibraries) {
|
|
12
|
-
throw new Error('Can only convert projects with one app');
|
|
13
|
-
}
|
|
14
7
|
let npmScope = (_a = options.npmScope) !== null && _a !== void 0 ? _a : options.name;
|
|
15
8
|
if (npmScope) {
|
|
16
9
|
npmScope = (0, devkit_1.names)(npmScope).fileName;
|
|
17
10
|
}
|
|
18
|
-
else {
|
|
19
|
-
|
|
11
|
+
else if (projects.libs.length > 0) {
|
|
12
|
+
// try get the scope from any library that have one
|
|
13
|
+
for (const lib of projects.libs) {
|
|
14
|
+
const { name } = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(lib.config.root, 'package.json'));
|
|
15
|
+
if (name.startsWith('@')) {
|
|
16
|
+
npmScope = name.split('/')[0].substring(1);
|
|
17
|
+
break;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
if (!npmScope) {
|
|
22
|
+
// use the name (scope if exists) in the root package.json
|
|
23
|
+
const { name } = (0, devkit_1.readJson)(tree, 'package.json');
|
|
24
|
+
npmScope = name.startsWith('@') ? name.split('/')[0].substring(1) : name;
|
|
20
25
|
}
|
|
21
26
|
return Object.assign(Object.assign({}, options), { npmScope });
|
|
22
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/normalize-options.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAwE;AAIxE,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAyB,EACzB,QAA2B;;IAE3B,IAAI,QAAQ,GAAG,MAAA,OAAO,CAAC,QAAQ,mCAAI,OAAO,CAAC,IAAI,CAAC;IAChD,IAAI,QAAQ,EAAE;QACZ,QAAQ,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;KACrC;SAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnC,mDAAmD;QACnD,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC/B,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iBAAQ,EACvB,IAAI,EACJ,IAAA,0BAAiB,EAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CACnD,CAAC;YACF,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACxB,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC3C,MAAM;aACP;SACF;KACF;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,0DAA0D;QAC1D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAChD,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAC1E;IAED,uCAAY,OAAO,KAAE,QAAQ,IAAG;AAClC,CAAC;AA7BD,4CA6BC"}
|
|
@@ -23,6 +23,11 @@ function validateWorkspace(tree, projects) {
|
|
|
23
23
|
if (!tree.exists('angular.json')) {
|
|
24
24
|
throw new Error('Cannot find angular.json');
|
|
25
25
|
}
|
|
26
|
+
// TODO: this restrictions will be removed when support for multiple
|
|
27
|
+
// projects is added
|
|
28
|
+
if (projects.apps.length > 2 || projects.libs.length > 0) {
|
|
29
|
+
throw new Error('Can only convert projects with one app');
|
|
30
|
+
}
|
|
26
31
|
const e2eKey = (0, e2e_utils_1.getE2eKey)(projects);
|
|
27
32
|
const e2eApp = (0, e2e_utils_1.getE2eProject)(projects);
|
|
28
33
|
if (!e2eApp) {
|
|
@@ -56,14 +61,7 @@ function validateWorkspace(tree, projects) {
|
|
|
56
61
|
exports.validateWorkspace = validateWorkspace;
|
|
57
62
|
function createNxJson(tree, options, setWorkspaceLayoutAsNewProjectRoot = false) {
|
|
58
63
|
var _a;
|
|
59
|
-
const {
|
|
60
|
-
// TODO: temporarily leaving this here because it's the old behavior for a
|
|
61
|
-
// minimal migration, will be removed in a later PR
|
|
62
|
-
const hasLibraries = Object.keys(projects).find((project) => projects[project].projectType &&
|
|
63
|
-
projects[project].projectType !== 'application');
|
|
64
|
-
if (Object.keys(projects).length !== 1 || hasLibraries) {
|
|
65
|
-
throw new Error(`The schematic can only be used with Angular CLI workspaces with a single application.`);
|
|
66
|
-
}
|
|
64
|
+
const { newProjectRoot = '' } = (0, devkit_1.readJson)(tree, 'angular.json');
|
|
67
65
|
(0, devkit_1.writeJson)(tree, 'nx.json', {
|
|
68
66
|
npmScope: options.npmScope,
|
|
69
67
|
affected: {
|
|
@@ -134,7 +132,14 @@ function updateWorkspaceConfigDefaults(tree) {
|
|
|
134
132
|
}
|
|
135
133
|
exports.updateWorkspaceConfigDefaults = updateWorkspaceConfigDefaults;
|
|
136
134
|
function updateRootTsConfig(tree) {
|
|
137
|
-
|
|
135
|
+
var _a, _b;
|
|
136
|
+
var _c;
|
|
137
|
+
const tsconfig = (0, devkit_1.readJson)(tree, (0, typescript_1.getRootTsConfigPathInTree)(tree));
|
|
138
|
+
(_a = (_c = tsconfig.compilerOptions).paths) !== null && _a !== void 0 ? _a : (_c.paths = {});
|
|
139
|
+
tsconfig.compilerOptions.baseUrl = '.';
|
|
140
|
+
tsconfig.compilerOptions.rootDir = '.';
|
|
141
|
+
tsconfig.exclude = Array.from(new Set([...((_b = tsconfig.exclude) !== null && _b !== void 0 ? _b : []), 'node_modules', 'tmp']));
|
|
142
|
+
(0, devkit_1.writeJson)(tree, 'tsconfig.base.json', tsconfig);
|
|
138
143
|
if (tree.exists('tsconfig.json')) {
|
|
139
144
|
tree.delete('tsconfig.json');
|
|
140
145
|
}
|
|
@@ -142,14 +147,15 @@ function updateRootTsConfig(tree) {
|
|
|
142
147
|
exports.updateRootTsConfig = updateRootTsConfig;
|
|
143
148
|
function updatePackageJson(tree) {
|
|
144
149
|
(0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
|
|
145
|
-
var _a, _b;
|
|
146
|
-
packageJson.scripts = packageJson.scripts
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
}
|
|
150
|
+
var _a, _b, _c;
|
|
151
|
+
packageJson.scripts = (_a = packageJson.scripts) !== null && _a !== void 0 ? _a : {};
|
|
152
|
+
Object.keys(packageJson.scripts).forEach((script) => {
|
|
153
|
+
packageJson.scripts[script] = packageJson.scripts[script]
|
|
154
|
+
.replace(/^ng /, 'nx ')
|
|
155
|
+
.replace(/ ng /, ' nx ');
|
|
156
|
+
});
|
|
157
|
+
packageJson.devDependencies = (_b = packageJson.devDependencies) !== null && _b !== void 0 ? _b : {};
|
|
158
|
+
packageJson.dependencies = (_c = packageJson.dependencies) !== null && _c !== void 0 ? _c : {};
|
|
153
159
|
if (!packageJson.devDependencies['@angular/cli']) {
|
|
154
160
|
packageJson.devDependencies['@angular/cli'] = versions_2.angularDevkitVersion;
|
|
155
161
|
}
|
|
@@ -247,12 +253,4 @@ function updatePrettierConfig(tree) {
|
|
|
247
253
|
}
|
|
248
254
|
});
|
|
249
255
|
}
|
|
250
|
-
function setUpCompilerOptions(tsconfig) {
|
|
251
|
-
if (!tsconfig.compilerOptions.paths) {
|
|
252
|
-
tsconfig.compilerOptions.paths = {};
|
|
253
|
-
}
|
|
254
|
-
tsconfig.compilerOptions.baseUrl = '.';
|
|
255
|
-
tsconfig.compilerOptions.rootDir = '.';
|
|
256
|
-
return tsconfig;
|
|
257
|
-
}
|
|
258
256
|
//# sourceMappingURL=workspace.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").NgRxGeneratorOptions) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").Schema) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").Schema) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").Schema) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").Schema) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").GeneratorOptions) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").StoriesGeneratorOptions) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").StorybookConfigurationOptions) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -41,6 +41,10 @@
|
|
|
41
41
|
"type": "string",
|
|
42
42
|
"enum": ["eslint", "none"],
|
|
43
43
|
"default": "eslint"
|
|
44
|
+
},
|
|
45
|
+
"projectBuildConfig": {
|
|
46
|
+
"description": "Provide a custom projectBuildConfig for the Angular executor. If left blank, Nx will use the default.",
|
|
47
|
+
"type": "string"
|
|
44
48
|
}
|
|
45
49
|
},
|
|
46
50
|
"additionalProperties": false,
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").StorybookMigrateDefault5to6Schema) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: any) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").UpgradeModuleGeneratorOptions) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").WebWorkerGeneratorOptions) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const mfe_webpack_1 = require("./mfe-webpack");
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
8
|
-
const file_utils_1 = require("nx/src/
|
|
8
|
+
const file_utils_1 = require("nx/src/project-graph/file-utils");
|
|
9
9
|
const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
|
|
10
10
|
function recursivelyResolveWorkspaceDependents(projectGraph, target, seenTargets = new Set()) {
|
|
11
11
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/with-module-federation.ts"],"names":[],"mappings":";;;;AAAA,+CAIuB;AACvB,yCAMsB;AACtB,yEAGkD;AAElD,
|
|
1
|
+
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/with-module-federation.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.10.0-
|
|
4
|
+
exports.nxVersion = '13.10.0-rc.2';
|
|
5
5
|
exports.angularVersion = '~13.3.0';
|
|
6
6
|
exports.angularDevkitVersion = '~13.3.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|