@nrwl/angular 15.0.12 → 15.1.0-beta.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.
Files changed (29) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/module-federation/index.d.ts +0 -1
  3. package/module-federation/index.js +0 -2
  4. package/module-federation/index.js.map +1 -1
  5. package/package.json +9 -9
  6. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +5 -4
  7. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
  8. package/src/builders/module-federation-dev-server/schema.d.ts +1 -0
  9. package/src/builders/module-federation-dev-server/schema.json +7 -0
  10. package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js +4 -2
  11. package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js.map +1 -1
  12. package/src/executors/package/package.impl.js +4 -2
  13. package/src/executors/package/package.impl.js.map +1 -1
  14. package/src/executors/utilities/typescript.d.ts +13 -0
  15. package/src/executors/utilities/typescript.js +49 -0
  16. package/src/executors/utilities/typescript.js.map +1 -0
  17. package/src/generators/component-test/files/__componentFileName__.cy.ts__tpl__ +12 -8
  18. package/src/utils/mf/with-module-federation.d.ts +2 -16
  19. package/src/utils/mf/with-module-federation.js +6 -77
  20. package/src/utils/mf/with-module-federation.js.map +1 -1
  21. package/src/utils/mf/mf-webpack.d.ts +0 -15
  22. package/src/utils/mf/mf-webpack.js +0 -185
  23. package/src/utils/mf/mf-webpack.js.map +0 -1
  24. package/src/utils/mf/typescript.d.ts +0 -2
  25. package/src/utils/mf/typescript.js +0 -28
  26. package/src/utils/mf/typescript.js.map +0 -1
  27. package/src/utils/mf/utils.d.ts +0 -18
  28. package/src/utils/mf/utils.js +0 -57
  29. package/src/utils/mf/utils.js.map +0 -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
- ## [15.0.12](https://github.com/nrwl/nx/compare/15.0.11...15.0.12) (2022-11-08)
6
+ # [15.1.0-beta.0](https://github.com/nrwl/nx/compare/15.0.7...15.1.0-beta.0) (2022-11-09)
7
7
 
8
8
  **Note:** Version bump only for package @nrwl/angular
@@ -1,2 +1 @@
1
1
  export { withModuleFederation } from '../src/utils/mf/with-module-federation';
2
- export * from '../src/utils/mf/mf-webpack';
@@ -1,8 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.withModuleFederation = void 0;
4
- const tslib_1 = require("tslib");
5
4
  var with_module_federation_1 = require("../src/utils/mf/with-module-federation");
6
5
  Object.defineProperty(exports, "withModuleFederation", { enumerable: true, get: function () { return with_module_federation_1.withModuleFederation; } });
7
- tslib_1.__exportStar(require("../src/utils/mf/mf-webpack"), exports);
8
6
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/angular/module-federation/index.ts"],"names":[],"mappings":";;;;AAAA,iFAA8E;AAArE,8HAAA,oBAAoB,OAAA;AAC7B,qEAA2C"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/angular/module-federation/index.ts"],"names":[],"mappings":";;;AAAA,iFAA8E;AAArE,8HAAA,oBAAoB,OAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/angular",
3
- "version": "15.0.12",
3
+ "version": "15.1.0-beta.0",
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": {
@@ -67,13 +67,13 @@
67
67
  },
68
68
  "dependencies": {
69
69
  "@angular-devkit/schematics": "~14.2.0",
70
- "@nrwl/cypress": "15.0.12",
71
- "@nrwl/devkit": "15.0.12",
72
- "@nrwl/jest": "15.0.12",
73
- "@nrwl/linter": "15.0.12",
74
- "@nrwl/storybook": "15.0.12",
75
- "@nrwl/webpack": "15.0.12",
76
- "@nrwl/workspace": "15.0.12",
70
+ "@nrwl/cypress": "15.1.0-beta.0",
71
+ "@nrwl/devkit": "15.1.0-beta.0",
72
+ "@nrwl/jest": "15.1.0-beta.0",
73
+ "@nrwl/linter": "15.1.0-beta.0",
74
+ "@nrwl/storybook": "15.1.0-beta.0",
75
+ "@nrwl/webpack": "15.1.0-beta.0",
76
+ "@nrwl/workspace": "15.1.0-beta.0",
77
77
  "@phenomnomnominal/tsquery": "4.1.1",
78
78
  "@schematics/angular": "~14.2.0",
79
79
  "chalk": "4.1.0",
@@ -99,5 +99,5 @@
99
99
  "fesm2015": "fesm2015/nrwl-angular.mjs",
100
100
  "typings": "index.d.ts",
101
101
  "sideEffects": false,
102
- "gitHead": "b3541f6e2a0abe85cb7201111b74348670d543d3"
102
+ "gitHead": "6bc3720656de60838d89a8307fff3b41cfee04b3"
103
103
  }
@@ -67,7 +67,7 @@ function validateDevRemotes(options, workspaceProjects) {
67
67
  }
68
68
  }
69
69
  function executeModuleFederationDevServerBuilder(schema, context) {
70
- var _a, _b;
70
+ var _a, _b, _c;
71
71
  const options = tslib_1.__rest(schema, []);
72
72
  const projectGraph = (0, devkit_1.readCachedProjectGraph)();
73
73
  const { projects: workspaceProjects } = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
@@ -76,7 +76,8 @@ function executeModuleFederationDevServerBuilder(schema, context) {
76
76
  validateDevRemotes(options, workspaceProjects);
77
77
  const staticRemotes = getStaticRemotes(project, context, workspaceProjects);
78
78
  const dynamicRemotes = getDynamicRemotes(project, context, workspaceProjects);
79
- const remotes = [...staticRemotes, ...dynamicRemotes];
79
+ const remotesToSkip = new Set((_a = options.skipRemotes) !== null && _a !== void 0 ? _a : []);
80
+ const remotes = [...staticRemotes, ...dynamicRemotes].filter((r) => !remotesToSkip.has(r));
80
81
  const devServeRemotes = !options.devRemotes
81
82
  ? []
82
83
  : Array.isArray(options.devRemotes)
@@ -85,10 +86,10 @@ function executeModuleFederationDevServerBuilder(schema, context) {
85
86
  for (const remote of remotes) {
86
87
  const isDev = devServeRemotes.includes(remote);
87
88
  const target = isDev ? 'serve' : 'serve-static';
88
- if (!((_a = workspaceProjects[remote].targets) === null || _a === void 0 ? void 0 : _a[target])) {
89
+ if (!((_b = workspaceProjects[remote].targets) === null || _b === void 0 ? void 0 : _b[target])) {
89
90
  throw new Error(`Could not find "${target}" target in "${remote}" project.`);
90
91
  }
91
- else if (!((_b = workspaceProjects[remote].targets) === null || _b === void 0 ? void 0 : _b[target].executor)) {
92
+ else if (!((_c = workspaceProjects[remote].targets) === null || _c === void 0 ? void 0 : _c[target].executor)) {
92
93
  throw new Error(`Could not find executor for "${target}" target in "${remote}" project.`);
93
94
  }
94
95
  const runOptions = {};
@@ -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":"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"}
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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"}
@@ -18,4 +18,5 @@ export interface Schema {
18
18
  watch?: boolean;
19
19
  poll?: number;
20
20
  devRemotes?: string[];
21
+ skipRemotes?: string[];
21
22
  }
@@ -110,6 +110,13 @@
110
110
  "type": "string"
111
111
  },
112
112
  "description": "List of remote applications to run in development mode (i.e. using serve target)."
113
+ },
114
+ "skipRemotes": {
115
+ "type": "array",
116
+ "items": {
117
+ "type": "string"
118
+ },
119
+ "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."
113
120
  }
114
121
  },
115
122
  "additionalProperties": false,
@@ -6,6 +6,7 @@ const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-
6
6
  const ng_packagr_1 = require("ng-packagr");
7
7
  const path_1 = require("path");
8
8
  const package_impl_1 = require("../package/package.impl");
9
+ const typescript_1 = require("../utilities/typescript");
9
10
  const entry_point_di_1 = require("./ng-packagr-adjustments/ng-package/entry-point/entry-point.di");
10
11
  const options_di_1 = require("./ng-packagr-adjustments/ng-package/options.di");
11
12
  const package_di_1 = require("./ng-packagr-adjustments/ng-package/package.di");
@@ -23,8 +24,9 @@ function initializeNgPackgrLite(options, context, projectDependencies) {
23
24
  packager.forProject((0, path_1.resolve)(context.root, options.project));
24
25
  packager.withBuildTransform(package_di_1.NX_PACKAGE_TRANSFORM.provide);
25
26
  if (options.tsConfig) {
26
- const tsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, context.workspace.projects[context.projectName].root, projectDependencies);
27
- packager.withTsConfig(tsConfigPath);
27
+ const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, context.workspace.projects[context.projectName].root, projectDependencies);
28
+ const tsConfig = yield (0, typescript_1.parseRemappedTsConfigAndMergeDefaults)(context.root, options.tsConfig, remappedTsConfigFilePath);
29
+ packager.withTsConfig(tsConfig);
28
30
  }
29
31
  return packager;
30
32
  });
@@ -1 +1 @@
1
- {"version":3,"file":"ng-packagr-lite.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-lite.impl.ts"],"names":[],"mappings":";;;;AACA,6FAG4D;AAC5D,2CAAuC;AACvC,+BAA+B;AAC/B,0DAAgE;AAEhE,mGAA0G;AAC1G,+EAAkF;AAClF,+EAGwD;AAExD,SAAe,sBAAsB,CACnC,OAA2C,EAC3C,OAAwB,EACxB,mBAAoD;;QAEpD,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAAC;YAC7B,sCAAsC;YACtC,GAAG,iCAAoB;YACvB,GAAG,yCAAwB;YAC3B,IAAA,6BAAgB,EAAC;gBACf,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,KAAK,EAAE,OAAO,CAAC,KAAK;aACrB,CAAC;SACH,CAAC,CAAC;QACH,QAAQ,CAAC,UAAU,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5D,QAAQ,CAAC,kBAAkB,CAAC,iCAAoB,CAAC,OAAO,CAAC,CAAC;QAE1D,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,MAAM,YAAY,GAAG,IAAA,wCAAiB,EACpC,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACpD,mBAAmB,CACpB,CAAC;YACF,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;SACrC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAEY,QAAA,qBAAqB,GAAG,IAAA,oCAAqB,EACxD,sBAAsB,CACvB,CAAC;AAEF,kBAAe,6BAAqB,CAAC"}
1
+ {"version":3,"file":"ng-packagr-lite.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-lite.impl.ts"],"names":[],"mappings":";;;;AACA,6FAG4D;AAC5D,2CAAuC;AACvC,+BAA+B;AAC/B,0DAAgE;AAEhE,wDAAgF;AAChF,mGAA0G;AAC1G,+EAAkF;AAClF,+EAGwD;AAExD,SAAe,sBAAsB,CACnC,OAA2C,EAC3C,OAAwB,EACxB,mBAAoD;;QAEpD,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAAC;YAC7B,sCAAsC;YACtC,GAAG,iCAAoB;YACvB,GAAG,yCAAwB;YAC3B,IAAA,6BAAgB,EAAC;gBACf,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,KAAK,EAAE,OAAO,CAAC,KAAK;aACrB,CAAC;SACH,CAAC,CAAC;QACH,QAAQ,CAAC,UAAU,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5D,QAAQ,CAAC,kBAAkB,CAAC,iCAAoB,CAAC,OAAO,CAAC,CAAC;QAE1D,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,MAAM,wBAAwB,GAAG,IAAA,wCAAiB,EAChD,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACpD,mBAAmB,CACpB,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,IAAA,kDAAqC,EAC1D,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,QAAQ,EAChB,wBAAwB,CACzB,CAAC;YACF,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;SACjC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAEY,QAAA,qBAAqB,GAAG,IAAA,oCAAqB,EACxD,sBAAsB,CACvB,CAAC;AAEF,kBAAe,6BAAqB,CAAC"}
@@ -7,6 +7,7 @@ const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-
7
7
  const path_1 = require("path");
8
8
  const rxjs_1 = require("rxjs");
9
9
  const operators_1 = require("rxjs/operators");
10
+ const typescript_1 = require("../utilities/typescript");
10
11
  const entry_point_di_1 = require("./ng-packagr-adjustments/ng-package/entry-point/entry-point.di");
11
12
  const options_di_1 = require("./ng-packagr-adjustments/ng-package/options.di");
12
13
  const package_di_1 = require("./ng-packagr-adjustments/ng-package/package.di");
@@ -23,8 +24,9 @@ function initializeNgPackagr(options, context, projectDependencies) {
23
24
  packager.forProject((0, path_1.resolve)(context.root, options.project));
24
25
  packager.withBuildTransform(package_di_1.NX_PACKAGE_TRANSFORM.provide);
25
26
  if (options.tsConfig) {
26
- const tsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, context.workspace.projects[context.projectName].root, projectDependencies);
27
- packager.withTsConfig(tsConfigPath);
27
+ const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, context.workspace.projects[context.projectName].root, projectDependencies);
28
+ const tsConfig = yield (0, typescript_1.parseRemappedTsConfigAndMergeDefaults)(context.root, options.tsConfig, remappedTsConfigFilePath);
29
+ packager.withTsConfig(tsConfig);
28
30
  }
29
31
  return packager;
30
32
  });
@@ -1 +1 @@
1
- {"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,13 @@
1
+ /**
2
+ * Adapted from a private function at ng-packagr
3
+ * https://github.com/ng-packagr/ng-packagr/blob/main/src/lib/ts/tsconfig.ts#L12:
4
+ *
5
+ * Changes made:
6
+ * - Added an extra function that updates the configFilePath in the returned parsed options
7
+ * to be the original tsconfig file.
8
+ */
9
+ import type { ParsedConfiguration } from '@angular/compiler-cli';
10
+ /**
11
+ * Proxy function that ensures the configFilePath option points to the original file path.
12
+ */
13
+ export declare function parseRemappedTsConfigAndMergeDefaults(workspaceRoot: string, originalFilePath: string, remappedFilePath: string): Promise<ParsedConfiguration>;
@@ -0,0 +1,49 @@
1
+ "use strict";
2
+ /**
3
+ * Adapted from a private function at ng-packagr
4
+ * https://github.com/ng-packagr/ng-packagr/blob/main/src/lib/ts/tsconfig.ts#L12:
5
+ *
6
+ * Changes made:
7
+ * - Added an extra function that updates the configFilePath in the returned parsed options
8
+ * to be the original tsconfig file.
9
+ */
10
+ Object.defineProperty(exports, "__esModule", { value: true });
11
+ exports.parseRemappedTsConfigAndMergeDefaults = void 0;
12
+ const tslib_1 = require("tslib");
13
+ const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
14
+ const path_1 = require("path");
15
+ const ts = require("typescript");
16
+ function readDefaultTsConfig(fileName) {
17
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
18
+ // these options are mandatory
19
+ const extraOptions = {
20
+ target: ts.ScriptTarget.ES2020,
21
+ experimentalDecorators: true,
22
+ // sourcemaps
23
+ sourceMap: false,
24
+ inlineSources: true,
25
+ inlineSourceMap: true,
26
+ outDir: '',
27
+ declaration: true,
28
+ // ng compiler to options
29
+ enableResourceInlining: true,
30
+ // these are required to set the appropriate EmitFlags
31
+ flatModuleId: 'AUTOGENERATED',
32
+ flatModuleOutFile: 'AUTOGENERATED',
33
+ };
34
+ const { readConfiguration } = yield (0, ng_compiler_cli_1.ngCompilerCli)();
35
+ return readConfiguration(fileName, extraOptions);
36
+ });
37
+ }
38
+ /**
39
+ * Proxy function that ensures the configFilePath option points to the original file path.
40
+ */
41
+ function parseRemappedTsConfigAndMergeDefaults(workspaceRoot, originalFilePath, remappedFilePath) {
42
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
43
+ const parsedConfiguration = yield readDefaultTsConfig(remappedFilePath);
44
+ parsedConfiguration.options.configFilePath = (0, path_1.resolve)(workspaceRoot, originalFilePath);
45
+ return parsedConfiguration;
46
+ });
47
+ }
48
+ exports.parseRemappedTsConfigAndMergeDefaults = parseRemappedTsConfigAndMergeDefaults;
49
+ //# sourceMappingURL=typescript.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/typescript.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;AAMH,0EAAqE;AACrE,+BAA+B;AAC/B,iCAAiC;AAEjC,SAAe,mBAAmB,CAChC,QAAgB;;QAEhB,8BAA8B;QAC9B,MAAM,YAAY,GAAoB;YACpC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM;YAC9B,sBAAsB,EAAE,IAAI;YAE5B,aAAa;YACb,SAAS,EAAE,KAAK;YAChB,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,IAAI;YAErB,MAAM,EAAE,EAAE;YACV,WAAW,EAAE,IAAI;YAEjB,yBAAyB;YACzB,sBAAsB,EAAE,IAAI;YAE5B,sDAAsD;YACtD,YAAY,EAAE,eAAe;YAC7B,iBAAiB,EAAE,eAAe;SACnC,CAAC;QAEF,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,+BAAa,GAAE,CAAC;QAEpD,OAAO,iBAAiB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACnD,CAAC;CAAA;AAED;;GAEG;AACH,SAAsB,qCAAqC,CACzD,aAAqB,EACrB,gBAAwB,EACxB,gBAAwB;;QAExB,MAAM,mBAAmB,GAAG,MAAM,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;QACxE,mBAAmB,CAAC,OAAO,CAAC,cAAc,GAAG,IAAA,cAAO,EAClD,aAAa,EACb,gBAAgB,CACjB,CAAC;QAEF,OAAO,mBAAmB,CAAC;IAC7B,CAAC;CAAA;AAZD,sFAYC"}
@@ -1,19 +1,23 @@
1
- import { MountConfig } from 'cypress/angular';
1
+ import { TestBed } from '@angular/core/testing';
2
2
  import { <%= componentName %> } from './<%= componentFileName %>';
3
3
 
4
4
  describe(<%= componentName %>.name, () => {
5
- const config: MountConfig<<%= componentName %>> = {
6
- declarations: [],
7
- imports: [],
8
- providers: []
9
- }
5
+
6
+ beforeEach(() => {
7
+ TestBed.overrideComponent(<%= componentName %>, {
8
+ add: {
9
+ imports: [],
10
+ providers: []
11
+ }
12
+ })
13
+ })
10
14
 
11
15
  it('renders', () => {
12
16
  cy.mount(<%= componentName %>,<% if(props.length > 0) { %> {
13
- ...config,
14
17
  componentProperties: {<% for (let prop of props) { %>
15
18
  <%= prop.name %>: <%- prop.defaultValue %>,<% } %>
16
19
  }
17
- }<% } else { %> config<% } %>);
20
+ }<% } %>);
18
21
  })
22
+
19
23
  })
@@ -1,16 +1,2 @@
1
- import { SharedLibraryConfig } from './mf-webpack';
2
- export declare type MFRemotes = string[] | [remoteName: string, remoteUrl: string][];
3
- declare type SharedFunction = (libraryName: string, sharedConfig: SharedLibraryConfig) => SharedLibraryConfig | false;
4
- declare type AdditionalSharedConfig = Array<string | [libraryName: string, sharedConfig: SharedLibraryConfig] | {
5
- libraryName: string;
6
- sharedConfig: SharedLibraryConfig;
7
- }>;
8
- export interface MFConfig {
9
- name: string;
10
- remotes?: MFRemotes;
11
- exposes?: Record<string, string>;
12
- shared?: SharedFunction;
13
- additionalShared?: AdditionalSharedConfig;
14
- }
15
- export declare function withModuleFederation(options: MFConfig): Promise<(config: any) => any>;
16
- export {};
1
+ import { ModuleFederationConfig } from '@nrwl/devkit';
2
+ export declare function withModuleFederation(options: ModuleFederationConfig): Promise<(config: any) => any>;
@@ -4,9 +4,6 @@ exports.withModuleFederation = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nrwl/devkit");
6
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");
10
7
  const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
11
8
  function determineRemoteUrl(remote) {
12
9
  const remoteProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
@@ -20,74 +17,6 @@ function determineRemoteUrl(remote) {
20
17
  }
21
18
  return `${publicHost.endsWith('/') ? publicHost.slice(0, -1) : publicHost}/remoteEntry.mjs`;
22
19
  }
23
- function mapRemotes(remotes) {
24
- const mappedRemotes = {};
25
- for (const remote of remotes) {
26
- if (Array.isArray(remote)) {
27
- const [remoteName, remoteLocation] = remote;
28
- const remoteLocationExt = (0, path_1.extname)(remoteLocation);
29
- mappedRemotes[remoteName] = ['.js', '.mjs'].includes(remoteLocationExt)
30
- ? remoteLocation
31
- : `${remoteLocation.endsWith('/')
32
- ? remoteLocation.slice(0, -1)
33
- : remoteLocation}/remoteEntry.mjs`;
34
- }
35
- else if (typeof remote === 'string') {
36
- mappedRemotes[remote] = determineRemoteUrl(remote);
37
- }
38
- }
39
- return mappedRemotes;
40
- }
41
- function applySharedFunction(sharedConfig, sharedFn) {
42
- if (!sharedFn) {
43
- return;
44
- }
45
- for (const [libraryName, library] of Object.entries(sharedConfig)) {
46
- const mappedDependency = sharedFn(libraryName, library);
47
- if (mappedDependency === false) {
48
- delete sharedConfig[libraryName];
49
- continue;
50
- }
51
- else if (!mappedDependency) {
52
- continue;
53
- }
54
- sharedConfig[libraryName] = mappedDependency;
55
- }
56
- }
57
- function addStringDependencyToSharedConfig(sharedConfig, dependency, projectGraph) {
58
- var _a, _b, _c, _d;
59
- if (projectGraph.nodes[dependency]) {
60
- sharedConfig[dependency] = { requiredVersion: false };
61
- }
62
- else if ((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[`npm:${dependency}`]) {
63
- const pkgJson = (0, utils_1.readRootPackageJson)();
64
- const config = (0, mf_webpack_1.getNpmPackageSharedConfig)(dependency, (_c = (_b = pkgJson.dependencies) === null || _b === void 0 ? void 0 : _b[dependency]) !== null && _c !== void 0 ? _c : (_d = pkgJson.devDependencies) === null || _d === void 0 ? void 0 : _d[dependency]);
65
- if (!config) {
66
- return;
67
- }
68
- sharedConfig[dependency] = config;
69
- }
70
- else {
71
- throw new Error(`The specified dependency "${dependency}" in the additionalShared configuration does not exist in the project graph. ` +
72
- `Please check your additionalShared configuration and make sure you are including valid workspace projects or npm packages.`);
73
- }
74
- }
75
- function applyAdditionalShared(sharedConfig, additionalShared, projectGraph) {
76
- if (!additionalShared) {
77
- return;
78
- }
79
- for (const shared of additionalShared) {
80
- if (typeof shared === 'string') {
81
- addStringDependencyToSharedConfig(sharedConfig, shared, projectGraph);
82
- }
83
- else if (Array.isArray(shared)) {
84
- sharedConfig[shared[0]] = shared[1];
85
- }
86
- else if (typeof shared === 'object') {
87
- sharedConfig[shared.libraryName] = shared.sharedConfig;
88
- }
89
- }
90
- }
91
20
  function applyDefaultEagerPackages(sharedConfig) {
92
21
  const DEFAULT_PACKAGES_TO_LOAD_EAGERLY = [
93
22
  '@angular/localize',
@@ -114,9 +43,9 @@ function withModuleFederation(options) {
114
43
  catch (e) {
115
44
  projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
116
45
  }
117
- const dependencies = (0, utils_1.getDependentPackagesForProject)(projectGraph, options.name);
118
- const sharedLibraries = (0, mf_webpack_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
119
- const npmPackages = (0, mf_webpack_1.sharePackages)(Array.from(new Set([
46
+ const dependencies = (0, devkit_1.getDependentPackagesForProject)(projectGraph, options.name);
47
+ const sharedLibraries = (0, devkit_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
48
+ const npmPackages = (0, devkit_1.sharePackages)(Array.from(new Set([
120
49
  ...DEFAULT_ANGULAR_PACKAGES_TO_SHARE,
121
50
  ...dependencies.npmPackages.filter((pkg) => !DEFAULT_NPM_PACKAGES_TO_AVOID.includes(pkg)),
122
51
  ])));
@@ -127,11 +56,11 @@ function withModuleFederation(options) {
127
56
  });
128
57
  const sharedDependencies = Object.assign(Object.assign({}, sharedLibraries.getLibraries()), npmPackages);
129
58
  applyDefaultEagerPackages(sharedDependencies);
130
- applySharedFunction(sharedDependencies, options.shared);
131
- applyAdditionalShared(sharedDependencies, options.additionalShared, projectGraph);
59
+ (0, devkit_1.applySharedFunction)(sharedDependencies, options.shared);
60
+ (0, devkit_1.applyAdditionalShared)(sharedDependencies, options.additionalShared, projectGraph);
132
61
  const mappedRemotes = !options.remotes || options.remotes.length === 0
133
62
  ? {}
134
- : mapRemotes(options.remotes);
63
+ : (0, devkit_1.mapRemotes)(options.remotes, 'mjs', determineRemoteUrl);
135
64
  return (config) => {
136
65
  var _a, _b, _c, _d, _e, _f, _g;
137
66
  return (Object.assign(Object.assign({}, (config !== null && config !== void 0 ? config : {})), { output: Object.assign(Object.assign({}, ((_a = config.output) !== null && _a !== void 0 ? _a : {})), { uniqueName: options.name, publicPath: 'auto' }), optimization: Object.assign(Object.assign({}, ((_b = config.optimization) !== null && _b !== void 0 ? _b : {})), { runtimeChunk: false }), resolve: Object.assign(Object.assign({}, ((_c = config.resolve) !== null && _c !== void 0 ? _c : {})), { alias: Object.assign(Object.assign({}, ((_e = (_d = config.resolve) === null || _d === void 0 ? void 0 : _d.alias) !== null && _e !== void 0 ? _e : {})), sharedLibraries.getAliases()) }), experiments: Object.assign(Object.assign({}, ((_f = config.experiments) !== null && _f !== void 0 ? _f : {})), { outputModule: true }), plugins: [
@@ -1 +1 @@
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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"}
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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"}
@@ -1,15 +0,0 @@
1
- import { NormalModuleReplacementPlugin } from 'webpack';
2
- import { WorkspaceLibrary } from './utils';
3
- export interface SharedLibraryConfig {
4
- singleton?: boolean;
5
- strictVersion?: boolean;
6
- requiredVersion?: false | string;
7
- eager?: boolean;
8
- }
9
- export declare function shareWorkspaceLibraries(libraries: WorkspaceLibrary[], tsConfigPath?: string): {
10
- getAliases: () => {};
11
- getLibraries: (eager?: boolean) => Record<string, SharedLibraryConfig>;
12
- getReplacementPlugin: () => NormalModuleReplacementPlugin;
13
- };
14
- export declare function getNpmPackageSharedConfig(pkgName: string, version: string): SharedLibraryConfig | undefined;
15
- export declare function sharePackages(packages: string[]): Record<string, SharedLibraryConfig>;
@@ -1,185 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.sharePackages = exports.getNpmPackageSharedConfig = exports.shareWorkspaceLibraries = void 0;
4
- const devkit_1 = require("@nrwl/devkit");
5
- const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
6
- const fs_1 = require("fs");
7
- const package_json_1 = require("nx/src/utils/package-json");
8
- const path_1 = require("path");
9
- const webpack_1 = require("webpack");
10
- const typescript_2 = require("./typescript");
11
- const utils_1 = require("./utils");
12
- function collectWorkspaceLibrarySecondaryEntryPoints(library, tsconfigPathAliases) {
13
- const libraryRoot = (0, path_1.join)(devkit_1.workspaceRoot, library.root);
14
- const needsSecondaryEntryPointsCollected = (0, fs_1.existsSync)((0, path_1.join)(libraryRoot, 'ng-package.json'));
15
- const secondaryEntryPoints = [];
16
- if (needsSecondaryEntryPointsCollected) {
17
- const tsConfigAliasesForLibWithSecondaryEntryPoints = Object.entries(tsconfigPathAliases).reduce((acc, [tsKey, tsPaths]) => {
18
- if (!tsKey.startsWith(library.importKey)) {
19
- return Object.assign({}, acc);
20
- }
21
- if (tsPaths.some((path) => path.startsWith(`${library.root}/`))) {
22
- acc = Object.assign(Object.assign({}, acc), { [tsKey]: tsPaths });
23
- }
24
- return acc;
25
- }, {});
26
- for (const [alias] of Object.entries(tsConfigAliasesForLibWithSecondaryEntryPoints)) {
27
- const pathToLib = (0, path_1.dirname)((0, path_1.join)(devkit_1.workspaceRoot, tsconfigPathAliases[alias][0]));
28
- let searchDir = pathToLib;
29
- while (searchDir !== libraryRoot) {
30
- if ((0, fs_1.existsSync)((0, path_1.join)(searchDir, 'ng-package.json'))) {
31
- secondaryEntryPoints.push({ name: alias, path: pathToLib });
32
- break;
33
- }
34
- searchDir = (0, path_1.dirname)(searchDir);
35
- }
36
- }
37
- }
38
- return secondaryEntryPoints;
39
- }
40
- function shareWorkspaceLibraries(libraries, tsConfigPath) {
41
- var _a;
42
- if (tsConfigPath === void 0) { tsConfigPath = (_a = process.env.NX_TSCONFIG_PATH) !== null && _a !== void 0 ? _a : (0, typescript_1.getRootTsConfigPath)(); }
43
- if (!libraries) {
44
- return getEmptySharedLibrariesConfig();
45
- }
46
- const tsconfigPathAliases = (0, typescript_2.readTsPathMappings)(tsConfigPath);
47
- if (!Object.keys(tsconfigPathAliases).length) {
48
- return getEmptySharedLibrariesConfig();
49
- }
50
- const pathMappings = [];
51
- for (const [key, paths] of Object.entries(tsconfigPathAliases)) {
52
- const library = libraries.find((lib) => lib.importKey === key);
53
- if (!library) {
54
- continue;
55
- }
56
- collectWorkspaceLibrarySecondaryEntryPoints(library, tsconfigPathAliases).forEach(({ name, path }) => pathMappings.push({
57
- name,
58
- path,
59
- }));
60
- pathMappings.push({
61
- name: key,
62
- path: (0, path_1.normalize)((0, path_1.join)(devkit_1.workspaceRoot, paths[0])),
63
- });
64
- }
65
- return {
66
- getAliases: () => pathMappings.reduce((aliases, library) => (Object.assign(Object.assign({}, aliases), { [library.name]: library.path })), {}),
67
- getLibraries: (eager) => pathMappings.reduce((libraries, library) => (Object.assign(Object.assign({}, libraries), { [library.name]: { requiredVersion: false, eager } })), {}),
68
- getReplacementPlugin: () => new webpack_1.NormalModuleReplacementPlugin(/./, (req) => {
69
- if (!req.request.startsWith('.')) {
70
- return;
71
- }
72
- const from = req.context;
73
- const to = (0, path_1.normalize)((0, path_1.join)(req.context, req.request));
74
- for (const library of pathMappings) {
75
- const libFolder = (0, path_1.normalize)((0, path_1.dirname)(library.path));
76
- if (!from.startsWith(libFolder) &&
77
- to.startsWith(libFolder) &&
78
- !library.name.endsWith('/*')) {
79
- req.request = library.name;
80
- }
81
- }
82
- }),
83
- };
84
- }
85
- exports.shareWorkspaceLibraries = shareWorkspaceLibraries;
86
- function getEmptySharedLibrariesConfig() {
87
- return {
88
- getAliases: () => ({}),
89
- getLibraries: () => ({}),
90
- getReplacementPlugin: () => new webpack_1.NormalModuleReplacementPlugin(/./, () => { }),
91
- };
92
- }
93
- function getNonNodeModulesSubDirs(directory) {
94
- return (0, fs_1.readdirSync)(directory)
95
- .filter((file) => file !== 'node_modules')
96
- .map((file) => (0, path_1.join)(directory, file))
97
- .filter((file) => (0, fs_1.lstatSync)(file).isDirectory());
98
- }
99
- function recursivelyCollectSecondaryEntryPointsFromDirectory(pkgName, pkgVersion, pkgRoot, mainEntryPointExports, directories, collectedPackages) {
100
- for (const directory of directories) {
101
- const packageJsonPath = (0, path_1.join)(directory, 'package.json');
102
- const relativeEntryPointPath = (0, path_1.relative)(pkgRoot, directory);
103
- const entryPointName = (0, devkit_1.joinPathFragments)(pkgName, relativeEntryPointPath);
104
- if ((0, fs_1.existsSync)(packageJsonPath)) {
105
- try {
106
- // require the secondary entry point to try to rule out sample code
107
- require.resolve(entryPointName, { paths: [devkit_1.workspaceRoot] });
108
- const { name } = (0, devkit_1.readJsonFile)(packageJsonPath);
109
- // further check to make sure what we were able to require is the
110
- // same as the package name
111
- if (name === entryPointName) {
112
- collectedPackages.push({ name, version: pkgVersion });
113
- }
114
- }
115
- catch (_a) { }
116
- }
117
- else if (mainEntryPointExports) {
118
- // if the package.json doesn't exist, check if the directory is
119
- // exported by the main entry point
120
- const entryPointExportKey = `./${relativeEntryPointPath}`;
121
- const entryPointInfo = mainEntryPointExports[entryPointExportKey];
122
- if (entryPointInfo) {
123
- collectedPackages.push({
124
- name: entryPointName,
125
- version: pkgVersion,
126
- });
127
- }
128
- }
129
- const subDirs = getNonNodeModulesSubDirs(directory);
130
- recursivelyCollectSecondaryEntryPointsFromDirectory(pkgName, pkgVersion, pkgRoot, mainEntryPointExports, subDirs, collectedPackages);
131
- }
132
- }
133
- function collectPackageSecondaryEntryPoints(pkgName, pkgVersion, collectedPackages) {
134
- let pathToPackage;
135
- let packageJsonPath;
136
- let packageJson;
137
- try {
138
- ({ path: packageJsonPath, packageJson } = (0, package_json_1.readModulePackageJson)(pkgName));
139
- pathToPackage = (0, path_1.dirname)(packageJsonPath);
140
- }
141
- catch (_a) {
142
- // the package.json might not resolve if the package has the "exports"
143
- // entry and is not exporting the package.json file, fall back to trying
144
- // to find it from the top-level node_modules
145
- pathToPackage = (0, path_1.join)(devkit_1.workspaceRoot, 'node_modules', pkgName);
146
- packageJsonPath = (0, path_1.join)(pathToPackage, 'package.json');
147
- if (!(0, fs_1.existsSync)(packageJsonPath)) {
148
- // might not exist if it's nested in another package, just return here
149
- return;
150
- }
151
- packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
152
- }
153
- const { exports } = packageJson;
154
- const subDirs = getNonNodeModulesSubDirs(pathToPackage);
155
- recursivelyCollectSecondaryEntryPointsFromDirectory(pkgName, pkgVersion, pathToPackage, exports, subDirs, collectedPackages);
156
- }
157
- function getNpmPackageSharedConfig(pkgName, version) {
158
- if (!version) {
159
- devkit_1.logger.warn(`Could not find a version for "${pkgName}" in the root "package.json" ` +
160
- 'when collecting shared packages for the Module Federation setup. ' +
161
- 'The package will not be shared.');
162
- return undefined;
163
- }
164
- return { singleton: true, strictVersion: true, requiredVersion: version };
165
- }
166
- exports.getNpmPackageSharedConfig = getNpmPackageSharedConfig;
167
- function sharePackages(packages) {
168
- const pkgJson = (0, utils_1.readRootPackageJson)();
169
- const allPackages = [];
170
- packages.forEach((pkg) => {
171
- var _a, _b, _c;
172
- const pkgVersion = (_b = (_a = pkgJson.dependencies) === null || _a === void 0 ? void 0 : _a[pkg]) !== null && _b !== void 0 ? _b : (_c = pkgJson.devDependencies) === null || _c === void 0 ? void 0 : _c[pkg];
173
- allPackages.push({ name: pkg, version: pkgVersion });
174
- collectPackageSecondaryEntryPoints(pkg, pkgVersion, allPackages);
175
- });
176
- return allPackages.reduce((shared, pkg) => {
177
- const config = getNpmPackageSharedConfig(pkg.name, pkg.version);
178
- if (config) {
179
- shared[pkg.name] = config;
180
- }
181
- return shared;
182
- }, {});
183
- }
184
- exports.sharePackages = sharePackages;
185
- //# sourceMappingURL=mf-webpack.js.map
@@ -1 +0,0 @@
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,OAAyB,EACzB,mBAA6C;IAE7C,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,MAAM,kCAAkC,GAAG,IAAA,eAAU,EACnD,IAAA,WAAI,EAAC,WAAW,EAAE,iBAAiB,CAAC,CACrC,CAAC;IAEF,MAAM,oBAAoB,GAAG,EAAE,CAAC;IAChC,IAAI,kCAAkC,EAAE;QACtC,MAAM,6CAA6C,GAAG,MAAM,CAAC,OAAO,CAClE,mBAAmB,CACpB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,EAAE;YACjC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBACxC,yBAAY,GAAG,EAAG;aACnB;YAED,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE;gBAC/D,GAAG,mCAAQ,GAAG,KAAE,CAAC,KAAK,CAAC,EAAE,OAAO,GAAE,CAAC;aACpC;YAED,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAClC,6CAA6C,CAC9C,EAAE;YACD,MAAM,SAAS,GAAG,IAAA,cAAO,EACvB,IAAA,WAAI,EAAC,sBAAa,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CACnD,CAAC;YACF,IAAI,SAAS,GAAG,SAAS,CAAC;YAC1B,OAAO,SAAS,KAAK,WAAW,EAAE;gBAChC,IAAI,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC,EAAE;oBAClD,oBAAoB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;oBAC5D,MAAM;iBACP;gBACD,SAAS,GAAG,IAAA,cAAO,EAAC,SAAS,CAAC,CAAC;aAChC;SACF;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,OAAO,EACP,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;AAvED,0DAuEC;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"}
@@ -1,2 +0,0 @@
1
- import { ParsedCommandLine } from 'typescript';
2
- export declare function readTsPathMappings(tsConfigPath?: string): ParsedCommandLine['options']['paths'];
@@ -1,28 +0,0 @@
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
@@ -1 +0,0 @@
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"}
@@ -1,18 +0,0 @@
1
- import { ProjectGraph } from '@nrwl/devkit';
2
- export declare type WorkspaceLibrary = {
3
- name: string;
4
- root: string;
5
- importKey: string | undefined;
6
- };
7
- export declare function readRootPackageJson(): {
8
- dependencies?: {
9
- [key: string]: string;
10
- };
11
- devDependencies?: {
12
- [key: string]: string;
13
- };
14
- };
15
- export declare function getDependentPackagesForProject(projectGraph: ProjectGraph, name: string): {
16
- workspaceLibraries: WorkspaceLibrary[];
17
- npmPackages: string[];
18
- };
@@ -1,57 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getDependentPackagesForProject = exports.readRootPackageJson = void 0;
4
- const devkit_1 = require("@nrwl/devkit");
5
- const fs_1 = require("fs");
6
- const typescript_1 = require("./typescript");
7
- function readRootPackageJson() {
8
- const pkgJsonPath = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'package.json');
9
- if (!(0, fs_1.existsSync)(pkgJsonPath)) {
10
- throw new Error('NX MF: Could not find root package.json to determine dependency versions.');
11
- }
12
- return (0, devkit_1.readJsonFile)(pkgJsonPath);
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
- }
57
- //# sourceMappingURL=utils.js.map
@@ -1 +0,0 @@
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"}