@nrwl/angular 14.0.5 → 14.1.0
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/package.json +7 -7
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +40 -2
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/executors/file-server/file-server.impl.js +0 -3
- package/src/executors/file-server/file-server.impl.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/library/lib/normalize-options.js +5 -4
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/lib/update-project.js +3 -0
- package/src/generators/library/lib/update-project.js.map +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +0 -4
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/utilities/app.migrator.d.ts +16 -2
- package/src/generators/ng-add/utilities/app.migrator.js +278 -83
- package/src/generators/ng-add/utilities/app.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/e2e.migrator.d.ts +6 -2
- package/src/generators/ng-add/utilities/e2e.migrator.js +112 -70
- package/src/generators/ng-add/utilities/e2e.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/lib.migrator.d.ts +3 -5
- package/src/generators/ng-add/utilities/lib.migrator.js +26 -108
- package/src/generators/ng-add/utilities/lib.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/project.migrator.d.ts +9 -5
- package/src/generators/ng-add/utilities/project.migrator.js +120 -11
- package/src/generators/ng-add/utilities/project.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/types.d.ts +4 -0
- package/src/generators/utils/project.d.ts +1 -0
- package/src/generators/utils/project.js +13 -4
- package/src/generators/utils/project.js.map +1 -1
- package/src/utils/mfe/with-module-federation.js +6 -1
- package/src/utils/mfe/with-module-federation.js.map +1 -1
- package/src/utils/versions.js +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/lib.migrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"lib.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/lib.migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { ProjectConfiguration, TargetConfiguration, Tree } from '@nrwl/devkit';
|
|
2
2
|
import { GeneratorOptions } from '../schema';
|
|
3
3
|
import { Logger } from './logger';
|
|
4
|
-
import { MigrationProjectConfiguration, ValidationResult } from './types';
|
|
5
|
-
export declare abstract class ProjectMigrator {
|
|
4
|
+
import { MigrationProjectConfiguration, Target, ValidationResult } from './types';
|
|
5
|
+
export declare abstract class ProjectMigrator<TargetType extends string = any> {
|
|
6
6
|
protected readonly tree: Tree;
|
|
7
7
|
protected readonly options: GeneratorOptions;
|
|
8
|
+
protected readonly targets: Record<TargetType, Target>;
|
|
8
9
|
get projectName(): string;
|
|
9
10
|
protected projectConfig: ProjectConfiguration;
|
|
10
11
|
protected project: {
|
|
@@ -15,18 +16,21 @@ export declare abstract class ProjectMigrator {
|
|
|
15
16
|
newSourceRoot: string;
|
|
16
17
|
};
|
|
17
18
|
protected logger: Logger;
|
|
18
|
-
|
|
19
|
+
protected readonly targetNames: Partial<Record<TargetType, string>>;
|
|
20
|
+
constructor(tree: Tree, options: GeneratorOptions, targets: Record<TargetType, Target>, project: MigrationProjectConfiguration, rootDir: string, logger?: Logger);
|
|
19
21
|
abstract migrate(): Promise<void>;
|
|
20
|
-
|
|
22
|
+
validate(): ValidationResult;
|
|
21
23
|
protected convertAsset(asset: string | any): string | any;
|
|
22
24
|
protected convertEsLintConfigExtendToNewPath(eslintConfigPath: string, extendPath: string): string;
|
|
23
25
|
protected convertSourceRootPath(originalPath: string): string;
|
|
24
26
|
protected convertRootPath(originalPath: string): string;
|
|
25
27
|
protected convertPath(originalPath: string): string;
|
|
26
28
|
protected getTargetValuesForOption(target: TargetConfiguration, optionPath: string): any[];
|
|
27
|
-
protected getValueForOption(options: Record<string, any
|
|
29
|
+
protected getValueForOption(options: Record<string, any> | undefined, optionPath: string): any;
|
|
28
30
|
protected moveProjectRootFile(filePath: string, isRequired?: boolean): void;
|
|
29
31
|
protected moveDir(from: string, to: string): void;
|
|
30
32
|
protected moveFile(from: string, to: string, required?: boolean): void;
|
|
33
|
+
protected updateCacheableOperations(targetNames: string[]): void;
|
|
31
34
|
protected updateTsConfigFile(tsConfigPath: string, rootTsConfigFile: string, projectOffsetFromRoot: string): void;
|
|
35
|
+
private collectTargetNames;
|
|
32
36
|
}
|
|
@@ -4,24 +4,104 @@ exports.ProjectMigrator = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const logger_1 = require("./logger");
|
|
7
|
+
const validation_logging_1 = require("./validation-logging");
|
|
7
8
|
class ProjectMigrator {
|
|
8
|
-
constructor(tree, options, project, rootDir, logger) {
|
|
9
|
-
var _a, _b
|
|
9
|
+
constructor(tree, options, targets, project, rootDir, logger) {
|
|
10
|
+
var _a, _b;
|
|
10
11
|
this.tree = tree;
|
|
11
12
|
this.options = options;
|
|
13
|
+
this.targets = targets;
|
|
14
|
+
this.targetNames = {};
|
|
12
15
|
this.projectConfig = project.config;
|
|
13
16
|
this.project = {
|
|
14
17
|
name: project.name,
|
|
15
18
|
oldRoot: (_a = this.projectConfig.root) !== null && _a !== void 0 ? _a : '',
|
|
16
|
-
oldSourceRoot:
|
|
19
|
+
oldSourceRoot: this.projectConfig.sourceRoot ||
|
|
20
|
+
(0, devkit_1.joinPathFragments)((_b = this.projectConfig.root) !== null && _b !== void 0 ? _b : '', 'src'),
|
|
17
21
|
newRoot: `${rootDir}/${project.name}`,
|
|
18
22
|
newSourceRoot: `${rootDir}/${project.name}/src`,
|
|
19
23
|
};
|
|
20
24
|
this.logger = logger !== null && logger !== void 0 ? logger : new logger_1.Logger(this.project.name);
|
|
25
|
+
this.collectTargetNames();
|
|
21
26
|
}
|
|
22
27
|
get projectName() {
|
|
23
28
|
return this.project.name;
|
|
24
29
|
}
|
|
30
|
+
validate() {
|
|
31
|
+
var _a, _b;
|
|
32
|
+
const result = [];
|
|
33
|
+
// check project root
|
|
34
|
+
if (this.projectConfig.root === undefined ||
|
|
35
|
+
this.projectConfig.root === null) {
|
|
36
|
+
result.push({
|
|
37
|
+
message: 'The project root is not defined in the project configuration.',
|
|
38
|
+
hint: `Make sure the value for "projects.${this.project.name}.root" is set ` +
|
|
39
|
+
`or remove the project if it is not valid.`,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
else if (this.projectConfig.root !== '' &&
|
|
43
|
+
!this.tree.exists(this.projectConfig.root)) {
|
|
44
|
+
result.push({
|
|
45
|
+
message: `The project root "${this.project.oldRoot}" could not be found.`,
|
|
46
|
+
hint: `Make sure the value for "projects.${this.project.name}.root" is correct ` +
|
|
47
|
+
`or remove the project if it is not valid.`,
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
// check project source root
|
|
51
|
+
if (this.projectConfig.sourceRoot &&
|
|
52
|
+
!this.tree.exists(this.projectConfig.sourceRoot)) {
|
|
53
|
+
result.push({
|
|
54
|
+
message: `The project source root "${this.project.oldSourceRoot}" could not be found.`,
|
|
55
|
+
hint: `Make sure the value for "projects.${this.project.name}.sourceRoot" is correct ` +
|
|
56
|
+
`or remove the project if it is not valid.`,
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
// check for usage of unsupported builders
|
|
60
|
+
const allSupportedBuilders = [
|
|
61
|
+
...Object.values(this.targets)
|
|
62
|
+
.map((x) => x.builders)
|
|
63
|
+
.flat(),
|
|
64
|
+
];
|
|
65
|
+
const unsupportedBuilders = [];
|
|
66
|
+
Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {}).forEach(([targetName, target]) => {
|
|
67
|
+
if (!allSupportedBuilders.includes(target.executor)) {
|
|
68
|
+
unsupportedBuilders.push([targetName, target.executor]);
|
|
69
|
+
}
|
|
70
|
+
});
|
|
71
|
+
if (unsupportedBuilders.length) {
|
|
72
|
+
result.push({
|
|
73
|
+
messageGroup: {
|
|
74
|
+
title: 'Unsupported builders',
|
|
75
|
+
messages: unsupportedBuilders.map(([target, builder]) => `The "${target}" target is using an unsupported builder "${builder}".`),
|
|
76
|
+
},
|
|
77
|
+
hint: `The supported builders for ${this.projectConfig.projectType === 'library'
|
|
78
|
+
? 'libraries'
|
|
79
|
+
: 'applications'} are: ${(0, validation_logging_1.arrayToString)(allSupportedBuilders)}.`,
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
// check for multiple targets for the same type of target
|
|
83
|
+
const targetTypes = Object.keys(this.targets);
|
|
84
|
+
const targetsByType = Object.entries((_b = this.projectConfig.targets) !== null && _b !== void 0 ? _b : {}).reduce((acc, [target, { executor }]) => {
|
|
85
|
+
targetTypes.forEach((targetType) => {
|
|
86
|
+
if (this.targets[targetType].builders.includes(executor)) {
|
|
87
|
+
acc[targetType].push(target);
|
|
88
|
+
return acc;
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
return acc;
|
|
92
|
+
}, targetTypes.reduce((acc, targetType) => (Object.assign(Object.assign({}, acc), { [targetType]: [] })), {}));
|
|
93
|
+
targetTypes.forEach((targetType) => {
|
|
94
|
+
if (this.targets[targetType].acceptMultipleDefinitions ||
|
|
95
|
+
targetsByType[targetType].length <= 1) {
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
result.push({
|
|
99
|
+
message: `There is more than one target using a builder that is used to ${targetType} the project (${(0, validation_logging_1.arrayToString)(targetsByType[targetType])}).`,
|
|
100
|
+
hint: `Make sure the project only has one target with a builder that is used to ${targetType} the project.`,
|
|
101
|
+
});
|
|
102
|
+
});
|
|
103
|
+
return result.length ? result : null;
|
|
104
|
+
}
|
|
25
105
|
convertAsset(asset) {
|
|
26
106
|
if (typeof asset === 'string') {
|
|
27
107
|
return this.convertSourceRootPath(asset);
|
|
@@ -53,29 +133,30 @@ class ProjectMigrator {
|
|
|
53
133
|
if (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldSourceRoot)) {
|
|
54
134
|
return (0, devkit_1.joinPathFragments)(this.project.newSourceRoot, originalPath.replace(this.project.oldSourceRoot, ''));
|
|
55
135
|
}
|
|
56
|
-
if (this.project.oldRoot
|
|
57
|
-
(originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldRoot))) {
|
|
136
|
+
if (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldRoot)) {
|
|
58
137
|
return (0, devkit_1.joinPathFragments)(this.project.newRoot, originalPath.replace(this.project.oldRoot, ''));
|
|
59
138
|
}
|
|
60
139
|
return originalPath;
|
|
61
140
|
}
|
|
62
141
|
getTargetValuesForOption(target, optionPath) {
|
|
142
|
+
var _a;
|
|
63
143
|
const values = new Set();
|
|
64
144
|
const value = this.getValueForOption(target.options, optionPath);
|
|
65
145
|
if (value) {
|
|
66
146
|
values.add(value);
|
|
67
147
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
values.add(value);
|
|
73
|
-
}
|
|
148
|
+
for (const configuration of Object.values((_a = target.configurations) !== null && _a !== void 0 ? _a : {})) {
|
|
149
|
+
const value = this.getValueForOption(configuration, optionPath);
|
|
150
|
+
if (value) {
|
|
151
|
+
values.add(value);
|
|
74
152
|
}
|
|
75
153
|
}
|
|
76
154
|
return Array.from(values);
|
|
77
155
|
}
|
|
78
156
|
getValueForOption(options, optionPath) {
|
|
157
|
+
if (!options) {
|
|
158
|
+
return null;
|
|
159
|
+
}
|
|
79
160
|
const segments = optionPath.split('.');
|
|
80
161
|
let value = options;
|
|
81
162
|
for (const segment of segments) {
|
|
@@ -119,6 +200,22 @@ class ProjectMigrator {
|
|
|
119
200
|
this.tree.delete(from);
|
|
120
201
|
}
|
|
121
202
|
}
|
|
203
|
+
updateCacheableOperations(targetNames) {
|
|
204
|
+
var _a;
|
|
205
|
+
if (!targetNames.length) {
|
|
206
|
+
return;
|
|
207
|
+
}
|
|
208
|
+
const workspaceConfig = (0, devkit_1.readWorkspaceConfiguration)(this.tree);
|
|
209
|
+
Object.keys((_a = workspaceConfig.tasksRunnerOptions) !== null && _a !== void 0 ? _a : {}).forEach((taskRunnerName) => {
|
|
210
|
+
var _a;
|
|
211
|
+
const taskRunner = workspaceConfig.tasksRunnerOptions[taskRunnerName];
|
|
212
|
+
taskRunner.options.cacheableOperations = Array.from(new Set([
|
|
213
|
+
...((_a = taskRunner.options.cacheableOperations) !== null && _a !== void 0 ? _a : []),
|
|
214
|
+
...targetNames,
|
|
215
|
+
]));
|
|
216
|
+
});
|
|
217
|
+
(0, devkit_1.updateWorkspaceConfiguration)(this.tree, workspaceConfig);
|
|
218
|
+
}
|
|
122
219
|
updateTsConfigFile(tsConfigPath, rootTsConfigFile, projectOffsetFromRoot) {
|
|
123
220
|
(0, devkit_1.updateJson)(this.tree, tsConfigPath, (json) => {
|
|
124
221
|
var _a;
|
|
@@ -128,6 +225,18 @@ class ProjectMigrator {
|
|
|
128
225
|
return json;
|
|
129
226
|
});
|
|
130
227
|
}
|
|
228
|
+
collectTargetNames() {
|
|
229
|
+
var _a;
|
|
230
|
+
const targetTypes = Object.keys(this.targets);
|
|
231
|
+
Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {}).forEach(([targetName, target]) => {
|
|
232
|
+
targetTypes.forEach((targetType) => {
|
|
233
|
+
if (!this.targetNames[targetType] &&
|
|
234
|
+
this.targets[targetType].builders.includes(target.executor)) {
|
|
235
|
+
this.targetNames[targetType] = targetName;
|
|
236
|
+
}
|
|
237
|
+
});
|
|
238
|
+
});
|
|
239
|
+
}
|
|
131
240
|
}
|
|
132
241
|
exports.ProjectMigrator = ProjectMigrator;
|
|
133
242
|
//# sourceMappingURL=project.migrator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/project.migrator.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"project.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/project.migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
export declare function normalizeDirectory(appName: string, directoryName: string): string;
|
|
2
2
|
export declare function normalizeProjectName(appName: string, directoryName: string): string;
|
|
3
|
+
export declare function normalizePrefix(prefix: string | undefined, npmScope: string | undefined): string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.normalizeProjectName = exports.normalizeDirectory = void 0;
|
|
3
|
+
exports.normalizePrefix = exports.normalizeProjectName = exports.normalizeDirectory = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function normalizeDirectory(appName, directoryName) {
|
|
6
6
|
return directoryName
|
|
@@ -9,9 +9,18 @@ function normalizeDirectory(appName, directoryName) {
|
|
|
9
9
|
}
|
|
10
10
|
exports.normalizeDirectory = normalizeDirectory;
|
|
11
11
|
function normalizeProjectName(appName, directoryName) {
|
|
12
|
-
return normalizeDirectory(appName, directoryName)
|
|
13
|
-
.replace(new RegExp('/', 'g'), '-')
|
|
14
|
-
.replace(/-\d+/g, '');
|
|
12
|
+
return normalizeDirectory(appName, directoryName).replace(/\//g, '-');
|
|
15
13
|
}
|
|
16
14
|
exports.normalizeProjectName = normalizeProjectName;
|
|
15
|
+
function normalizePrefix(prefix, npmScope) {
|
|
16
|
+
if (prefix) {
|
|
17
|
+
return prefix;
|
|
18
|
+
}
|
|
19
|
+
// Prefix needs to be a valid html selector, if npmScope it's not valid, we don't default
|
|
20
|
+
// to it and let it fall through to the Angular schematic to handle it
|
|
21
|
+
// https://github.com/angular/angular-cli/blob/1c634cd327e5a850553b258aa2d5e6a6b2c75c65/packages/schematics/angular/component/index.ts#L130
|
|
22
|
+
const htmlSelectorRegex = /^[a-zA-Z][.0-9a-zA-Z]*(:?-[a-zA-Z][.0-9a-zA-Z]*)*$/;
|
|
23
|
+
return npmScope && htmlSelectorRegex.test(npmScope) ? npmScope : undefined;
|
|
24
|
+
}
|
|
25
|
+
exports.normalizePrefix = normalizePrefix;
|
|
17
26
|
//# sourceMappingURL=project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/project.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,SAAgB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/project.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,SAAgB,kBAAkB,CAChC,OAAe,EACf,aAAqB;IAErB,OAAO,aAAa;QAClB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,EAAE;QAC/D,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;AAC9B,CAAC;AAPD,gDAOC;AAED,SAAgB,oBAAoB,CAClC,OAAe,EACf,aAAqB;IAErB,OAAO,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACxE,CAAC;AALD,oDAKC;AAED,SAAgB,eAAe,CAC7B,MAA0B,EAC1B,QAA4B;IAE5B,IAAI,MAAM,EAAE;QACV,OAAO,MAAM,CAAC;KACf;IAED,yFAAyF;IACzF,sEAAsE;IACtE,2IAA2I;IAC3I,MAAM,iBAAiB,GACrB,oDAAoD,CAAC;IACvD,OAAO,QAAQ,IAAI,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7E,CAAC;AAdD,0CAcC"}
|
|
@@ -100,10 +100,15 @@ function mapRemotes(remotes) {
|
|
|
100
100
|
}
|
|
101
101
|
function withModuleFederation(options) {
|
|
102
102
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
103
|
-
const DEFAULT_NPM_PACKAGES_TO_AVOID = ['zone.js'];
|
|
103
|
+
const DEFAULT_NPM_PACKAGES_TO_AVOID = ['zone.js', '@nrwl/angular/mfe'];
|
|
104
104
|
const dependencies = yield getDependentPackagesForProject(options.name);
|
|
105
105
|
const sharedLibraries = (0, mfe_webpack_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
|
|
106
106
|
const npmPackages = (0, mfe_webpack_1.sharePackages)(dependencies.npmPackages.filter((pkg) => !DEFAULT_NPM_PACKAGES_TO_AVOID.includes(pkg)));
|
|
107
|
+
DEFAULT_NPM_PACKAGES_TO_AVOID.forEach((pkgName) => {
|
|
108
|
+
if (pkgName in npmPackages) {
|
|
109
|
+
delete npmPackages[pkgName];
|
|
110
|
+
}
|
|
111
|
+
});
|
|
107
112
|
const sharedDependencies = Object.assign(Object.assign({}, sharedLibraries.getLibraries()), npmPackages);
|
|
108
113
|
if (options.shared) {
|
|
109
114
|
for (const [libraryName, library] of Object.entries(sharedDependencies)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/with-module-federation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/with-module-federation.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '14.0
|
|
4
|
+
exports.nxVersion = '14.1.0';
|
|
5
5
|
exports.angularVersion = '~13.3.0';
|
|
6
6
|
exports.angularDevkitVersion = '~13.3.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|