@nrwl/angular 14.2.0-beta.3 → 14.2.0-beta.4
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/esm2020/src/runtime/nx/data-persistence.mjs +3 -3
- package/esm2020/src/runtime/nx/nx.module.mjs +4 -4
- package/fesm2015/nrwl-angular.mjs +7 -7
- package/fesm2020/nrwl-angular.mjs +7 -7
- package/generators.json +1 -1
- package/migrations.json +24 -24
- package/package.json +10 -10
- package/src/generators/component/component.js +2 -35
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/lib/component.d.ts +3 -0
- package/src/generators/component/lib/component.js +44 -0
- package/src/generators/component/lib/component.js.map +1 -0
- package/src/generators/component/schema.json +1 -1
- package/src/generators/library/library.js +1 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/migrations/update-14-2-0/update-angular-cli.js +2 -2
- package/src/migrations/update-14-2-0/update-tsconfig-target.js +7 -1
- package/src/migrations/update-14-2-0/update-tsconfig-target.js.map +1 -1
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +2 -2
- package/src/generators/component/lib/index.d.ts +0 -3
- package/src/generators/component/lib/index.js +0 -7
- package/src/generators/component/lib/index.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
|
-
# [14.2.0-beta.
|
|
6
|
+
# [14.2.0-beta.4](https://github.com/nrwl/nx/compare/14.1.9...14.2.0-beta.4) (2022-06-02)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
|
@@ -294,9 +294,9 @@ export class DataPersistence {
|
|
|
294
294
|
return this.actions.pipe(withLatestFrom(this.store), navigation(component, opts));
|
|
295
295
|
}
|
|
296
296
|
}
|
|
297
|
-
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
298
|
-
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
299
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
297
|
+
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: DataPersistence, deps: [{ token: i1.Store }, { token: i2.Actions }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
298
|
+
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: DataPersistence });
|
|
299
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: DataPersistence, decorators: [{
|
|
300
300
|
type: Injectable
|
|
301
301
|
}], ctorParameters: function () { return [{ type: i1.Store }, { type: i2.Actions }]; } });
|
|
302
302
|
function findSnapshot(component, s) {
|
|
@@ -11,10 +11,10 @@ export class NxModule {
|
|
|
11
11
|
return { ngModule: NxModule, providers: [DataPersistence] };
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
|
-
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
15
|
-
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.0.0-rc.
|
|
16
|
-
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
17
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
14
|
+
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: NxModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
15
|
+
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.0.0-rc.3", ngImport: i0, type: NxModule });
|
|
16
|
+
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: NxModule });
|
|
17
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: NxModule, decorators: [{
|
|
18
18
|
type: NgModule,
|
|
19
19
|
args: [{}]
|
|
20
20
|
}] });
|
|
@@ -295,9 +295,9 @@ class DataPersistence {
|
|
|
295
295
|
return this.actions.pipe(withLatestFrom(this.store), navigation(component, opts));
|
|
296
296
|
}
|
|
297
297
|
}
|
|
298
|
-
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
299
|
-
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
300
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
298
|
+
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: DataPersistence, deps: [{ token: i1.Store }, { token: i2.Actions }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
299
|
+
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: DataPersistence });
|
|
300
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: DataPersistence, decorators: [{
|
|
301
301
|
type: Injectable
|
|
302
302
|
}], ctorParameters: function () { return [{ type: i1.Store }, { type: i2.Actions }]; } });
|
|
303
303
|
function findSnapshot(component, s) {
|
|
@@ -334,10 +334,10 @@ class NxModule {
|
|
|
334
334
|
return { ngModule: NxModule, providers: [DataPersistence] };
|
|
335
335
|
}
|
|
336
336
|
}
|
|
337
|
-
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
338
|
-
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.0.0-rc.
|
|
339
|
-
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
340
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
337
|
+
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: NxModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
338
|
+
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.0.0-rc.3", ngImport: i0, type: NxModule });
|
|
339
|
+
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: NxModule });
|
|
340
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: NxModule, decorators: [{
|
|
341
341
|
type: NgModule,
|
|
342
342
|
args: [{}]
|
|
343
343
|
}] });
|
|
@@ -295,9 +295,9 @@ class DataPersistence {
|
|
|
295
295
|
return this.actions.pipe(withLatestFrom(this.store), navigation(component, opts));
|
|
296
296
|
}
|
|
297
297
|
}
|
|
298
|
-
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
299
|
-
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
300
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
298
|
+
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: DataPersistence, deps: [{ token: i1.Store }, { token: i2.Actions }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
299
|
+
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: DataPersistence });
|
|
300
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: DataPersistence, decorators: [{
|
|
301
301
|
type: Injectable
|
|
302
302
|
}], ctorParameters: function () { return [{ type: i1.Store }, { type: i2.Actions }]; } });
|
|
303
303
|
function findSnapshot(component, s) {
|
|
@@ -334,10 +334,10 @@ class NxModule {
|
|
|
334
334
|
return { ngModule: NxModule, providers: [DataPersistence] };
|
|
335
335
|
}
|
|
336
336
|
}
|
|
337
|
-
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
338
|
-
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.0.0-rc.
|
|
339
|
-
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
340
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.
|
|
337
|
+
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: NxModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
338
|
+
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.0.0-rc.3", ngImport: i0, type: NxModule });
|
|
339
|
+
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: NxModule });
|
|
340
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.3", ngImport: i0, type: NxModule, decorators: [{
|
|
341
341
|
type: NgModule,
|
|
342
342
|
args: [{}]
|
|
343
343
|
}] });
|
package/generators.json
CHANGED
|
@@ -127,7 +127,7 @@
|
|
|
127
127
|
"description": "Generate a Module Federation configuration for a given Angular application."
|
|
128
128
|
},
|
|
129
129
|
"setup-tailwind": {
|
|
130
|
-
"factory": "./src/generators/setup-tailwind/compat",
|
|
130
|
+
"factory": "./src/generators/setup-tailwind/setup-tailwind.compat",
|
|
131
131
|
"schema": "./src/generators/setup-tailwind/schema.json",
|
|
132
132
|
"description": "Configures Tailwind CSS for an application or a buildable/publishable library."
|
|
133
133
|
},
|
package/migrations.json
CHANGED
|
@@ -1119,95 +1119,95 @@
|
|
|
1119
1119
|
}
|
|
1120
1120
|
}
|
|
1121
1121
|
},
|
|
1122
|
-
"14.2.0-beta.
|
|
1123
|
-
"version": "14.2.0-beta.
|
|
1122
|
+
"14.2.0-beta.4": {
|
|
1123
|
+
"version": "14.2.0-beta.4",
|
|
1124
1124
|
"packages": {
|
|
1125
1125
|
"@angular-devkit/architect": {
|
|
1126
|
-
"version": "~0.1400.0-rc.
|
|
1126
|
+
"version": "~0.1400.0-rc.3",
|
|
1127
1127
|
"alwaysAddToPackageJson": false
|
|
1128
1128
|
},
|
|
1129
1129
|
"@angular-devkit/build-angular": {
|
|
1130
|
-
"version": "~14.0.0-rc.
|
|
1130
|
+
"version": "~14.0.0-rc.3",
|
|
1131
1131
|
"alwaysAddToPackageJson": false
|
|
1132
1132
|
},
|
|
1133
1133
|
"@angular-devkit/build-webpack": {
|
|
1134
|
-
"version": "~0.1400.0-rc.
|
|
1134
|
+
"version": "~0.1400.0-rc.3",
|
|
1135
1135
|
"alwaysAddToPackageJson": false
|
|
1136
1136
|
},
|
|
1137
1137
|
"@angular-devkit/core": {
|
|
1138
|
-
"version": "~14.0.0-rc.
|
|
1138
|
+
"version": "~14.0.0-rc.3",
|
|
1139
1139
|
"alwaysAddToPackageJson": false
|
|
1140
1140
|
},
|
|
1141
1141
|
"@angular-devkit/schematics": {
|
|
1142
|
-
"version": "~14.0.0-rc.
|
|
1142
|
+
"version": "~14.0.0-rc.3",
|
|
1143
1143
|
"alwaysAddToPackageJson": false
|
|
1144
1144
|
},
|
|
1145
1145
|
"@angular/core": {
|
|
1146
|
-
"version": "~14.0.0-rc.
|
|
1146
|
+
"version": "~14.0.0-rc.3",
|
|
1147
1147
|
"alwaysAddToPackageJson": true
|
|
1148
1148
|
},
|
|
1149
1149
|
"@angular/common": {
|
|
1150
|
-
"version": "~14.0.0-rc.
|
|
1150
|
+
"version": "~14.0.0-rc.3",
|
|
1151
1151
|
"alwaysAddToPackageJson": false
|
|
1152
1152
|
},
|
|
1153
1153
|
"@angular/forms": {
|
|
1154
|
-
"version": "~14.0.0-rc.
|
|
1154
|
+
"version": "~14.0.0-rc.3",
|
|
1155
1155
|
"alwaysAddToPackageJson": false
|
|
1156
1156
|
},
|
|
1157
1157
|
"@angular/elements": {
|
|
1158
|
-
"version": "~14.0.0-rc.
|
|
1158
|
+
"version": "~14.0.0-rc.3",
|
|
1159
1159
|
"alwaysAddToPackageJson": false
|
|
1160
1160
|
},
|
|
1161
1161
|
"@angular/compiler": {
|
|
1162
|
-
"version": "~14.0.0-rc.
|
|
1162
|
+
"version": "~14.0.0-rc.3",
|
|
1163
1163
|
"alwaysAddToPackageJson": false
|
|
1164
1164
|
},
|
|
1165
1165
|
"@angular/compiler-cli": {
|
|
1166
|
-
"version": "~14.0.0-rc.
|
|
1166
|
+
"version": "~14.0.0-rc.3",
|
|
1167
1167
|
"alwaysAddToPackageJson": false
|
|
1168
1168
|
},
|
|
1169
1169
|
"@angular/localize": {
|
|
1170
|
-
"version": "~14.0.0-rc.
|
|
1170
|
+
"version": "~14.0.0-rc.3",
|
|
1171
1171
|
"alwaysAddToPackageJson": false
|
|
1172
1172
|
},
|
|
1173
1173
|
"@angular/platform-browser": {
|
|
1174
|
-
"version": "~14.0.0-rc.
|
|
1174
|
+
"version": "~14.0.0-rc.3",
|
|
1175
1175
|
"alwaysAddToPackageJson": false
|
|
1176
1176
|
},
|
|
1177
1177
|
"@angular/platform-browser-dynamic": {
|
|
1178
|
-
"version": "~14.0.0-rc.
|
|
1178
|
+
"version": "~14.0.0-rc.3",
|
|
1179
1179
|
"alwaysAddToPackageJson": false
|
|
1180
1180
|
},
|
|
1181
1181
|
"@angular/platform-server": {
|
|
1182
|
-
"version": "~14.0.0-rc.
|
|
1182
|
+
"version": "~14.0.0-rc.3",
|
|
1183
1183
|
"alwaysAddToPackageJson": false
|
|
1184
1184
|
},
|
|
1185
1185
|
"@angular/router": {
|
|
1186
|
-
"version": "~14.0.0-rc.
|
|
1186
|
+
"version": "~14.0.0-rc.3",
|
|
1187
1187
|
"alwaysAddToPackageJson": false
|
|
1188
1188
|
},
|
|
1189
1189
|
"@angular/upgrade": {
|
|
1190
|
-
"version": "~14.0.0-rc.
|
|
1190
|
+
"version": "~14.0.0-rc.3",
|
|
1191
1191
|
"alwaysAddToPackageJson": false
|
|
1192
1192
|
},
|
|
1193
1193
|
"@angular/language-service": {
|
|
1194
|
-
"version": "~14.0.0-rc.
|
|
1194
|
+
"version": "~14.0.0-rc.3",
|
|
1195
1195
|
"alwaysAddToPackageJson": false
|
|
1196
1196
|
},
|
|
1197
1197
|
"@angular/animations": {
|
|
1198
|
-
"version": "~14.0.0-rc.
|
|
1198
|
+
"version": "~14.0.0-rc.3",
|
|
1199
1199
|
"alwaysAddToPackageJson": false
|
|
1200
1200
|
},
|
|
1201
1201
|
"@angular/service-worker": {
|
|
1202
|
-
"version": "~14.0.0-rc.
|
|
1202
|
+
"version": "~14.0.0-rc.3",
|
|
1203
1203
|
"alwaysAddToPackageJson": false
|
|
1204
1204
|
},
|
|
1205
1205
|
"@angular/material": {
|
|
1206
|
-
"version": "~14.0.0-rc.
|
|
1206
|
+
"version": "~14.0.0-rc.2",
|
|
1207
1207
|
"alwaysAddToPackageJson": false
|
|
1208
1208
|
},
|
|
1209
1209
|
"@angular/cdk": {
|
|
1210
|
-
"version": "~14.0.0-rc.
|
|
1210
|
+
"version": "~14.0.0-rc.2",
|
|
1211
1211
|
"alwaysAddToPackageJson": false
|
|
1212
1212
|
},
|
|
1213
1213
|
"ng-packagr": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "14.2.0-beta.
|
|
3
|
+
"version": "14.2.0-beta.4",
|
|
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",
|
|
@@ -64,15 +64,15 @@
|
|
|
64
64
|
"migrations": "./migrations.json"
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@angular-devkit/schematics": "~14.0.0-rc.
|
|
68
|
-
"@nrwl/cypress": "14.2.0-beta.
|
|
69
|
-
"@nrwl/devkit": "14.2.0-beta.
|
|
70
|
-
"@nrwl/jest": "14.2.0-beta.
|
|
71
|
-
"@nrwl/linter": "14.2.0-beta.
|
|
72
|
-
"@nrwl/storybook": "14.2.0-beta.
|
|
73
|
-
"@nrwl/workspace": "14.2.0-beta.
|
|
67
|
+
"@angular-devkit/schematics": "~14.0.0-rc.3",
|
|
68
|
+
"@nrwl/cypress": "14.2.0-beta.4",
|
|
69
|
+
"@nrwl/devkit": "14.2.0-beta.4",
|
|
70
|
+
"@nrwl/jest": "14.2.0-beta.4",
|
|
71
|
+
"@nrwl/linter": "14.2.0-beta.4",
|
|
72
|
+
"@nrwl/storybook": "14.2.0-beta.4",
|
|
73
|
+
"@nrwl/workspace": "14.2.0-beta.4",
|
|
74
74
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
75
|
-
"@schematics/angular": "~14.0.0-rc.
|
|
75
|
+
"@schematics/angular": "~14.0.0-rc.3",
|
|
76
76
|
"chalk": "4.1.0",
|
|
77
77
|
"chokidar": "^3.5.1",
|
|
78
78
|
"http-server": "^14.1.0",
|
|
@@ -93,5 +93,5 @@
|
|
|
93
93
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
94
94
|
"typings": "index.d.ts",
|
|
95
95
|
"sideEffects": false,
|
|
96
|
-
"gitHead": "
|
|
96
|
+
"gitHead": "1794cacf2e087d9f3bad4947105d4c689e7ebd61"
|
|
97
97
|
}
|
|
@@ -5,13 +5,13 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
7
7
|
const path_1 = require("../utils/path");
|
|
8
|
-
const
|
|
8
|
+
const component_1 = require("./lib/component");
|
|
9
9
|
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
13
|
yield angularComponentSchematic(tree, Object.assign({}, schema));
|
|
14
|
-
exportComponentInEntryPoint(tree, schema);
|
|
14
|
+
(0, component_1.exportComponentInEntryPoint)(tree, schema);
|
|
15
15
|
yield (0, devkit_1.formatFiles)(tree);
|
|
16
16
|
});
|
|
17
17
|
}
|
|
@@ -32,38 +32,5 @@ function checkPathUnderProjectRoot(tree, schema) {
|
|
|
32
32
|
`Please make sure to provide a path that exists under the project root.`);
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
|
-
function exportComponentInEntryPoint(tree, schema) {
|
|
36
|
-
var _a, _b;
|
|
37
|
-
if (!schema.export || schema.skipImport) {
|
|
38
|
-
return;
|
|
39
|
-
}
|
|
40
|
-
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
41
|
-
const { root, sourceRoot, projectType } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
42
|
-
if (projectType === 'application') {
|
|
43
|
-
return;
|
|
44
|
-
}
|
|
45
|
-
const componentNames = (0, devkit_1.names)(schema.name);
|
|
46
|
-
const componentFileName = `${componentNames.fileName}.${schema.type ? (0, devkit_1.names)(schema.type).fileName : 'component'}`;
|
|
47
|
-
const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
|
|
48
|
-
(_b = schema.path) !== null && _b !== void 0 ? _b : (schema.path = (0, devkit_1.joinPathFragments)(projectSourceRoot, 'lib'));
|
|
49
|
-
const componentDirectory = schema.flat
|
|
50
|
-
? (0, devkit_1.normalizePath)(schema.path)
|
|
51
|
-
: (0, devkit_1.joinPathFragments)(schema.path, componentNames.fileName);
|
|
52
|
-
const componentFilePath = (0, devkit_1.joinPathFragments)(componentDirectory, `${componentFileName}.ts`);
|
|
53
|
-
const entryPointPath = (0, lib_1.locateLibraryEntryPointFromDirectory)(tree, componentDirectory, root, projectSourceRoot);
|
|
54
|
-
if (!entryPointPath) {
|
|
55
|
-
devkit_1.logger.warn(`Unable to determine whether the component should be exported in the library entry point file. ` +
|
|
56
|
-
`The library's entry point file could not be found. Skipping exporting the component in the entry point file.`);
|
|
57
|
-
return;
|
|
58
|
-
}
|
|
59
|
-
const modulePath = (0, lib_1.findModuleFromOptions)(tree, schema, root);
|
|
60
|
-
if (!(0, lib_1.shouldExportInEntryPoint)(tree, entryPointPath, modulePath)) {
|
|
61
|
-
return;
|
|
62
|
-
}
|
|
63
|
-
const relativePathFromEntryPoint = (0, lib_1.getRelativeImportToFile)(entryPointPath, componentFilePath);
|
|
64
|
-
const updateEntryPointContent = (0, devkit_1.stripIndents) `${tree.read(entryPointPath, 'utf-8')}
|
|
65
|
-
export * from "${relativePathFromEntryPoint}";`;
|
|
66
|
-
tree.write(entryPointPath, updateEntryPointContent);
|
|
67
|
-
}
|
|
68
35
|
exports.default = componentGenerator;
|
|
69
36
|
//# sourceMappingURL=component.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,8DAAwE;AACxE,wCAA+C;AAC/C,+CAA8D;AAG9D,SAAsB,kBAAkB,CAAC,IAAU,EAAE,MAAc;;QACjE,yBAAyB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAExC,MAAM,yBAAyB,GAAG,IAAA,0CAA0B,EAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,oBAAO,MAAM,EAAG,CAAC;QAErD,IAAA,uCAA2B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE1C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAZD,gDAYC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,MAAc;;IAC3D,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;QAChB,OAAO;KACR;IAED,MAAM,OAAO,GACX,MAAA,MAAM,CAAC,OAAO,mCAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACpE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,wCAAwC,MAAM,CAAC,IAAI,4CAA4C,IAAI,KAAK;YACtG,wEAAwE,CAC3E,CAAC;KACH;AACH,CAAC;AAED,kBAAe,kBAAkB,CAAC"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.exportComponentInEntryPoint = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const entry_point_1 = require("./entry-point");
|
|
6
|
+
const module_1 = require("./module");
|
|
7
|
+
const path_1 = require("./path");
|
|
8
|
+
function exportComponentInEntryPoint(tree, schema) {
|
|
9
|
+
var _a, _b;
|
|
10
|
+
if (!schema.export || (schema.skipImport && !schema.standalone)) {
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
14
|
+
const { root, sourceRoot, projectType } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
15
|
+
if (projectType === 'application') {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
const componentNames = (0, devkit_1.names)(schema.name);
|
|
19
|
+
const componentFileName = `${componentNames.fileName}.${schema.type ? (0, devkit_1.names)(schema.type).fileName : 'component'}`;
|
|
20
|
+
const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
|
|
21
|
+
(_b = schema.path) !== null && _b !== void 0 ? _b : (schema.path = (0, devkit_1.joinPathFragments)(projectSourceRoot, 'lib'));
|
|
22
|
+
const componentDirectory = schema.flat
|
|
23
|
+
? (0, devkit_1.normalizePath)(schema.path)
|
|
24
|
+
: (0, devkit_1.joinPathFragments)(schema.path, componentNames.fileName);
|
|
25
|
+
const componentFilePath = (0, devkit_1.joinPathFragments)(componentDirectory, `${componentFileName}.ts`);
|
|
26
|
+
const entryPointPath = (0, entry_point_1.locateLibraryEntryPointFromDirectory)(tree, componentDirectory, root, projectSourceRoot);
|
|
27
|
+
if (!entryPointPath) {
|
|
28
|
+
devkit_1.logger.warn(`Unable to determine whether the component should be exported in the library entry point file. ` +
|
|
29
|
+
`The library's entry point file could not be found. Skipping exporting the component in the entry point file.`);
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
if (!schema.standalone) {
|
|
33
|
+
const modulePath = (0, module_1.findModuleFromOptions)(tree, schema, root);
|
|
34
|
+
if (!(0, entry_point_1.shouldExportInEntryPoint)(tree, entryPointPath, modulePath)) {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
const relativePathFromEntryPoint = (0, path_1.getRelativeImportToFile)(entryPointPath, componentFilePath);
|
|
39
|
+
const updateEntryPointContent = (0, devkit_1.stripIndents) `${tree.read(entryPointPath, 'utf-8')}
|
|
40
|
+
export * from "${relativePathFromEntryPoint}";`;
|
|
41
|
+
tree.write(entryPointPath, updateEntryPointContent);
|
|
42
|
+
}
|
|
43
|
+
exports.exportComponentInEntryPoint = exportComponentInEntryPoint;
|
|
44
|
+
//# sourceMappingURL=component.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/component.ts"],"names":[],"mappings":";;;AACA,yCAQsB;AAEtB,+CAGuB;AACvB,qCAAiD;AACjD,iCAAiD;AAEjD,SAAgB,2BAA2B,CAAC,IAAU,EAAE,MAAc;;IACpE,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAC/D,OAAO;KACR;IAED,MAAM,OAAO,GACX,MAAA,MAAM,CAAC,OAAO,mCAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IAEpE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,CAAC;IAEF,IAAI,WAAW,KAAK,aAAa,EAAE;QACjC,OAAO;KACR;IAED,MAAM,cAAc,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE1C,MAAM,iBAAiB,GAAG,GAAG,cAAc,CAAC,QAAQ,IAClD,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAC9C,EAAE,CAAC;IAEH,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,MAAA,MAAM,CAAC,IAAI,oCAAX,MAAM,CAAC,IAAI,GAAK,IAAA,0BAAiB,EAAC,iBAAiB,EAAE,KAAK,CAAC,EAAC;IAC5D,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI;QACpC,CAAC,CAAC,IAAA,sBAAa,EAAC,MAAM,CAAC,IAAI,CAAC;QAC5B,CAAC,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IAE5D,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,kBAAkB,EAClB,GAAG,iBAAiB,KAAK,CAC1B,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,kDAAoC,EACzD,IAAI,EACJ,kBAAkB,EAClB,IAAI,EACJ,iBAAiB,CAClB,CAAC;IACF,IAAI,CAAC,cAAc,EAAE;QACnB,eAAM,CAAC,IAAI,CACT,gGAAgG;YAC9F,8GAA8G,CACjH,CAAC;QAEF,OAAO;KACR;IAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,MAAM,UAAU,GAAG,IAAA,8BAAqB,EAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,IAAA,sCAAwB,EAAC,IAAI,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE;YAC/D,OAAO;SACR;KACF;IAED,MAAM,0BAA0B,GAAG,IAAA,8BAAuB,EACxD,cAAc,EACd,iBAAiB,CAClB,CAAC;IACF,MAAM,uBAAuB,GAAG,IAAA,qBAAY,EAAA,GAAG,IAAI,CAAC,IAAI,CACtD,cAAc,EACd,OAAO,CACR;qBACkB,0BAA0B,IAAI,CAAC;IAElD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAC;AACtD,CAAC;AAnED,kEAmEC"}
|
|
@@ -108,7 +108,7 @@
|
|
|
108
108
|
},
|
|
109
109
|
"export": {
|
|
110
110
|
"type": "boolean",
|
|
111
|
-
"description": "Specifies if the component should be exported in the declaring `NgModule`. Additionally, if the project is a library, the component will be exported from the project's entry point (normally `index.ts`) if the module it belongs to is also exported.",
|
|
111
|
+
"description": "Specifies if the component should be exported in the declaring `NgModule`. Additionally, if the project is a library, the component will be exported from the project's entry point (normally `index.ts`) if the module it belongs to is also exported or if the component is standalone.",
|
|
112
112
|
"default": false
|
|
113
113
|
}
|
|
114
114
|
},
|
|
@@ -32,7 +32,7 @@ function libraryGenerator(host, schema) {
|
|
|
32
32
|
throw new Error(`To use "--addTailwind" option, you have to set either "--buildable" or "--publishable".`);
|
|
33
33
|
}
|
|
34
34
|
const options = (0, normalize_options_1.normalizeOptions)(host, schema);
|
|
35
|
-
yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
|
|
35
|
+
yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true, e2eTestRunner: "none" /* None */ }));
|
|
36
36
|
const runAngularLibrarySchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'library');
|
|
37
37
|
yield runAngularLibrarySchematic(host, {
|
|
38
38
|
name: options.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,8DAAwE;AACxE,qCAAkD;AAClD,yCAAsC;AACtC,2DAAyE;AACzE,qDAA8C;
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,8DAAwE;AACxE,qCAAkD;AAClD,yCAAsC;AACtC,2DAAyE;AACzE,qDAA8C;AAE9C,mDAAwD;AACxD,4DAA6D;AAC7D,kEAAmE;AACnE,qEAAsE;AACtE,wDAAiF;AACjF,iDAA6C;AAC7C,mFAG2C;AAC3C,+DAA2D;AAE3D,qFAA8E;AAC9E,yDAAqD;AACrD,2DAAuD;AAGvD,SAAsB,gBAAgB,CAAC,IAAU,EAAE,MAAuB;;QACxE,4BAA4B;QAC5B,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;SAC1E;QAED,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACrD,MAAM,IAAI,KAAK,CACb,oJAAoJ,CACrJ,CAAC;SACH;QAED,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YAClE,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,IAAA,cAAI,EAAC,IAAI,kCACV,OAAO,KACV,UAAU,EAAE,IAAI,EAChB,aAAa,uBACb,CAAC;QAEH,MAAM,0BAA0B,GAAG,IAAA,0CAA0B,EAC3D,qBAAqB,EACrB,SAAS,CACV,CAAC;QACF,MAAM,0BAA0B,CAAC,IAAI,EAAE;YACrC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,OAAO;YAClB,eAAe,EACb,OAAO,CAAC,eAAe,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;YACxE,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,qBAAqB,KAAK,OAAO,CAAC,WAAW,EAAE;YACzD,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,qBAAqB,EAC7B,OAAO,CAAC,WAAW,CACpB,CAAC;SACH;QACD,MAAM,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnC,IAAA,gCAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvC,sCAAsC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,IAAA,sBAAS,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,MAAM,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAI,OAAO,CAAC,WAAW,EAAE;YACvB,MAAM,IAAA,wBAAsB,EAAC,IAAI,EAAE;gBACjC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;YAC5C,IAAA,0CAAiC,EAAC,IAAI,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;YAC5D,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,YAAY,EAAE,2BAAgB;aAC/B,CACF,CAAC;YACF,IAAA,uDAAwC,EAAC,IAAI,CAAC,CAAC;SAChD;QAED,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC5B,MAAM,IAAA,wCAA2B,EAAC,IAAI,EAAE;gBACtC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,GAAG,EAAE,KAAK;gBACV,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AAxFD,4CAwFC;AAED,SAAe,iBAAiB,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,KAAK;gBACjB,eAAe,EAAE,KAAK;gBACtB,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,cAAc,KAAK,OAAO,EAAE;YAC7C,MAAM,IAAA,uBAAqB,EAAC,IAAI,EAAE;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAED,SAAS,sCAAsC,CAC7C,IAAU,EACV,OAAyB;IAEzB,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,IAAA,uDAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACzC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,IAAU,EAAE,OAAyB;IAC1D,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,IAAA,sDAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACzC;SAAM;QACL,IAAA,qDAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;KAC/C;AACH,CAAC;AAED,SAAe,UAAU,CAAC,IAAU,EAAE,OAAyB;;QAC7D,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,IAAI,EAAE;YAClC,OAAO;SACR;QACD,MAAM,IAAA,qBAAmB,EAAC,IAAI,EAAE;YAC9B,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAED,kBAAe,gBAAgB,CAAC"}
|
|
@@ -8,11 +8,11 @@ function default_1(tree) {
|
|
|
8
8
|
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
9
9
|
var _a, _b;
|
|
10
10
|
if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) {
|
|
11
|
-
json.devDependencies['@angular/cli'] = '~14.0.0-rc.
|
|
11
|
+
json.devDependencies['@angular/cli'] = '~14.0.0-rc.3';
|
|
12
12
|
shouldFormat = true;
|
|
13
13
|
}
|
|
14
14
|
else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
|
|
15
|
-
json.dependencies['@angular/cli'] = '~14.0.0-rc.
|
|
15
|
+
json.dependencies['@angular/cli'] = '~14.0.0-rc.3';
|
|
16
16
|
shouldFormat = true;
|
|
17
17
|
}
|
|
18
18
|
return json;
|
|
@@ -29,6 +29,9 @@ function default_1(tree) {
|
|
|
29
29
|
json.compilerOptions.target = 'es2020';
|
|
30
30
|
}
|
|
31
31
|
return json;
|
|
32
|
+
}, {
|
|
33
|
+
allowTrailingComma: true,
|
|
34
|
+
disallowComments: false,
|
|
32
35
|
});
|
|
33
36
|
}
|
|
34
37
|
yield (0, devkit_2.formatFiles)(tree);
|
|
@@ -52,7 +55,10 @@ function collectTsConfigPaths(tree) {
|
|
|
52
55
|
const targetTsConfigPaths = getProjectTsConfigPaths(tree, project, projectName, false);
|
|
53
56
|
targetTsConfigPaths.forEach((tsConfigPath) => {
|
|
54
57
|
var _a;
|
|
55
|
-
const tsConfig = (0, devkit_1.readJson)(tree, tsConfigPath
|
|
58
|
+
const tsConfig = (0, devkit_1.readJson)(tree, tsConfigPath, {
|
|
59
|
+
allowTrailingComma: true,
|
|
60
|
+
disallowComments: false,
|
|
61
|
+
});
|
|
56
62
|
if ((_a = tsConfig.compilerOptions) === null || _a === void 0 ? void 0 : _a.target) {
|
|
57
63
|
uniqueTsConfigs.add(tsConfigPath);
|
|
58
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-tsconfig-target.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-2-0/update-tsconfig-target.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,yCAOsB;AACtB,uDAAoD;AACpD,+BAA+B;AAG/B,MAAM,YAAY,GAAG,iBAAiB,CAAC;AACvC,MAAM,SAAS,GAAG;IAChB,uCAAuC;IACvC,qCAAqC;IACrC,0CAA0C;IAC1C,+BAA+B;IAC/B,8BAA8B;IAC9B,+BAA+B;IAC/B,uBAAuB;CACxB,CAAC;AACF,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAE7D,mBAA+B,IAAU;;QACvC,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAEvD,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;YACxC,IAAA,mBAAU,
|
|
1
|
+
{"version":3,"file":"update-tsconfig-target.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-2-0/update-tsconfig-target.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export declare const nxVersion: any;
|
|
2
|
-
export declare const angularVersion = "~14.0.0-rc.
|
|
3
|
-
export declare const angularDevkitVersion = "~14.0.0-rc.
|
|
2
|
+
export declare const angularVersion = "~14.0.0-rc.3";
|
|
3
|
+
export declare const angularDevkitVersion = "~14.0.0-rc.3";
|
|
4
4
|
export declare const ngPackagrVersion = "~14.0.0-rc.0";
|
|
5
5
|
export declare const angularJsVersion = "1.7.9";
|
|
6
6
|
export declare const ngrxVersion = "~13.2.0";
|
package/src/utils/versions.js
CHANGED
|
@@ -2,8 +2,8 @@
|
|
|
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.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
4
|
exports.nxVersion = require('../../package.json').version;
|
|
5
|
-
exports.angularVersion = '~14.0.0-rc.
|
|
6
|
-
exports.angularDevkitVersion = '~14.0.0-rc.
|
|
5
|
+
exports.angularVersion = '~14.0.0-rc.3';
|
|
6
|
+
exports.angularDevkitVersion = '~14.0.0-rc.3';
|
|
7
7
|
exports.ngPackagrVersion = '~14.0.0-rc.0';
|
|
8
8
|
exports.angularJsVersion = '1.7.9';
|
|
9
9
|
exports.ngrxVersion = '~13.2.0';
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./entry-point"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./module"), exports);
|
|
6
|
-
tslib_1.__exportStar(require("./path"), exports);
|
|
7
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/index.ts"],"names":[],"mappings":";;;AAAA,wDAA8B;AAC9B,mDAAyB;AACzB,iDAAuB"}
|