@nrwl/angular 13.10.0-beta.1 → 13.10.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/mfe/index.mjs +2 -0
- package/esm2020/mfe/mfe.mjs +45 -0
- package/esm2020/mfe/nrwl-angular-mfe.mjs +5 -0
- package/esm2020/src/runtime/nx/data-persistence.mjs +3 -3
- package/esm2020/src/runtime/nx/nx.module.mjs +4 -4
- package/executors.js +3 -3
- package/executors.js.map +1 -1
- package/executors.json +4 -4
- package/fesm2015/nrwl-angular-mfe.mjs +57 -0
- package/fesm2015/nrwl-angular-mfe.mjs.map +1 -0
- package/fesm2015/nrwl-angular.mjs +7 -7
- package/fesm2020/nrwl-angular-mfe.mjs +51 -0
- package/fesm2020/nrwl-angular-mfe.mjs.map +1 -0
- package/fesm2020/nrwl-angular.mjs +7 -7
- package/generators.js +26 -26
- package/generators.js.map +1 -1
- package/generators.json +10 -0
- package/mfe/index.d.ts +1 -0
- package/mfe/index.js +7 -0
- package/mfe/index.js.map +1 -0
- package/mfe/mfe.d.ts +4 -0
- package/mfe/mfe.js +56 -0
- package/mfe/mfe.js.map +1 -0
- package/mfe/ng-package.json +6 -0
- package/mfe/nrwl-angular-mfe.d.ts +5 -0
- package/mfe/package.json +10 -0
- package/module-federation/index.d.ts +1 -0
- package/module-federation/index.js +6 -0
- package/module-federation/index.js.map +1 -0
- package/package.json +15 -7
- package/scripts/nx-cli-warning.js +1 -1
- package/src/builders/webpack-browser/schema.json +3 -2
- package/src/builders/webpack-browser/webpack-browser.impl.js +5 -5
- package/src/builders/webpack-browser/webpack-browser.impl.js.map +1 -1
- package/src/builders/webpack-server/lib/index.js +1 -1
- package/src/builders/webpack-server/lib/index.js.map +1 -1
- package/src/builders/webpack-server/schema.json +3 -2
- package/src/builders/webpack-server/webpack-server.impl.js +2 -3
- package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
- package/src/executors/delegate-build/delegate-build.impl.js +6 -6
- package/src/executors/delegate-build/delegate-build.impl.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/entry-point.transform.js +2 -2
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js +2 -2
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ngc/compile-source-files.js +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js +3 -3
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.js +2 -2
- package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js +1 -1
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js +1 -1
- package/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.js +1 -1
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js +3 -3
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js +2 -2
- package/src/executors/package/package.impl.js +9 -9
- package/src/executors/package/package.impl.js.map +1 -1
- package/src/executors/utilities/tailwindcss.js +3 -3
- package/src/executors/utilities/tailwindcss.js.map +1 -1
- package/src/generators/add-linting/add-linting.js +1 -1
- package/src/generators/application/application.js +1 -1
- package/src/generators/application/lib/add-e2e.js +1 -1
- package/src/generators/application/lib/add-linting.js +1 -1
- package/src/generators/application/lib/add-mfe.js +1 -1
- package/src/generators/application/lib/add-protractor.js +1 -1
- package/src/generators/application/lib/add-unit-test-runner.js +1 -1
- package/src/generators/application/lib/index.js +20 -20
- package/src/generators/application/lib/index.js.map +1 -1
- package/src/generators/application/lib/update-config-files.js +1 -1
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/component/component.js +1 -1
- package/src/generators/convert-to-with-mf/convert-to-with-mf.compat.d.ts +2 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.compat.js +6 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.compat.js.map +1 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.d.ts +3 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.js +32 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.js.map +1 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.test-data.d.ts +5 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.test-data.js +449 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.test-data.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/check-name-matches.d.ts +2 -0
- package/src/generators/convert-to-with-mf/lib/check-name-matches.js +24 -0
- package/src/generators/convert-to-with-mf/lib/check-name-matches.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.d.ts +2 -0
- package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js +49 -0
- package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/get-webpack-config-path.d.ts +2 -0
- package/src/generators/convert-to-with-mf/lib/get-webpack-config-path.js +20 -0
- package/src/generators/convert-to-with-mf/lib/get-webpack-config-path.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/index.d.ts +6 -0
- package/src/generators/convert-to-with-mf/lib/index.js +10 -0
- package/src/generators/convert-to-with-mf/lib/index.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.d.ts +5 -0
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js +63 -0
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.d.ts +2 -0
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js +13 -0
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.d.ts +3 -0
- package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js +48 -0
- package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js.map +1 -0
- package/src/generators/convert-to-with-mf/schema.d.ts +3 -0
- package/src/generators/convert-to-with-mf/schema.json +20 -0
- package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js +4 -4
- package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js.map +1 -1
- package/src/generators/downgrade-module/downgrade-module.js +1 -1
- package/src/generators/downgrade-module/lib/index.js +4 -4
- package/src/generators/downgrade-module/lib/index.js.map +1 -1
- package/src/generators/init/init.js +1 -1
- package/src/generators/karma-project/karma-project.js +1 -1
- package/src/generators/library/lib/update-project.js +2 -2
- package/src/generators/library/lib/update-project.js.map +1 -1
- package/src/generators/library/library.js +3 -3
- package/src/generators/library-secondary-entry-point/lib/index.js +4 -4
- package/src/generators/library-secondary-entry-point/lib/index.js.map +1 -1
- package/src/generators/library-secondary-entry-point/library-secondary-entry-point.js +1 -1
- package/src/generators/mfe-host/mfe-host.js +1 -1
- package/src/generators/mfe-host/schema.json +1 -1
- package/src/generators/mfe-remote/mfe-remote.js +15 -2
- package/src/generators/mfe-remote/mfe-remote.js.map +1 -1
- package/src/generators/mfe-remote/schema.json +1 -1
- package/src/generators/move/lib/update-ng-package.js +2 -2
- package/src/generators/move/lib/update-ng-package.js.map +1 -1
- package/src/generators/move/move.js +1 -1
- package/src/generators/ng-add/files/decorate-angular-cli/decorate-angular-cli.js__tmpl__ +1 -1
- package/src/generators/ng-add/files/root/nx.json__tmpl__ +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +4 -10
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/ng-add.js +1 -1
- package/src/generators/ngrx/ngrx.js +1 -1
- package/src/generators/scam/scam.js +2 -2
- package/src/generators/scam/scam.js.map +1 -1
- package/src/generators/scam-directive/scam-directive.js +2 -2
- package/src/generators/scam-directive/scam-directive.js.map +1 -1
- package/src/generators/scam-pipe/scam-pipe.js +2 -2
- package/src/generators/scam-pipe/scam-pipe.js.map +1 -1
- package/src/generators/setup-mfe/files/webpack/webpack.config.js__tmpl__ +8 -59
- package/src/generators/setup-mfe/lib/add-remote-to-host.d.ts +1 -0
- package/src/generators/setup-mfe/lib/add-remote-to-host.js +15 -6
- package/src/generators/setup-mfe/lib/add-remote-to-host.js.map +1 -1
- package/src/generators/setup-mfe/lib/generate-config.js +1 -12
- package/src/generators/setup-mfe/lib/generate-config.js.map +1 -1
- package/src/generators/setup-mfe/lib/index.js +10 -10
- package/src/generators/setup-mfe/lib/index.js.map +1 -1
- package/src/generators/setup-mfe/setup-mfe.d.ts +2 -2
- package/src/generators/setup-mfe/setup-mfe.js +1 -10
- package/src/generators/setup-mfe/setup-mfe.js.map +1 -1
- package/src/generators/setup-tailwind/lib/index.js +6 -6
- package/src/generators/setup-tailwind/lib/index.js.map +1 -1
- package/src/generators/setup-tailwind/setup-tailwind.js +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +1 -1
- package/src/generators/storybook-configuration/storybook-configuration.js +1 -1
- package/src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2.js +1 -1
- package/src/generators/upgrade-module/lib/index.js +4 -4
- package/src/generators/upgrade-module/lib/index.js.map +1 -1
- package/src/generators/upgrade-module/upgrade-module.js +1 -1
- package/src/generators/utils/index.js +1 -1
- package/src/generators/utils/index.js.map +1 -1
- package/src/generators/utils/testing.js +1 -1
- package/src/generators/web-worker/lib/index.js +2 -2
- package/src/generators/web-worker/lib/index.js.map +1 -1
- package/src/generators/web-worker/web-worker.js +2 -2
- package/src/generators/web-worker/web-worker.js.map +1 -1
- package/src/migrations/update-10-3-0/update-10-3-0.js +1 -1
- package/src/migrations/update-10-4-0/update-10-4-0.js +1 -1
- package/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.js +3 -3
- package/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.js.map +1 -1
- package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js +3 -3
- package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js.map +1 -1
- package/src/migrations/update-12-3-0/update-angular-eslint-rules.js +1 -1
- package/src/migrations/update-12-3-0/update-storybook.js +1 -1
- package/src/migrations/update-12-3-0/update-webpack-browser-config.js +1 -1
- package/src/migrations/update-12-9-0/update-invalid-import-paths.js +1 -1
- package/src/migrations/update-13-0-0/add-postcss-packages.js +1 -1
- package/src/migrations/update-13-2-0/opt-out-testbed-teardown.js +1 -1
- package/src/migrations/update-13-2-0/update-angular-config.js +1 -1
- package/src/migrations/update-13-2-0/update-angular-jest-config.js +1 -1
- package/src/migrations/update-13-2-0/update-libraries.js +1 -1
- package/src/migrations/update-13-2-0/update-testing-imports.js +1 -1
- package/src/migrations/update-13-3-0/update-mfe-webpack-config.js +1 -1
- package/src/migrations/update-13-5-0/remove-library-generator-style-default.js +1 -1
- package/src/migrations/update-13-5-0/update-mfe-configs.js +1 -1
- package/src/migrations/update-13-8-1/add-cypress-mfe-workaround.js +1 -1
- package/src/migrations/update-13-8-4/migrate-karma-conf.js +1 -1
- package/src/migrations/update-13-9-0/set-build-libs-from-source.js +1 -1
- package/src/runtime/nx/data-persistence.js +2 -2
- package/src/runtime/nx/data-persistence.js.map +1 -1
- package/src/runtime/nx/nx.module.js +1 -1
- package/src/utils/get-mfe-projects.d.ts +3 -1
- package/src/utils/get-mfe-projects.js +5 -2
- package/src/utils/get-mfe-projects.js.map +1 -1
- package/src/utils/mfe/mfe-webpack.js +2 -3
- package/src/utils/mfe/mfe-webpack.js.map +1 -1
- package/src/utils/mfe/with-module-federation.js +8 -11
- package/src/utils/mfe/with-module-federation.js.map +1 -1
- package/src/utils/versions.d.ts +0 -1
- package/src/utils/versions.js +2 -3
- package/src/utils/versions.js.map +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"check-shared-npm-packages.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAEpD,SAAgB,mCAAmC,CAAC,GAAe;IACjE,MAAM,qBAAqB,GACzB,8FAA8F,CAAC;IACjG,MAAM,8BAA8B,GAClC,wEAAwE,CAAC;IAE3E,MAAM,gBAAgB,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,qBAAqB,EAAE;QAC3D,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IAEH,IAAI,wBAAgC,CAAC;IACrC,IAAI,eAAe,GAAa,EAAE,CAAC;IACnC,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;QACjC,mFAAmF;QACnF,MAAM,sBAAsB,GAC1B,2EAA2E,CAAC;QAC9E,MAAM,iBAAiB,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,sBAAsB,EAAE;YAC7D,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QAEH,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;YAClC,kDAAkD;YAClD,OAAO,IAAI,CAAC;SACb;QAED,wBAAwB,GAAG,IAAA,iBAAO,EAChC,iBAAiB,CAAC,CAAC,CAAC,EACpB,8BAA8B,EAC9B,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;QAEF,eAAe,GAAG,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;KAC9D;SAAM;QACL,wBAAwB,GAAG,IAAA,iBAAO,EAChC,gBAAgB,CAAC,CAAC,CAAC,EACnB,8BAA8B,EAC9B,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;QAEF,eAAe,GAAG;YAChB,iBAAiB;YACjB,qBAAqB;YACrB,yBAAyB;SAC1B,CAAC;KACH;IAED,IAAI,wBAAwB,CAAC,MAAM,KAAK,CAAC,EAAE;QACzC,4EAA4E;QAC5E,OAAO,IAAI,CAAC;KACb;IAED,IAAI,aAAa,GAAG,IAAI,CAAC;IACzB,KAAK,MAAM,UAAU,IAAI,wBAAwB,EAAE;QACjD,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QACxC,aAAa,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAChD,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAC7B,CAAC;QAEF,IAAI,CAAC,aAAa,EAAE;YAClB,MAAM;SACP;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAhED,kFAgEC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getWebpackConfigPath = void 0;
|
|
4
|
+
function getWebpackConfigPath(project, projectName) {
|
|
5
|
+
var _a, _b, _c;
|
|
6
|
+
let pathToWebpackConfig = '';
|
|
7
|
+
for (const target of Object.values((_a = project.targets) !== null && _a !== void 0 ? _a : {})) {
|
|
8
|
+
if (target.executor === '@nrwl/angular:webpack-browser' &&
|
|
9
|
+
((_b = target.options.customWebpackConfig) === null || _b === void 0 ? void 0 : _b.path)) {
|
|
10
|
+
pathToWebpackConfig = (_c = target.options.customWebpackConfig) === null || _c === void 0 ? void 0 : _c.path;
|
|
11
|
+
break;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
if (!pathToWebpackConfig) {
|
|
15
|
+
throw new Error(`Could not find webpack config for \`${projectName}\` in your workspace.`);
|
|
16
|
+
}
|
|
17
|
+
return pathToWebpackConfig;
|
|
18
|
+
}
|
|
19
|
+
exports.getWebpackConfigPath = getWebpackConfigPath;
|
|
20
|
+
//# sourceMappingURL=get-webpack-config-path.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-webpack-config-path.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/get-webpack-config-path.ts"],"names":[],"mappings":";;;AAEA,SAAgB,oBAAoB,CAClC,OAA6B,EAC7B,WAAmB;;IAEnB,IAAI,mBAAmB,GAAG,EAAE,CAAC;IAC7B,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC,EAAE;QACzD,IACE,MAAM,CAAC,QAAQ,KAAK,+BAA+B;aACnD,MAAA,MAAM,CAAC,OAAO,CAAC,mBAAmB,0CAAE,IAAI,CAAA,EACxC;YACA,mBAAmB,GAAG,MAAA,MAAM,CAAC,OAAO,CAAC,mBAAmB,0CAAE,IAAI,CAAC;YAC/D,MAAM;SACP;KACF;IAED,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,uCAAuC,WAAW,uBAAuB,CAC1E,CAAC;KACH;IAED,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAtBD,oDAsBC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./check-name-matches"), exports);
|
|
5
|
+
(0, tslib_1.__exportStar)(require("./check-shared-npm-packages"), exports);
|
|
6
|
+
(0, tslib_1.__exportStar)(require("./get-webpack-config-path"), exports);
|
|
7
|
+
(0, tslib_1.__exportStar)(require("./is-host-remote-config"), exports);
|
|
8
|
+
(0, tslib_1.__exportStar)(require("./parse-ast-webpack-config"), exports);
|
|
9
|
+
(0, tslib_1.__exportStar)(require("./write-new-webpack-config"), exports);
|
|
10
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/index.ts"],"names":[],"mappings":";;;AAAA,oEAAqC;AACrC,2EAA4C;AAC5C,yEAA0C;AAC1C,uEAAwC;AACxC,0EAA2C;AAC3C,0EAA2C"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { SourceFile } from 'typescript';
|
|
2
|
+
export declare type IsHostRemoteConfigResult = 'host' | 'remote' | 'both' | false;
|
|
3
|
+
export declare function isHostRemoteConfig(ast: SourceFile): IsHostRemoteConfigResult;
|
|
4
|
+
export declare function getRemotesFromHost(ast: SourceFile): any[];
|
|
5
|
+
export declare function getExposedModulesFromRemote(ast: SourceFile): {};
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getExposedModulesFromRemote = exports.getRemotesFromHost = exports.isHostRemoteConfig = void 0;
|
|
4
|
+
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
|
+
const REMOTES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=remotes]) > ObjectLiteralExpression';
|
|
6
|
+
const EXPOSES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=exposes]) > ObjectLiteralExpression';
|
|
7
|
+
const PROPERTY_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment';
|
|
8
|
+
function isHostRemoteConfig(ast) {
|
|
9
|
+
let isHost = false;
|
|
10
|
+
let isRemote = false;
|
|
11
|
+
const remotesNodes = (0, tsquery_1.tsquery)(ast, REMOTES_EXPRESSION_SELECTOR, {
|
|
12
|
+
visitAllChildren: true,
|
|
13
|
+
});
|
|
14
|
+
if (remotesNodes.length > 0) {
|
|
15
|
+
isHost = true;
|
|
16
|
+
}
|
|
17
|
+
const exposesNodes = (0, tsquery_1.tsquery)(ast, EXPOSES_EXPRESSION_SELECTOR, {
|
|
18
|
+
visitAllChildren: true,
|
|
19
|
+
});
|
|
20
|
+
if (exposesNodes.length > 0) {
|
|
21
|
+
isRemote = true;
|
|
22
|
+
}
|
|
23
|
+
let result = isHost && isRemote ? 'both' : isHost ? 'host' : isRemote ? 'remote' : false;
|
|
24
|
+
return result;
|
|
25
|
+
}
|
|
26
|
+
exports.isHostRemoteConfig = isHostRemoteConfig;
|
|
27
|
+
function getRemotesFromHost(ast) {
|
|
28
|
+
const remotesObjectNodes = (0, tsquery_1.tsquery)(ast, REMOTES_EXPRESSION_SELECTOR, {
|
|
29
|
+
visitAllChildren: true,
|
|
30
|
+
});
|
|
31
|
+
if (remotesObjectNodes.length === 0) {
|
|
32
|
+
return [];
|
|
33
|
+
}
|
|
34
|
+
const remotesNodes = (0, tsquery_1.tsquery)(remotesObjectNodes[0], PROPERTY_SELECTOR, {
|
|
35
|
+
visitAllChildren: true,
|
|
36
|
+
});
|
|
37
|
+
if (remotesNodes.length === 0) {
|
|
38
|
+
return [];
|
|
39
|
+
}
|
|
40
|
+
const remotes = [];
|
|
41
|
+
for (const remoteNode of remotesNodes) {
|
|
42
|
+
const remoteText = remoteNode.getText();
|
|
43
|
+
const remoteParts = remoteText
|
|
44
|
+
.split(':')
|
|
45
|
+
.map((part) => part.trim().replace(/'/g, ''));
|
|
46
|
+
const remoteName = remoteParts.shift();
|
|
47
|
+
const remoteLocation = remoteParts.join(':').replace(/\/[^\/]+$/, '');
|
|
48
|
+
remotes.push([remoteName, remoteLocation]);
|
|
49
|
+
}
|
|
50
|
+
return remotes;
|
|
51
|
+
}
|
|
52
|
+
exports.getRemotesFromHost = getRemotesFromHost;
|
|
53
|
+
function getExposedModulesFromRemote(ast) {
|
|
54
|
+
const exposesObjectNodes = (0, tsquery_1.tsquery)(ast, EXPOSES_EXPRESSION_SELECTOR, {
|
|
55
|
+
visitAllChildren: true,
|
|
56
|
+
});
|
|
57
|
+
if (exposesObjectNodes.length === 0) {
|
|
58
|
+
return {};
|
|
59
|
+
}
|
|
60
|
+
return exposesObjectNodes[0].getText();
|
|
61
|
+
}
|
|
62
|
+
exports.getExposedModulesFromRemote = getExposedModulesFromRemote;
|
|
63
|
+
//# sourceMappingURL=is-host-remote-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"is-host-remote-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/is-host-remote-config.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAIpD,MAAM,2BAA2B,GAC/B,4EAA4E,CAAC;AAC/E,MAAM,2BAA2B,GAC/B,4EAA4E,CAAC;AAC/E,MAAM,iBAAiB,GAAG,8CAA8C,CAAC;AAEzE,SAAgB,kBAAkB,CAAC,GAAe;IAChD,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,MAAM,YAAY,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,2BAA2B,EAAE;QAC7D,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,GAAG,IAAI,CAAC;KACf;IAED,MAAM,YAAY,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,2BAA2B,EAAE;QAC7D,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,QAAQ,GAAG,IAAI,CAAC;KACjB;IAED,IAAI,MAAM,GACR,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;IAC9E,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,gDAqBC;AAED,SAAgB,kBAAkB,CAAC,GAAe;IAChD,MAAM,kBAAkB,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,2BAA2B,EAAE;QACnE,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QACnC,OAAO,EAAE,CAAC;KACX;IAED,MAAM,YAAY,GAAG,IAAA,iBAAO,EAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE;QACrE,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IAEH,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE;QACrC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,WAAW,GAAG,UAAU;aAC3B,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QAChD,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC;QACvC,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACtE,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;KAC5C;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AA3BD,gDA2BC;AAED,SAAgB,2BAA2B,CAAC,GAAe;IACzD,MAAM,kBAAkB,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,2BAA2B,EAAE;QACnE,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QACnC,OAAO,EAAE,CAAC;KACX;IAED,OAAO,kBAAkB,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;AACzC,CAAC;AATD,kEASC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parseASTOfWebpackConfig = void 0;
|
|
4
|
+
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
|
+
function parseASTOfWebpackConfig(tree, pathToWebpackConfig) {
|
|
6
|
+
if (!tree.exists(pathToWebpackConfig)) {
|
|
7
|
+
throw new Error(`Cannot migrate webpack config at \`${pathToWebpackConfig}\` as it does not exist. Please ensure this file exists and that the path to the file is correct.`);
|
|
8
|
+
}
|
|
9
|
+
const source = tree.read(pathToWebpackConfig, 'utf-8');
|
|
10
|
+
return tsquery_1.tsquery.ast(source);
|
|
11
|
+
}
|
|
12
|
+
exports.parseASTOfWebpackConfig = parseASTOfWebpackConfig;
|
|
13
|
+
//# sourceMappingURL=parse-ast-webpack-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse-ast-webpack-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAEpD,SAAgB,uBAAuB,CACrC,IAAU,EACV,mBAA2B;IAE3B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CACb,sCAAsC,mBAAmB,mGAAmG,CAC7J,CAAC;KACH;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IACvD,OAAO,iBAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAZD,0DAYC"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.writeNewWebpackConfig = void 0;
|
|
4
|
+
const is_host_remote_config_1 = require("./is-host-remote-config");
|
|
5
|
+
function writeNewWebpackConfig(ast, mfType, projectName) {
|
|
6
|
+
let webpackConfig = '';
|
|
7
|
+
if (!mfType) {
|
|
8
|
+
webpackConfig = `const { withModuleFederation } = require('@nrwl/angular/module-federation');
|
|
9
|
+
module.exports = withModuleFederation({
|
|
10
|
+
name: '${projectName}',
|
|
11
|
+
});`;
|
|
12
|
+
}
|
|
13
|
+
else if (mfType === 'host') {
|
|
14
|
+
const remotes = hostRemotesToString(ast);
|
|
15
|
+
webpackConfig = `const { withModuleFederation } = require('@nrwl/angular/module-federation');
|
|
16
|
+
module.exports = withModuleFederation({
|
|
17
|
+
name: '${projectName}',
|
|
18
|
+
remotes: ${remotes},
|
|
19
|
+
});`;
|
|
20
|
+
}
|
|
21
|
+
else if (mfType === 'remote') {
|
|
22
|
+
const exposedModules = (0, is_host_remote_config_1.getExposedModulesFromRemote)(ast);
|
|
23
|
+
webpackConfig = `const { withModuleFederation } = require('@nrwl/angular/module-federation');
|
|
24
|
+
module.exports = withModuleFederation({
|
|
25
|
+
name: '${projectName}',
|
|
26
|
+
exposes: ${exposedModules},
|
|
27
|
+
});`;
|
|
28
|
+
}
|
|
29
|
+
else if (mfType === 'both') {
|
|
30
|
+
const remotes = hostRemotesToString(ast);
|
|
31
|
+
const exposedModules = (0, is_host_remote_config_1.getExposedModulesFromRemote)(ast);
|
|
32
|
+
webpackConfig = `const { withModuleFederation } = require('@nrwl/angular/module-federation');
|
|
33
|
+
module.exports = withModuleFederation({
|
|
34
|
+
name: '${projectName}',
|
|
35
|
+
remotes: ${remotes},
|
|
36
|
+
exposes: ${exposedModules},
|
|
37
|
+
});`;
|
|
38
|
+
}
|
|
39
|
+
return webpackConfig;
|
|
40
|
+
}
|
|
41
|
+
exports.writeNewWebpackConfig = writeNewWebpackConfig;
|
|
42
|
+
function hostRemotesToString(ast) {
|
|
43
|
+
const remotes = (0, is_host_remote_config_1.getRemotesFromHost)(ast)
|
|
44
|
+
.reduce((acc, remotePair) => `['${remotePair[0]}', '${remotePair[1]}'], ${acc}`, '')
|
|
45
|
+
.trim();
|
|
46
|
+
return `[${remotes.endsWith(',') ? remotes.slice(0, -1) : remotes}]`;
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=write-new-webpack-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"write-new-webpack-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/write-new-webpack-config.ts"],"names":[],"mappings":";;;AACA,mEAIiC;AAEjC,SAAgB,qBAAqB,CACnC,GAAe,EACf,MAAgC,EAChC,WAAmB;IAEnB,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,IAAI,CAAC,MAAM,EAAE;QACX,aAAa,GAAG;;mBAED,WAAW;YAClB,CAAC;KACV;SAAM,IAAI,MAAM,KAAK,MAAM,EAAE;QAC5B,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACzC,aAAa,GAAG;;mBAED,WAAW;qBACT,OAAO;YAChB,CAAC;KACV;SAAM,IAAI,MAAM,KAAK,QAAQ,EAAE;QAC9B,MAAM,cAAc,GAAG,IAAA,mDAA2B,EAAC,GAAG,CAAC,CAAC;QACxD,aAAa,GAAG;;mBAED,WAAW;qBACT,cAAc;YACvB,CAAC;KACV;SAAM,IAAI,MAAM,KAAK,MAAM,EAAE;QAC5B,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,cAAc,GAAG,IAAA,mDAA2B,EAAC,GAAG,CAAC,CAAC;QACxD,aAAa,GAAG;;eAEL,WAAW;iBACT,OAAO;iBACP,cAAc;QACvB,CAAC;KACN;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AArCD,sDAqCC;AAED,SAAS,mBAAmB,CAAC,GAAe;IAC1C,MAAM,OAAO,GAAW,IAAA,0CAAkB,EAAC,GAAG,CAAC;SAC5C,MAAM,CACL,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,OAAO,GAAG,EAAE,EACvE,EAAE,CACH;SACA,IAAI,EAAE,CAAC;IACV,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC;AACvE,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/draft-07/schema",
|
|
3
|
+
"$id": "ConvertToWithMFGenerator",
|
|
4
|
+
"cli": "nx",
|
|
5
|
+
"title": "Convert to withModuleFederation Generator Options Schema",
|
|
6
|
+
"type": "object",
|
|
7
|
+
"description": "Converts an old micro frontend configuration to use the new withModuleFederation helper. It will run successfully if the following conditions are met: \n - Is either a host or remote application \n - Shared npm package configurations have not been modified \n - Name used to identify the Micro Frontend application matches the project name \n\n _**Note:** This generator will overwrite your webpack config. If you have additional custom configuration in your config file, it will be lost!_",
|
|
8
|
+
"additionalProperties": false,
|
|
9
|
+
"properties": {
|
|
10
|
+
"project": {
|
|
11
|
+
"type": "string",
|
|
12
|
+
"description": "The name of the micro frontend project to migrate.",
|
|
13
|
+
"$default": {
|
|
14
|
+
"$source": "argv",
|
|
15
|
+
"index": 0
|
|
16
|
+
},
|
|
17
|
+
"x-prompt": "What micro frontend project would you like to migrate?"
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
}
|
|
@@ -7,7 +7,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
7
7
|
const linter_1 = require("@nrwl/linter");
|
|
8
8
|
const add_linting_1 = require("../add-linting/add-linting");
|
|
9
9
|
function conversionGenerator(host, options) {
|
|
10
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
11
11
|
/**
|
|
12
12
|
* The ProjectConverter instance encapsulates all the standard operations we need
|
|
13
13
|
* to perform in order to convert a project from TSLint to ESLint, as well as some
|
|
@@ -22,7 +22,7 @@ function conversionGenerator(host, options) {
|
|
|
22
22
|
host,
|
|
23
23
|
projectName: options.project,
|
|
24
24
|
ignoreExistingTslintConfig: options.ignoreExistingTslintConfig,
|
|
25
|
-
eslintInitializer: ({ projectName, projectConfig }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
|
+
eslintInitializer: ({ projectName, projectConfig }) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
26
26
|
yield (0, add_linting_1.addLintingGenerator)(host, {
|
|
27
27
|
projectName,
|
|
28
28
|
projectRoot: projectConfig.root,
|
|
@@ -67,7 +67,7 @@ function conversionGenerator(host, options) {
|
|
|
67
67
|
*/
|
|
68
68
|
projectConverter.removeProjectTSLintFile();
|
|
69
69
|
// Only project shouldn't be added as a default
|
|
70
|
-
const { project } = options, defaults = tslib_1.__rest(options, ["project"]);
|
|
70
|
+
const { project } = options, defaults = (0, tslib_1.__rest)(options, ["project"]);
|
|
71
71
|
/**
|
|
72
72
|
* Store user preferences for the collection
|
|
73
73
|
*/
|
|
@@ -105,7 +105,7 @@ function conversionGenerator(host, options) {
|
|
|
105
105
|
if (!options.skipFormat) {
|
|
106
106
|
yield (0, devkit_1.formatFiles)(host);
|
|
107
107
|
}
|
|
108
|
-
return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
108
|
+
return () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
109
109
|
yield eslintInitInstallTask();
|
|
110
110
|
yield rootConfigInstallTask();
|
|
111
111
|
yield projectConfigInstallTask();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-tslint-to-eslint.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.ts"],"names":[],"mappings":";;;;AAAA,2CAAkF;AAClF,yCAMsB;AACtB,yCAA6E;AAE7E,4DAAiE;AAEjE,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAoC;;QAEpC;;;;;;;;;WASG;QACH,MAAM,gBAAgB,GAAG,IAAI,yBAAgB,CAAC;YAC5C,IAAI;YACJ,WAAW,EAAE,OAAO,CAAC,OAAO;YAC5B,0BAA0B,EAAE,OAAO,CAAC,0BAA0B;YAC9D,iBAAiB,EAAE,CAAO,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,EAAE;gBAC1D,MAAM,IAAA,iCAAmB,EAAC,IAAI,EAAE;oBAC9B,WAAW;oBACX,WAAW,EAAE,aAAa,CAAC,IAAI;oBAC/B,MAAM,EAAG,aAAqB,CAAC,MAAM,IAAI,KAAK;oBAC9C;;;;uBAIG;oBACH,uBAAuB,EAAE,IAAI;oBAC7B,UAAU,EAAE,OAAO,CAAC,UAAU;iBAC/B,CAAC,CAAC;YACL,CAAC,CAAA;SACF,CAAC,CAAC;QAEH;;;;WAIG;QACH,MAAM,sBAAsB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC7D;;;WAGG;QACH,MAAM,qBAAqB,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE,CAAC;QAElE;;WAEG;QACH,MAAM,qBAAqB,GAAG,MAAM,gBAAgB,CAAC,uBAAuB,CAC1E,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,SAAS,GAAG;gBACf,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC9B,EAAE,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;aACjC,CAAC;YACF,OAAO,mCAAmC,CAAC,IAAI,CAAC,CAAC;QACnD,CAAC,EACD,sBAAsB,CACvB,CAAC;QAEF;;WAEG;QACH,MAAM,wBAAwB,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,CAC1E,CAAC,IAAI,EAAE,EAAE,CAAC,mCAAmC,CAAC,IAAI,CAAC,CACpD,CAAC;QACF;;WAEG;QACH,gBAAgB,CAAC,uBAAuB,EAAE,CAAC;QAE3C,+CAA+C;QAC/C,MAAM,EAAE,OAAO,KAAkB,OAAO,EAApB,QAAQ,
|
|
1
|
+
{"version":3,"file":"convert-tslint-to-eslint.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const upgrade_1 = require("../utils/upgrade");
|
|
7
7
|
const lib_1 = require("./lib");
|
|
8
8
|
function downgradeModuleGenerator(tree, rawOptions) {
|
|
9
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
10
10
|
const options = (0, lib_1.normalizeOptions)(rawOptions);
|
|
11
11
|
(0, lib_1.updateMain)(tree, options);
|
|
12
12
|
(0, lib_1.addEntryComponentsToModule)(tree, options);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./add-entry-components-to-module"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./normalize-options"), exports);
|
|
6
|
-
tslib_1.__exportStar(require("./update-main"), exports);
|
|
7
|
-
tslib_1.__exportStar(require("./update-module-bootstrap"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./add-entry-components-to-module"), exports);
|
|
5
|
+
(0, tslib_1.__exportStar)(require("./normalize-options"), exports);
|
|
6
|
+
(0, tslib_1.__exportStar)(require("./update-main"), exports);
|
|
7
|
+
(0, tslib_1.__exportStar)(require("./update-module-bootstrap"), exports);
|
|
8
8
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/downgrade-module/lib/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/downgrade-module/lib/index.ts"],"names":[],"mappings":";;;AAAA,gFAAiD;AACjD,mEAAoC;AACpC,6DAA8B;AAC9B,yEAA0C"}
|
|
@@ -12,7 +12,7 @@ const set_default_collection_1 = require("@nrwl/workspace/src/utilities/set-defa
|
|
|
12
12
|
const versions_1 = require("../../utils/versions");
|
|
13
13
|
const karma_1 = require("../karma/karma");
|
|
14
14
|
function angularInitGenerator(host, rawOptions) {
|
|
15
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
16
16
|
const options = normalizeOptions(rawOptions);
|
|
17
17
|
setDefaults(host, options);
|
|
18
18
|
addPostInstall(host);
|
|
@@ -8,7 +8,7 @@ const generate_karma_project_files_1 = require("./lib/generate-karma-project-fil
|
|
|
8
8
|
const update_tsconfig_1 = require("./lib/update-tsconfig");
|
|
9
9
|
const update_workspace_config_1 = require("./lib/update-workspace-config");
|
|
10
10
|
function karmaProjectGenerator(tree, options) {
|
|
11
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
12
12
|
(0, check_test_target_1.checkProjectTestTarget)(tree, options.project);
|
|
13
13
|
(0, generate_karma_project_files_1.generateKarmaProjectFiles)(tree, options.project);
|
|
14
14
|
(0, update_tsconfig_1.updateTsConfigs)(tree, options.project);
|
|
@@ -8,7 +8,7 @@ const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
|
8
8
|
const path = require("path");
|
|
9
9
|
const update_ng_package_1 = require("./update-ng-package");
|
|
10
10
|
function updateProject(host, options) {
|
|
11
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
12
12
|
createFiles(host, options);
|
|
13
13
|
updateProjectTsConfig(host, options);
|
|
14
14
|
fixProjectWorkspaceConfig(host, options);
|
|
@@ -102,7 +102,7 @@ function fixProjectWorkspaceConfig(host, options) {
|
|
|
102
102
|
// Set the right builder for the type of library.
|
|
103
103
|
// Ensure the outputs property comes after the builder for
|
|
104
104
|
// better readability.
|
|
105
|
-
const _a = project.targets.build, { executor } = _a, rest = tslib_1.__rest(_a, ["executor"]);
|
|
105
|
+
const _a = project.targets.build, { executor } = _a, rest = (0, tslib_1.__rest)(_a, ["executor"]);
|
|
106
106
|
project.targets.build = Object.assign({ executor: options.publishable
|
|
107
107
|
? '@nrwl/angular:package'
|
|
108
108
|
: '@nrwl/angular:ng-packagr-lite', outputs: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,iFAAoF;AACpF,yEAAyF;AACzF,6BAA6B;AAE7B,2DAAsD;AAEtD,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAyB;;QACvE,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,IAAA,mCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC;CAAA;AAND,sCAMC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAyB;IACxD,MAAM,OAAO,GAAG,GAAG,OAAO,CAAC,WAAW,WAAW,CAAC;IAClD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,kBAAkB,CAAC,CAAC;IAC9E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACjC,OAAO,EACP,GAAG,OAAO,CAAC,IAAI,oBAAoB,CACpC,CAAC;IAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC;IAE9D,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;KAC9B;IAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC;IAEhE,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;QAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC;KACtE;IAED,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;KAChE;IAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC,CAAC;IAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;IAC3D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAElE,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC;KAC9D;IACD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,IAAI,CAAC,KAAK,CACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,YAAY,CAAC,EACnD;;;;;;;;;uBASiB,OAAO,CAAC,UAAU;SAChC,CACJ,CAAC;QAEF,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,IAAI,OAAO,CAAC,aAAa,EAAE;YAC9D,IAAI,CAAC,KAAK,CACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,iBAAiB,CAAC,EACxD;;eAEO,OAAO,CAAC,UAAU,cAAc,OAAO,CAAC,QAAQ;;gBAE/C,OAAO,CAAC,UAAU;;;uBAGX,OAAO,CAAC,UAAU;;;;;;;;;;iBAUxB,OAAO,CAAC,UAAU;;;WAGxB,CACJ,CAAC;SACH;KACF;SAAM;QACL,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,YAAY,CAAC,CAAC,CAAC;KAC1E;IAED,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,CAAC,WAAW,eAAe,EACrC,OAAO,CAAC,UAAU;QAChB,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;+BACuB,OAAO,CAAC,QAAQ;SACtC,CACN,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAyB;IACxD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EACpC,OAAO,CAAC,WAAW,kCAEd,OAAO,KACV,gBAAgB,EAAE,IAAA,0CAA6B,EAC7C,IAAI,EACJ,OAAO,CAAC,WAAW,CACpB,EACD,GAAG,EAAE,EAAE,IAEV,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAyB;IACtE,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;IAElC,IAAI,OAAO,CAAC,qBAAqB,KAAK,OAAO,CAAC,WAAW,EAAE;QACzD,OAAO,GAAG,IAAA,yCAAsB,EAC9B,OAAO,EACP,OAAO,CAAC,qBAAqB,EAC7B,OAAO,CAAC,WAAW,CACpB,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QAC9C,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;KAC9B;SAAM;QACL,iDAAiD;QACjD,0DAA0D;QAC1D,sBAAsB;QACtB,MAAM,KAAwB,OAAO,CAAC,OAAO,CAAC,KAAK,EAA7C,EAAE,QAAQ,OAAmC,EAA9B,IAAI,2BAAnB,YAAqB,CAAwB,CAAC;QACpD,OAAO,CAAC,OAAO,CAAC,KAAK,mBACnB,QAAQ,EAAE,OAAO,CAAC,WAAW;gBAC3B,CAAC,CAAC,uBAAuB;gBACzB,CAAC,CAAC,+BAA+B,EACnC,OAAO,EAAE;gBACP,IAAA,0BAAiB,EACf,MAAM,EACN,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,OAAO,CAAC,gBAAgB,CACzB;aACF,IACE,IAAI,CACR,CAAC;KACH;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;IAE5B,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAU,EAAE,OAAyB;IAClE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,oBAAoB,CAAC,EAAE;QAC5D,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,IAAI,CAAC,CAAC;KAC9D;IACD,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,IAAI,CAAC,OAAO,GAAG,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;SACtD;aAAM,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YAC5C,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;SACnB;aAAM;YACL,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;SACnC;QAED,uCACK,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,cAAc,OAE9D;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -19,7 +19,7 @@ const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-sco
|
|
|
19
19
|
const update_project_1 = require("./lib/update-project");
|
|
20
20
|
const update_tsconfig_1 = require("./lib/update-tsconfig");
|
|
21
21
|
function libraryGenerator(host, schema) {
|
|
22
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
23
23
|
// Do some validation checks
|
|
24
24
|
if (!schema.routing && schema.lazy) {
|
|
25
25
|
throw new Error(`To use "--lazy" option, "--routing" must also be set.`);
|
|
@@ -81,7 +81,7 @@ function libraryGenerator(host, schema) {
|
|
|
81
81
|
}
|
|
82
82
|
exports.libraryGenerator = libraryGenerator;
|
|
83
83
|
function addUnitTestRunner(host, options) {
|
|
84
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
84
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
85
85
|
if (options.unitTestRunner === 'jest') {
|
|
86
86
|
yield (0, jest_1.jestProjectGenerator)(host, {
|
|
87
87
|
project: options.name,
|
|
@@ -113,7 +113,7 @@ function setStrictMode(host, options) {
|
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
115
|
function addLinting(host, options) {
|
|
116
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
116
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
117
117
|
if (options.linter === linter_1.Linter.None) {
|
|
118
118
|
return;
|
|
119
119
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./add-files"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./add-path-mapping"), exports);
|
|
6
|
-
tslib_1.__exportStar(require("./normalize-options"), exports);
|
|
7
|
-
tslib_1.__exportStar(require("./update-linting-file-patterns"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./add-files"), exports);
|
|
5
|
+
(0, tslib_1.__exportStar)(require("./add-path-mapping"), exports);
|
|
6
|
+
(0, tslib_1.__exportStar)(require("./normalize-options"), exports);
|
|
7
|
+
(0, tslib_1.__exportStar)(require("./update-linting-file-patterns"), exports);
|
|
8
8
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library-secondary-entry-point/lib/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library-secondary-entry-point/lib/index.ts"],"names":[],"mappings":";;;AAAA,2DAA4B;AAC5B,kEAAmC;AACnC,mEAAoC;AACpC,8EAA+C"}
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const lib_1 = require("./lib");
|
|
7
7
|
function librarySecondaryEntryPointGenerator(tree, rawOptions) {
|
|
8
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
9
9
|
const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
|
|
10
10
|
(0, lib_1.addFiles)(tree, options);
|
|
11
11
|
(0, lib_1.addPathMapping)(tree, options);
|
|
@@ -5,7 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const application_1 = require("../application/application");
|
|
6
6
|
function mfeHost(tree, options) {
|
|
7
7
|
var _a;
|
|
8
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
9
9
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
10
10
|
if (options.remotes && options.remotes.length > 0) {
|
|
11
11
|
options.remotes.forEach((remote) => {
|
|
@@ -3,9 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const application_1 = require("../application/application");
|
|
6
|
+
const get_mfe_projects_1 = require("../../utils/get-mfe-projects");
|
|
7
|
+
function findNextAvailablePort(tree) {
|
|
8
|
+
var _a, _b, _c;
|
|
9
|
+
const mfeProjects = (0, get_mfe_projects_1.getMfeProjects)(tree);
|
|
10
|
+
const ports = new Set([4200]);
|
|
11
|
+
for (const mfeProject of mfeProjects) {
|
|
12
|
+
const { targets } = (0, devkit_1.readProjectConfiguration)(tree, mfeProject);
|
|
13
|
+
const port = (_c = (_b = (_a = targets === null || targets === void 0 ? void 0 : targets.serve) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.port) !== null && _c !== void 0 ? _c : 4200;
|
|
14
|
+
ports.add(port);
|
|
15
|
+
}
|
|
16
|
+
const nextAvailablePort = Math.max(...ports) + 1;
|
|
17
|
+
return nextAvailablePort;
|
|
18
|
+
}
|
|
6
19
|
function mfeRemote(tree, options) {
|
|
7
20
|
var _a;
|
|
8
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
9
22
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
10
23
|
if (options.host && !projects.has(options.host)) {
|
|
11
24
|
throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
|
|
@@ -16,7 +29,7 @@ function mfeRemote(tree, options) {
|
|
|
16
29
|
mfeType: 'remote',
|
|
17
30
|
routing: true,
|
|
18
31
|
host: options.host,
|
|
19
|
-
port: (_a = options.port) !== null && _a !== void 0 ? _a :
|
|
32
|
+
port: (_a = options.port) !== null && _a !== void 0 ? _a : findNextAvailablePort(tree),
|
|
20
33
|
});
|
|
21
34
|
return installTask;
|
|
22
35
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mfe-remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/mfe-remote/mfe-remote.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"mfe-remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/mfe-remote/mfe-remote.ts"],"names":[],"mappings":";;;AAEA,yCAAqE;AACrE,4DAA8D;AAC9D,mEAA8D;AAE9D,SAAS,qBAAqB,CAAC,IAAU;;IACvC,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,IAAI,CAAC,CAAC;IAEzC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACtC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,MAAA,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,OAAO,0CAAE,IAAI,mCAAI,IAAI,CAAC;QACnD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACjB;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;IAEjD,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,SAA8B,SAAS,CAAC,IAAU,EAAE,OAAe;;;QACjE,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,2EAA2E,OAAO,CAAC,IAAI,GAAG,CAC3F,CAAC;SACH;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,EAAE;YACnD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,GAAG,EAAE,IAAI;YACT,OAAO,EAAE,QAAQ;YACjB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,qBAAqB,CAAC,IAAI,CAAC;SAClD,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;;CACpB;AAlBD,4BAkBC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateNgPackage = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const devkit_2 = require("@nrwl/devkit");
|
|
6
6
|
const utils_1 = require("@nrwl/workspace/src/generators/move/lib/utils");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
function updateNgPackage(tree, schema) {
|
|
@@ -16,7 +16,7 @@ function updateNgPackage(tree, schema) {
|
|
|
16
16
|
if (!tree.exists(ngPackagePath)) {
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
|
-
const rootOffset = (0, path_1.relative)((0, path_1.join)(
|
|
19
|
+
const rootOffset = (0, path_1.relative)((0, path_1.join)(devkit_2.appRootPath, project.root), devkit_2.appRootPath);
|
|
20
20
|
let output = `dist/${project.root}`;
|
|
21
21
|
if (((_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.outputs) === null || _c === void 0 ? void 0 : _c.length) > 0) {
|
|
22
22
|
output = project.targets.build.outputs[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAA0E;AAC1E,yCAA2C;AAC3C,yEAAkF;AAClF,+BAAsC;AAGtC,SAAgB,eAAe,CAAC,IAAU,EAAE,MAAc;;IACxD,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;QACzC,OAAO;KACR;IAED,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,IAAI,kBAAkB,CAAC;IACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,IAAA,WAAI,EAAC,oBAAW,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,oBAAW,CAAC,CAAC;IAC1E,IAAI,MAAM,GAAG,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,CAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,OAAO,0CAAE,MAAM,IAAG,CAAC,EAAE;QAC/C,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAC3C;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACvC,IAAI,CAAC,IAAI,GAAG,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAvBD,0CAuBC"}
|
|
@@ -14,7 +14,7 @@ const update_ng_package_1 = require("./lib/update-ng-package");
|
|
|
14
14
|
* to get the before and after names and paths.
|
|
15
15
|
*/
|
|
16
16
|
function angularMoveGenerator(tree, schema) {
|
|
17
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
18
18
|
yield (0, generators_1.moveGenerator)(tree, Object.assign(Object.assign({}, schema), { skipFormat: true }));
|
|
19
19
|
(0, update_module_name_1.updateModuleName)(tree, schema);
|
|
20
20
|
(0, update_ng_package_1.updateNgPackage)(tree, schema);
|
|
@@ -62,7 +62,7 @@ function symlinkNgCLItoNxCLI() {
|
|
|
62
62
|
|
|
63
63
|
try {
|
|
64
64
|
symlinkNgCLItoNxCLI();
|
|
65
|
-
require('nx/src/
|
|
65
|
+
require('nx/src/adapter/decorate-cli').decorateCli();
|
|
66
66
|
output.log({ title: 'Angular CLI has been decorated to enable computation caching.' });
|
|
67
67
|
} catch(e) {
|
|
68
68
|
output.error({ title: 'Decoration of the Angular CLI did not complete successfully' });
|