@nrwl/angular 13.0.0-beta.8 → 13.0.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/migrations.json +32 -4
- package/package.json +6 -6
- package/src/builders/webpack-browser/webpack-browser.impl.js +1 -1
- package/src/builders/webpack-browser/webpack-browser.impl.js.map +1 -1
- package/src/executors/delegate-build/delegate-build.impl.js +1 -1
- package/src/executors/delegate-build/delegate-build.impl.js.map +1 -1
- package/src/executors/package/package.impl.js +23 -4
- package/src/executors/package/package.impl.js.map +1 -1
- package/src/generators/application/application.d.ts +1 -1
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/add-protractor.js +9 -1
- package/src/generators/application/lib/add-protractor.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +3 -3
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/update-config-files.js +3 -0
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/application/schema.json +1 -2
- package/src/generators/library/lib/normalize-options.js +3 -3
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/library.js +7 -2
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +1 -2
- package/src/generators/ngrx/lib/add-imports-to-module.js +1 -1
- package/src/generators/ngrx/lib/add-imports-to-module.js.map +1 -1
- package/src/generators/ngrx/lib/normalize-options.js +1 -8
- package/src/generators/ngrx/lib/normalize-options.js.map +1 -1
- package/src/generators/ngrx/ngrx.js +2 -3
- package/src/generators/ngrx/ngrx.js.map +1 -1
- package/src/generators/ngrx/schema.d.ts +0 -10
- package/src/generators/ngrx/schema.json +0 -12
- package/src/generators/setup-mfe/lib/add-entry-module.js +6 -1
- package/src/generators/setup-mfe/lib/add-entry-module.js.map +1 -1
- package/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.js +2 -2
- package/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.js.map +1 -1
- package/src/migrations/update-13-0-0/{add-postcss-import.d.ts → add-postcss-packages.d.ts} +0 -0
- package/src/migrations/update-13-0-0/{add-postcss-import.js → add-postcss-packages.js} +7 -2
- package/src/migrations/update-13-0-0/add-postcss-packages.js.map +1 -0
- package/src/utils/testing.d.ts +0 -8
- package/src/utils/testing.js +1 -17
- package/src/utils/testing.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +2 -2
- package/src/migrations/update-13-0-0/add-postcss-import.js.map +0 -1
- package/src/utils/ast-utils.d.ts +0 -59
- package/src/utils/ast-utils.js +0 -438
- package/src/utils/ast-utils.js.map +0 -1
package/migrations.json
CHANGED
|
@@ -91,11 +91,11 @@
|
|
|
91
91
|
"description": "Fixes invalid importPaths for buildable and publishable libs.",
|
|
92
92
|
"factory": "./src/migrations/update-12-9-0/update-invalid-import-paths"
|
|
93
93
|
},
|
|
94
|
-
"add-postcss-
|
|
94
|
+
"add-postcss-packages": {
|
|
95
95
|
"cli": "nx",
|
|
96
|
-
"version": "13.0.0-beta.
|
|
97
|
-
"description": "Adds postcss
|
|
98
|
-
"factory": "./src/migrations/update-13-0-0/add-postcss-
|
|
96
|
+
"version": "13.0.0-beta.10",
|
|
97
|
+
"description": "Adds postcss packages needed for Tailwind support if ng-packagr is already installed.",
|
|
98
|
+
"factory": "./src/migrations/update-13-0-0/add-postcss-packages"
|
|
99
99
|
}
|
|
100
100
|
},
|
|
101
101
|
"packageJsonUpdates": {
|
|
@@ -893,6 +893,34 @@
|
|
|
893
893
|
"ng-packagr": {
|
|
894
894
|
"version": "~12.2.3",
|
|
895
895
|
"alwaysAddToPackageJson": false
|
|
896
|
+
},
|
|
897
|
+
"@ngrx/store": {
|
|
898
|
+
"version": "~12.5.0",
|
|
899
|
+
"alwaysAddToPackageJson": false
|
|
900
|
+
},
|
|
901
|
+
"@ngrx/effects": {
|
|
902
|
+
"version": "~12.5.0",
|
|
903
|
+
"alwaysAddToPackageJson": false
|
|
904
|
+
},
|
|
905
|
+
"@ngrx/entity": {
|
|
906
|
+
"version": "~12.5.0",
|
|
907
|
+
"alwaysAddToPackageJson": false
|
|
908
|
+
},
|
|
909
|
+
"@ngrx/router-store": {
|
|
910
|
+
"version": "~12.5.0",
|
|
911
|
+
"alwaysAddToPackageJson": false
|
|
912
|
+
},
|
|
913
|
+
"@ngrx/schematics": {
|
|
914
|
+
"version": "~12.5.0",
|
|
915
|
+
"alwaysAddToPackageJson": false
|
|
916
|
+
},
|
|
917
|
+
"@ngrx/store-devtools": {
|
|
918
|
+
"version": "~12.5.0",
|
|
919
|
+
"alwaysAddToPackageJson": false
|
|
920
|
+
},
|
|
921
|
+
"@ngrx/component-store": {
|
|
922
|
+
"version": "~12.5.0",
|
|
923
|
+
"alwaysAddToPackageJson": false
|
|
896
924
|
}
|
|
897
925
|
}
|
|
898
926
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "13.0.0-
|
|
3
|
+
"version": "13.0.0-rc.2",
|
|
4
4
|
"description": "Angular Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -35,11 +35,11 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@angular-devkit/schematics": "~12.2.0",
|
|
38
|
-
"@nrwl/cypress": "13.0.0-
|
|
39
|
-
"@nrwl/devkit": "13.0.0-
|
|
40
|
-
"@nrwl/jest": "13.0.0-
|
|
41
|
-
"@nrwl/linter": "13.0.0-
|
|
42
|
-
"@nrwl/storybook": "13.0.0-
|
|
38
|
+
"@nrwl/cypress": "13.0.0-rc.2",
|
|
39
|
+
"@nrwl/devkit": "13.0.0-rc.2",
|
|
40
|
+
"@nrwl/jest": "13.0.0-rc.2",
|
|
41
|
+
"@nrwl/linter": "13.0.0-rc.2",
|
|
42
|
+
"@nrwl/storybook": "13.0.0-rc.2",
|
|
43
43
|
"@schematics/angular": "~12.2.0",
|
|
44
44
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
45
45
|
"ignore": "^5.0.4",
|
|
@@ -50,7 +50,7 @@ function buildAppWithCustomWebpackConfiguration(options, context, pathToWebpackC
|
|
|
50
50
|
});
|
|
51
51
|
}
|
|
52
52
|
function run(options, context) {
|
|
53
|
-
const { target, dependencies } = buildable_libs_utils_1.calculateProjectDependencies(project_graph_1.readCachedProjectGraph(
|
|
53
|
+
const { target, dependencies } = buildable_libs_utils_1.calculateProjectDependencies(project_graph_1.readCachedProjectGraph(), context.workspaceRoot, context.target.project, context.target.target, context.target.configuration);
|
|
54
54
|
options.tsConfig = buildable_libs_utils_1.createTmpTsConfig(path_1.join(context.workspaceRoot, options.tsConfig), context.workspaceRoot, target.data.root, dependencies);
|
|
55
55
|
process.env.NX_TSCONFIG_PATH = options.tsConfig;
|
|
56
56
|
return rxjs_1.of(buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt(context.workspaceRoot, context.target.project, context.target.target, dependencies)).pipe(operators_1.switchMap((result) => {
|
|
@@ -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;AAEtE,+BAA4C;AAC5C,6FAI4D;AAC5D,yCAAiD;AACjD,+BAA4B;AAC5B,0EAAgF;AAEhF,8CAA2C;AAC3C,2BAAgC;AAChC,iDAAsC;AAQtC,SAAS,QAAQ,CACf,OAA6B,EAC7B,OAAuB;IAEvB,MAAM,EAAE,mBAAmB,KAAyB,OAAO,EAA3B,eAAe,kBAAK,OAAO,EAArD,uBAA2C,CAAU,CAAC;IAC5D,8CAA8C;IAC9C,mDAAmD;IACnD,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,MAAM,mBAAmB,GAAG,0BAAiB,CAC3C,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,eAAU,CAAC,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,MAAM,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAC9C,uCAAuC,EACvC,eAAsC,EACtC;QACE,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAa;KAC9B,CACF,CAAC;IAEF,OAAO,WAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,qBAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,sCAAsC,CAC7C,OAAe,EACf,OAAuB,EACvB,mBAA2B;IAE3B,OAAO,qCAAqB,CAAC,OAAO,EAAE,OAAO,EAAE;QAC7C,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;YAChD,MAAM,0BAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;YAChE,0FAA0F;YAC1F,4DAA4D;YAC5D,IAAI,OAAO,0BAA0B,KAAK,UAAU,EAAE;gBACpD,OAAO,0BAA0B,CAAC,iBAAiB,CAAC,CAAC;aACtD;iBAAM;gBACL,OAAO,qBAAK,CACV,iBAAiB;gBACjB,gFAAgF;gBAChF,yFAAyF;gBACzF,4CAA4C;gBAC5C,MAAM,0BAA0B,CACjC,CAAC;aACH;QACH,CAAC,CAAA;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,GAAG,CACV,OAA6B,EAC7B,OAAuB;IAEvB,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,mDAA4B,CAC3D,sCAAsB,
|
|
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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"}
|
|
@@ -7,7 +7,7 @@ const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
|
|
|
7
7
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
8
8
|
function delegateBuildExecutor(options, context) {
|
|
9
9
|
return tslib_1.__asyncGenerator(this, arguments, function* delegateBuildExecutor_1() {
|
|
10
|
-
const { target, dependencies } = buildable_libs_utils_1.calculateProjectDependencies(project_graph_1.readCachedProjectGraph(
|
|
10
|
+
const { target, dependencies } = buildable_libs_utils_1.calculateProjectDependencies(project_graph_1.readCachedProjectGraph(), context.root, context.projectName, context.targetName, context.configurationName);
|
|
11
11
|
options.tsConfig = buildable_libs_utils_1.createTmpTsConfig(devkit_1.joinPathFragments(context.root, options.tsConfig), context.root, target.data.root, dependencies);
|
|
12
12
|
if (!buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt(context.root, context.projectName, context.targetName, dependencies)) {
|
|
13
13
|
return yield tslib_1.__await({ success: false });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delegate-build.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/delegate-build/delegate-build.impl.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AACtB,0EAAgF;AAChF,6FAI4D;AAG5D,SAAuB,qBAAqB,CAC1C,OAAoC,EACpC,OAAwB;;QAExB,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,mDAA4B,CAC3D,sCAAsB,
|
|
1
|
+
{"version":3,"file":"delegate-build.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/delegate-build/delegate-build.impl.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AACtB,0EAAgF;AAChF,6FAI4D;AAG5D,SAAuB,qBAAqB,CAC1C,OAAoC,EACpC,OAAwB;;QAExB,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,mDAA4B,CAC3D,sCAAsB,EAAE,EACxB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;QAEF,OAAO,CAAC,QAAQ,GAAG,wCAAiB,CAClC,0BAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,EACjD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,IAAI,CAAC,IAAI,EAChB,YAAY,CACb,CAAC;QAEF,IACE,CAAC,0DAAmC,CAClC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,YAAY,CACb,EACD;YACA,6BAAO,EAAE,OAAO,EAAE,KAAK,EAAE,EAAC;SAC3B;QAED,MAAM,EAAE,WAAW,KAAuB,OAAO,EAAzB,aAAa,kBAAK,OAAO,EAA3C,eAAiC,CAAU,CAAC;QAClD,MAAM,cAAc,GAAG,0BAAiB,CAAC,WAAW,CAAC,CAAC;QAEtD,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,sBAAM,oBAAW,CAAC,cAAc,EAAE,aAAa,EAAE,OAAO,CAAC,CAAA,CAAA,CAAA,CAAA,CAAC;IACnE,CAAC;CAAA;AAlCD,sDAkCC;AAED,kBAAe,qBAAqB,CAAC"}
|
|
@@ -9,6 +9,7 @@ const path_1 = require("path");
|
|
|
9
9
|
const rxjs_1 = require("rxjs");
|
|
10
10
|
const rxjs_for_await_1 = require("rxjs-for-await");
|
|
11
11
|
const operators_1 = require("rxjs/operators");
|
|
12
|
+
const ts = require("typescript");
|
|
12
13
|
const entry_point_di_1 = require("./ng-packagr-adjustments/ng-package/entry-point/entry-point.di");
|
|
13
14
|
const package_di_1 = require("./ng-packagr-adjustments/ng-package/package.di");
|
|
14
15
|
function initializeNgPackagr(options, context, projectDependencies) {
|
|
@@ -19,10 +20,28 @@ function initializeNgPackagr(options, context, projectDependencies) {
|
|
|
19
20
|
]);
|
|
20
21
|
packager.forProject(path_1.resolve(context.root, options.project));
|
|
21
22
|
packager.withBuildTransform(package_di_1.NX_PACKAGE_TRANSFORM.provide);
|
|
23
|
+
// read the tsconfig and modify its path in memory to
|
|
24
|
+
// pass it on to ngpackagr if specified
|
|
22
25
|
if (options.tsConfig) {
|
|
23
|
-
//
|
|
24
|
-
//
|
|
25
|
-
const
|
|
26
|
+
// these options are mandatory
|
|
27
|
+
// see https://github.com/ng-packagr/ng-packagr/blob/v12.2/src/lib/ts/tsconfig.ts#L16
|
|
28
|
+
const extraOptions = {
|
|
29
|
+
moduleResolution: ts.ModuleResolutionKind.NodeJs,
|
|
30
|
+
target: ts.ScriptTarget.ES2015,
|
|
31
|
+
experimentalDecorators: true,
|
|
32
|
+
// sourcemaps
|
|
33
|
+
sourceMap: false,
|
|
34
|
+
inlineSources: true,
|
|
35
|
+
inlineSourceMap: true,
|
|
36
|
+
outDir: '',
|
|
37
|
+
declaration: true,
|
|
38
|
+
// ng compiler to options
|
|
39
|
+
enableResourceInlining: true,
|
|
40
|
+
// these are required to set the appropriate EmitFlags
|
|
41
|
+
flatModuleId: 'AUTOGENERATED',
|
|
42
|
+
flatModuleOutFile: 'AUTOGENERATED',
|
|
43
|
+
};
|
|
44
|
+
const parsedTSConfig = ng.readConfiguration(options.tsConfig, extraOptions);
|
|
26
45
|
buildable_libs_utils_1.updatePaths(projectDependencies, parsedTSConfig.options.paths);
|
|
27
46
|
packager.withTsConfig(parsedTSConfig);
|
|
28
47
|
}
|
|
@@ -37,7 +56,7 @@ function initializeNgPackagr(options, context, projectDependencies) {
|
|
|
37
56
|
function createLibraryExecutor(initializeNgPackagr) {
|
|
38
57
|
return function (options, context) {
|
|
39
58
|
return tslib_1.__asyncGenerator(this, arguments, function* () {
|
|
40
|
-
const { target, dependencies } = buildable_libs_utils_1.calculateProjectDependencies(project_graph_1.readCachedProjectGraph(
|
|
59
|
+
const { target, dependencies } = buildable_libs_utils_1.calculateProjectDependencies(project_graph_1.readCachedProjectGraph(), context.root, context.projectName, context.targetName, context.configurationName);
|
|
41
60
|
if (!buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt(context.root, context.projectName, context.targetName, dependencies)) {
|
|
42
61
|
return yield tslib_1.__await(Promise.resolve({ success: false }));
|
|
43
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":";;;;AAAA,4CAA4C;AAE5C,0EAAgF;AAEhF,6FAK4D;AAE5D,+BAA+B;AAC/B,+BAA4B;AAC5B,mDAA+C;AAC/C,8CAAuD;AACvD,mGAA0G;AAC1G,+EAGwD;AAGxD,SAAe,mBAAmB,CAChC,OAA2C,EAC3C,OAAwB,EACxB,mBAAoD;;QAEpD,MAAM,QAAQ,GAAG,IAAI,CAAC,2CAAa,YAAY,EAAC,CAAC,CAAC,SAAS,CAAC;YAC1D,GAAG,iCAAoB;YACvB,GAAG,yCAAwB;SAC5B,CAAC,CAAC;QAEH,QAAQ,CAAC,UAAU,CAAC,cAAO,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5D,QAAQ,CAAC,kBAAkB,CAAC,iCAAoB,CAAC,OAAO,CAAC,CAAC;QAE1D,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,
|
|
1
|
+
{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|
|
@@ -3,15 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addProtractor = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const devkit_2 = require("@nrwl/devkit");
|
|
6
7
|
const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
8
|
+
const workspace_1 = require("@nrwl/workspace");
|
|
7
9
|
function addProtractor(host, options) {
|
|
10
|
+
var _a;
|
|
8
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
12
|
const protractorSchematic = ngcli_adapter_1.wrapAngularDevkitSchematic('@schematics/angular', 'e2e');
|
|
10
13
|
yield protractorSchematic(host, {
|
|
11
14
|
relatedAppName: options.name,
|
|
12
15
|
rootSelector: `${options.prefix}-root`,
|
|
13
16
|
});
|
|
14
|
-
|
|
17
|
+
if ((_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : devkit_1.getWorkspaceLayout(host).standaloneAsDefault) {
|
|
18
|
+
yield workspace_1.convertToNxProjectGenerator(host, {
|
|
19
|
+
project: options.e2eProjectName,
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
devkit_2.moveFilesToNewDirectory(host, devkit_2.joinPathFragments(options.appProjectRoot, 'e2e'), options.e2eProjectRoot);
|
|
15
23
|
});
|
|
16
24
|
}
|
|
17
25
|
exports.addProtractor = addProtractor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-protractor.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-protractor.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"add-protractor.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-protractor.ts"],"names":[],"mappings":";;;;AAAA,yCAAwD;AAGxD,yCAA0E;AAC1E,8DAAwE;AACxE,+CAA8D;AAE9D,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAyB;;;QACvE,MAAM,mBAAmB,GAAG,0CAA0B,CACpD,qBAAqB,EACrB,KAAK,CACN,CAAC;QAEF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,cAAc,EAAE,OAAO,CAAC,IAAI;YAC5B,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,OAAO;SACvC,CAAC,CAAC;QAEH,IACE,MAAA,OAAO,CAAC,gBAAgB,mCACxB,2BAAkB,CAAC,IAAI,CAAC,CAAC,mBAAmB,EAC5C;YACA,MAAM,uCAA2B,CAAC,IAAI,EAAE;gBACtC,OAAO,EAAE,OAAO,CAAC,cAAc;aAChC,CAAC,CAAC;SACJ;QAED,gCAAuB,CACrB,IAAI,EACJ,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EAChD,OAAO,CAAC,cAAc,CACvB,CAAC;;CACH;AAzBD,sCAyBC"}
|
|
@@ -4,7 +4,7 @@ exports.normalizeOptions = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const linter_1 = require("@nrwl/linter");
|
|
6
6
|
function normalizeOptions(host, options) {
|
|
7
|
-
var _a;
|
|
7
|
+
var _a, _b;
|
|
8
8
|
const { appsDir, npmScope, standaloneAsDefault } = devkit_1.getWorkspaceLayout(host);
|
|
9
9
|
const appDirectory = options.directory
|
|
10
10
|
? `${devkit_1.names(options.directory).fileName}/${devkit_1.names(options.name).fileName}`
|
|
@@ -20,9 +20,9 @@ function normalizeOptions(host, options) {
|
|
|
20
20
|
? options.tags.split(',').map((s) => s.trim())
|
|
21
21
|
: [];
|
|
22
22
|
const defaultPrefix = npmScope;
|
|
23
|
-
options.standaloneConfig = options.standaloneConfig
|
|
23
|
+
options.standaloneConfig = (_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : standaloneAsDefault;
|
|
24
24
|
// Set defaults and then overwrite with user options
|
|
25
|
-
return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, unitTestRunner: "jest" /* Jest */, e2eTestRunner: "cypress" /* Cypress */, linter: linter_1.Linter.EsLint, strict: true }, options), { prefix: (
|
|
25
|
+
return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, unitTestRunner: "jest" /* Jest */, e2eTestRunner: "cypress" /* Cypress */, linter: linter_1.Linter.EsLint, strict: true }, options), { prefix: (_b = options.prefix) !== null && _b !== void 0 ? _b : defaultPrefix, name: appProjectName, appProjectRoot,
|
|
26
26
|
e2eProjectRoot,
|
|
27
27
|
e2eProjectName,
|
|
28
28
|
parsedTags });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAIA,yCAAyD;AAEzD,yCAAsC;AAEtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;QACpC,CAAC,CAAC,GAAG,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,IAAI,cAAc,GAAG,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAC3D,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACvE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;QACvC,cAAc,GAAG,GAAG,cAAc,MAAM,CAAC;KAC1C;IAED,MAAM,cAAc,GAAG,GAAG,OAAO,IAAI,YAAY,EAAE,CAAC;IACpD,MAAM,cAAc,GAAG,GAAG,OAAO,IAAI,YAAY,MAAM,CAAC;IAExD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAIA,yCAAyD;AAEzD,yCAAsC;AAEtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;QACpC,CAAC,CAAC,GAAG,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,IAAI,cAAc,GAAG,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAC3D,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACvE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;QACvC,cAAc,GAAG,GAAG,cAAc,MAAM,CAAC;KAC1C;IAED,MAAM,cAAc,GAAG,GAAG,OAAO,IAAI,YAAY,EAAE,CAAC;IACpD,MAAM,cAAc,GAAG,GAAG,OAAO,IAAI,YAAY,MAAM,CAAC;IAExD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,oDAAoD;IACpD,qCACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK,EACjB,cAAc,qBACd,aAAa,2BACb,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,IACT,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,aAAa,EACvC,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU,IACV;AACJ,CAAC;AA/CD,4CA+CC"}
|
|
@@ -32,6 +32,9 @@ function updateAppAndE2EProjectConfigurations(host, options) {
|
|
|
32
32
|
if (fixedProject.generators) {
|
|
33
33
|
delete fixedProject.generators;
|
|
34
34
|
}
|
|
35
|
+
if (options.port) {
|
|
36
|
+
fixedProject.targets.serve = Object.assign(Object.assign({}, fixedProject.targets.serve), { options: Object.assign(Object.assign({}, fixedProject.targets.serve.options), { port: options.port }) });
|
|
37
|
+
}
|
|
35
38
|
devkit_1.updateProjectConfiguration(host, options.name, fixedProject);
|
|
36
39
|
if (options.unitTestRunner === "none" /* None */) {
|
|
37
40
|
host.delete(`${options.appProjectRoot}/src/app/app.component.spec.ts`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":";;;;AAGA,yCAOsB;AACtB,+CAAyD;AAGzD,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;IACrE,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9B,6BAA6B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,oCAAoC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAJD,8CAIC;AAED,SAAS,cAAc,CAAC,IAAU,EAAE,OAAyB;IAC3D,8BAA8B;IAC9B,MAAM,aAAa,GAAG,iCAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,MAAM,UAAU,mCACX,aAAa,KAChB,IAAI,EAAE,OAAO,CAAC,UAAU,GACzB,CAAC;IACF,mCAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,6BAA6B,CAAC,IAAU,EAAE,OAAyB;IAC1E,oBAAoB;IACpB,mBAAU,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACrE,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,uBAAc,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,OAEjE,CAAC,CAAC;AACN,CAAC;AAED,SAAS,oCAAoC,CAC3C,IAAU,EACV,OAAyB;IAEzB,iBAAiB;IACjB,MAAM,OAAO,GAAG,iCAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D,IAAI,YAAY,GAAG,kCAAsB,CACvC,OAAO,EACP,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,cAAc,CACvB,CAAC;IAEF,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;IAEjC,2DAA2D;IAC3D,sBAAsB;IACtB,MAAM,KAAwB,YAAY,CAAC,OAAO,CAAC,KAAK,EAAlD,EAAE,QAAQ,OAAwC,EAAnC,IAAI,sBAAnB,YAAqB,CAA6B,CAAC;IACzD,YAAY,CAAC,OAAO,CAAC,KAAK,mBACxB,QAAQ,EACR,OAAO,EAAE,CAAC,sBAAsB,CAAC,IAC9B,IAAI,CACR,CAAC;IAEF,IAAI,YAAY,CAAC,UAAU,EAAE;QAC3B,OAAO,YAAY,CAAC,UAAU,CAAC;KAChC;IAED,mCAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAE7D,IAAI,OAAO,CAAC,cAAc,sBAAwB,EAAE;QAClD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,gCAAgC,CAAC,CAAC;QACvE,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,qBAAqB,CAAC,CAAC;KAC7D;IAED,IAAI,OAAO,CAAC,aAAa,sBAAuB,EAAE;QAChD,MAAM,QAAQ,GAAG,oBAAW,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACxC,mCAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;SAC1D;KACF;IAED,mCAAmC;IACnC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC,CAAC;IACvD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,cAAc,CAAC,CAAC;AACvD,CAAC"}
|
|
1
|
+
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -125,8 +125,7 @@
|
|
|
125
125
|
},
|
|
126
126
|
"standaloneConfig": {
|
|
127
127
|
"description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
|
128
|
-
"type": "boolean"
|
|
129
|
-
"default": false
|
|
128
|
+
"type": "boolean"
|
|
130
129
|
},
|
|
131
130
|
"mfe": {
|
|
132
131
|
"description": "Generate a Module Federation configuration for the application",
|
|
@@ -5,7 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const devkit_2 = require("@nrwl/devkit");
|
|
6
6
|
const linter_1 = require("@nrwl/linter");
|
|
7
7
|
function normalizeOptions(host, schema) {
|
|
8
|
-
var _a;
|
|
8
|
+
var _a, _b;
|
|
9
9
|
// Create a schema with populated default values
|
|
10
10
|
const options = Object.assign({ buildable: false, enableIvy: false, linter: linter_1.Linter.EsLint, name: '', publishable: false, simpleModuleName: false, skipFormat: false, unitTestRunner: "jest" /* Jest */ }, schema);
|
|
11
11
|
const name = devkit_2.names(options.name).fileName;
|
|
@@ -22,9 +22,9 @@ function normalizeOptions(host, schema) {
|
|
|
22
22
|
: [];
|
|
23
23
|
const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
|
|
24
24
|
const defaultPrefix = npmScope;
|
|
25
|
-
options.standaloneConfig = options.standaloneConfig
|
|
25
|
+
options.standaloneConfig = (_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : standaloneAsDefault;
|
|
26
26
|
const importPath = options.importPath || `@${defaultPrefix}/${projectDirectory}`;
|
|
27
|
-
return Object.assign(Object.assign({}, options), { prefix: (
|
|
27
|
+
return Object.assign(Object.assign({}, options), { prefix: (_b = options.prefix) !== null && _b !== void 0 ? _b : defaultPrefix, name: projectName, projectRoot, entryFile: 'index', moduleName,
|
|
28
28
|
projectDirectory,
|
|
29
29
|
modulePath,
|
|
30
30
|
parsedTags,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAwD;AAGxD,yCAAqC;AACrC,yCAAsC;AAGtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAuB;;IAEvB,gDAAgD;IAChD,MAAM,OAAO,mBACX,SAAS,EAAE,KAAK,EAChB,SAAS,EAAE,KAAK,EAChB,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,EAAE,EACR,WAAW,EAAE,KAAK,EAClB,gBAAgB,EAAE,KAAK,EACvB,UAAU,EAAE,KAAK,EACjB,cAAc,uBACX,MAAM,CACV,CAAC;IAEF,MAAM,IAAI,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/D,MAAM,WAAW,GAAG,GAAG,OAAO,IAAI,gBAAgB,EAAE,CAAC;IAErD,MAAM,UAAU,GAAG,GAAG,cAAK,CAAC,QAAQ,CAAC,CAAC,SAAS,QAAQ,CAAC;IACxD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,UAAU,GAAG,GAAG,WAAW,YAAY,QAAQ,YAAY,CAAC;IAClE,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAwD;AAGxD,yCAAqC;AACrC,yCAAsC;AAGtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAuB;;IAEvB,gDAAgD;IAChD,MAAM,OAAO,mBACX,SAAS,EAAE,KAAK,EAChB,SAAS,EAAE,KAAK,EAChB,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,EAAE,EACR,WAAW,EAAE,KAAK,EAClB,gBAAgB,EAAE,KAAK,EACvB,UAAU,EAAE,KAAK,EACjB,cAAc,uBACX,MAAM,CACV,CAAC;IAEF,MAAM,IAAI,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/D,MAAM,WAAW,GAAG,GAAG,OAAO,IAAI,gBAAgB,EAAE,CAAC;IAErD,MAAM,UAAU,GAAG,GAAG,cAAK,CAAC,QAAQ,CAAC,CAAC,SAAS,QAAQ,CAAC;IACxD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,UAAU,GAAG,GAAG,WAAW,YAAY,QAAQ,YAAY,CAAC;IAClE,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,MAAM,UAAU,GACd,OAAO,CAAC,UAAU,IAAI,IAAI,aAAa,IAAI,gBAAgB,EAAE,CAAC;IAEhE,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,aAAa,EACvC,IAAI,EAAE,WAAW,EACjB,WAAW,EACX,SAAS,EAAE,OAAO,EAClB,UAAU;QACV,gBAAgB;QAChB,UAAU;QACV,UAAU;QACV,QAAQ;QACR,UAAU,IACV;AACJ,CAAC;AArDD,4CAqDC"}
|
|
@@ -46,8 +46,13 @@ function libraryGenerator(host, schema) {
|
|
|
46
46
|
add_module_1.addModule(host, options);
|
|
47
47
|
setStrictMode(host, options);
|
|
48
48
|
yield addLinting(host, options);
|
|
49
|
-
if (options.publishable) {
|
|
50
|
-
devkit_1.addDependenciesToPackageJson(host, {}, {
|
|
49
|
+
if (options.buildable || options.publishable) {
|
|
50
|
+
devkit_1.addDependenciesToPackageJson(host, {}, {
|
|
51
|
+
postcss: '^8.3.9',
|
|
52
|
+
'postcss-import': '^14.0.2',
|
|
53
|
+
'postcss-preset-env': '^6.7.0',
|
|
54
|
+
'postcss-url': '^10.1.1',
|
|
55
|
+
});
|
|
51
56
|
}
|
|
52
57
|
if (options.standaloneConfig) {
|
|
53
58
|
yield workspace_1.convertToNxProjectGenerator(host, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,8DAAwE;AACxE,qCAAkD;AAClD,yCAAsC;AAEtC,qDAA8C;AAC9C,4DAA6D;AAC7D,kEAAmE;AAEnE,iDAA6C;AAC7C,+DAA2D;AAC3D,qFAA8E;AAC9E,yDAAqD;AACrD,2DAAuD;AACvD,mFAG2C;AAG3C,+CAA8D;AAE9D,SAAsB,gBAAgB,CAAC,IAAU,EAAE,MAAuB;;QACxE,4BAA4B;QAC5B,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;SACtE;QAED,IAAI,MAAM,CAAC,SAAS,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YAClD,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAChE;QAED,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACrD,MAAM,IAAI,KAAK,CACb,oJAAoJ,CACrJ,CAAC;SACH;QAED,MAAM,OAAO,GAAG,oCAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,cAAI,CAAC,IAAI,kCACV,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,0BAA0B,GAAG,0CAA0B,CAC3D,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,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;YAC5D,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,gCAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACjE,MAAM,8BAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnC,gCAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvC,sCAAsC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,sBAAS,CAAC,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;
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -106,8 +106,7 @@
|
|
|
106
106
|
},
|
|
107
107
|
"standaloneConfig": {
|
|
108
108
|
"description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
|
109
|
-
"type": "boolean"
|
|
110
|
-
"default": false
|
|
109
|
+
"type": "boolean"
|
|
111
110
|
}
|
|
112
111
|
},
|
|
113
112
|
"required": []
|
|
@@ -42,7 +42,7 @@ function addImportsToModule(tree, options) {
|
|
|
42
42
|
const hasNxModule = sourceText.includes(nxModule);
|
|
43
43
|
sourceFile = addImport(sourceFile, 'StoreModule', '@ngrx/store');
|
|
44
44
|
sourceFile = addImport(sourceFile, 'EffectsModule', '@ngrx/effects');
|
|
45
|
-
if (
|
|
45
|
+
if (options.minimal && options.root) {
|
|
46
46
|
sourceFile = addImport(sourceFile, 'StoreDevtoolsModule', '@ngrx/store-devtools');
|
|
47
47
|
sourceFile = addImport(sourceFile, 'environment', '../environments/environment');
|
|
48
48
|
sourceFile = ast_utils_2.addImportToModule(tree, sourceFile, modulePath, storeForRoot);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-imports-to-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-imports-to-module.ts"],"names":[],"mappings":";;;AACA,yCAAqC;AACrC,uEAAuE;AAEvE,2CAA4D;AAC5D,kEAG4C;AAG5C,SAAgB,kBAAkB,CAChC,IAAU,EACV,OAA6B;IAE7B,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAClC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAClD,IAAI,UAAU,GAAG,6BAAgB,CAC/B,UAAU,EACV,UAAU,EACV,yBAAY,CAAC,MAAM,EACnB,IAAI,CACL,CAAC;IACF,MAAM,SAAS,GAAG,CAChB,MAAkB,EAClB,UAAkB,EAClB,QAAgB,EAChB,SAAS,GAAG,KAAK,EACL,EAAE;QACd,OAAO,wBAAY,CACjB,IAAI,EACJ,MAAM,EACN,UAAU,EACV,UAAU,EACV,QAAQ,EACR,SAAS,CACV,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,GAAG,GAAG,KAAK,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrD,MAAM,UAAU,GAAG,GAAG,GAAG,IAAI,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC5D,MAAM,WAAW,GAAG,GAAG,UAAU,UAAU,CAAC;IAC5C,MAAM,WAAW,GAAG,GAAG,UAAU,UAAU,CAAC;IAC5C,MAAM,UAAU,GAAG,GAAG,UAAU,SAAS,CAAC;IAE1C,MAAM,YAAY,GAAG,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC;IAC3D,MAAM,WAAW,GAAG,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,SAAS,CAAC;IAC9D,MAAM,UAAU,GAAG,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,QAAQ,CAAC;IAC5D,MAAM,SAAS,GAAG,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;IACrD,MAAM,cAAc,GAAG,YAAY,SAAS,EAAE,CAAC;IAE/C,MAAM,iBAAiB,GAAG,iDAAiD,CAAC;IAE5E,MAAM,YAAY,GAAG;QACf,iBAAiB;;;;;OAKlB,CAAC;IACN,MAAM,QAAQ,GAAG,oBAAoB,CAAC;IACtC,MAAM,cAAc,GAAG,0BAA0B,WAAW,IAAI,CAAC;IACjE,MAAM,mBAAmB,GAAG,2BAA2B,CAAC;IACxD,MAAM,eAAe,GAAG,8BAA8B,SAAS,IAAI,YAAY,qBAAqB,SAAS,WAAW,CAAC;IACzH,MAAM,iBAAiB,GAAG,6BAA6B,WAAW,IAAI,CAAC;IACvE,MAAM,QAAQ,GAAG,iEAAiE,CAAC;IACnF,MAAM,iBAAiB,GAAG,uCAAuC,CAAC;IAElE,2BAA2B;IAC3B,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAElD,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;IACjE,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;IAErE,IAAI,
|
|
1
|
+
{"version":3,"file":"add-imports-to-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-imports-to-module.ts"],"names":[],"mappings":";;;AACA,yCAAqC;AACrC,uEAAuE;AAEvE,2CAA4D;AAC5D,kEAG4C;AAG5C,SAAgB,kBAAkB,CAChC,IAAU,EACV,OAA6B;IAE7B,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAClC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAClD,IAAI,UAAU,GAAG,6BAAgB,CAC/B,UAAU,EACV,UAAU,EACV,yBAAY,CAAC,MAAM,EACnB,IAAI,CACL,CAAC;IACF,MAAM,SAAS,GAAG,CAChB,MAAkB,EAClB,UAAkB,EAClB,QAAgB,EAChB,SAAS,GAAG,KAAK,EACL,EAAE;QACd,OAAO,wBAAY,CACjB,IAAI,EACJ,MAAM,EACN,UAAU,EACV,UAAU,EACV,QAAQ,EACR,SAAS,CACV,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,GAAG,GAAG,KAAK,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrD,MAAM,UAAU,GAAG,GAAG,GAAG,IAAI,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC5D,MAAM,WAAW,GAAG,GAAG,UAAU,UAAU,CAAC;IAC5C,MAAM,WAAW,GAAG,GAAG,UAAU,UAAU,CAAC;IAC5C,MAAM,UAAU,GAAG,GAAG,UAAU,SAAS,CAAC;IAE1C,MAAM,YAAY,GAAG,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC;IAC3D,MAAM,WAAW,GAAG,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,SAAS,CAAC;IAC9D,MAAM,UAAU,GAAG,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,QAAQ,CAAC;IAC5D,MAAM,SAAS,GAAG,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;IACrD,MAAM,cAAc,GAAG,YAAY,SAAS,EAAE,CAAC;IAE/C,MAAM,iBAAiB,GAAG,iDAAiD,CAAC;IAE5E,MAAM,YAAY,GAAG;QACf,iBAAiB;;;;;OAKlB,CAAC;IACN,MAAM,QAAQ,GAAG,oBAAoB,CAAC;IACtC,MAAM,cAAc,GAAG,0BAA0B,WAAW,IAAI,CAAC;IACjE,MAAM,mBAAmB,GAAG,2BAA2B,CAAC;IACxD,MAAM,eAAe,GAAG,8BAA8B,SAAS,IAAI,YAAY,qBAAqB,SAAS,WAAW,CAAC;IACzH,MAAM,iBAAiB,GAAG,6BAA6B,WAAW,IAAI,CAAC;IACvE,MAAM,QAAQ,GAAG,iEAAiE,CAAC;IACnF,MAAM,iBAAiB,GAAG,uCAAuC,CAAC;IAElE,2BAA2B;IAC3B,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAElD,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;IACjE,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;IAErE,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE;QACnC,UAAU,GAAG,SAAS,CACpB,UAAU,EACV,qBAAqB,EACrB,sBAAsB,CACvB,CAAC;QACF,UAAU,GAAG,SAAS,CACpB,UAAU,EACV,aAAa,EACb,6BAA6B,CAC9B,CAAC;QAEF,UAAU,GAAG,6BAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QAC3E,UAAU,GAAG,6BAAiB,CAC5B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,mBAAmB,CACpB,CAAC;QACF,UAAU,GAAG,6BAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAEvE,IAAI,SAAS,EAAE;YACb,UAAU,GAAG,SAAS,CACpB,UAAU,EACV,6BAA6B,EAC7B,oBAAoB,CACrB,CAAC;YACF,UAAU,GAAG,6BAAiB,CAC5B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,iBAAiB,CAClB,CAAC;SACH;KACF;SAAM;QACL,MAAM,gBAAgB,GAAG,GAAe,EAAE;YACxC,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;YACtE,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;YAE7D,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClB,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;gBAC3D,UAAU,GAAG,+BAAmB,CAC9B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,UAAU,CACX,CAAC;aACH;YAED,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC;QAEF,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,UAAU,GAAG,gBAAgB,EAAE,CAAC;YAEhC,IAAI,CAAC,WAAW,EAAE;gBAChB,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;gBAChE,UAAU,GAAG,6BAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;aACxE;YAED,UAAU,GAAG,SAAS,CACpB,UAAU,EACV,qBAAqB,EACrB,sBAAsB,CACvB,CAAC;YACF,UAAU,GAAG,SAAS,CACpB,UAAU,EACV,aAAa,EACb,6BAA6B,CAC9B,CAAC;YAEF,UAAU,GAAG,6BAAiB,CAC5B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,YAAY,CACb,CAAC;YACF,UAAU,GAAG,6BAAiB,CAC5B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,cAAc,CACf,CAAC;YACF,UAAU,GAAG,6BAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;YAEvE,IAAI,SAAS,EAAE;gBACb,UAAU,GAAG,SAAS,CACpB,UAAU,EACV,6BAA6B,EAC7B,oBAAoB,CACrB,CAAC;gBACF,UAAU,GAAG,6BAAiB,CAC5B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,iBAAiB,CAClB,CAAC;aACH;YAED,UAAU,GAAG,6BAAiB,CAC5B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,eAAe,CAChB,CAAC;SACH;aAAM;YACL,UAAU,GAAG,gBAAgB,EAAE,CAAC;YAEhC,UAAU,GAAG,6BAAiB,CAC5B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,eAAe,CAChB,CAAC;YACF,UAAU,GAAG,6BAAiB,CAC5B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,iBAAiB,CAClB,CAAC;SACH;KACF;AACH,CAAC;AA1LD,gDA0LC"}
|
|
@@ -3,14 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function normalizeOptions(options) {
|
|
6
|
-
|
|
7
|
-
if (options.minimal) {
|
|
8
|
-
normalizedOptions.onlyEmptyRoot = true;
|
|
9
|
-
}
|
|
10
|
-
if (options.skipImport) {
|
|
11
|
-
normalizedOptions.onlyAddFiles = true;
|
|
12
|
-
}
|
|
13
|
-
return normalizedOptions;
|
|
6
|
+
return Object.assign(Object.assign({}, options), { directory: devkit_1.names(options.directory).fileName });
|
|
14
7
|
}
|
|
15
8
|
exports.normalizeOptions = normalizeOptions;
|
|
16
9
|
//# sourceMappingURL=normalize-options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAGrC,SAAgB,gBAAgB,CAC9B,OAA6B;IAE7B,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAGrC,SAAgB,gBAAgB,CAC9B,OAA6B;IAE7B,uCACK,OAAO,KACV,SAAS,EAAE,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAC5C;AACJ,CAAC;AAPD,4CAOC"}
|
|
@@ -10,11 +10,10 @@ function ngrxGenerator(tree, options) {
|
|
|
10
10
|
if (!tree.exists(normalizedOptions.module)) {
|
|
11
11
|
throw new Error(`Module does not exist: ${normalizedOptions.module}.`);
|
|
12
12
|
}
|
|
13
|
-
if (!normalizedOptions.
|
|
14
|
-
(!normalizedOptions.root && normalizedOptions.minimal)) {
|
|
13
|
+
if (!normalizedOptions.minimal || !normalizedOptions.root) {
|
|
15
14
|
lib_1.generateNgrxFilesFromTemplates(tree, normalizedOptions);
|
|
16
15
|
}
|
|
17
|
-
if (!normalizedOptions.
|
|
16
|
+
if (!normalizedOptions.skipImport) {
|
|
18
17
|
lib_1.addImportsToModule(tree, normalizedOptions);
|
|
19
18
|
lib_1.addExportsToBarrel(tree, normalizedOptions);
|
|
20
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ngrx.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ngrx/ngrx.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+BAMe;AAGf,SAAsB,aAAa,CACjC,IAAU,EACV,OAA6B;;QAE7B,MAAM,iBAAiB,GAAG,sBAAgB,CAAC,OAAO,CAAC,CAAC;QAEpD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE;YAC1C,MAAM,IAAI,KAAK,CAAC,0BAA0B,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;SACxE;QAED,
|
|
1
|
+
{"version":3,"file":"ngrx.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ngrx/ngrx.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+BAMe;AAGf,SAAsB,aAAa,CACjC,IAAU,EACV,OAA6B;;QAE7B,MAAM,iBAAiB,GAAG,sBAAgB,CAAC,OAAO,CAAC,CAAC;QAEpD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE;YAC1C,MAAM,IAAI,KAAK,CAAC,0BAA0B,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;SACxE;QAED,IAAI,CAAC,iBAAiB,CAAC,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE;YACzD,oCAA8B,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;SACzD;QAED,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE;YACjC,wBAAkB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YAC5C,wBAAkB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;SAC7C;QAED,IAAI,uBAAuB,GAAsB,GAAG,EAAE,GAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE;YACtC,uBAAuB,GAAG,0BAAoB,CAAC,IAAI,CAAC,CAAC;SACtD;QAED,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE;YACjC,MAAM,oBAAW,CAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,uBAAuB,CAAC;IACjC,CAAC;CAAA;AA7BD,sCA6BC;AAED,kBAAe,aAAa,CAAC"}
|
|
@@ -11,14 +11,4 @@ export interface NgRxGeneratorOptions {
|
|
|
11
11
|
skipImport?: boolean;
|
|
12
12
|
skipPackageJson?: boolean;
|
|
13
13
|
syntax?: 'classes' | 'creators';
|
|
14
|
-
|
|
15
|
-
/**
|
|
16
|
-
* @deprecated use `skipImport`.
|
|
17
|
-
*/
|
|
18
|
-
onlyAddFiles?: boolean;
|
|
19
|
-
|
|
20
|
-
/**
|
|
21
|
-
* @deprecated use `minimal`.
|
|
22
|
-
*/
|
|
23
|
-
onlyEmptyRoot?: boolean;
|
|
24
14
|
}
|
|
@@ -41,23 +41,11 @@
|
|
|
41
41
|
"default": false,
|
|
42
42
|
"description": "Generate NgRx feature files without registering the feature in the NgModule."
|
|
43
43
|
},
|
|
44
|
-
"onlyAddFiles": {
|
|
45
|
-
"type": "boolean",
|
|
46
|
-
"default": false,
|
|
47
|
-
"description": "Only add new NgRx files, without changing the module file (e.g., `--onlyAddFiles`).",
|
|
48
|
-
"x-deprecated": "Use the `skipImport` option instead."
|
|
49
|
-
},
|
|
50
44
|
"minimal": {
|
|
51
45
|
"type": "boolean",
|
|
52
46
|
"default": true,
|
|
53
47
|
"description": "Only register the root state management setup or feature state."
|
|
54
48
|
},
|
|
55
|
-
"onlyEmptyRoot": {
|
|
56
|
-
"type": "boolean",
|
|
57
|
-
"default": false,
|
|
58
|
-
"description": "Do not generate any files. Only generate `StoreModule.forRoot` and `EffectsModule.forRoot` (e.g., `--onlyEmptyRoot`).",
|
|
59
|
-
"x-deprecated": "Use the `minimal` option instead."
|
|
60
|
-
},
|
|
61
49
|
"skipFormat": {
|
|
62
50
|
"description": "Skip formatting files.",
|
|
63
51
|
"type": "boolean",
|
|
@@ -11,7 +11,12 @@ function addEntryModule(host, { appName, routing, mfeType }, appRoot) {
|
|
|
11
11
|
npmScope,
|
|
12
12
|
routing,
|
|
13
13
|
});
|
|
14
|
-
host.write(`${appRoot}/src/app/app.module.ts`,
|
|
14
|
+
host.write(`${appRoot}/src/app/app.module.ts`, `/*
|
|
15
|
+
* This RemoteEntryModule is imported here to allow TS to find the Module during
|
|
16
|
+
* compilation, allowing it to be included in the built bundle. This is required
|
|
17
|
+
* for the Module Federation Plugin to expose the Module correctly.
|
|
18
|
+
* */
|
|
19
|
+
import { RemoteEntryModule } from './remote-entry/entry.module';
|
|
15
20
|
${host.read(`${appRoot}/src/app/app.module.ts`, 'utf-8')}`);
|
|
16
21
|
}
|
|
17
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-entry-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/add-entry-module.ts"],"names":[],"mappings":";;;AAEA,yCAIsB;AAEtB,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAU,EACrC,OAAe;IAEf,IAAI,OAAO,KAAK,QAAQ,EAAE;QACxB,MAAM,EAAE,QAAQ,EAAE,GAAG,mCAA0B,CAAC,IAAI,CAAC,CAAC;QACtD,sBAAa,CACX,IAAI,EACJ,0BAAiB,CAAC,SAAS,EAAE,6BAA6B,CAAC,EAC3D,GAAG,OAAO,uBAAuB,EACjC;YACE,IAAI,EAAE,EAAE;YACR,OAAO;YACP,QAAQ;YACR,OAAO;SACR,CACF,CAAC;QAEF,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,wBAAwB,EAClC
|
|
1
|
+
{"version":3,"file":"add-entry-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/add-entry-module.ts"],"names":[],"mappings":";;;AAEA,yCAIsB;AAEtB,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAU,EACrC,OAAe;IAEf,IAAI,OAAO,KAAK,QAAQ,EAAE;QACxB,MAAM,EAAE,QAAQ,EAAE,GAAG,mCAA0B,CAAC,IAAI,CAAC,CAAC;QACtD,sBAAa,CACX,IAAI,EACJ,0BAAiB,CAAC,SAAS,EAAE,6BAA6B,CAAC,EAC3D,GAAG,OAAO,uBAAuB,EACjC;YACE,IAAI,EAAE,EAAE;YACR,OAAO;YACP,QAAQ;YACR,OAAO;SACR,CACF,CAAC;QAEF,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,wBAAwB,EAClC;;;;;;EAMJ,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,wBAAwB,EAAE,OAAO,CAAC,EAAE,CACrD,CAAC;KACH;AACH,CAAC;AA9BD,wCA8BC"}
|
|
@@ -23,7 +23,7 @@ function addHTMLPatternToBuilderConfig(projectName, projectSourceRoot, targetNam
|
|
|
23
23
|
function updateProjectESLintConfigsAndBuilders(host) {
|
|
24
24
|
var _a;
|
|
25
25
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
|
-
const graph = yield project_graph_1.createProjectGraphAsync(
|
|
26
|
+
const graph = yield project_graph_1.createProjectGraphAsync();
|
|
27
27
|
/**
|
|
28
28
|
* Make sure user is already using ESLint and is up to date with
|
|
29
29
|
* previous migrations
|
|
@@ -40,7 +40,7 @@ function updateProjectESLintConfigsAndBuilders(host) {
|
|
|
40
40
|
Object.keys(workspace.projects).forEach((projectName) => {
|
|
41
41
|
const project = workspace.projects[projectName];
|
|
42
42
|
if (!graph.dependencies[projectName].some((dependency) => dependency.target.startsWith('npm:@angular/') &&
|
|
43
|
-
|
|
43
|
+
graph.externalNodes[dependency.target])) {
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
46
|
Object.keys(project.architect || {}).forEach((targetName) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-template-support-and-presets-to-eslint.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.ts"],"names":[],"mappings":";;;AAAA,+CAAiD;AACjD,2DAA+D;AAC/D,+CAQyB;AACzB,+BAA4B;AAC5B,yCAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"add-template-support-and-presets-to-eslint.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
@@ -9,10 +9,15 @@ function default_1(tree) {
|
|
|
9
9
|
if (!devDependencies['ng-packagr']) {
|
|
10
10
|
return;
|
|
11
11
|
}
|
|
12
|
-
const task = devkit_1.addDependenciesToPackageJson(tree, {}, {
|
|
12
|
+
const task = devkit_1.addDependenciesToPackageJson(tree, {}, {
|
|
13
|
+
postcss: '^8.3.9',
|
|
14
|
+
'postcss-import': '^14.0.2',
|
|
15
|
+
'postcss-preset-env': '^6.7.0',
|
|
16
|
+
'postcss-url': '^10.1.1',
|
|
17
|
+
});
|
|
13
18
|
yield devkit_1.formatFiles(tree);
|
|
14
19
|
return task;
|
|
15
20
|
});
|
|
16
21
|
}
|
|
17
22
|
exports.default = default_1;
|
|
18
|
-
//# sourceMappingURL=add-postcss-
|
|
23
|
+
//# sourceMappingURL=add-postcss-packages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-postcss-packages.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-0-0/add-postcss-packages.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,mBAA+B,IAAU;;QACvC,MAAM,EAAE,eAAe,EAAE,GAAG,iBAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAE3D,2CAA2C;QAC3C,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE;YAClC,OAAO;SACR;QAED,MAAM,IAAI,GAAG,qCAA4B,CACvC,IAAI,EACJ,EAAE,EACF;YACE,OAAO,EAAE,QAAQ;YACjB,gBAAgB,EAAE,SAAS;YAC3B,oBAAoB,EAAE,QAAQ;YAC9B,aAAa,EAAE,SAAS;SACzB,CACF,CAAC;QAEF,MAAM,oBAAW,CAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAtBD,4BAsBC"}
|