@nrwl/angular 14.5.0-beta.3 → 14.5.0-rc.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/CHANGELOG.md +1 -1
- package/esm2020/src/runtime/nx/data-persistence.mjs +3 -3
- package/esm2020/src/runtime/nx/nx.module.mjs +4 -4
- package/fesm2015/nrwl-angular.mjs +7 -7
- package/fesm2020/nrwl-angular.mjs +7 -7
- package/migrations.json +41 -0
- package/package.json +11 -12
- package/src/executors/file-server/file-server.impl.js +14 -6
- package/src/executors/file-server/file-server.impl.js.map +1 -1
- package/src/executors/file-server/schema.d.ts +1 -0
- package/src/executors/file-server/schema.json +5 -0
- package/src/executors/package/package.impl.js +1 -1
- package/src/executors/package/package.impl.js.map +1 -1
- package/src/generators/application/schema.json +1 -1
- package/src/generators/init/init.js +6 -6
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/karma/karma.js +10 -9
- package/src/generators/karma/karma.js.map +1 -1
- package/src/generators/utils/dependencies.js +3 -3
- package/src/generators/utils/dependencies.js.map +1 -1
- package/src/utils/mf/mf-webpack.d.ts +2 -1
- package/src/utils/mf/mf-webpack.js +31 -45
- package/src/utils/mf/mf-webpack.js.map +1 -1
- package/src/utils/mf/typescript.d.ts +2 -0
- package/src/utils/mf/typescript.js +28 -0
- package/src/utils/mf/typescript.js.map +1 -0
- package/src/utils/mf/utils.d.ts +10 -0
- package/src/utils/mf/utils.js +44 -1
- package/src/utils/mf/utils.js.map +1 -1
- package/src/utils/mf/with-module-federation.js +4 -62
- package/src/utils/mf/with-module-federation.js.map +1 -1
- package/src/utils/test-runners.d.ts +4 -0
- package/src/utils/versions.d.ts +21 -6
- package/src/utils/versions.js +22 -7
- package/src/utils/versions.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
# [14.5.0-
|
|
6
|
+
# [14.5.0-rc.0](https://github.com/nrwl/nx/compare/14.4.2...14.5.0-rc.0) (2022-07-28)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
|
@@ -370,9 +370,9 @@ export class DataPersistence {
|
|
|
370
370
|
return this.actions.pipe(withLatestFrom(this.store), navigation(component, opts));
|
|
371
371
|
}
|
|
372
372
|
}
|
|
373
|
-
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.
|
|
374
|
-
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.
|
|
375
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.
|
|
373
|
+
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: DataPersistence, deps: [{ token: i1.Store }, { token: i2.Actions }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
374
|
+
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: DataPersistence });
|
|
375
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: DataPersistence, decorators: [{
|
|
376
376
|
type: Injectable
|
|
377
377
|
}], ctorParameters: function () { return [{ type: i1.Store }, { type: i2.Actions }]; } });
|
|
378
378
|
function findSnapshot(component, s) {
|
|
@@ -13,10 +13,10 @@ export class NxModule {
|
|
|
13
13
|
return { ngModule: NxModule, providers: [DataPersistence] };
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
|
-
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.
|
|
17
|
-
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.
|
|
18
|
-
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.
|
|
19
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.
|
|
16
|
+
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: NxModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
17
|
+
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.1.0", ngImport: i0, type: NxModule });
|
|
18
|
+
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: NxModule });
|
|
19
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: NxModule, decorators: [{
|
|
20
20
|
type: NgModule,
|
|
21
21
|
args: [{}]
|
|
22
22
|
}] });
|
|
@@ -371,9 +371,9 @@ class DataPersistence {
|
|
|
371
371
|
return this.actions.pipe(withLatestFrom(this.store), navigation(component, opts));
|
|
372
372
|
}
|
|
373
373
|
}
|
|
374
|
-
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.
|
|
375
|
-
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.
|
|
376
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.
|
|
374
|
+
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: DataPersistence, deps: [{ token: i1.Store }, { token: i2.Actions }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
375
|
+
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: DataPersistence });
|
|
376
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: DataPersistence, decorators: [{
|
|
377
377
|
type: Injectable
|
|
378
378
|
}], ctorParameters: function () { return [{ type: i1.Store }, { type: i2.Actions }]; } });
|
|
379
379
|
function findSnapshot(component, s) {
|
|
@@ -412,10 +412,10 @@ class NxModule {
|
|
|
412
412
|
return { ngModule: NxModule, providers: [DataPersistence] };
|
|
413
413
|
}
|
|
414
414
|
}
|
|
415
|
-
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.
|
|
416
|
-
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.
|
|
417
|
-
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.
|
|
418
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.
|
|
415
|
+
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: NxModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
416
|
+
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.1.0", ngImport: i0, type: NxModule });
|
|
417
|
+
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: NxModule });
|
|
418
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: NxModule, decorators: [{
|
|
419
419
|
type: NgModule,
|
|
420
420
|
args: [{}]
|
|
421
421
|
}] });
|
|
@@ -371,9 +371,9 @@ class DataPersistence {
|
|
|
371
371
|
return this.actions.pipe(withLatestFrom(this.store), navigation(component, opts));
|
|
372
372
|
}
|
|
373
373
|
}
|
|
374
|
-
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.
|
|
375
|
-
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.
|
|
376
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.
|
|
374
|
+
DataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: DataPersistence, deps: [{ token: i1.Store }, { token: i2.Actions }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
375
|
+
DataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: DataPersistence });
|
|
376
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: DataPersistence, decorators: [{
|
|
377
377
|
type: Injectable
|
|
378
378
|
}], ctorParameters: function () { return [{ type: i1.Store }, { type: i2.Actions }]; } });
|
|
379
379
|
function findSnapshot(component, s) {
|
|
@@ -412,10 +412,10 @@ class NxModule {
|
|
|
412
412
|
return { ngModule: NxModule, providers: [DataPersistence] };
|
|
413
413
|
}
|
|
414
414
|
}
|
|
415
|
-
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.
|
|
416
|
-
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.
|
|
417
|
-
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.
|
|
418
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.
|
|
415
|
+
NxModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: NxModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
416
|
+
NxModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.1.0", ngImport: i0, type: NxModule });
|
|
417
|
+
NxModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: NxModule });
|
|
418
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.0", ngImport: i0, type: NxModule, decorators: [{
|
|
419
419
|
type: NgModule,
|
|
420
420
|
args: [{}]
|
|
421
421
|
}] });
|
package/migrations.json
CHANGED
|
@@ -1340,6 +1340,47 @@
|
|
|
1340
1340
|
"alwaysAddToPackageJson": false
|
|
1341
1341
|
}
|
|
1342
1342
|
}
|
|
1343
|
+
},
|
|
1344
|
+
"14.5.0": {
|
|
1345
|
+
"version": "14.5.0-beta.4",
|
|
1346
|
+
"packages": {
|
|
1347
|
+
"@angular/cli": {
|
|
1348
|
+
"version": "~14.1.0",
|
|
1349
|
+
"alwaysAddToPackageJson": false
|
|
1350
|
+
},
|
|
1351
|
+
"@schematics/angular": {
|
|
1352
|
+
"version": "~14.1.0",
|
|
1353
|
+
"alwaysAddToPackageJson": false
|
|
1354
|
+
},
|
|
1355
|
+
"@angular/core": {
|
|
1356
|
+
"version": "~14.1.0",
|
|
1357
|
+
"alwaysAddToPackageJson": true
|
|
1358
|
+
},
|
|
1359
|
+
"@angular/material": {
|
|
1360
|
+
"version": "~14.1.0",
|
|
1361
|
+
"alwaysAddToPackageJson": false
|
|
1362
|
+
},
|
|
1363
|
+
"ng-packagr": {
|
|
1364
|
+
"version": "~14.1.0",
|
|
1365
|
+
"alwaysAddToPackageJson": false
|
|
1366
|
+
},
|
|
1367
|
+
"karma": {
|
|
1368
|
+
"version": "~6.4.0",
|
|
1369
|
+
"alwaysAddToPackageJson": false
|
|
1370
|
+
},
|
|
1371
|
+
"karma-jasmine": {
|
|
1372
|
+
"version": "~5.1.0",
|
|
1373
|
+
"alwaysAddToPackageJson": false
|
|
1374
|
+
},
|
|
1375
|
+
"karma-jasmine-html-reporter": {
|
|
1376
|
+
"version": "~2.0.0",
|
|
1377
|
+
"alwaysAddToPackageJson": false
|
|
1378
|
+
},
|
|
1379
|
+
"jasmine-core": {
|
|
1380
|
+
"version": "~4.2.0",
|
|
1381
|
+
"alwaysAddToPackageJson": false
|
|
1382
|
+
}
|
|
1383
|
+
}
|
|
1343
1384
|
}
|
|
1344
1385
|
}
|
|
1345
1386
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "14.5.0-
|
|
3
|
+
"version": "14.5.0-rc.0",
|
|
4
4
|
"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.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -64,23 +64,22 @@
|
|
|
64
64
|
"migrations": "./migrations.json"
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@angular-devkit/schematics": "~14.
|
|
68
|
-
"@nrwl/cypress": "14.5.0-
|
|
69
|
-
"@nrwl/devkit": "14.5.0-
|
|
70
|
-
"@nrwl/jest": "14.5.0-
|
|
71
|
-
"@nrwl/linter": "14.5.0-
|
|
72
|
-
"@nrwl/storybook": "14.5.0-
|
|
73
|
-
"@nrwl/web": "14.5.0-
|
|
74
|
-
"@nrwl/workspace": "14.5.0-
|
|
67
|
+
"@angular-devkit/schematics": "~14.1.0",
|
|
68
|
+
"@nrwl/cypress": "14.5.0-rc.0",
|
|
69
|
+
"@nrwl/devkit": "14.5.0-rc.0",
|
|
70
|
+
"@nrwl/jest": "14.5.0-rc.0",
|
|
71
|
+
"@nrwl/linter": "14.5.0-rc.0",
|
|
72
|
+
"@nrwl/storybook": "14.5.0-rc.0",
|
|
73
|
+
"@nrwl/web": "14.5.0-rc.0",
|
|
74
|
+
"@nrwl/workspace": "14.5.0-rc.0",
|
|
75
75
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
76
|
-
"@schematics/angular": "~14.
|
|
76
|
+
"@schematics/angular": "~14.1.0",
|
|
77
77
|
"chalk": "4.1.0",
|
|
78
78
|
"chokidar": "^3.5.1",
|
|
79
79
|
"http-server": "^14.1.0",
|
|
80
80
|
"ignore": "^5.0.4",
|
|
81
81
|
"jasmine-marbles": "~0.8.4",
|
|
82
82
|
"magic-string": "~0.26.2",
|
|
83
|
-
"rxjs-for-await": "0.0.2",
|
|
84
83
|
"semver": "7.3.4",
|
|
85
84
|
"ts-node": "~10.8.0",
|
|
86
85
|
"tsconfig-paths": "^3.9.0",
|
|
@@ -95,5 +94,5 @@
|
|
|
95
94
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
96
95
|
"typings": "index.d.ts",
|
|
97
96
|
"sideEffects": false,
|
|
98
|
-
"gitHead": "
|
|
97
|
+
"gitHead": "635825ed2b08bcd001a36eeb26ef992336f466ed"
|
|
99
98
|
}
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
const child_process_1 = require("child_process");
|
|
5
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const
|
|
7
|
-
const fs_1 = require("fs");
|
|
5
|
+
const child_process_1 = require("child_process");
|
|
8
6
|
const chokidar_1 = require("chokidar");
|
|
7
|
+
const fs_1 = require("fs");
|
|
8
|
+
const ignore_1 = require("ignore");
|
|
9
|
+
const package_json_1 = require("nx/src/utils/package-json");
|
|
9
10
|
const os_1 = require("os");
|
|
10
11
|
const path_1 = require("path");
|
|
11
|
-
const package_json_1 = require("nx/src/utils/package-json");
|
|
12
12
|
// platform specific command name
|
|
13
13
|
const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
|
|
14
14
|
function getHttpServerArgs(options) {
|
|
15
|
-
const args = ['-c-1'];
|
|
15
|
+
const args = ['-c-1', '--cors'];
|
|
16
16
|
if (options.port) {
|
|
17
17
|
args.push(`-p=${options.port}`);
|
|
18
18
|
}
|
|
@@ -36,7 +36,6 @@ function getHttpServerArgs(options) {
|
|
|
36
36
|
args.push(`--proxy-options.${key}=options.proxyOptions[key]`);
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
|
-
args.push('--cors');
|
|
40
39
|
return args;
|
|
41
40
|
}
|
|
42
41
|
function getBuildTargetCommand(options) {
|
|
@@ -121,6 +120,12 @@ function fileServerExecutor(options, context) {
|
|
|
121
120
|
// perform initial run
|
|
122
121
|
run();
|
|
123
122
|
const outputPath = getBuildTargetOutputPath(options, context);
|
|
123
|
+
if (options.spa) {
|
|
124
|
+
const src = (0, path_1.join)(outputPath, 'index.html');
|
|
125
|
+
const dst = (0, path_1.join)(outputPath, '404.html');
|
|
126
|
+
// See: https://github.com/http-party/http-server#magic-files
|
|
127
|
+
(0, fs_1.copyFileSync)(src, dst);
|
|
128
|
+
}
|
|
124
129
|
const args = getHttpServerArgs(options);
|
|
125
130
|
const { path: pathToHttpServerPkgJson, packageJson } = (0, package_json_1.readModulePackageJson)('http-server');
|
|
126
131
|
const pathToHttpServerBin = packageJson.bin['http-server'];
|
|
@@ -135,6 +140,9 @@ function fileServerExecutor(options, context) {
|
|
|
135
140
|
if (disposeWatch) {
|
|
136
141
|
disposeWatch();
|
|
137
142
|
}
|
|
143
|
+
if (options.spa) {
|
|
144
|
+
(0, fs_1.unlinkSync)((0, path_1.join)(outputPath, '404.html'));
|
|
145
|
+
}
|
|
138
146
|
};
|
|
139
147
|
process.on('exit', processExitListener);
|
|
140
148
|
process.on('SIGTERM', processExitListener);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/file-server/file-server.impl.ts"],"names":[],"mappings":";;;AAAA,iDAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"file-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/file-server/file-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,6 +60,11 @@
|
|
|
60
60
|
"type": "boolean",
|
|
61
61
|
"description": "Watch for file changes.",
|
|
62
62
|
"default": false
|
|
63
|
+
},
|
|
64
|
+
"spa": {
|
|
65
|
+
"type": "boolean",
|
|
66
|
+
"description": "Redirect 404 errors to index.html (useful for SPA's).",
|
|
67
|
+
"default": false
|
|
63
68
|
}
|
|
64
69
|
},
|
|
65
70
|
"additionalProperties": false,
|
|
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.packageExecutor = exports.createLibraryExecutor = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const rxjs_for_await_1 = require("@nrwl/devkit/src/utils/rxjs-for-await");
|
|
6
7
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
7
8
|
const path_1 = require("path");
|
|
8
9
|
const rxjs_1 = require("rxjs");
|
|
9
|
-
const rxjs_for_await_1 = require("rxjs-for-await");
|
|
10
10
|
const operators_1 = require("rxjs/operators");
|
|
11
11
|
const entry_point_di_1 = require("./ng-packagr-adjustments/ng-package/entry-point/entry-point.di");
|
|
12
12
|
const options_di_1 = require("./ng-packagr-adjustments/ng-package/options.di");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":";;;;AACA,yCAAsD;AACtD,6FAM4D;AAE5D,+BAA+B;AAC/B,+BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,7 +107,7 @@
|
|
|
107
107
|
"e2eTestRunner": {
|
|
108
108
|
"type": "string",
|
|
109
109
|
"enum": ["protractor", "cypress", "none"],
|
|
110
|
-
"description": "Test runner to use for end to end (E2E) tests.",
|
|
110
|
+
"description": "Test runner to use for end to end (E2E) tests. The `protractor` option is deprecated and it will be removed in v15.",
|
|
111
111
|
"default": "cypress"
|
|
112
112
|
},
|
|
113
113
|
"tags": {
|
|
@@ -77,7 +77,7 @@ function updateDependencies(host) {
|
|
|
77
77
|
'@angular/router': versions_1.angularVersion,
|
|
78
78
|
rxjs: versions_1.rxjsVersion,
|
|
79
79
|
tslib: versions_1.tsLibVersion,
|
|
80
|
-
'zone.js':
|
|
80
|
+
'zone.js': versions_1.zoneJsVersion,
|
|
81
81
|
}, {
|
|
82
82
|
'@angular/cli': versions_1.angularDevkitVersion,
|
|
83
83
|
'@angular/compiler-cli': versions_1.angularVersion,
|
|
@@ -107,12 +107,12 @@ function addE2ETestRunner(host, options) {
|
|
|
107
107
|
case "protractor" /* E2eTestRunner.Protractor */:
|
|
108
108
|
return !options.skipPackageJson
|
|
109
109
|
? (0, devkit_2.addDependenciesToPackageJson)(host, {}, {
|
|
110
|
-
protractor:
|
|
111
|
-
'jasmine-core':
|
|
112
|
-
'jasmine-spec-reporter':
|
|
110
|
+
protractor: versions_1.protractorVersion,
|
|
111
|
+
'jasmine-core': versions_1.jasmineCoreVersion,
|
|
112
|
+
'jasmine-spec-reporter': versions_1.jasmineSpecReporterVersion,
|
|
113
113
|
'ts-node': versions_1.tsNodeVersion,
|
|
114
|
-
'@types/jasmine':
|
|
115
|
-
'@types/jasminewd2':
|
|
114
|
+
'@types/jasmine': versions_1.typesJasmineVersion,
|
|
115
|
+
'@types/jasminewd2': versions_1.typesJasminewd2Version,
|
|
116
116
|
})
|
|
117
117
|
: () => { };
|
|
118
118
|
case "cypress" /* E2eTestRunner.Cypress */:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAA+D;AAC/D,yCAMsB;AACtB,qCAA+C;AAC/C,yCAAsC;AACtC,2FAAqF;AAErF,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.karmaGenerator = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const versions_1 = require("../../utils/versions");
|
|
5
6
|
function karmaGenerator(tree, options) {
|
|
6
7
|
const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
7
8
|
if (!tree.exists('karma.conf.js')) {
|
|
@@ -13,15 +14,15 @@ function karmaGenerator(tree, options) {
|
|
|
13
14
|
return () => { };
|
|
14
15
|
}
|
|
15
16
|
return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
16
|
-
karma:
|
|
17
|
-
'karma-chrome-launcher':
|
|
18
|
-
'karma-coverage':
|
|
19
|
-
'karma-jasmine':
|
|
20
|
-
'karma-jasmine-html-reporter':
|
|
21
|
-
'jasmine-core':
|
|
22
|
-
'jasmine-spec-reporter':
|
|
23
|
-
'@types/jasmine':
|
|
24
|
-
'@types/node':
|
|
17
|
+
karma: versions_1.karmaVersion,
|
|
18
|
+
'karma-chrome-launcher': versions_1.karmaChromeLauncherVersion,
|
|
19
|
+
'karma-coverage': versions_1.karmaCoverageVersion,
|
|
20
|
+
'karma-jasmine': versions_1.karmaJasmineVersion,
|
|
21
|
+
'karma-jasmine-html-reporter': versions_1.karmaJasmineHtmlReporterVersion,
|
|
22
|
+
'jasmine-core': versions_1.jasmineCoreVersion,
|
|
23
|
+
'jasmine-spec-reporter': versions_1.jasmineSpecReporterVersion,
|
|
24
|
+
'@types/jasmine': versions_1.typesJasmineVersion,
|
|
25
|
+
'@types/node': versions_1.typesNodeVersion,
|
|
25
26
|
});
|
|
26
27
|
}
|
|
27
28
|
exports.karmaGenerator = karmaGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;AACA,yCAKsB;
|
|
1
|
+
{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,mDAU8B;AAG9B,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAEnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE;YAC9D,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;KACJ;IAED,IAAI,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;QACnE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IACD,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,KAAK,EAAE,uBAAY;QACnB,uBAAuB,EAAE,qCAA0B;QACnD,gBAAgB,EAAE,+BAAoB;QACtC,eAAe,EAAE,8BAAmB;QACpC,6BAA6B,EAAE,0CAA+B;QAC9D,cAAc,EAAE,6BAAkB;QAClC,uBAAuB,EAAE,qCAA0B;QACnD,gBAAgB,EAAE,8BAAmB;QACrC,aAAa,EAAE,2BAAgB;KAChC,CACF,CAAC;AACJ,CAAC;AA3BD,wCA2BC;AAED,kBAAe,cAAc,CAAC"}
|
|
@@ -6,9 +6,9 @@ const versions_1 = require("../../utils/versions");
|
|
|
6
6
|
function addBuildableLibrariesPostCssDependencies(tree) {
|
|
7
7
|
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
8
8
|
postcss: versions_1.postcssVersion,
|
|
9
|
-
'postcss-import':
|
|
10
|
-
'postcss-preset-env':
|
|
11
|
-
'postcss-url':
|
|
9
|
+
'postcss-import': versions_1.postcssImportVersion,
|
|
10
|
+
'postcss-preset-env': versions_1.postcssPresetEnvVersion,
|
|
11
|
+
'postcss-url': versions_1.postcssUrlVersion,
|
|
12
12
|
});
|
|
13
13
|
}
|
|
14
14
|
exports.addBuildableLibrariesPostCssDependencies = addBuildableLibrariesPostCssDependencies;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/dependencies.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/dependencies.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAClE,mDAK8B;AAE9B,SAAgB,wCAAwC,CAAC,IAAU;IACjE,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;QACE,OAAO,EAAE,yBAAc;QACvB,gBAAgB,EAAE,+BAAoB;QACtC,oBAAoB,EAAE,kCAAuB;QAC7C,aAAa,EAAE,4BAAiB;KACjC,CACF,CAAC;AACJ,CAAC;AAXD,4FAWC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { NormalModuleReplacementPlugin } from 'webpack';
|
|
2
|
+
import { WorkspaceLibrary } from './utils';
|
|
2
3
|
export interface SharedLibraryConfig {
|
|
3
4
|
singleton?: boolean;
|
|
4
5
|
strictVersion?: boolean;
|
|
5
6
|
requiredVersion?: false | string;
|
|
6
7
|
eager?: boolean;
|
|
7
8
|
}
|
|
8
|
-
export declare function shareWorkspaceLibraries(libraries:
|
|
9
|
+
export declare function shareWorkspaceLibraries(libraries: WorkspaceLibrary[], tsConfigPath?: string): {
|
|
9
10
|
getAliases: () => {};
|
|
10
11
|
getLibraries: (eager?: boolean) => Record<string, SharedLibraryConfig>;
|
|
11
12
|
getReplacementPlugin: () => NormalModuleReplacementPlugin;
|
|
@@ -7,69 +7,48 @@ const fs_1 = require("fs");
|
|
|
7
7
|
const package_json_1 = require("nx/src/utils/package-json");
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const webpack_1 = require("webpack");
|
|
10
|
+
const typescript_2 = require("./typescript");
|
|
10
11
|
const utils_1 = require("./utils");
|
|
11
|
-
function
|
|
12
|
-
while (dirPath !== endPath) {
|
|
13
|
-
if (action(dirPath)) {
|
|
14
|
-
break;
|
|
15
|
-
}
|
|
16
|
-
dirPath = (0, path_1.dirname)(dirPath);
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
function collectWorkspaceLibrarySecondaryEntryPoints(library, libraryPath, tsconfigPathAliases) {
|
|
20
|
-
let libraryRootDirPath = libraryPath;
|
|
21
|
-
traverseUpFileTreeAndPerformActionUntil((0, path_1.dirname)(libraryRootDirPath), devkit_1.workspaceRoot, (currentDirPath) => {
|
|
22
|
-
if ((0, fs_1.existsSync)((0, path_1.join)(currentDirPath, 'package.json'))) {
|
|
23
|
-
libraryRootDirPath = currentDirPath;
|
|
24
|
-
return true;
|
|
25
|
-
}
|
|
26
|
-
});
|
|
12
|
+
function collectWorkspaceLibrarySecondaryEntryPoints(library, libraryRoot, tsconfigPathAliases) {
|
|
27
13
|
const aliasesUnderLibrary = Object.keys(tsconfigPathAliases).filter((libName) => libName.startsWith(library) && libName !== library);
|
|
28
14
|
const secondaryEntryPoints = [];
|
|
29
15
|
for (const alias of aliasesUnderLibrary) {
|
|
30
16
|
const pathToLib = (0, path_1.dirname)((0, path_1.join)(devkit_1.workspaceRoot, tsconfigPathAliases[alias][0]));
|
|
31
|
-
let isSecondaryEntrypoint = false;
|
|
32
17
|
let searchDir = pathToLib;
|
|
33
|
-
|
|
34
|
-
if ((0, fs_1.existsSync)((0, path_1.join)(
|
|
35
|
-
|
|
36
|
-
|
|
18
|
+
while (searchDir !== libraryRoot) {
|
|
19
|
+
if ((0, fs_1.existsSync)((0, path_1.join)(searchDir, 'ng-package.json'))) {
|
|
20
|
+
secondaryEntryPoints.push({ name: alias, path: pathToLib });
|
|
21
|
+
break;
|
|
37
22
|
}
|
|
38
|
-
|
|
39
|
-
if (isSecondaryEntrypoint) {
|
|
40
|
-
secondaryEntryPoints.push({ name: alias, path: pathToLib });
|
|
23
|
+
searchDir = (0, path_1.dirname)(searchDir);
|
|
41
24
|
}
|
|
42
25
|
}
|
|
43
26
|
return secondaryEntryPoints;
|
|
44
27
|
}
|
|
45
28
|
function shareWorkspaceLibraries(libraries, tsConfigPath) {
|
|
46
|
-
var _a
|
|
29
|
+
var _a;
|
|
47
30
|
if (tsConfigPath === void 0) { tsConfigPath = (_a = process.env.NX_TSCONFIG_PATH) !== null && _a !== void 0 ? _a : (0, typescript_1.getRootTsConfigPath)(); }
|
|
48
|
-
if (!
|
|
49
|
-
|
|
31
|
+
if (!libraries) {
|
|
32
|
+
return getEmptySharedLibrariesConfig();
|
|
50
33
|
}
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
return {
|
|
55
|
-
getAliases: () => [],
|
|
56
|
-
getLibraries: () => ({}),
|
|
57
|
-
getReplacementPlugin: () => new webpack_1.NormalModuleReplacementPlugin(/./, () => { }),
|
|
58
|
-
};
|
|
34
|
+
const tsconfigPathAliases = (0, typescript_2.readTsPathMappings)(tsConfigPath);
|
|
35
|
+
if (!Object.keys(tsconfigPathAliases).length) {
|
|
36
|
+
return getEmptySharedLibrariesConfig();
|
|
59
37
|
}
|
|
60
38
|
const pathMappings = [];
|
|
61
39
|
for (const [key, paths] of Object.entries(tsconfigPathAliases)) {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
name,
|
|
66
|
-
path,
|
|
67
|
-
}));
|
|
68
|
-
pathMappings.push({
|
|
69
|
-
name: key,
|
|
70
|
-
path: pathToLib,
|
|
71
|
-
});
|
|
40
|
+
const library = libraries.find((lib) => lib.importKey === key);
|
|
41
|
+
if (!library) {
|
|
42
|
+
continue;
|
|
72
43
|
}
|
|
44
|
+
collectWorkspaceLibrarySecondaryEntryPoints(key, (0, path_1.join)(devkit_1.workspaceRoot, library.root), tsconfigPathAliases).forEach(({ name, path }) => pathMappings.push({
|
|
45
|
+
name,
|
|
46
|
+
path,
|
|
47
|
+
}));
|
|
48
|
+
pathMappings.push({
|
|
49
|
+
name: key,
|
|
50
|
+
path: (0, path_1.normalize)((0, path_1.join)(devkit_1.workspaceRoot, paths[0])),
|
|
51
|
+
});
|
|
73
52
|
}
|
|
74
53
|
return {
|
|
75
54
|
getAliases: () => pathMappings.reduce((aliases, library) => (Object.assign(Object.assign({}, aliases), { [library.name]: library.path })), {}),
|
|
@@ -92,6 +71,13 @@ function shareWorkspaceLibraries(libraries, tsConfigPath) {
|
|
|
92
71
|
};
|
|
93
72
|
}
|
|
94
73
|
exports.shareWorkspaceLibraries = shareWorkspaceLibraries;
|
|
74
|
+
function getEmptySharedLibrariesConfig() {
|
|
75
|
+
return {
|
|
76
|
+
getAliases: () => ({}),
|
|
77
|
+
getLibraries: () => ({}),
|
|
78
|
+
getReplacementPlugin: () => new webpack_1.NormalModuleReplacementPlugin(/./, () => { }),
|
|
79
|
+
};
|
|
80
|
+
}
|
|
95
81
|
function getNonNodeModulesSubDirs(directory) {
|
|
96
82
|
return (0, fs_1.readdirSync)(directory)
|
|
97
83
|
.filter((file) => file !== 'node_modules')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mf-webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/mf-webpack.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,
|
|
1
|
+
{"version":3,"file":"mf-webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/mf-webpack.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,yEAA+E;AAC/E,2BAAwD;AACxD,4DAA+E;AAC/E,+BAA0D;AAC1D,qCAAwD;AACxD,6CAAkD;AAClD,mCAAgE;AAShE,SAAS,2CAA2C,CAClD,OAAe,EACf,WAAmB,EACnB,mBAA6C;IAE7C,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,CACjE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,OAAO,KAAK,OAAO,CAChE,CAAC;IACF,MAAM,oBAAoB,GAAG,EAAE,CAAC;IAChC,KAAK,MAAM,KAAK,IAAI,mBAAmB,EAAE;QACvC,MAAM,SAAS,GAAG,IAAA,cAAO,EACvB,IAAA,WAAI,EAAC,sBAAa,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CACnD,CAAC;QACF,IAAI,SAAS,GAAG,SAAS,CAAC;QAC1B,OAAO,SAAS,KAAK,WAAW,EAAE;YAChC,IAAI,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC,EAAE;gBAClD,oBAAoB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;gBAC5D,MAAM;aACP;YACD,SAAS,GAAG,IAAA,cAAO,EAAC,SAAS,CAAC,CAAC;SAChC;KACF;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,SAAgB,uBAAuB,CACrC,SAA6B,EAC7B,YAAoE;;iCAApE,EAAA,qBAAe,OAAO,CAAC,GAAG,CAAC,gBAAgB,mCAAI,IAAA,gCAAmB,GAAE;IAEpE,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,6BAA6B,EAAE,CAAC;KACxC;IAED,MAAM,mBAAmB,GAAG,IAAA,+BAAkB,EAAC,YAAY,CAAC,CAAC;IAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE;QAC5C,OAAO,6BAA6B,EAAE,CAAC;KACxC;IAED,MAAM,YAAY,GAAqC,EAAE,CAAC;IAC1D,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE;QAC9D,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,KAAK,GAAG,CAAC,CAAC;QAC/D,IAAI,CAAC,OAAO,EAAE;YACZ,SAAS;SACV;QAED,2CAA2C,CACzC,GAAG,EACH,IAAA,WAAI,EAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EACjC,mBAAmB,CACpB,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAC3B,YAAY,CAAC,IAAI,CAAC;YAChB,IAAI;YACJ,IAAI;SACL,CAAC,CACH,CAAC;QAEF,YAAY,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/C,CAAC,CAAC;KACJ;IAED,OAAO;QACL,UAAU,EAAE,GAAG,EAAE,CACf,YAAY,CAAC,MAAM,CACjB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,iCAAM,OAAO,KAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,IAAG,EACpE,EAAE,CACH;QACH,YAAY,EAAE,CAAC,KAAe,EAAuC,EAAE,CACrE,YAAY,CAAC,MAAM,CACjB,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,iCACnB,SAAS,KACZ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,IACjD,EACF,EAAyC,CAC1C;QACH,oBAAoB,EAAE,GAAG,EAAE,CACzB,IAAI,uCAA6B,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;YAC7C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBAChC,OAAO;aACR;YAED,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC;YACzB,MAAM,EAAE,GAAG,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;YAErD,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE;gBAClC,MAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBACnD,IACE,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;oBAC3B,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;oBACxB,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC5B;oBACA,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;iBAC5B;aACF;QACH,CAAC,CAAC;KACL,CAAC;AACJ,CAAC;AAxED,0DAwEC;AAED,SAAS,6BAA6B;IACpC,OAAO;QACL,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;QACtB,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;QACxB,oBAAoB,EAAE,GAAG,EAAE,CACzB,IAAI,uCAA6B,CAAC,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC;KACnD,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,SAAiB;IACjD,OAAO,IAAA,gBAAW,EAAC,SAAS,CAAC;SAC1B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,cAAc,CAAC;SACzC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;SACpC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,cAAS,EAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,mDAAmD,CAC1D,OAAe,EACf,UAAkB,EAClB,OAAe,EACf,qBAAsC,EACtC,WAAqB,EACrB,iBAAsD;IAEtD,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE;QACnC,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACxD,MAAM,sBAAsB,GAAG,IAAA,eAAQ,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC5D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC;QAC1E,IAAI,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE;YAC/B,IAAI;gBACF,mEAAmE;gBACnE,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,CAAC,sBAAa,CAAC,EAAE,CAAC,CAAC;gBAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,qBAAY,EAAC,eAAe,CAAC,CAAC;gBAC/C,iEAAiE;gBACjE,2BAA2B;gBAC3B,IAAI,IAAI,KAAK,cAAc,EAAE;oBAC3B,iBAAiB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;iBACvD;aACF;YAAC,WAAM,GAAE;SACX;aAAM,IAAI,qBAAqB,EAAE;YAChC,+DAA+D;YAC/D,mCAAmC;YACnC,MAAM,mBAAmB,GAAG,KAAK,sBAAsB,EAAE,CAAC;YAC1D,MAAM,cAAc,GAAG,qBAAqB,CAAC,mBAAmB,CAAC,CAAC;YAClE,IAAI,cAAc,EAAE;gBAClB,iBAAiB,CAAC,IAAI,CAAC;oBACrB,IAAI,EAAE,cAAc;oBACpB,OAAO,EAAE,UAAU;iBACpB,CAAC,CAAC;aACJ;SACF;QAED,MAAM,OAAO,GAAG,wBAAwB,CAAC,SAAS,CAAC,CAAC;QACpD,mDAAmD,CACjD,OAAO,EACP,UAAU,EACV,OAAO,EACP,qBAAqB,EACrB,OAAO,EACP,iBAAiB,CAClB,CAAC;KACH;AACH,CAAC;AAED,SAAS,kCAAkC,CACzC,OAAe,EACf,UAAkB,EAClB,iBAAsD;IAEtD,IAAI,aAAqB,CAAC;IAC1B,IAAI,eAAuB,CAAC;IAC5B,IAAI,WAAwB,CAAC;IAC7B,IAAI;QACF,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,IAAA,oCAAqB,EAAC,OAAO,CAAC,CAAC,CAAC;QAC1E,aAAa,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;KAC1C;IAAC,WAAM;QACN,sEAAsE;QACtE,wEAAwE;QACxE,6CAA6C;QAC7C,aAAa,GAAG,IAAA,WAAI,EAAC,sBAAa,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QAC7D,eAAe,GAAG,IAAA,WAAI,EAAC,aAAa,EAAE,cAAc,CAAC,CAAC;QACtD,IAAI,CAAC,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE;YAChC,sEAAsE;YACtE,OAAO;SACR;QACD,WAAW,GAAG,IAAA,qBAAY,EAAC,eAAe,CAAC,CAAC;KAC7C;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAChC,MAAM,OAAO,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAC;IACxD,mDAAmD,CACjD,OAAO,EACP,UAAU,EACV,aAAa,EACb,OAAO,EACP,OAAO,EACP,iBAAiB,CAClB,CAAC;AACJ,CAAC;AAED,SAAgB,yBAAyB,CACvC,OAAe,EACf,OAAe;IAEf,IAAI,CAAC,OAAO,EAAE;QACZ,eAAM,CAAC,IAAI,CACT,iCAAiC,OAAO,+BAA+B;YACrE,mEAAmE;YACnE,iCAAiC,CACpC,CAAC;QAEF,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC;AAC5E,CAAC;AAfD,8DAeC;AAED,SAAgB,aAAa,CAC3B,QAAkB;IAElB,MAAM,OAAO,GAAG,IAAA,2BAAmB,GAAE,CAAC;IACtC,MAAM,WAAW,GAAwC,EAAE,CAAC;IAC5D,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;;QACvB,MAAM,UAAU,GACd,MAAA,MAAA,OAAO,CAAC,YAAY,0CAAG,GAAG,CAAC,mCAAI,MAAA,OAAO,CAAC,eAAe,0CAAG,GAAG,CAAC,CAAC;QAChE,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;QACrD,kCAAkC,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QACxC,MAAM,MAAM,GAAG,yBAAyB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAChE,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;SAC3B;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,EAAyC,CAAC,CAAC;AAChD,CAAC;AApBD,sCAoBC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.readTsPathMappings = void 0;
|
|
4
|
+
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
5
|
+
const fs_1 = require("fs");
|
|
6
|
+
let tsConfig;
|
|
7
|
+
let tsPathMappings;
|
|
8
|
+
function readTsPathMappings(tsConfigPath) {
|
|
9
|
+
var _a, _b, _c;
|
|
10
|
+
if (tsConfigPath === void 0) { tsConfigPath = (_a = process.env.NX_TSCONFIG_PATH) !== null && _a !== void 0 ? _a : (0, typescript_1.getRootTsConfigPath)(); }
|
|
11
|
+
if (tsPathMappings) {
|
|
12
|
+
return tsPathMappings;
|
|
13
|
+
}
|
|
14
|
+
tsConfig !== null && tsConfig !== void 0 ? tsConfig : (tsConfig = readTsConfiguration(tsConfigPath));
|
|
15
|
+
tsPathMappings = {};
|
|
16
|
+
Object.entries((_c = (_b = tsConfig.options) === null || _b === void 0 ? void 0 : _b.paths) !== null && _c !== void 0 ? _c : {}).forEach(([alias, paths]) => {
|
|
17
|
+
tsPathMappings[alias] = paths.map((path) => path.replace(/^\.\//, ''));
|
|
18
|
+
});
|
|
19
|
+
return tsPathMappings;
|
|
20
|
+
}
|
|
21
|
+
exports.readTsPathMappings = readTsPathMappings;
|
|
22
|
+
function readTsConfiguration(tsConfigPath) {
|
|
23
|
+
if (!(0, fs_1.existsSync)(tsConfigPath)) {
|
|
24
|
+
throw new Error(`NX MF: TsConfig Path for workspace libraries does not exist! (${tsConfigPath}).`);
|
|
25
|
+
}
|
|
26
|
+
return (0, typescript_1.readTsConfig)(tsConfigPath);
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=typescript.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/typescript.ts"],"names":[],"mappings":";;;AAAA,yEAGkD;AAClD,2BAAgC;AAGhC,IAAI,QAA2B,CAAC;AAChC,IAAI,cAAqD,CAAC;AAC1D,SAAgB,kBAAkB,CAChC,YAA4E;;iCAA5E,EAAA,qBAAuB,OAAO,CAAC,GAAG,CAAC,gBAAgB,mCAAI,IAAA,gCAAmB,GAAE;IAE5E,IAAI,cAAc,EAAE;QAClB,OAAO,cAAc,CAAC;KACvB;IAED,QAAQ,aAAR,QAAQ,cAAR,QAAQ,IAAR,QAAQ,GAAK,mBAAmB,CAAC,YAAY,CAAC,EAAC;IAC/C,cAAc,GAAG,EAAE,CAAC;IACpB,MAAM,CAAC,OAAO,CAAC,MAAA,MAAA,QAAQ,CAAC,OAAO,0CAAE,KAAK,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE;QACvE,cAAc,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC;AACxB,CAAC;AAdD,gDAcC;AAED,SAAS,mBAAmB,CAAC,YAAoB;IAC/C,IAAI,CAAC,IAAA,eAAU,EAAC,YAAY,CAAC,EAAE;QAC7B,MAAM,IAAI,KAAK,CACb,iEAAiE,YAAY,IAAI,CAClF,CAAC;KACH;IAED,OAAO,IAAA,yBAAY,EAAC,YAAY,CAAC,CAAC;AACpC,CAAC"}
|
package/src/utils/mf/utils.d.ts
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
import { ProjectGraph } from '@nrwl/devkit';
|
|
2
|
+
export declare type WorkspaceLibrary = {
|
|
3
|
+
name: string;
|
|
4
|
+
root: string;
|
|
5
|
+
importKey: string | undefined;
|
|
6
|
+
};
|
|
1
7
|
export declare function readRootPackageJson(): {
|
|
2
8
|
dependencies?: {
|
|
3
9
|
[key: string]: string;
|
|
@@ -6,3 +12,7 @@ export declare function readRootPackageJson(): {
|
|
|
6
12
|
[key: string]: string;
|
|
7
13
|
};
|
|
8
14
|
};
|
|
15
|
+
export declare function getDependentPackagesForProject(projectGraph: ProjectGraph, name: string): {
|
|
16
|
+
workspaceLibraries: WorkspaceLibrary[];
|
|
17
|
+
npmPackages: string[];
|
|
18
|
+
};
|
package/src/utils/mf/utils.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.readRootPackageJson = void 0;
|
|
3
|
+
exports.getDependentPackagesForProject = exports.readRootPackageJson = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const fs_1 = require("fs");
|
|
6
|
+
const typescript_1 = require("./typescript");
|
|
6
7
|
function readRootPackageJson() {
|
|
7
8
|
const pkgJsonPath = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'package.json');
|
|
8
9
|
if (!(0, fs_1.existsSync)(pkgJsonPath)) {
|
|
@@ -11,4 +12,46 @@ function readRootPackageJson() {
|
|
|
11
12
|
return (0, devkit_1.readJsonFile)(pkgJsonPath);
|
|
12
13
|
}
|
|
13
14
|
exports.readRootPackageJson = readRootPackageJson;
|
|
15
|
+
function getDependentPackagesForProject(projectGraph, name) {
|
|
16
|
+
const { npmPackages, workspaceLibraries } = collectDependencies(projectGraph, name);
|
|
17
|
+
return {
|
|
18
|
+
workspaceLibraries: [...workspaceLibraries.values()],
|
|
19
|
+
npmPackages: [...npmPackages],
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
exports.getDependentPackagesForProject = getDependentPackagesForProject;
|
|
23
|
+
function collectDependencies(projectGraph, name, dependencies = {
|
|
24
|
+
workspaceLibraries: new Map(),
|
|
25
|
+
npmPackages: new Set(),
|
|
26
|
+
}, seen = new Set()) {
|
|
27
|
+
var _a;
|
|
28
|
+
if (seen.has(name)) {
|
|
29
|
+
return dependencies;
|
|
30
|
+
}
|
|
31
|
+
seen.add(name);
|
|
32
|
+
((_a = projectGraph.dependencies[name]) !== null && _a !== void 0 ? _a : []).forEach((dependency) => {
|
|
33
|
+
if (dependency.target.startsWith('npm:')) {
|
|
34
|
+
dependencies.npmPackages.add(dependency.target.replace('npm:', ''));
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
dependencies.workspaceLibraries.set(dependency.target, {
|
|
38
|
+
name: dependency.target,
|
|
39
|
+
root: projectGraph.nodes[dependency.target].data.root,
|
|
40
|
+
importKey: getLibraryImportPath(dependency.target, projectGraph),
|
|
41
|
+
});
|
|
42
|
+
collectDependencies(projectGraph, dependency.target, dependencies, seen);
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
return dependencies;
|
|
46
|
+
}
|
|
47
|
+
function getLibraryImportPath(library, projectGraph) {
|
|
48
|
+
const tsConfigPathMappings = (0, typescript_1.readTsPathMappings)();
|
|
49
|
+
const sourceRoot = projectGraph.nodes[library].data.sourceRoot;
|
|
50
|
+
for (const [key, value] of Object.entries(tsConfigPathMappings)) {
|
|
51
|
+
if (value.find((path) => path.startsWith(sourceRoot))) {
|
|
52
|
+
return key;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return undefined;
|
|
56
|
+
}
|
|
14
57
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/utils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/utils.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,2BAAgC;AAChC,6CAAkD;AAQlD,SAAgB,mBAAmB;IAIjC,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,sBAAa,EAAE,cAAc,CAAC,CAAC;IACrE,IAAI,CAAC,IAAA,eAAU,EAAC,WAAW,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,2EAA2E,CAC5E,CAAC;KACH;IAED,OAAO,IAAA,qBAAY,EAAC,WAAW,CAAC,CAAC;AACnC,CAAC;AAZD,kDAYC;AAED,SAAgB,8BAA8B,CAC5C,YAA0B,EAC1B,IAAY;IAKZ,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,mBAAmB,CAC7D,YAAY,EACZ,IAAI,CACL,CAAC;IAEF,OAAO;QACL,kBAAkB,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC;QACpD,WAAW,EAAE,CAAC,GAAG,WAAW,CAAC;KAC9B,CAAC;AACJ,CAAC;AAhBD,wEAgBC;AAED,SAAS,mBAAmB,CAC1B,YAA0B,EAC1B,IAAY,EACZ,eAAe;IACb,kBAAkB,EAAE,IAAI,GAAG,EAA4B;IACvD,WAAW,EAAE,IAAI,GAAG,EAAU;CAC/B,EACD,OAAoB,IAAI,GAAG,EAAE;;IAK7B,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QAClB,OAAO,YAAY,CAAC;KACrB;IACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEf,CAAC,MAAA,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAC7D,IAAI,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YACxC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;SACrE;aAAM;YACL,YAAY,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE;gBACrD,IAAI,EAAE,UAAU,CAAC,MAAM;gBACvB,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI;gBACrD,SAAS,EAAE,oBAAoB,CAAC,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC;aACjE,CAAC,CAAC;YACH,mBAAmB,CAAC,YAAY,EAAE,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;SAC1E;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,oBAAoB,CAC3B,OAAe,EACf,YAA0B;IAE1B,MAAM,oBAAoB,GAAG,IAAA,+BAAkB,GAAE,CAAC;IAElD,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;IAC/D,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;QAC/D,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAAE;YACrD,OAAO,GAAG,CAAC;SACZ;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -2,70 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.withModuleFederation = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const mf_webpack_1 = require("./mf-webpack");
|
|
6
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
|
-
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
8
|
-
const utils_1 = require("./utils");
|
|
9
|
-
const path_1 = require("path");
|
|
10
6
|
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
7
|
+
const path_1 = require("path");
|
|
8
|
+
const mf_webpack_1 = require("./mf-webpack");
|
|
9
|
+
const utils_1 = require("./utils");
|
|
11
10
|
const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
|
|
12
|
-
function collectDependencies(projectGraph, name, dependencies = {
|
|
13
|
-
workspaceLibraries: new Set(),
|
|
14
|
-
npmPackages: new Set(),
|
|
15
|
-
}, seen = new Set()) {
|
|
16
|
-
var _a;
|
|
17
|
-
if (seen.has(name)) {
|
|
18
|
-
return dependencies;
|
|
19
|
-
}
|
|
20
|
-
seen.add(name);
|
|
21
|
-
((_a = projectGraph.dependencies[name]) !== null && _a !== void 0 ? _a : []).forEach((dependency) => {
|
|
22
|
-
if (dependency.target.startsWith('npm:')) {
|
|
23
|
-
dependencies.npmPackages.add(dependency.target.replace('npm:', ''));
|
|
24
|
-
}
|
|
25
|
-
else {
|
|
26
|
-
dependencies.workspaceLibraries.add(dependency.target);
|
|
27
|
-
collectDependencies(projectGraph, dependency.target, dependencies, seen);
|
|
28
|
-
}
|
|
29
|
-
});
|
|
30
|
-
return dependencies;
|
|
31
|
-
}
|
|
32
|
-
function mapWorkspaceLibrariesToTsConfigImport(workspaceLibraries) {
|
|
33
|
-
var _a, _b;
|
|
34
|
-
const { nodes: projectGraphNodes } = (0, devkit_1.readCachedProjectGraph)();
|
|
35
|
-
const tsConfigPath = (_a = process.env.NX_TSCONFIG_PATH) !== null && _a !== void 0 ? _a : (0, typescript_1.getRootTsConfigPath)();
|
|
36
|
-
const tsConfig = (0, typescript_1.readTsConfig)(tsConfigPath);
|
|
37
|
-
const tsconfigPathAliases = (_b = tsConfig.options) === null || _b === void 0 ? void 0 : _b.paths;
|
|
38
|
-
if (!tsconfigPathAliases) {
|
|
39
|
-
return workspaceLibraries;
|
|
40
|
-
}
|
|
41
|
-
const mappedLibraries = [];
|
|
42
|
-
for (const lib of workspaceLibraries) {
|
|
43
|
-
const sourceRoot = projectGraphNodes[lib].data.sourceRoot;
|
|
44
|
-
let found = false;
|
|
45
|
-
for (const [key, value] of Object.entries(tsconfigPathAliases)) {
|
|
46
|
-
if (value.find((p) => p.startsWith(sourceRoot))) {
|
|
47
|
-
mappedLibraries.push(key);
|
|
48
|
-
found = true;
|
|
49
|
-
break;
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
if (!found) {
|
|
53
|
-
mappedLibraries.push(lib);
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
return mappedLibraries;
|
|
57
|
-
}
|
|
58
|
-
function getDependentPackagesForProject(projectGraph, name) {
|
|
59
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
60
|
-
const { npmPackages, workspaceLibraries } = collectDependencies(projectGraph, name);
|
|
61
|
-
return {
|
|
62
|
-
workspaceLibraries: mapWorkspaceLibrariesToTsConfigImport([
|
|
63
|
-
...workspaceLibraries,
|
|
64
|
-
]),
|
|
65
|
-
npmPackages: [...npmPackages],
|
|
66
|
-
};
|
|
67
|
-
});
|
|
68
|
-
}
|
|
69
11
|
function determineRemoteUrl(remote) {
|
|
70
12
|
const remoteProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
|
|
71
13
|
let publicHost = '';
|
|
@@ -164,7 +106,7 @@ function withModuleFederation(options) {
|
|
|
164
106
|
catch (e) {
|
|
165
107
|
projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
166
108
|
}
|
|
167
|
-
const dependencies =
|
|
109
|
+
const dependencies = (0, utils_1.getDependentPackagesForProject)(projectGraph, options.name);
|
|
168
110
|
const sharedLibraries = (0, mf_webpack_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
|
|
169
111
|
const npmPackages = (0, mf_webpack_1.sharePackages)(dependencies.npmPackages.filter((pkg) => !DEFAULT_NPM_PACKAGES_TO_AVOID.includes(pkg)));
|
|
170
112
|
DEFAULT_NPM_PACKAGES_TO_AVOID.forEach((pkgName) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/with-module-federation.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/with-module-federation.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,10 @@ export declare const enum UnitTestRunner {
|
|
|
4
4
|
None = "none"
|
|
5
5
|
}
|
|
6
6
|
export declare const enum E2eTestRunner {
|
|
7
|
+
/**
|
|
8
|
+
* @deprecated Protractor is no longer maintained. Support for generating
|
|
9
|
+
* E2E tests with it will be removed in v15.
|
|
10
|
+
*/
|
|
7
11
|
Protractor = "protractor",
|
|
8
12
|
Cypress = "cypress",
|
|
9
13
|
None = "none"
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -1,14 +1,29 @@
|
|
|
1
1
|
export declare const nxVersion: any;
|
|
2
|
-
export declare const angularVersion = "~14.
|
|
3
|
-
export declare const angularDevkitVersion = "~14.
|
|
4
|
-
export declare const ngPackagrVersion = "~14.
|
|
5
|
-
export declare const angularJsVersion = "1.7.9";
|
|
2
|
+
export declare const angularVersion = "~14.1.0";
|
|
3
|
+
export declare const angularDevkitVersion = "~14.1.0";
|
|
4
|
+
export declare const ngPackagrVersion = "~14.1.0";
|
|
6
5
|
export declare const ngrxVersion = "~14.0.0";
|
|
7
6
|
export declare const rxjsVersion = "~7.4.0";
|
|
8
|
-
export declare const
|
|
7
|
+
export declare const zoneJsVersion = "~0.11.4";
|
|
8
|
+
export declare const angularJsVersion = "1.7.9";
|
|
9
|
+
export declare const tsLibVersion = "^2.3.0";
|
|
9
10
|
export declare const angularEslintVersion = "~14.0.0";
|
|
10
11
|
export declare const tailwindVersion = "^3.0.2";
|
|
11
12
|
export declare const postcssVersion = "^8.4.5";
|
|
13
|
+
export declare const postcssImportVersion = "~14.1.0";
|
|
14
|
+
export declare const postcssPresetEnvVersion = "~7.5.0";
|
|
15
|
+
export declare const postcssUrlVersion = "~10.1.3";
|
|
12
16
|
export declare const autoprefixerVersion = "^10.4.0";
|
|
13
|
-
export declare const tsLibVersion = "^2.3.0";
|
|
14
17
|
export declare const tsNodeVersion = "~10.8.0";
|
|
18
|
+
export declare const jestPresetAngularVersion = "~11.1.2";
|
|
19
|
+
export declare const protractorVersion = "~7.0.0";
|
|
20
|
+
export declare const karmaVersion = "~6.4.0";
|
|
21
|
+
export declare const karmaChromeLauncherVersion = "~3.1.0";
|
|
22
|
+
export declare const karmaCoverageVersion = "~2.2.0";
|
|
23
|
+
export declare const karmaJasmineVersion = "~5.1.0";
|
|
24
|
+
export declare const karmaJasmineHtmlReporterVersion = "~2.0.0";
|
|
25
|
+
export declare const jasmineCoreVersion = "~4.2.0";
|
|
26
|
+
export declare const jasmineSpecReporterVersion = "~7.0.0";
|
|
27
|
+
export declare const typesJasmineVersion = "~4.0.0";
|
|
28
|
+
export declare const typesJasminewd2Version = "~2.0.3";
|
|
29
|
+
export declare const typesNodeVersion = "16.11.7";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,18 +1,33 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.typesNodeVersion = exports.typesJasminewd2Version = exports.typesJasmineVersion = exports.jasmineSpecReporterVersion = exports.jasmineCoreVersion = exports.karmaJasmineHtmlReporterVersion = exports.karmaJasmineVersion = exports.karmaCoverageVersion = exports.karmaChromeLauncherVersion = exports.karmaVersion = exports.protractorVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
4
|
exports.nxVersion = require('../../package.json').version;
|
|
5
|
-
exports.angularVersion = '~14.
|
|
6
|
-
exports.angularDevkitVersion = '~14.
|
|
7
|
-
exports.ngPackagrVersion = '~14.
|
|
8
|
-
exports.angularJsVersion = '1.7.9';
|
|
5
|
+
exports.angularVersion = '~14.1.0';
|
|
6
|
+
exports.angularDevkitVersion = '~14.1.0';
|
|
7
|
+
exports.ngPackagrVersion = '~14.1.0';
|
|
9
8
|
exports.ngrxVersion = '~14.0.0';
|
|
10
9
|
exports.rxjsVersion = '~7.4.0';
|
|
11
|
-
exports.
|
|
10
|
+
exports.zoneJsVersion = '~0.11.4';
|
|
11
|
+
exports.angularJsVersion = '1.7.9';
|
|
12
|
+
exports.tsLibVersion = '^2.3.0';
|
|
12
13
|
exports.angularEslintVersion = '~14.0.0';
|
|
13
14
|
exports.tailwindVersion = '^3.0.2';
|
|
14
15
|
exports.postcssVersion = '^8.4.5';
|
|
16
|
+
exports.postcssImportVersion = '~14.1.0';
|
|
17
|
+
exports.postcssPresetEnvVersion = '~7.5.0';
|
|
18
|
+
exports.postcssUrlVersion = '~10.1.3';
|
|
15
19
|
exports.autoprefixerVersion = '^10.4.0';
|
|
16
|
-
exports.tsLibVersion = '^2.3.0';
|
|
17
20
|
exports.tsNodeVersion = '~10.8.0';
|
|
21
|
+
exports.jestPresetAngularVersion = '~11.1.2';
|
|
22
|
+
exports.protractorVersion = '~7.0.0';
|
|
23
|
+
exports.karmaVersion = '~6.4.0';
|
|
24
|
+
exports.karmaChromeLauncherVersion = '~3.1.0';
|
|
25
|
+
exports.karmaCoverageVersion = '~2.2.0';
|
|
26
|
+
exports.karmaJasmineVersion = '~5.1.0';
|
|
27
|
+
exports.karmaJasmineHtmlReporterVersion = '~2.0.0';
|
|
28
|
+
exports.jasmineCoreVersion = '~4.2.0';
|
|
29
|
+
exports.jasmineSpecReporterVersion = '~7.0.0';
|
|
30
|
+
exports.typesJasmineVersion = '~4.0.0';
|
|
31
|
+
exports.typesJasminewd2Version = '~2.0.3';
|
|
32
|
+
exports.typesNodeVersion = '16.11.7';
|
|
18
33
|
//# sourceMappingURL=versions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,SAAS,CAAC;AAE1B,QAAA,wBAAwB,GAAG,SAAS,CAAC;AACrC,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,+BAA+B,GAAG,QAAQ,CAAC;AAC3C,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,gBAAgB,GAAG,SAAS,CAAC"}
|