@nrwl/angular 13.4.0-beta.1 → 13.4.1-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/esm2020/src/runtime/nx/data-persistence.mjs +3 -3
- package/esm2020/src/runtime/nx/nx.module.mjs +4 -4
- package/fesm2015/nrwl-angular-testing.mjs +1 -0
- package/fesm2015/nrwl-angular.mjs +8 -7
- package/fesm2020/nrwl-angular-testing.mjs +1 -0
- package/fesm2020/nrwl-angular.mjs +8 -7
- package/generators.d.ts +1 -0
- package/generators.js +1 -0
- package/generators.js.map +1 -1
- package/generators.json +35 -27
- package/migrations.json +93 -0
- package/ng-package.json +2 -1
- package/package.json +9 -8
- package/src/builders/webpack-browser/webpack-browser.impl.js +1 -5
- package/src/builders/webpack-browser/webpack-browser.impl.js.map +1 -1
- package/src/generators/application/application.d.ts +1 -1
- package/src/generators/application/application.js +9 -3
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/enable-strict-type-checking.js +1 -1
- package/src/generators/application/lib/enable-strict-type-checking.js.map +1 -1
- package/src/generators/application/lib/index.d.ts +1 -0
- package/src/generators/application/lib/index.js +1 -0
- package/src/generators/application/lib/index.js.map +1 -1
- package/src/generators/application/lib/normalized-schema.d.ts +5 -1
- package/src/generators/application/schema.d.ts +7 -4
- package/src/generators/application/schema.json +7 -1
- package/src/generators/init/init.js +1 -1
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/init/schema.d.ts +1 -1
- package/src/generators/library/lib/enable-strict-type-checking.js +1 -1
- package/src/generators/library/lib/enable-strict-type-checking.js.map +1 -1
- package/src/generators/library/lib/normalize-options.js +2 -2
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/lib/normalized-schema.d.ts +5 -3
- package/src/generators/library/library.js +15 -4
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.d.ts +9 -9
- package/src/generators/library/schema.json +7 -1
- package/src/generators/setup-mfe/files/entry-module-files/entry.module.ts__tmpl__ +2 -2
- package/src/generators/setup-mfe/files/webpack/webpack.config.js__tmpl__ +4 -4
- package/src/generators/setup-mfe/lib/generate-config.js +1 -0
- package/src/generators/setup-mfe/lib/generate-config.js.map +1 -1
- package/src/generators/setup-mfe/lib/setup-serve-target.js +1 -3
- package/src/generators/setup-mfe/lib/setup-serve-target.js.map +1 -1
- package/src/generators/setup-tailwind/files/v2/tailwind.config.js__tmpl__ +18 -0
- package/src/generators/setup-tailwind/files/v3/tailwind.config.js__tmpl__ +16 -0
- package/src/generators/setup-tailwind/lib/add-tailwind-config-path-to-project.d.ts +3 -0
- package/src/generators/setup-tailwind/lib/add-tailwind-config-path-to-project.js +32 -0
- package/src/generators/setup-tailwind/lib/add-tailwind-config-path-to-project.js.map +1 -0
- package/src/generators/setup-tailwind/lib/add-tailwind-config.d.ts +3 -0
- package/src/generators/setup-tailwind/lib/add-tailwind-config.js +19 -0
- package/src/generators/setup-tailwind/lib/add-tailwind-config.js.map +1 -0
- package/src/generators/setup-tailwind/lib/add-tailwind-required-packages.d.ts +2 -0
- package/src/generators/setup-tailwind/lib/add-tailwind-required-packages.js +14 -0
- package/src/generators/setup-tailwind/lib/add-tailwind-required-packages.js.map +1 -0
- package/src/generators/setup-tailwind/lib/detect-tailwind-installed-version.d.ts +2 -0
- package/src/generators/setup-tailwind/lib/detect-tailwind-installed-version.js +21 -0
- package/src/generators/setup-tailwind/lib/detect-tailwind-installed-version.js.map +1 -0
- package/src/generators/setup-tailwind/lib/index.d.ts +6 -0
- package/src/generators/setup-tailwind/lib/index.js +10 -0
- package/src/generators/setup-tailwind/lib/index.js.map +1 -0
- package/src/generators/setup-tailwind/lib/normalize-options.d.ts +2 -0
- package/src/generators/setup-tailwind/lib/normalize-options.js +8 -0
- package/src/generators/setup-tailwind/lib/normalize-options.js.map +1 -0
- package/src/generators/setup-tailwind/lib/update-application-styles.d.ts +3 -0
- package/src/generators/setup-tailwind/lib/update-application-styles.js +54 -0
- package/src/generators/setup-tailwind/lib/update-application-styles.js.map +1 -0
- package/src/generators/setup-tailwind/schema.d.ts +10 -0
- package/src/generators/setup-tailwind/schema.json +34 -0
- package/src/generators/setup-tailwind/setup-tailwind.compat.d.ts +2 -0
- package/src/generators/setup-tailwind/setup-tailwind.compat.js +6 -0
- package/src/generators/setup-tailwind/setup-tailwind.compat.js.map +1 -0
- package/src/generators/setup-tailwind/setup-tailwind.d.ts +4 -0
- package/src/generators/setup-tailwind/setup-tailwind.js +31 -0
- package/src/generators/setup-tailwind/setup-tailwind.js.map +1 -0
- package/src/generators/utils/insert-ngmodule-import.d.ts +3 -0
- package/src/generators/utils/insert-ngmodule-import.js +18 -14
- package/src/generators/utils/insert-ngmodule-import.js.map +1 -1
- package/src/utils/versions.d.ts +5 -2
- package/src/utils/versions.js +7 -4
- package/src/utils/versions.js.map +1 -1
package/README.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Extensible Build
|
|
1
|
+
<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
|
|
2
2
|
|
|
3
3
|
<div style="text-align: center;">
|
|
4
4
|
|
|
@@ -43,9 +43,9 @@ For more information about the `@nrwl/angular` package take a look at the [Angul
|
|
|
43
43
|
|
|
44
44
|
## What is Nx?
|
|
45
45
|
|
|
46
|
-
🔎 **Smart, Extensible Build
|
|
46
|
+
🔎 **Smart, Fast and Extensible Build System**
|
|
47
47
|
|
|
48
|
-
Nx is a smart and extensible build
|
|
48
|
+
Nx is a smart, fast and extensible build system. It comes with first class monorepo support and powerful integrations.
|
|
49
49
|
|
|
50
50
|
### Best-in-Class Support for Monorepos
|
|
51
51
|
|
|
@@ -296,9 +296,9 @@ export class DataPersistence {
|
|
|
296
296
|
return this.actions.pipe(withLatestFrom(this.store), navigation(component, opts));
|
|
297
297
|
}
|
|
298
298
|
}
|
|
299
|
-
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0
|
|
300
|
-
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0
|
|
301
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0
|
|
299
|
+
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: DataPersistence, deps: [{ token: i1.Store }, { token: i2.Actions }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
300
|
+
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: DataPersistence });
|
|
301
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: DataPersistence, decorators: [{
|
|
302
302
|
type: Injectable
|
|
303
303
|
}], ctorParameters: function () { return [{ type: i1.Store }, { type: i2.Actions }]; } });
|
|
304
304
|
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: "13.0
|
|
15
|
-
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.0
|
|
16
|
-
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.0
|
|
17
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0
|
|
14
|
+
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: NxModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
15
|
+
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: NxModule });
|
|
16
|
+
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: NxModule });
|
|
17
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: NxModule, decorators: [{
|
|
18
18
|
type: NgModule,
|
|
19
19
|
args: [{}]
|
|
20
20
|
}] });
|
|
@@ -297,9 +297,9 @@ class DataPersistence {
|
|
|
297
297
|
return this.actions.pipe(withLatestFrom(this.store), navigation(component, opts));
|
|
298
298
|
}
|
|
299
299
|
}
|
|
300
|
-
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0
|
|
301
|
-
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0
|
|
302
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0
|
|
300
|
+
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: DataPersistence, deps: [{ token: i1.Store }, { token: i2.Actions }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
301
|
+
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: DataPersistence });
|
|
302
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: DataPersistence, decorators: [{
|
|
303
303
|
type: Injectable
|
|
304
304
|
}], ctorParameters: function () { return [{ type: i1.Store }, { type: i2.Actions }]; } });
|
|
305
305
|
function findSnapshot(component, s) {
|
|
@@ -336,10 +336,10 @@ class NxModule {
|
|
|
336
336
|
return { ngModule: NxModule, providers: [DataPersistence] };
|
|
337
337
|
}
|
|
338
338
|
}
|
|
339
|
-
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0
|
|
340
|
-
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.0
|
|
341
|
-
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.0
|
|
342
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0
|
|
339
|
+
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: NxModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
340
|
+
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: NxModule });
|
|
341
|
+
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: NxModule });
|
|
342
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: NxModule, decorators: [{
|
|
343
343
|
type: NgModule,
|
|
344
344
|
args: [{}]
|
|
345
345
|
}] });
|
|
@@ -349,3 +349,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.2", ngImpor
|
|
|
349
349
|
*/
|
|
350
350
|
|
|
351
351
|
export { DataPersistence, NxModule, fetch, navigation, optimisticUpdate, pessimisticUpdate };
|
|
352
|
+
//# sourceMappingURL=nrwl-angular.mjs.map
|
|
@@ -297,9 +297,9 @@ class DataPersistence {
|
|
|
297
297
|
return this.actions.pipe(withLatestFrom(this.store), navigation(component, opts));
|
|
298
298
|
}
|
|
299
299
|
}
|
|
300
|
-
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0
|
|
301
|
-
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0
|
|
302
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0
|
|
300
|
+
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: DataPersistence, deps: [{ token: i1.Store }, { token: i2.Actions }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
301
|
+
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: DataPersistence });
|
|
302
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: DataPersistence, decorators: [{
|
|
303
303
|
type: Injectable
|
|
304
304
|
}], ctorParameters: function () { return [{ type: i1.Store }, { type: i2.Actions }]; } });
|
|
305
305
|
function findSnapshot(component, s) {
|
|
@@ -336,10 +336,10 @@ class NxModule {
|
|
|
336
336
|
return { ngModule: NxModule, providers: [DataPersistence] };
|
|
337
337
|
}
|
|
338
338
|
}
|
|
339
|
-
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0
|
|
340
|
-
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.0
|
|
341
|
-
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.0
|
|
342
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0
|
|
339
|
+
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: NxModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
340
|
+
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: NxModule });
|
|
341
|
+
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: NxModule });
|
|
342
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: NxModule, decorators: [{
|
|
343
343
|
type: NgModule,
|
|
344
344
|
args: [{}]
|
|
345
345
|
}] });
|
|
@@ -349,3 +349,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.2", ngImpor
|
|
|
349
349
|
*/
|
|
350
350
|
|
|
351
351
|
export { DataPersistence, NxModule, fetch, navigation, optimisticUpdate, pessimisticUpdate };
|
|
352
|
+
//# sourceMappingURL=nrwl-angular.mjs.map
|
package/generators.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ export * from './src/generators/library/library';
|
|
|
8
8
|
export * from './src/generators/library-secondary-entry-point/library-secondary-entry-point';
|
|
9
9
|
export * from './src/generators/move/move';
|
|
10
10
|
export * from './src/generators/ngrx/ngrx';
|
|
11
|
+
export * from './src/generators/setup-tailwind/setup-tailwind';
|
|
11
12
|
export * from './src/generators/stories/stories';
|
|
12
13
|
export * from './src/generators/storybook-configuration/storybook-configuration';
|
|
13
14
|
export * from './src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6';
|
package/generators.js
CHANGED
|
@@ -11,6 +11,7 @@ const tslib_1 = require("tslib");
|
|
|
11
11
|
(0, tslib_1.__exportStar)(require("./src/generators/library-secondary-entry-point/library-secondary-entry-point"), exports);
|
|
12
12
|
(0, tslib_1.__exportStar)(require("./src/generators/move/move"), exports);
|
|
13
13
|
(0, tslib_1.__exportStar)(require("./src/generators/ngrx/ngrx"), exports);
|
|
14
|
+
(0, tslib_1.__exportStar)(require("./src/generators/setup-tailwind/setup-tailwind"), exports);
|
|
14
15
|
(0, tslib_1.__exportStar)(require("./src/generators/stories/stories"), exports);
|
|
15
16
|
(0, tslib_1.__exportStar)(require("./src/generators/storybook-configuration/storybook-configuration"), exports);
|
|
16
17
|
(0, tslib_1.__exportStar)(require("./src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6"), exports);
|
package/generators.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,wFAAyD;AACzD,kHAAmF;AACnF,kGAAmE;AACnE,0EAA2C;AAC3C,4EAA6C;AAC7C,4FAA6D;AAC7D,gFAAiD;AACjD,4HAA6F;AAC7F,0EAA2C;AAC3C,0EAA2C;AAC3C,gFAAiD;AACjD,gHAAiF;AACjF,oIAAqG;AACrG,wHAAyF;AACzF,8FAA+D;AAC/D,oFAAqD;AACrD,0EAA2C;AAC3C,8FAA+D;AAC/D,oFAAqD"}
|
|
1
|
+
{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,wFAAyD;AACzD,kHAAmF;AACnF,kGAAmE;AACnE,0EAA2C;AAC3C,4EAA6C;AAC7C,4FAA6D;AAC7D,gFAAiD;AACjD,4HAA6F;AAC7F,0EAA2C;AAC3C,0EAA2C;AAC3C,8FAA+D;AAC/D,gFAAiD;AACjD,gHAAiF;AACjF,oIAAqG;AACrG,wHAAyF;AACzF,8FAA+D;AAC/D,oFAAqD;AACrD,0EAA2C;AAC3C,8FAA+D;AAC/D,oFAAqD"}
|
package/generators.json
CHANGED
|
@@ -79,6 +79,31 @@
|
|
|
79
79
|
"schema": "./src/generators/ngrx/schema.json",
|
|
80
80
|
"description": "Adds NgRx support to an application or library."
|
|
81
81
|
},
|
|
82
|
+
"scam": {
|
|
83
|
+
"factory": "./src/generators/scam/scam.compat",
|
|
84
|
+
"schema": "./src/generators/scam/schema.json",
|
|
85
|
+
"description": "Generate a component with an accompanying Single Component Angular Module (SCAM)."
|
|
86
|
+
},
|
|
87
|
+
"scam-directive": {
|
|
88
|
+
"factory": "./src/generators/scam-directive/scam-directive.compat",
|
|
89
|
+
"schema": "./src/generators/scam-directive/schema.json",
|
|
90
|
+
"description": "Generate a directive with an accompanying Single Component Angular Module (SCAM)."
|
|
91
|
+
},
|
|
92
|
+
"scam-pipe": {
|
|
93
|
+
"factory": "./src/generators/scam-pipe/scam-pipe.compat",
|
|
94
|
+
"schema": "./src/generators/scam-pipe/schema.json",
|
|
95
|
+
"description": "Generate a pipe with an accompanying Single Component Angular Module (SCAM)."
|
|
96
|
+
},
|
|
97
|
+
"setup-mfe": {
|
|
98
|
+
"factory": "./src/generators/setup-mfe/setup-mfe.compat",
|
|
99
|
+
"schema": "./src/generators/setup-mfe/schema.json",
|
|
100
|
+
"description": "Generate a Module Federation configuration for a given Angular application."
|
|
101
|
+
},
|
|
102
|
+
"setup-tailwind": {
|
|
103
|
+
"factory": "./src/generators/setup-tailwind/compat",
|
|
104
|
+
"schema": "./src/generators/setup-tailwind/schema.json",
|
|
105
|
+
"description": "Configures TailwindCSS for an application or a buildable/publishable library."
|
|
106
|
+
},
|
|
82
107
|
"stories": {
|
|
83
108
|
"factory": "./src/generators/stories/compat",
|
|
84
109
|
"schema": "./src/generators/stories/schema.json",
|
|
@@ -104,28 +129,6 @@
|
|
|
104
129
|
"schema": "./src/generators/upgrade-module/schema.json",
|
|
105
130
|
"description": "Sets up an Upgrade Module."
|
|
106
131
|
},
|
|
107
|
-
|
|
108
|
-
"setup-mfe": {
|
|
109
|
-
"factory": "./src/generators/setup-mfe/setup-mfe.compat",
|
|
110
|
-
"schema": "./src/generators/setup-mfe/schema.json",
|
|
111
|
-
"description": "Generate a Module Federation configuration for a given Angular application."
|
|
112
|
-
},
|
|
113
|
-
"scam": {
|
|
114
|
-
"factory": "./src/generators/scam/scam.compat",
|
|
115
|
-
"schema": "./src/generators/scam/schema.json",
|
|
116
|
-
"description": "Generate a component with an accompanying Single Component Angular Module (SCAM)."
|
|
117
|
-
},
|
|
118
|
-
"scam-directive": {
|
|
119
|
-
"factory": "./src/generators/scam-directive/scam-directive.compat",
|
|
120
|
-
"schema": "./src/generators/scam-directive/schema.json",
|
|
121
|
-
"description": "Generate a directive with an accompanying Single Component Angular Module (SCAM)."
|
|
122
|
-
},
|
|
123
|
-
"scam-pipe": {
|
|
124
|
-
"factory": "./src/generators/scam-pipe/scam-pipe.compat",
|
|
125
|
-
"schema": "./src/generators/scam-pipe/schema.json",
|
|
126
|
-
"description": "Generate a pipe with an accompanying Single Component Angular Module (SCAM)."
|
|
127
|
-
},
|
|
128
|
-
|
|
129
132
|
"web-worker": {
|
|
130
133
|
"factory": "./src/generators/web-worker/compat",
|
|
131
134
|
"schema": "./src/generators/web-worker/schema.json",
|
|
@@ -146,11 +149,6 @@
|
|
|
146
149
|
"x-type": "application",
|
|
147
150
|
"description": "Creates an Angular application."
|
|
148
151
|
},
|
|
149
|
-
"setup-mfe": {
|
|
150
|
-
"factory": "./src/generators/setup-mfe/setup-mfe",
|
|
151
|
-
"schema": "./src/generators/setup-mfe/schema.json",
|
|
152
|
-
"description": "Generate a Module Federation configuration for a given Angular application."
|
|
153
|
-
},
|
|
154
152
|
"component-cypress-spec": {
|
|
155
153
|
"factory": "./src/generators/component-cypress-spec/component-cypress-spec",
|
|
156
154
|
"schema": "./src/generators/component-cypress-spec/schema.json",
|
|
@@ -229,6 +227,16 @@
|
|
|
229
227
|
"schema": "./src/generators/scam-pipe/schema.json",
|
|
230
228
|
"description": "Generate a pipe with an accompanying Single Component Angular Module (SCAM)."
|
|
231
229
|
},
|
|
230
|
+
"setup-mfe": {
|
|
231
|
+
"factory": "./src/generators/setup-mfe/setup-mfe",
|
|
232
|
+
"schema": "./src/generators/setup-mfe/schema.json",
|
|
233
|
+
"description": "Generate a Module Federation configuration for a given Angular application."
|
|
234
|
+
},
|
|
235
|
+
"setup-tailwind": {
|
|
236
|
+
"factory": "./src/generators/setup-tailwind/setup-tailwind",
|
|
237
|
+
"schema": "./src/generators/setup-tailwind/schema.json",
|
|
238
|
+
"description": "Configures TailwindCSS for an application or a buildable/publishable library."
|
|
239
|
+
},
|
|
232
240
|
"stories": {
|
|
233
241
|
"factory": "./src/generators/stories/stories",
|
|
234
242
|
"schema": "./src/generators/stories/schema.json",
|
package/migrations.json
CHANGED
|
@@ -1142,6 +1142,99 @@
|
|
|
1142
1142
|
"alwaysAddToPackageJson": false
|
|
1143
1143
|
}
|
|
1144
1144
|
}
|
|
1145
|
+
},
|
|
1146
|
+
"13.4.0": {
|
|
1147
|
+
"version": "13.4.0-beta.1",
|
|
1148
|
+
"packages": {
|
|
1149
|
+
"@angular/cli": {
|
|
1150
|
+
"version": "~13.1.0",
|
|
1151
|
+
"alwaysAddToPackageJson": false
|
|
1152
|
+
},
|
|
1153
|
+
"@angular-devkit/build-angular": {
|
|
1154
|
+
"version": "~13.1.0",
|
|
1155
|
+
"alwaysAddToPackageJson": false
|
|
1156
|
+
},
|
|
1157
|
+
"@angular-devkit/build-optimizer": {
|
|
1158
|
+
"version": "~0.1301.0",
|
|
1159
|
+
"alwaysAddToPackageJson": false
|
|
1160
|
+
},
|
|
1161
|
+
"@angular/core": {
|
|
1162
|
+
"version": "~13.1.0",
|
|
1163
|
+
"alwaysAddToPackageJson": true
|
|
1164
|
+
},
|
|
1165
|
+
"@angular/common": {
|
|
1166
|
+
"version": "~13.1.0",
|
|
1167
|
+
"alwaysAddToPackageJson": false
|
|
1168
|
+
},
|
|
1169
|
+
"@angular/forms": {
|
|
1170
|
+
"version": "~13.1.0",
|
|
1171
|
+
"alwaysAddToPackageJson": false
|
|
1172
|
+
},
|
|
1173
|
+
"@angular/elements": {
|
|
1174
|
+
"version": "~13.1.0",
|
|
1175
|
+
"alwaysAddToPackageJson": false
|
|
1176
|
+
},
|
|
1177
|
+
"@angular/compiler": {
|
|
1178
|
+
"version": "~13.1.0",
|
|
1179
|
+
"alwaysAddToPackageJson": false
|
|
1180
|
+
},
|
|
1181
|
+
"@angular/compiler-cli": {
|
|
1182
|
+
"version": "~13.1.0",
|
|
1183
|
+
"alwaysAddToPackageJson": false
|
|
1184
|
+
},
|
|
1185
|
+
"@angular/localize": {
|
|
1186
|
+
"version": "~13.1.0",
|
|
1187
|
+
"alwaysAddToPackageJson": false
|
|
1188
|
+
},
|
|
1189
|
+
"@angular/platform-browser": {
|
|
1190
|
+
"version": "~13.1.0",
|
|
1191
|
+
"alwaysAddToPackageJson": false
|
|
1192
|
+
},
|
|
1193
|
+
"@angular/platform-browser-dynamic": {
|
|
1194
|
+
"version": "~13.1.0",
|
|
1195
|
+
"alwaysAddToPackageJson": false
|
|
1196
|
+
},
|
|
1197
|
+
"@angular/platform-server": {
|
|
1198
|
+
"version": "~13.1.0",
|
|
1199
|
+
"alwaysAddToPackageJson": false
|
|
1200
|
+
},
|
|
1201
|
+
"@angular/router": {
|
|
1202
|
+
"version": "~13.1.0",
|
|
1203
|
+
"alwaysAddToPackageJson": false
|
|
1204
|
+
},
|
|
1205
|
+
"@angular/upgrade": {
|
|
1206
|
+
"version": "~13.1.0",
|
|
1207
|
+
"alwaysAddToPackageJson": false
|
|
1208
|
+
},
|
|
1209
|
+
"@angular/language-service": {
|
|
1210
|
+
"version": "~13.1.0",
|
|
1211
|
+
"alwaysAddToPackageJson": false
|
|
1212
|
+
},
|
|
1213
|
+
"@angular/animations": {
|
|
1214
|
+
"version": "~13.1.0",
|
|
1215
|
+
"alwaysAddToPackageJson": false
|
|
1216
|
+
},
|
|
1217
|
+
"@angular/service-worker": {
|
|
1218
|
+
"version": "~13.1.0",
|
|
1219
|
+
"alwaysAddToPackageJson": false
|
|
1220
|
+
},
|
|
1221
|
+
"@angular/material": {
|
|
1222
|
+
"version": "~13.1.0",
|
|
1223
|
+
"alwaysAddToPackageJson": false
|
|
1224
|
+
},
|
|
1225
|
+
"@angular/cdk": {
|
|
1226
|
+
"version": "~13.1.0",
|
|
1227
|
+
"alwaysAddToPackageJson": false
|
|
1228
|
+
},
|
|
1229
|
+
"ng-packagr": {
|
|
1230
|
+
"version": "~13.1.0",
|
|
1231
|
+
"alwaysAddToPackageJson": false
|
|
1232
|
+
},
|
|
1233
|
+
"typescript": {
|
|
1234
|
+
"version": "~4.5.2",
|
|
1235
|
+
"alwaysAddToPackageJson": false
|
|
1236
|
+
}
|
|
1237
|
+
}
|
|
1145
1238
|
}
|
|
1146
1239
|
}
|
|
1147
1240
|
}
|
package/ng-package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "13.4.
|
|
3
|
+
"version": "13.4.1-beta.1",
|
|
4
4
|
"description": "Angular Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -54,13 +54,13 @@
|
|
|
54
54
|
"migrations": "./migrations.json"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@angular-devkit/schematics": "~13.
|
|
58
|
-
"@nrwl/cypress": "13.4.
|
|
59
|
-
"@nrwl/devkit": "13.4.
|
|
60
|
-
"@nrwl/jest": "13.4.
|
|
61
|
-
"@nrwl/linter": "13.4.
|
|
62
|
-
"@nrwl/storybook": "13.4.
|
|
63
|
-
"@schematics/angular": "~13.
|
|
57
|
+
"@angular-devkit/schematics": "~13.1.0",
|
|
58
|
+
"@nrwl/cypress": "13.4.1-beta.1",
|
|
59
|
+
"@nrwl/devkit": "13.4.1-beta.1",
|
|
60
|
+
"@nrwl/jest": "13.4.1-beta.1",
|
|
61
|
+
"@nrwl/linter": "13.4.1-beta.1",
|
|
62
|
+
"@nrwl/storybook": "13.4.1-beta.1",
|
|
63
|
+
"@schematics/angular": "~13.1.0",
|
|
64
64
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
65
65
|
"ignore": "^5.0.4",
|
|
66
66
|
"jasmine-marbles": "~0.8.4",
|
|
@@ -69,6 +69,7 @@
|
|
|
69
69
|
"find-parent-dir": "^0.3.1",
|
|
70
70
|
"ts-node": "~9.1.1",
|
|
71
71
|
"tsconfig-paths": "^3.9.0",
|
|
72
|
+
"semver": "7.3.4",
|
|
72
73
|
"tslib": "^2.3.0"
|
|
73
74
|
},
|
|
74
75
|
"module": "fesm2015/nrwl-angular.mjs",
|
|
@@ -25,11 +25,7 @@ function buildApp(options, context) {
|
|
|
25
25
|
throw new Error(`Custom Webpack Config File Not Found!\nTo use a custom webpack config, please ensure the path to the custom webpack file is correct: \n${pathToWebpackConfig}`);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
-
|
|
29
|
-
target: context.target,
|
|
30
|
-
logger: context.logger,
|
|
31
|
-
});
|
|
32
|
-
return (0, rxjs_1.from)(scheduledBuilder).pipe((0, operators_1.switchMap)((x) => x.result));
|
|
28
|
+
return (0, build_angular_1.executeBrowserBuilder)(delegateOptions, context);
|
|
33
29
|
}
|
|
34
30
|
function buildAppWithCustomWebpackConfiguration(options, context, pathToWebpackConfig) {
|
|
35
31
|
return (0, build_angular_1.executeBrowserBuilder)(options, context, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":";;;AAAA,yDAImC;AACnC,iEAAsE;AAGtE,yCAAiD;AACjD,0EAAgF;AAChF,6FAI4D;AAC5D,2BAAgC;AAChC,+BAA4B;AAC5B,+BAA4C;AAC5C,8CAA2C;AAC3C,iDAAsC;AACtC,kDAAkE;AAQlE,SAAS,QAAQ,CACf,OAA6B,EAC7B,OAAuB;IAEvB,MAAM,EAAE,mBAAmB,KAAyB,OAAO,EAA3B,eAAe,uBAAK,OAAO,EAArD,uBAA2C,CAAU,CAAC;IAC5D,8CAA8C;IAC9C,mDAAmD;IACnD,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,IAAA,eAAU,EAAC,mBAAmB,CAAC,EAAE;YACnC,OAAO,sCAAsC,CAC3C,eAAe,EACf,OAAO,EACP,mBAAmB,CACpB,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,
|
|
1
|
+
{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
7
7
|
const workspace_1 = require("@nrwl/workspace");
|
|
8
8
|
const init_1 = require("../init/init");
|
|
9
|
+
const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
|
|
9
10
|
const lib_1 = require("./lib");
|
|
10
|
-
const add_unit_test_runner_1 = require("./lib/add-unit-test-runner");
|
|
11
11
|
function applicationGenerator(host, schema) {
|
|
12
12
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
13
13
|
const options = (0, lib_1.normalizeOptions)(host, schema);
|
|
@@ -24,7 +24,7 @@ function applicationGenerator(host, schema) {
|
|
|
24
24
|
const e2eProjectRoot = newProjectRoot
|
|
25
25
|
? `${newProjectRoot}/${options.e2eProjectName}`
|
|
26
26
|
: `${options.name}/e2e`;
|
|
27
|
-
yield (0, init_1.
|
|
27
|
+
yield (0, init_1.angularInitGenerator)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
|
|
28
28
|
const angularAppSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'application');
|
|
29
29
|
yield angularAppSchematic(host, {
|
|
30
30
|
name: options.name,
|
|
@@ -55,6 +55,12 @@ function applicationGenerator(host, schema) {
|
|
|
55
55
|
project: options.name,
|
|
56
56
|
});
|
|
57
57
|
(0, lib_1.updateNxComponentTemplate)(host, options);
|
|
58
|
+
if (options.addTailwind) {
|
|
59
|
+
yield (0, setup_tailwind_1.setupTailwindGenerator)(host, {
|
|
60
|
+
project: options.name,
|
|
61
|
+
skipFormat: true,
|
|
62
|
+
});
|
|
63
|
+
}
|
|
58
64
|
if (options.unitTestRunner !== "none" /* None */) {
|
|
59
65
|
(0, lib_1.updateComponentSpec)(host, options);
|
|
60
66
|
}
|
|
@@ -62,7 +68,7 @@ function applicationGenerator(host, schema) {
|
|
|
62
68
|
(0, lib_1.addRouterRootConfiguration)(host, options);
|
|
63
69
|
}
|
|
64
70
|
(0, lib_1.addLinting)(host, options);
|
|
65
|
-
yield (0,
|
|
71
|
+
yield (0, lib_1.addUnitTestRunner)(host, options);
|
|
66
72
|
yield (0, lib_1.addE2e)(host, options, e2eProjectRoot);
|
|
67
73
|
(0, lib_1.updateEditorTsConfig)(host, options);
|
|
68
74
|
if (options.backendProject) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ function enableStrictTypeChecking(host, options) {
|
|
|
16
16
|
(0, devkit_1.updateJson)(host, configFile, (json) => {
|
|
17
17
|
var _a, _b;
|
|
18
18
|
// update the TypeScript settings
|
|
19
|
-
json.compilerOptions = Object.assign(Object.assign({}, ((_a = json.compilerOptions) !== null && _a !== void 0 ? _a : {})), { forceConsistentCasingInFileNames: true, strict: true, noImplicitReturns: true, noFallthroughCasesInSwitch: true });
|
|
19
|
+
json.compilerOptions = Object.assign(Object.assign({}, ((_a = json.compilerOptions) !== null && _a !== void 0 ? _a : {})), { forceConsistentCasingInFileNames: true, strict: true, noImplicitOverride: true, noPropertyAccessFromIndexSignature: true, noImplicitReturns: true, noFallthroughCasesInSwitch: true });
|
|
20
20
|
// update Angular Template Settings
|
|
21
21
|
json.angularCompilerOptions = Object.assign(Object.assign({}, ((_b = json.angularCompilerOptions) !== null && _b !== void 0 ? _b : {})), { strictInjectionParameters: true, strictInputAccessModifiers: true, strictTemplates: true });
|
|
22
22
|
return json;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enable-strict-type-checking.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/enable-strict-type-checking.ts"],"names":[],"mappings":";;;AAGA,yCAA0C;AAE1C,SAAgB,wBAAwB,CACtC,IAAU,EACV,OAAyB;IAEzB,MAAM,WAAW,GAAG;QAClB,GAAG,OAAO,CAAC,cAAc,gBAAgB;QACzC,GAAG,OAAO,CAAC,cAAc,gBAAgB;KAC1C,CAAC;IAEF,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC5B,SAAS;SACV;QAED,+EAA+E;QAC/E,4FAA4F;QAC5F,IAAA,mBAAU,EAAC,IAAI,EAAE,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;;YACpC,iCAAiC;YACjC,IAAI,CAAC,eAAe,mCACf,CAAC,MAAA,IAAI,CAAC,eAAe,mCAAI,EAAE,CAAC,KAC/B,gCAAgC,EAAE,IAAI,EACtC,MAAM,EAAE,IAAI,EACZ,iBAAiB,EAAE,IAAI,EACvB,0BAA0B,EAAE,IAAI,GACjC,CAAC;YAEF,mCAAmC;YACnC,IAAI,CAAC,sBAAsB,mCACtB,CAAC,MAAA,IAAI,CAAC,sBAAsB,mCAAI,EAAE,CAAC,KACtC,yBAAyB,EAAE,IAAI,EAC/B,0BAA0B,EAAE,IAAI,EAChC,eAAe,EAAE,IAAI,GACtB,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;
|
|
1
|
+
{"version":3,"file":"enable-strict-type-checking.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/enable-strict-type-checking.ts"],"names":[],"mappings":";;;AAGA,yCAA0C;AAE1C,SAAgB,wBAAwB,CACtC,IAAU,EACV,OAAyB;IAEzB,MAAM,WAAW,GAAG;QAClB,GAAG,OAAO,CAAC,cAAc,gBAAgB;QACzC,GAAG,OAAO,CAAC,cAAc,gBAAgB;KAC1C,CAAC;IAEF,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC5B,SAAS;SACV;QAED,+EAA+E;QAC/E,4FAA4F;QAC5F,IAAA,mBAAU,EAAC,IAAI,EAAE,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;;YACpC,iCAAiC;YACjC,IAAI,CAAC,eAAe,mCACf,CAAC,MAAA,IAAI,CAAC,eAAe,mCAAI,EAAE,CAAC,KAC/B,gCAAgC,EAAE,IAAI,EACtC,MAAM,EAAE,IAAI,EACZ,kBAAkB,EAAE,IAAI,EACxB,kCAAkC,EAAE,IAAI,EACxC,iBAAiB,EAAE,IAAI,EACvB,0BAA0B,EAAE,IAAI,GACjC,CAAC;YAEF,mCAAmC;YACnC,IAAI,CAAC,sBAAsB,mCACtB,CAAC,MAAA,IAAI,CAAC,sBAAsB,mCAAI,EAAE,CAAC,KACtC,yBAAyB,EAAE,IAAI,EAC/B,0BAA0B,EAAE,IAAI,EAChC,eAAe,EAAE,IAAI,GACtB,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAvCD,4DAuCC"}
|
|
@@ -3,6 +3,7 @@ export * from './add-linting';
|
|
|
3
3
|
export * from './add-mfe';
|
|
4
4
|
export * from './add-protractor';
|
|
5
5
|
export * from './add-proxy-config';
|
|
6
|
+
export * from './add-unit-test-runner';
|
|
6
7
|
export * from './create-files';
|
|
7
8
|
export * from './enable-strict-type-checking';
|
|
8
9
|
export * from './normalize-options';
|
|
@@ -6,6 +6,7 @@ const tslib_1 = require("tslib");
|
|
|
6
6
|
(0, tslib_1.__exportStar)(require("./add-mfe"), exports);
|
|
7
7
|
(0, tslib_1.__exportStar)(require("./add-protractor"), exports);
|
|
8
8
|
(0, tslib_1.__exportStar)(require("./add-proxy-config"), exports);
|
|
9
|
+
(0, tslib_1.__exportStar)(require("./add-unit-test-runner"), exports);
|
|
9
10
|
(0, tslib_1.__exportStar)(require("./create-files"), exports);
|
|
10
11
|
(0, tslib_1.__exportStar)(require("./enable-strict-type-checking"), exports);
|
|
11
12
|
(0, tslib_1.__exportStar)(require("./normalize-options"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/index.ts"],"names":[],"mappings":";;;AAAA,yDAA0B;AAC1B,6DAA8B;AAC9B,yDAA0B;AAC1B,gEAAiC;AACjC,kEAAmC;AACnC,8DAA+B;AAC/B,6EAA8C;AAC9C,mEAAoC;AACpC,mEAAoC;AACpC,+DAAgC;AAChC,uEAAwC;AACxC,oEAAqC;AACrC,wEAAyC;AACzC,uEAAwC;AACxC,+EAAgD;AAChD,8EAA+C;AAC/C,qEAAsC;AACtC,oEAAqC;AACrC,wEAAyC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/index.ts"],"names":[],"mappings":";;;AAAA,yDAA0B;AAC1B,6DAA8B;AAC9B,yDAA0B;AAC1B,gEAAiC;AACjC,kEAAmC;AACnC,sEAAuC;AACvC,8DAA+B;AAC/B,6EAA8C;AAC9C,mEAAoC;AACpC,mEAAoC;AACpC,+DAAgC;AAChC,uEAAwC;AACxC,oEAAqC;AACrC,wEAAyC;AACzC,uEAAwC;AACxC,+EAAgD;AAChD,8EAA+C;AAC/C,qEAAsC;AACtC,oEAAqC;AACrC,wEAAyC"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { E2eTestRunner, UnitTestRunner } from '../../../utils/test-runners';
|
|
2
|
+
import type { AngularLinter, Schema } from '../schema';
|
|
2
3
|
export interface NormalizedSchema extends Schema {
|
|
4
|
+
linter: AngularLinter;
|
|
5
|
+
unitTestRunner: UnitTestRunner;
|
|
6
|
+
e2eTestRunner: E2eTestRunner;
|
|
3
7
|
prefix: string;
|
|
4
8
|
appProjectRoot: string;
|
|
5
9
|
e2eProjectName: string;
|
|
@@ -2,9 +2,12 @@ import { Linter } from '@nrwl/linter';
|
|
|
2
2
|
import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
|
|
3
3
|
import type { Styles } from '../utils/types';
|
|
4
4
|
|
|
5
|
+
type AngularLinter = Exclude<Linter, Linter.TsLint>;
|
|
6
|
+
|
|
5
7
|
export interface Schema {
|
|
6
8
|
name: string;
|
|
7
|
-
|
|
9
|
+
addTailwind?: boolean;
|
|
10
|
+
skipFormat?: boolean;
|
|
8
11
|
inlineStyle?: boolean;
|
|
9
12
|
inlineTemplate?: boolean;
|
|
10
13
|
viewEncapsulation?: 'Emulated' | 'Native' | 'None';
|
|
@@ -14,9 +17,9 @@ export interface Schema {
|
|
|
14
17
|
skipTests?: boolean;
|
|
15
18
|
directory?: string;
|
|
16
19
|
tags?: string;
|
|
17
|
-
linter
|
|
18
|
-
unitTestRunner
|
|
19
|
-
e2eTestRunner
|
|
20
|
+
linter?: AngularLinter;
|
|
21
|
+
unitTestRunner?: UnitTestRunner;
|
|
22
|
+
e2eTestRunner?: E2eTestRunner;
|
|
20
23
|
backendProject?: string;
|
|
21
24
|
strict?: boolean;
|
|
22
25
|
standaloneConfig?: boolean;
|
|
@@ -154,7 +154,13 @@
|
|
|
154
154
|
"type": "boolean",
|
|
155
155
|
"description": "Whether or not to configure the ESLint \"parserOptions.project\" option. We do not do this by default for lint performance reasons.",
|
|
156
156
|
"default": false
|
|
157
|
+
},
|
|
158
|
+
"addTailwind": {
|
|
159
|
+
"type": "boolean",
|
|
160
|
+
"description": "Whether to configure TailwindCSS for the application.",
|
|
161
|
+
"default": false
|
|
157
162
|
}
|
|
158
163
|
},
|
|
159
|
-
"
|
|
164
|
+
"additionalProperties": false,
|
|
165
|
+
"required": ["name"]
|
|
160
166
|
}
|
|
@@ -29,7 +29,7 @@ function setDefaults(host, options) {
|
|
|
29
29
|
const workspace = (0, devkit_2.readWorkspaceConfiguration)(host);
|
|
30
30
|
workspace.generators = workspace.generators || {};
|
|
31
31
|
workspace.generators['@nrwl/angular:application'] = Object.assign({ style: options.style, linter: options.linter, unitTestRunner: options.unitTestRunner, e2eTestRunner: options.e2eTestRunner }, (workspace.generators['@nrwl/angular:application'] || {}));
|
|
32
|
-
workspace.generators['@nrwl/angular:library'] = Object.assign({
|
|
32
|
+
workspace.generators['@nrwl/angular:library'] = Object.assign({ linter: options.linter, unitTestRunner: options.unitTestRunner }, (workspace.generators['@nrwl/angular:library'] || {}));
|
|
33
33
|
workspace.generators['@nrwl/angular:component'] = Object.assign({ style: options.style }, (workspace.generators['@nrwl/angular:component'] || {}));
|
|
34
34
|
(0, devkit_2.updateWorkspaceConfiguration)(host, workspace);
|
|
35
35
|
(0, set_default_collection_1.setDefaultCollection)(host, '@nrwl/angular');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAA+D;AAC/D,yCAMsB;AACtB,qCAA+C;AAC/C,2FAAqF;AACrF,iGAA4F;AAE5F,mDAK8B;AAC9B,0CAAgD;AAGhD,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAAe;;QAEf,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,cAAc,CAAC,IAAI,CAAC,CAAC;QAErB,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChD,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAEpC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;CAAA;AAjBD,oDAiBC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAe;IAC9C,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,SAAS,CAAC,UAAU,CAAC,2BAA2B,CAAC,mBAC/C,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,EACtC,aAAa,EAAE,OAAO,CAAC,aAAa,IACjC,CAAC,SAAS,CAAC,UAAU,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC,CAC7D,CAAC;IACF,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,mBAC3C,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|