@nrwl/angular 15.7.1 → 15.7.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/ng-package.json +2 -1
- package/package.json +9 -8
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +14 -1
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/builders/module-federation-dev-server/schema.d.ts +1 -0
- package/src/builders/module-federation-dev-server/schema.json +4 -0
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js +13 -1
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js.map +1 -1
- package/src/builders/module-federation-dev-ssr/schema.d.ts +1 -0
- package/src/builders/module-federation-dev-ssr/schema.json +4 -0
- package/src/builders/utilities/module-federation.d.ts +1 -1
- package/src/builders/utilities/module-federation.js +5 -6
- package/src/builders/utilities/module-federation.js.map +1 -1
- package/src/generators/application/application.js +10 -0
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/schema.json +1 -1
- package/src/generators/host/host.js +2 -1
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/remote/remote.js +2 -2
- package/src/generators/remote/remote.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +1 -1
package/ng-package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.7.
|
|
3
|
+
"version": "15.7.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
6
6
|
"repository": {
|
|
@@ -63,15 +63,16 @@
|
|
|
63
63
|
"migrations": "./migrations.json"
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@nrwl/cypress": "15.7.
|
|
67
|
-
"@nrwl/devkit": "15.7.
|
|
68
|
-
"@nrwl/jest": "15.7.
|
|
69
|
-
"@nrwl/linter": "15.7.
|
|
70
|
-
"@nrwl/webpack": "15.7.
|
|
71
|
-
"@nrwl/workspace": "15.7.
|
|
66
|
+
"@nrwl/cypress": "15.7.2",
|
|
67
|
+
"@nrwl/devkit": "15.7.2",
|
|
68
|
+
"@nrwl/jest": "15.7.2",
|
|
69
|
+
"@nrwl/linter": "15.7.2",
|
|
70
|
+
"@nrwl/webpack": "15.7.2",
|
|
71
|
+
"@nrwl/workspace": "15.7.2",
|
|
72
72
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
73
73
|
"chalk": "^4.1.0",
|
|
74
74
|
"chokidar": "^3.5.1",
|
|
75
|
+
"enquirer": "^2.3.6",
|
|
75
76
|
"http-server": "^14.1.0",
|
|
76
77
|
"ignore": "^5.0.4",
|
|
77
78
|
"magic-string": "~0.26.2",
|
|
@@ -106,5 +107,5 @@
|
|
|
106
107
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
107
108
|
"typings": "index.d.ts",
|
|
108
109
|
"sideEffects": false,
|
|
109
|
-
"gitHead": "
|
|
110
|
+
"gitHead": "230913d97de8d054ef10900337e0af9d06d72331"
|
|
110
111
|
}
|
|
@@ -7,6 +7,8 @@ const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
|
|
|
7
7
|
const webpack_dev_server_impl_1 = require("../webpack-dev-server/webpack-dev-server.impl");
|
|
8
8
|
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
9
9
|
const module_federation_1 = require("../utilities/module-federation");
|
|
10
|
+
const fs_1 = require("fs");
|
|
11
|
+
const path_1 = require("path");
|
|
10
12
|
function executeModuleFederationDevServerBuilder(schema, context) {
|
|
11
13
|
var _a, _b, _c;
|
|
12
14
|
const options = tslib_1.__rest(schema, []);
|
|
@@ -14,10 +16,21 @@ function executeModuleFederationDevServerBuilder(schema, context) {
|
|
|
14
16
|
const { projects: workspaceProjects } = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
|
|
15
17
|
const ws = new devkit_1.Workspaces(devkit_1.workspaceRoot);
|
|
16
18
|
const project = workspaceProjects[context.target.project];
|
|
19
|
+
let pathToManifestFile = (0, path_1.join)(context.workspaceRoot, project.sourceRoot, 'assets/module-federation.manifest.json');
|
|
20
|
+
if (options.pathToManifestFile) {
|
|
21
|
+
const userPathToManifestFile = (0, path_1.join)(context.workspaceRoot, options.pathToManifestFile);
|
|
22
|
+
if (!(0, fs_1.existsSync)(userPathToManifestFile)) {
|
|
23
|
+
throw new Error(`The provided Module Federation manifest file path does not exist. Please check the file exists at "${userPathToManifestFile}".`);
|
|
24
|
+
}
|
|
25
|
+
else if ((0, path_1.extname)(options.pathToManifestFile) !== '.json') {
|
|
26
|
+
throw new Error(`The Module Federation manifest file must be a JSON. Please ensure the file at ${userPathToManifestFile} is a JSON.`);
|
|
27
|
+
}
|
|
28
|
+
pathToManifestFile = userPathToManifestFile;
|
|
29
|
+
}
|
|
17
30
|
(0, module_federation_1.validateDevRemotes)(options, workspaceProjects);
|
|
18
31
|
const remotesToSkip = new Set((_a = options.skipRemotes) !== null && _a !== void 0 ? _a : []);
|
|
19
32
|
const staticRemotes = (0, module_federation_1.getStaticRemotes)(project, context, workspaceProjects, remotesToSkip);
|
|
20
|
-
const dynamicRemotes = (0, module_federation_1.getDynamicRemotes)(project, context, workspaceProjects, remotesToSkip);
|
|
33
|
+
const dynamicRemotes = (0, module_federation_1.getDynamicRemotes)(project, context, workspaceProjects, remotesToSkip, pathToManifestFile);
|
|
21
34
|
const remotes = [...staticRemotes, ...dynamicRemotes];
|
|
22
35
|
const devServeRemotes = !options.devRemotes
|
|
23
36
|
? []
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AACtB,gEAA8D;AAC9D,2FAA+F;AAC/F,sEAA+F;AAC/F,sEAIwC;
|
|
1
|
+
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -118,6 +118,10 @@
|
|
|
118
118
|
"type": "string"
|
|
119
119
|
},
|
|
120
120
|
"description": "List of remote applications to not automatically serve, either statically or in development mode. This can be useful for multi-repository module federation setups where the host application uses a remote application from an external repository."
|
|
121
|
+
},
|
|
122
|
+
"pathToManifestFile": {
|
|
123
|
+
"type": "string",
|
|
124
|
+
"description": "Path to a Module Federation manifest file (e.g. `my/path/to/module-federation.manifest.json`) containing the dynamic remote applications relative to the workspace root."
|
|
121
125
|
}
|
|
122
126
|
},
|
|
123
127
|
"additionalProperties": false,
|
|
@@ -10,6 +10,7 @@ const rxjs_1 = require("rxjs");
|
|
|
10
10
|
const path_1 = require("path");
|
|
11
11
|
const child_process_1 = require("child_process");
|
|
12
12
|
const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
|
|
13
|
+
const fs_1 = require("fs");
|
|
13
14
|
function executeModuleFederationDevSSRBuilder(schema, context) {
|
|
14
15
|
var _a, _b, _c;
|
|
15
16
|
const options = tslib_1.__rest(schema, []);
|
|
@@ -17,10 +18,21 @@ function executeModuleFederationDevSSRBuilder(schema, context) {
|
|
|
17
18
|
const { projects: workspaceProjects } = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
|
|
18
19
|
const ws = new devkit_1.Workspaces(devkit_1.workspaceRoot);
|
|
19
20
|
const project = workspaceProjects[context.target.project];
|
|
21
|
+
let pathToManifestFile = (0, path_1.join)(context.workspaceRoot, project.sourceRoot, 'assets/module-federation.manifest.json');
|
|
22
|
+
if (options.pathToManifestFile) {
|
|
23
|
+
const userPathToManifestFile = (0, path_1.join)(context.workspaceRoot, options.pathToManifestFile);
|
|
24
|
+
if (!(0, fs_1.existsSync)(userPathToManifestFile)) {
|
|
25
|
+
throw new Error(`The provided Module Federation manifest file path does not exist. Please check the file exists at "${userPathToManifestFile}".`);
|
|
26
|
+
}
|
|
27
|
+
else if ((0, path_1.extname)(options.pathToManifestFile) !== '.json') {
|
|
28
|
+
throw new Error(`The Module Federation manifest file must be a JSON. Please ensure the file at ${userPathToManifestFile} is a JSON.`);
|
|
29
|
+
}
|
|
30
|
+
pathToManifestFile = userPathToManifestFile;
|
|
31
|
+
}
|
|
20
32
|
(0, module_federation_1.validateDevRemotes)(options, workspaceProjects);
|
|
21
33
|
const remotesToSkip = new Set((_a = options.skipRemotes) !== null && _a !== void 0 ? _a : []);
|
|
22
34
|
const staticRemotes = (0, module_federation_1.getStaticRemotes)(project, context, workspaceProjects, remotesToSkip);
|
|
23
|
-
const dynamicRemotes = (0, module_federation_1.getDynamicRemotes)(project, context, workspaceProjects, remotesToSkip);
|
|
35
|
+
const dynamicRemotes = (0, module_federation_1.getDynamicRemotes)(project, context, workspaceProjects, remotesToSkip, pathToManifestFile);
|
|
24
36
|
const remotes = [...staticRemotes, ...dynamicRemotes];
|
|
25
37
|
const devServeRemotes = !options.devRemotes
|
|
26
38
|
? []
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-federation-dev-ssr.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.ts"],"names":[],"mappings":";;;;AACA,sEAA+F;AAC/F,yCAIsB;AACtB,sEAIwC;AACxC,8CAAgD;AAChD,+BAA4B;AAC5B,+
|
|
1
|
+
{"version":3,"file":"module-federation-dev-ssr.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,6 +78,10 @@
|
|
|
78
78
|
"verbose": {
|
|
79
79
|
"type": "boolean",
|
|
80
80
|
"description": "Adds more details to output logging."
|
|
81
|
+
},
|
|
82
|
+
"pathToManifestFile": {
|
|
83
|
+
"type": "string",
|
|
84
|
+
"description": "Path to a Module Federation manifest file (e.g. `my/path/to/module-federation.manifest.json`) containing the dynamic remote applications relative to the workspace root."
|
|
81
85
|
}
|
|
82
86
|
},
|
|
83
87
|
"additionalProperties": false,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ProjectConfiguration } from 'nx/src/config/workspace-json-project-json';
|
|
2
|
-
export declare function getDynamicRemotes(project: ProjectConfiguration, context: import('@angular-devkit/architect').BuilderContext, workspaceProjects: Record<string, ProjectConfiguration>, remotesToSkip: Set<string
|
|
2
|
+
export declare function getDynamicRemotes(project: ProjectConfiguration, context: import('@angular-devkit/architect').BuilderContext, workspaceProjects: Record<string, ProjectConfiguration>, remotesToSkip: Set<string>, pathToManifestFile?: string): string[];
|
|
3
3
|
export declare function getStaticRemotes(project: ProjectConfiguration, context: import('@angular-devkit/architect').BuilderContext, workspaceProjects: Record<string, ProjectConfiguration>, remotesToSkip: Set<string>): string[];
|
|
4
4
|
export declare function validateDevRemotes(options: {
|
|
5
5
|
devRemotes?: string[];
|
|
@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.validateDevRemotes = exports.getStaticRemotes = exports.getDynamicRemotes = void 0;
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const fs_1 = require("fs");
|
|
6
|
-
function getDynamicRemotes(project, context, workspaceProjects, remotesToSkip) {
|
|
6
|
+
function getDynamicRemotes(project, context, workspaceProjects, remotesToSkip, pathToManifestFile = (0, path_1.join)(context.workspaceRoot, project.sourceRoot, 'assets/module-federation.manifest.json')) {
|
|
7
7
|
// check for dynamic remotes
|
|
8
8
|
// we should only check for dynamic based on what we generate
|
|
9
9
|
// and fallback to empty array
|
|
10
|
-
|
|
11
|
-
if (!(0, fs_1.existsSync)(standardPathToGeneratedMFManifestJson)) {
|
|
10
|
+
if (!(0, fs_1.existsSync)(pathToManifestFile)) {
|
|
12
11
|
return [];
|
|
13
12
|
}
|
|
14
|
-
const moduleFederationManifestJson = (0, fs_1.readFileSync)(
|
|
13
|
+
const moduleFederationManifestJson = (0, fs_1.readFileSync)(pathToManifestFile, 'utf-8');
|
|
15
14
|
if (!moduleFederationManifestJson) {
|
|
16
15
|
return [];
|
|
17
16
|
}
|
|
@@ -29,8 +28,8 @@ function getDynamicRemotes(project, context, workspaceProjects, remotesToSkip) {
|
|
|
29
28
|
const invalidDynamicRemotes = dynamicRemotes.filter((remote) => !workspaceProjects[remote]);
|
|
30
29
|
if (invalidDynamicRemotes.length) {
|
|
31
30
|
throw new Error(invalidDynamicRemotes.length === 1
|
|
32
|
-
? `Invalid dynamic remote configured in "${
|
|
33
|
-
: `Invalid dynamic remotes configured in "${
|
|
31
|
+
? `Invalid dynamic remote configured in "${pathToManifestFile}": ${invalidDynamicRemotes[0]}.`
|
|
32
|
+
: `Invalid dynamic remotes configured in "${pathToManifestFile}": ${invalidDynamicRemotes.join(', ')}.`);
|
|
34
33
|
}
|
|
35
34
|
return dynamicRemotes;
|
|
36
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/module-federation.ts"],"names":[],"mappings":";;;AACA,+BAA4B;AAC5B,2BAA8C;AAG9C,SAAgB,iBAAiB,CAC/B,OAA6B,EAC7B,OAA2D,EAC3D,iBAAuD,EACvD,aAA0B
|
|
1
|
+
{"version":3,"file":"module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/module-federation.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
|
|
|
10
10
|
const version_utils_1 = require("../utils/version-utils");
|
|
11
11
|
const lib_1 = require("./lib");
|
|
12
12
|
const semver_1 = require("semver");
|
|
13
|
+
const enquirer_1 = require("enquirer");
|
|
13
14
|
function applicationGenerator(tree, schema) {
|
|
14
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
16
|
const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
@@ -17,6 +18,15 @@ function applicationGenerator(tree, schema) {
|
|
|
17
18
|
throw new Error((0, devkit_1.stripIndents) `The "standalone" option is only supported in Angular >= 14.1.0. You are currently using ${installedAngularVersionInfo.version}.
|
|
18
19
|
You can resolve this error by removing the "standalone" option or by migrating to Angular 14.1.0.`);
|
|
19
20
|
}
|
|
21
|
+
if ((0, semver_1.gte)(installedAngularVersionInfo.version, '14.1.0') &&
|
|
22
|
+
schema.standalone === undefined &&
|
|
23
|
+
process.env.NX_INTERACTIVE === 'true') {
|
|
24
|
+
schema.standalone = yield (0, enquirer_1.prompt)({
|
|
25
|
+
name: 'standalone-components',
|
|
26
|
+
message: 'Would you like to use Standalone Components?',
|
|
27
|
+
type: 'confirm',
|
|
28
|
+
}).then((a) => a['standalone-components']);
|
|
29
|
+
}
|
|
20
30
|
const generatorDirectory = (0, version_utils_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
|
|
21
31
|
if (generatorDirectory) {
|
|
22
32
|
let previousGenerator = yield Promise.resolve().then(() => require((0, path_1.join)(__dirname, generatorDirectory, 'application')));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AACtB,+BAA4B;AAC5B,2DAA0D;AAC1D,uCAAoD;AACpD,qEAA0E;AAC1E,0DAGgC;AAChC,+BAgBe;AAEf,
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -151,7 +151,7 @@
|
|
|
151
151
|
"standalone": {
|
|
152
152
|
"description": "Generate an application that is setup to use standalone components. _Note: This is only supported in Angular versions >= 14.1.0_",
|
|
153
153
|
"type": "boolean",
|
|
154
|
-
"
|
|
154
|
+
"x-priority": "important"
|
|
155
155
|
},
|
|
156
156
|
"rootProject": {
|
|
157
157
|
"description": "Create an application at the root of the workspace.",
|
|
@@ -13,6 +13,7 @@ const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-i
|
|
|
13
13
|
const version_utils_1 = require("../utils/version-utils");
|
|
14
14
|
const semver_1 = require("semver");
|
|
15
15
|
function host(tree, options) {
|
|
16
|
+
var _a;
|
|
16
17
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
18
|
const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
18
19
|
if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') && options.standalone) {
|
|
@@ -33,7 +34,7 @@ function host(tree, options) {
|
|
|
33
34
|
});
|
|
34
35
|
}
|
|
35
36
|
const appName = (0, project_1.normalizeProjectName)(options.name, options.directory);
|
|
36
|
-
const appInstallTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { routing: true, port: 4200, skipFormat: true }));
|
|
37
|
+
const appInstallTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { standalone: (_a = options.standalone) !== null && _a !== void 0 ? _a : false, routing: true, port: 4200, skipFormat: true }));
|
|
37
38
|
const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;
|
|
38
39
|
yield (0, setup_mf_1.setupMf)(tree, {
|
|
39
40
|
appName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":";;;;AAAA,yCAA4E;AAE5E,4DAA8D;AAC9D,6CAA+C;AAC/C,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAA+B;AAC/B,2FAAqF;AACrF,0DAAwE;AACxE,mCAA4B;AAE5B,SAAsB,IAAI,CAAC,IAAU,EAAE,OAAe
|
|
1
|
+
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-i
|
|
|
12
12
|
const version_utils_1 = require("../utils/version-utils");
|
|
13
13
|
const semver_1 = require("semver");
|
|
14
14
|
function remote(tree, options) {
|
|
15
|
-
var _a;
|
|
15
|
+
var _a, _b;
|
|
16
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
17
|
const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
18
18
|
if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') && options.standalone) {
|
|
@@ -25,7 +25,7 @@ function remote(tree, options) {
|
|
|
25
25
|
}
|
|
26
26
|
const appName = (0, project_1.normalizeProjectName)(options.name, options.directory);
|
|
27
27
|
const port = (_a = options.port) !== null && _a !== void 0 ? _a : (0, lib_1.findNextAvailablePort)(tree);
|
|
28
|
-
const appInstallTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { routing: true, port }));
|
|
28
|
+
const appInstallTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { standalone: (_b = options.standalone) !== null && _b !== void 0 ? _b : false, routing: true, port }));
|
|
29
29
|
const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;
|
|
30
30
|
yield (0, setup_mf_1.setupMf)(tree, {
|
|
31
31
|
appName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,yCAA4E;AAE5E,4DAA8D;AAC9D,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAAsD;AACtD,2FAAqF;AACrF,0DAAwE;AACxE,mCAA4B;AAE5B,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe;;;QACtD,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IAAI,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YAC3E,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,2EAA2E,OAAO,CAAC,IAAI,GAAG,CAC3F,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACtE,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAA,2BAAqB,EAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCACjD,OAAO,KACV,OAAO,EAAE,IAAI,EACb,IAAI,IACJ,CAAC;QAEH,MAAM,OAAO,GACX,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,CAAC;QAEzE,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE;YAClB,OAAO;YACP,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI;YACJ,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,UAAU,EAAE,IAAI;YAChB,OAAO;YACP,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;YACtD,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;QAEH,IAAI,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,IAAI,cAAc,GAAG,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;;CAC1C;
|
|
1
|
+
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,yCAA4E;AAE5E,4DAA8D;AAC9D,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAAsD;AACtD,2FAAqF;AACrF,0DAAwE;AACxE,mCAA4B;AAE5B,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe;;;QACtD,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IAAI,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YAC3E,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,2EAA2E,OAAO,CAAC,IAAI,GAAG,CAC3F,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACtE,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAA,2BAAqB,EAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCACjD,OAAO,KACV,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK,EACvC,OAAO,EAAE,IAAI,EACb,IAAI,IACJ,CAAC;QAEH,MAAM,OAAO,GACX,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,CAAC;QAEzE,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE;YAClB,OAAO;YACP,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI;YACJ,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,UAAU,EAAE,IAAI;YAChB,OAAO;YACP,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;YACtD,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;QAEH,IAAI,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,IAAI,cAAc,GAAG,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;;CAC1C;AApDD,wBAoDC;AAED,kBAAe,MAAM,CAAC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ export declare const angularVersion = "~15.1.0";
|
|
|
3
3
|
export declare const angularDevkitVersion = "~15.1.0";
|
|
4
4
|
export declare const ngPackagrVersion = "~15.1.0";
|
|
5
5
|
export declare const ngrxVersion = "~15.0.0";
|
|
6
|
-
export declare const rxjsVersion = "~7.
|
|
6
|
+
export declare const rxjsVersion = "~7.8.0";
|
|
7
7
|
export declare const zoneJsVersion = "~0.11.4";
|
|
8
8
|
export declare const angularJsVersion = "1.7.9";
|
|
9
9
|
export declare const tsLibVersion = "^2.3.0";
|
package/src/utils/versions.js
CHANGED
|
@@ -6,7 +6,7 @@ exports.angularVersion = '~15.1.0';
|
|
|
6
6
|
exports.angularDevkitVersion = '~15.1.0';
|
|
7
7
|
exports.ngPackagrVersion = '~15.1.0';
|
|
8
8
|
exports.ngrxVersion = '~15.0.0';
|
|
9
|
-
exports.rxjsVersion = '~7.
|
|
9
|
+
exports.rxjsVersion = '~7.8.0';
|
|
10
10
|
exports.zoneJsVersion = '~0.11.4';
|
|
11
11
|
exports.angularJsVersion = '1.7.9';
|
|
12
12
|
exports.tsLibVersion = '^2.3.0';
|