@nrwl/angular 13.2.3 → 13.3.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/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/migrations.json +23 -0
- package/ng-package.json +3 -1
- package/package.json +8 -6
- package/src/builders/utilities/webpack.d.ts +1 -0
- package/src/builders/utilities/webpack.js +36 -0
- package/src/builders/utilities/webpack.js.map +1 -0
- package/src/builders/webpack-browser/webpack-browser.impl.d.ts +1 -6
- package/src/builders/webpack-browser/webpack-browser.impl.js +6 -5
- package/src/builders/webpack-browser/webpack-browser.impl.js.map +1 -1
- package/src/builders/webpack-server/webpack-server.impl.d.ts +1 -2
- package/src/builders/webpack-server/webpack-server.impl.js +3 -2
- package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.d.ts +9 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js +13 -4
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.d.ts +5 -4
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js +4 -3
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.di.d.ts +1 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.di.js +3 -2
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.di.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js +0 -9
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/options.di.d.ts +14 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/options.di.js +32 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/options.di.js.map +1 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/package.di.d.ts +2 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/package.di.js +5 -3
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/package.di.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.d.ts +46 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.di.d.ts +10 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.di.js +18 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.di.js.map +1 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js +268 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -0
- package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js +5 -0
- package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js.map +1 -1
- package/src/executors/ng-packagr-lite/schema.json +4 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js +2 -2
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.d.ts +1 -1
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js +1 -1
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/ng-package/options.di.d.ts +14 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/options.di.js +32 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/options.di.js.map +1 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.d.ts +2 -0
- package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.js +5 -3
- package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.d.ts +2 -1
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js +5 -4
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -1
- package/src/executors/package/package.impl.js +8 -4
- package/src/executors/package/package.impl.js.map +1 -1
- package/src/executors/package/schema.d.ts +2 -1
- package/src/executors/package/schema.json +4 -0
- package/src/executors/{package/ng-packagr-adjustments/utilities → utilities}/tailwindcss.d.ts +1 -1
- package/src/executors/{package/ng-packagr-adjustments/utilities → utilities}/tailwindcss.js +11 -9
- package/src/executors/utilities/tailwindcss.js.map +1 -0
- package/src/generators/application/application.js +9 -5
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/update-config-files.js +1 -7
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/library/lib/normalize-options.js +8 -4
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/lib/update-tsconfig.js +2 -1
- package/src/generators/library/lib/update-tsconfig.js.map +1 -1
- package/src/generators/library/schema.d.ts +1 -0
- package/src/generators/library/schema.json +5 -0
- package/src/generators/setup-mfe/setup-mfe.js +4 -1
- package/src/generators/setup-mfe/setup-mfe.js.map +1 -1
- package/src/migrations/update-13-2-0/opt-out-testbed-teardown.d.ts +2 -0
- package/src/migrations/update-13-2-0/opt-out-testbed-teardown.js +231 -0
- package/src/migrations/update-13-2-0/opt-out-testbed-teardown.js.map +1 -0
- package/src/utils/versions.d.ts +2 -1
- package/src/utils/versions.js +4 -3
- package/src/utils/versions.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.js.map +0 -1
|
@@ -20,7 +20,7 @@ const log = require("ng-packagr/lib/utils/log");
|
|
|
20
20
|
const path_1 = require("path");
|
|
21
21
|
const postcssPresetEnv = require("postcss-preset-env");
|
|
22
22
|
const postcssUrl = require("postcss-url");
|
|
23
|
-
const tailwindcss_1 = require("
|
|
23
|
+
const tailwindcss_1 = require("../../../utilities/tailwindcss");
|
|
24
24
|
const postcss = require('postcss');
|
|
25
25
|
var CssUrl;
|
|
26
26
|
(function (CssUrl) {
|
|
@@ -35,7 +35,7 @@ var InlineStyleLanguage;
|
|
|
35
35
|
InlineStyleLanguage["less"] = "less";
|
|
36
36
|
})(InlineStyleLanguage = exports.InlineStyleLanguage || (exports.InlineStyleLanguage = {}));
|
|
37
37
|
class StylesheetProcessor {
|
|
38
|
-
constructor(basePath, cssUrl, styleIncludePaths, cacheDirectory, watch) {
|
|
38
|
+
constructor(basePath, cssUrl, styleIncludePaths, cacheDirectory, watch, tailwindConfig) {
|
|
39
39
|
// By default, browserslist defaults are too inclusive
|
|
40
40
|
// https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
|
|
41
41
|
this.basePath = basePath;
|
|
@@ -43,6 +43,7 @@ class StylesheetProcessor {
|
|
|
43
43
|
this.styleIncludePaths = styleIncludePaths;
|
|
44
44
|
this.cacheDirectory = cacheDirectory;
|
|
45
45
|
this.watch = watch;
|
|
46
|
+
this.tailwindConfig = tailwindConfig;
|
|
46
47
|
this.esbuild = new esbuild_executor_1.EsbuildExecutor();
|
|
47
48
|
// We change the default query to browsers that Angular support.
|
|
48
49
|
// https://angular.io/guide/browser-support
|
|
@@ -56,7 +57,7 @@ class StylesheetProcessor {
|
|
|
56
57
|
];
|
|
57
58
|
this.browserslistData = browserslist(undefined, { path: this.basePath });
|
|
58
59
|
this.targets = transformSupportedBrowsersToTargets(this.browserslistData);
|
|
59
|
-
this.tailwindSetup = (0, tailwindcss_1.getTailwindSetup)(this.basePath);
|
|
60
|
+
this.tailwindSetup = (0, tailwindcss_1.getTailwindSetup)(this.basePath, this.tailwindConfig);
|
|
60
61
|
this.postCssProcessor = this.createPostCssPlugins();
|
|
61
62
|
}
|
|
62
63
|
process({ filePath, content, }) {
|
|
@@ -171,7 +172,7 @@ class StylesheetProcessor {
|
|
|
171
172
|
.css.toString();
|
|
172
173
|
}
|
|
173
174
|
case '.less': {
|
|
174
|
-
const { css: content } = yield (yield Promise.resolve().then(() => require('less'))).
|
|
175
|
+
const { css: content } = yield (yield Promise.resolve().then(() => require('less'))).render(css, {
|
|
175
176
|
filename: filePath,
|
|
176
177
|
math: 'always',
|
|
177
178
|
javascriptEnabled: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;AAEH,6CAA6C;AAC7C,qDAAuC;AACvC,2BAAgC;AAChC,8EAA0E;AAC1E,sDAIoC;AACpC,gDAAgD;AAChD,+BAAiD;AACjD,uDAAuD;AACvD,0CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,18 +4,22 @@ exports.packageExecutor = exports.createLibraryExecutor = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
|
|
6
6
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
7
|
-
const buildable_libs_utils_2 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
8
7
|
const path_1 = require("path");
|
|
9
8
|
const rxjs_1 = require("rxjs");
|
|
10
9
|
const rxjs_for_await_1 = require("rxjs-for-await");
|
|
11
10
|
const operators_1 = require("rxjs/operators");
|
|
12
11
|
const entry_point_di_1 = require("./ng-packagr-adjustments/ng-package/entry-point/entry-point.di");
|
|
12
|
+
const options_di_1 = require("./ng-packagr-adjustments/ng-package/options.di");
|
|
13
13
|
const package_di_1 = require("./ng-packagr-adjustments/ng-package/package.di");
|
|
14
14
|
function initializeNgPackagr(options, context, projectDependencies) {
|
|
15
15
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
16
16
|
const packager = new (yield Promise.resolve().then(() => require('ng-packagr'))).NgPackagr([
|
|
17
17
|
...package_di_1.NX_PACKAGE_PROVIDERS,
|
|
18
18
|
...entry_point_di_1.NX_ENTRY_POINT_PROVIDERS,
|
|
19
|
+
(0, options_di_1.nxProvideOptions)({
|
|
20
|
+
tailwindConfig: options.tailwindConfig,
|
|
21
|
+
watch: options.watch,
|
|
22
|
+
}),
|
|
19
23
|
]);
|
|
20
24
|
packager.forProject((0, path_1.resolve)(context.root, options.project));
|
|
21
25
|
packager.withBuildTransform(package_di_1.NX_PACKAGE_TRANSFORM.provide);
|
|
@@ -34,14 +38,14 @@ function initializeNgPackagr(options, context, projectDependencies) {
|
|
|
34
38
|
function createLibraryExecutor(initializeNgPackagr) {
|
|
35
39
|
return function (options, context) {
|
|
36
40
|
return (0, tslib_1.__asyncGenerator)(this, arguments, function* () {
|
|
37
|
-
const { target, dependencies } = (0,
|
|
38
|
-
if (!(0,
|
|
41
|
+
const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, project_graph_1.readCachedProjectGraph)(), context.root, context.projectName, context.targetName, context.configurationName);
|
|
42
|
+
if (!(0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
|
|
39
43
|
return yield (0, tslib_1.__await)(Promise.resolve({ success: false }));
|
|
40
44
|
}
|
|
41
45
|
function updatePackageJson() {
|
|
42
46
|
if (dependencies.length > 0 &&
|
|
43
47
|
options.updateBuildableProjectDepsInPackageJson) {
|
|
44
|
-
(0,
|
|
48
|
+
(0, buildable_libs_utils_1.updateBuildableProjectPackageJsonDependencies)(context.root, context.projectName, context.targetName, context.configurationName, target, dependencies, options.buildableProjectDepsInPackageJsonType);
|
|
45
49
|
}
|
|
46
50
|
}
|
|
47
51
|
if (options.watch) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":";;;;AACA,0EAAgF;AAChF,
|
|
1
|
+
{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
export interface BuildAngularLibraryExecutorOptions {
|
|
2
2
|
project: string;
|
|
3
|
-
tsConfig?: string;
|
|
4
3
|
buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
|
|
4
|
+
tailwindConfig?: string;
|
|
5
|
+
tsConfig?: string;
|
|
5
6
|
updateBuildableProjectDepsInPackageJson?: boolean;
|
|
6
7
|
watch?: boolean;
|
|
7
8
|
}
|
|
@@ -28,6 +28,10 @@
|
|
|
28
28
|
"description": "When `updateBuildableProjectDepsInPackageJson` is `true`, this adds dependencies to either `peerDependencies` or `dependencies`.",
|
|
29
29
|
"enum": ["dependencies", "peerDependencies"],
|
|
30
30
|
"default": "peerDependencies"
|
|
31
|
+
},
|
|
32
|
+
"tailwindConfig": {
|
|
33
|
+
"type": "string",
|
|
34
|
+
"description": "The full path for the Tailwind configuration file, relative to the workspace root. If not provided and a `tailwind.config.js` file exists in the project or workspace root, it will be used. Otherwise, Tailwind will not be configured."
|
|
31
35
|
}
|
|
32
36
|
},
|
|
33
37
|
"additionalProperties": false,
|
package/src/executors/{package/ng-packagr-adjustments/utilities → utilities}/tailwindcss.d.ts
RENAMED
|
@@ -3,5 +3,5 @@ export interface TailwindSetup {
|
|
|
3
3
|
tailwindPackagePath: string;
|
|
4
4
|
}
|
|
5
5
|
export declare const tailwindDirectives: string[];
|
|
6
|
-
export declare function getTailwindSetup(basePath: string): TailwindSetup | undefined;
|
|
6
|
+
export declare function getTailwindSetup(basePath: string, tailwindConfig?: string): TailwindSetup | undefined;
|
|
7
7
|
export declare function getTailwindPostCssPlugins({ tailwindConfigPath, tailwindPackagePath }: TailwindSetup, includePaths?: string[], watch?: boolean): any[];
|
|
@@ -14,15 +14,17 @@ exports.tailwindDirectives = [
|
|
|
14
14
|
'@responsive',
|
|
15
15
|
'@screen',
|
|
16
16
|
];
|
|
17
|
-
function getTailwindSetup(basePath) {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
17
|
+
function getTailwindSetup(basePath, tailwindConfig) {
|
|
18
|
+
let tailwindConfigPath = tailwindConfig;
|
|
19
|
+
if (!tailwindConfigPath) {
|
|
20
|
+
// Try to find TailwindCSS configuration file in the project or workspace root.
|
|
21
|
+
const tailwindConfigFile = 'tailwind.config.js';
|
|
22
|
+
for (const path of [basePath, app_root_1.appRootPath]) {
|
|
23
|
+
const fullPath = (0, path_1.join)(path, tailwindConfigFile);
|
|
24
|
+
if ((0, fs_1.existsSync)(fullPath)) {
|
|
25
|
+
tailwindConfigPath = fullPath;
|
|
26
|
+
break;
|
|
27
|
+
}
|
|
26
28
|
}
|
|
27
29
|
}
|
|
28
30
|
// Only load Tailwind CSS plugin if configuration file was found.
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tailwindcss.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/tailwindcss.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,2DAA2D;AAC3D,2BAAgC;AAChC,+BAAsC;AACtC,gDAAgD;AAOnC,QAAA,kBAAkB,GAAG;IAChC,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,aAAa;IACb,SAAS;CACV,CAAC;AAEF,SAAgB,gBAAgB,CAC9B,QAAgB,EAChB,cAAuB;IAEvB,IAAI,kBAAkB,GAAG,cAAc,CAAC;IAExC,IAAI,CAAC,kBAAkB,EAAE;QACvB,+EAA+E;QAC/E,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;QAChD,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,sBAAW,CAAC,EAAE;YAC1C,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;YAChD,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;gBACxB,kBAAkB,GAAG,QAAQ,CAAC;gBAC9B,MAAM;aACP;SACF;KACF;IAED,iEAAiE;IACjE,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,mBAAuC,CAAC;IAC5C,IAAI;QACF,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KACtD;IAAC,WAAM;QACN,MAAM,0BAA0B,GAAG,IAAA,eAAQ,EACzC,sBAAW,EACX,kBAAkB,CACnB,CAAC;QACF,eAAM,CAAC,IAAI,CACT,0CAA0C,0BAA0B,GAAG;YACrE,kDAAkD;YAClD,oEAAoE,CACvE,CAAC;QAEF,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,CAAC;AACrD,CAAC;AA7CD,4CA6CC;AAED,SAAgB,yBAAyB,CACvC,EAAE,kBAAkB,EAAE,mBAAmB,EAAiB,EAC1D,YAAuB,EACvB,KAAe;IAEf,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;KAC1D;IAED,OAAO;QACL,aAAa,CAAC;YACZ,qBAAqB,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE;YACzC,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SACzE,CAAC;QACF,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;KAC7D,CAAC;AACJ,CAAC;AAhBD,8DAgBC"}
|
|
@@ -13,12 +13,16 @@ function applicationGenerator(host, schema) {
|
|
|
13
13
|
const options = (0, lib_1.normalizeOptions)(host, schema);
|
|
14
14
|
// Determine the roots where @schematics/angular will place the projects
|
|
15
15
|
// This is not where the projects actually end up
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
const workspaceJsonPath = (0, devkit_1.getWorkspacePath)(host);
|
|
17
|
+
let newProjectRoot = null;
|
|
18
|
+
if (workspaceJsonPath) {
|
|
19
|
+
({ newProjectRoot } = (0, devkit_1.readJson)(host, workspaceJsonPath));
|
|
20
|
+
}
|
|
21
|
+
const appProjectRoot = newProjectRoot
|
|
22
|
+
? `${newProjectRoot}/${options.name}`
|
|
19
23
|
: options.name;
|
|
20
|
-
const e2eProjectRoot =
|
|
21
|
-
? `${
|
|
24
|
+
const e2eProjectRoot = newProjectRoot
|
|
25
|
+
? `${newProjectRoot}/${options.e2eProjectName}`
|
|
22
26
|
: `${options.name}/e2e`;
|
|
23
27
|
yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
|
|
24
28
|
const angularAppSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'application');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAEA,yCAOsB;AACtB,8DAAwE;AACxE,+CAA8D;AAG9D,uCAAgC;AAEhC,+BAee;AACf,qEAA+D;AAE/D,SAAsB,oBAAoB,CACxC,IAAU,EACV,MAAuB;;QAEvB,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,wEAAwE;QACxE,iDAAiD;QACjD,MAAM,
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,17 +5,10 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const workspace_1 = require("@nrwl/workspace");
|
|
7
7
|
function updateConfigFiles(host, options) {
|
|
8
|
-
addProjectToNx(host, options);
|
|
9
8
|
updateTsConfigOptions(host, options);
|
|
10
9
|
updateAppAndE2EProjectConfigurations(host, options);
|
|
11
10
|
}
|
|
12
11
|
exports.updateConfigFiles = updateConfigFiles;
|
|
13
|
-
function addProjectToNx(host, options) {
|
|
14
|
-
// tags, implicit dependencies
|
|
15
|
-
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
16
|
-
const resultJson = Object.assign(Object.assign({}, projectConfig), { tags: options.parsedTags });
|
|
17
|
-
(0, devkit_1.updateProjectConfiguration)(host, options.name, resultJson);
|
|
18
|
-
}
|
|
19
12
|
function updateTsConfigOptions(host, options) {
|
|
20
13
|
// tsconfig.app.json
|
|
21
14
|
(0, devkit_1.updateJson)(host, `${options.appProjectRoot}/tsconfig.app.json`, (json) => (Object.assign(Object.assign({}, json), { extends: './tsconfig.json', compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${(0, devkit_1.offsetFromRoot)(options.appProjectRoot)}dist/out-tsc` }), exclude: [
|
|
@@ -37,6 +30,7 @@ function updateAppAndE2EProjectConfigurations(host, options) {
|
|
|
37
30
|
if (options.port) {
|
|
38
31
|
fixedProject.targets.serve = Object.assign(Object.assign({}, fixedProject.targets.serve), { options: Object.assign(Object.assign({}, fixedProject.targets.serve.options), { port: options.port }) });
|
|
39
32
|
}
|
|
33
|
+
fixedProject.tags = options.parsedTags;
|
|
40
34
|
(0, devkit_1.updateProjectConfiguration)(host, options.name, fixedProject);
|
|
41
35
|
if (options.unitTestRunner === "none" /* None */) {
|
|
42
36
|
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,
|
|
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,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,oCAAoC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAHD,8CAGC;AAED,SAAS,qBAAqB,CAAC,IAAU,EAAE,OAAyB;IAClE,oBAAoB;IACpB,IAAA,mBAAU,EAAC,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,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,cAAc,KAEjE,OAAO,EAAE;YACP,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;SACtE,IACD,CAAC,CAAC;AACN,CAAC;AAED,SAAS,oCAAoC,CAC3C,IAAU,EACV,OAAyB;IAEzB,iBAAiB;IACjB,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D,IAAI,YAAY,GAAG,IAAA,kCAAsB,EACvC,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,2BAAnB,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,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,YAAY,CAAC,OAAO,CAAC,KAAK,mCACrB,YAAY,CAAC,OAAO,CAAC,KAAK,KAC7B,OAAO,kCACF,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KACrC,IAAI,EAAE,OAAO,CAAC,IAAI,MAErB,CAAC;KACH;IAED,YAAY,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;IAEvC,IAAA,mCAA0B,EAAC,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,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACxC,IAAA,mCAA0B,EAAC,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"}
|
|
@@ -5,9 +5,13 @@ 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, _b;
|
|
8
|
+
var _a, _b, _c;
|
|
9
9
|
// Create a schema with populated default values
|
|
10
|
-
const options = Object.assign({ buildable: false, linter: linter_1.Linter.EsLint, name: '', publishable: false, simpleModuleName: false, skipFormat: false, unitTestRunner: "jest" /* Jest
|
|
10
|
+
const options = Object.assign({ buildable: false, linter: linter_1.Linter.EsLint, name: '', publishable: false, simpleModuleName: false, skipFormat: false, unitTestRunner: "jest" /* Jest */,
|
|
11
|
+
// Publishable libs cannot use `full` yet, so if its false then use the passed value or default to `full`
|
|
12
|
+
compilationMode: schema.publishable
|
|
13
|
+
? 'partial'
|
|
14
|
+
: (_a = schema.compilationMode) !== null && _a !== void 0 ? _a : 'full' }, schema);
|
|
11
15
|
const name = (0, devkit_2.names)(options.name).fileName;
|
|
12
16
|
const projectDirectory = options.directory
|
|
13
17
|
? `${(0, devkit_2.names)(options.directory).fileName}/${name}`
|
|
@@ -22,9 +26,9 @@ function normalizeOptions(host, schema) {
|
|
|
22
26
|
: [];
|
|
23
27
|
const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
|
|
24
28
|
const defaultPrefix = npmScope;
|
|
25
|
-
options.standaloneConfig = (
|
|
29
|
+
options.standaloneConfig = (_b = options.standaloneConfig) !== null && _b !== void 0 ? _b : standaloneAsDefault;
|
|
26
30
|
const importPath = options.importPath || `@${defaultPrefix}/${projectDirectory}`;
|
|
27
|
-
return Object.assign(Object.assign({}, options), { prefix: (
|
|
31
|
+
return Object.assign(Object.assign({}, options), { prefix: (_c = options.prefix) !== null && _c !== void 0 ? _c : defaultPrefix, name: projectName, projectRoot, entryFile: 'index', moduleName,
|
|
28
32
|
projectDirectory,
|
|
29
33
|
modulePath,
|
|
30
34
|
parsedTags,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAA2E;AAG3E,yCAAqC;AACrC,yCAAsC;AAGtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAuB;;IAEvB,gDAAgD;IAChD,MAAM,OAAO,mBACX,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,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAA2E;AAG3E,yCAAqC;AACrC,yCAAsC;AAGtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAuB;;IAEvB,gDAAgD;IAChD,MAAM,OAAO,mBACX,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;QACd,yGAAyG;QACzG,eAAe,EAAE,MAAM,CAAC,WAAW;YACjC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAA,MAAM,CAAC,eAAe,mCAAI,MAAM,IACjC,MAAM,CACV,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2BAAkB,EAAC,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,IAAA,0BAAiB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAEjE,MAAM,UAAU,GAAG,GAAG,IAAA,cAAK,EAAC,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;AAxDD,4CAwDC"}
|
|
@@ -28,7 +28,8 @@ function updateProjectConfig(host, options) {
|
|
|
28
28
|
function updateProjectIvyConfig(host, options) {
|
|
29
29
|
if (options.buildable || options.publishable) {
|
|
30
30
|
return (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.prod.json`, (json) => {
|
|
31
|
-
json.angularCompilerOptions['compilationMode'] =
|
|
31
|
+
json.angularCompilerOptions['compilationMode'] =
|
|
32
|
+
options.compilationMode === 'full' ? undefined : 'partial';
|
|
32
33
|
return json;
|
|
33
34
|
});
|
|
34
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AAGpE,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IAC7D,IAAA,mBAAU,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9C,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IACjC,OAAO,CAAC,gBACV,eAAe;SAChB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IAChE,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;SACtE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IACnE,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AAGpE,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IAC7D,IAAA,mBAAU,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9C,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IACjC,OAAO,CAAC,gBACV,eAAe;SAChB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IAChE,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;SACtE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IACnE,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBAC5C,OAAO,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAJD,wCAIC"}
|
|
@@ -102,6 +102,11 @@
|
|
|
102
102
|
"standaloneConfig": {
|
|
103
103
|
"description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
|
104
104
|
"type": "boolean"
|
|
105
|
+
},
|
|
106
|
+
"compilationMode": {
|
|
107
|
+
"description": "Specifies the compilation mode to use. If not specified, it will default to `partial` for publishable libraries and to `full` for buildable libraries. The `full` value can not be used for publishable libraries.",
|
|
108
|
+
"type": "string",
|
|
109
|
+
"enum": ["full", "partial"]
|
|
105
110
|
}
|
|
106
111
|
},
|
|
107
112
|
"required": []
|
|
@@ -4,6 +4,7 @@ exports.setupMfe = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const lib_1 = require("./lib");
|
|
7
|
+
const versions_1 = require("../../utils/versions");
|
|
7
8
|
function setupMfe(host, options) {
|
|
8
9
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
9
10
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
|
|
@@ -16,7 +17,9 @@ function setupMfe(host, options) {
|
|
|
16
17
|
(0, lib_1.setupServeTarget)(host, options);
|
|
17
18
|
(0, lib_1.fixBootstrap)(host, projectConfig.root);
|
|
18
19
|
// add package to install
|
|
19
|
-
const installPackages = (0, devkit_1.addDependenciesToPackageJson)(host, {
|
|
20
|
+
const installPackages = (0, devkit_1.addDependenciesToPackageJson)(host, {
|
|
21
|
+
'@angular-architects/module-federation': versions_1.angularArchitectsModuleFederationPluginVersion,
|
|
22
|
+
}, {});
|
|
20
23
|
// format files
|
|
21
24
|
if (!options.skipFormat) {
|
|
22
25
|
yield (0, devkit_1.formatFiles)(host);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-mfe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mfe/setup-mfe.ts"],"names":[],"mappings":";;;;AAGA,yCAIsB;AAEtB,+BASe;
|
|
1
|
+
{"version":3,"file":"setup-mfe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mfe/setup-mfe.ts"],"names":[],"mappings":";;;;AAGA,yCAIsB;AAEtB,+BASe;AACf,mDAAsF;AAEtF,SAAsB,QAAQ,CAAC,IAAU,EAAE,OAAe;;QACxD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,MAAM,gBAAgB,GAAG,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE/B,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAE3E,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;QAClD,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAA,kBAAY,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;QAEvC,yBAAyB;QACzB,MAAM,eAAe,GAAG,IAAA,qCAA4B,EAClD,IAAI,EACJ;YACE,uCAAuC,EACrC,yDAA8C;SACjD,EACD,EAAE,CACH,CAAC;QAEF,eAAe;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;CAAA;AA/BD,4BA+BC;AAED,kBAAe,QAAQ,CAAC"}
|