@nx/angular 16.0.0-beta.1 → 16.0.0-beta.3
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/generators.json +3 -3
- package/ng-package.json +0 -1
- package/package.json +10 -10
- package/src/builders/utilities/module-federation.js +1 -1
- package/src/builders/utilities/module-federation.js.map +1 -1
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js +2 -2
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js.map +1 -1
- package/src/generators/add-linting/lib/create-eslint-configuration.js +4 -4
- package/src/generators/add-linting/lib/create-eslint-configuration.js.map +1 -1
- package/src/generators/application/files/ng-module/src/app/nx-welcome.component.ts__tpl__ +2 -2
- package/src/generators/application/files/standalone-components/src/app/nx-welcome.component.ts__tpl__ +2 -2
- package/src/generators/application/lib/add-e2e.js +3 -3
- package/src/generators/application/lib/add-e2e.js.map +1 -1
- package/src/generators/application/lib/set-app-strict-default.js +4 -4
- package/src/generators/application/lib/set-app-strict-default.js.map +1 -1
- package/src/generators/component/component.js +1 -3
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/lib/module.js +1 -1
- package/src/generators/component/lib/module.js.map +1 -1
- package/src/generators/component/lib/normalize-options.js +2 -2
- package/src/generators/component/lib/normalize-options.js.map +1 -1
- package/src/generators/component-cypress-spec/lib/get-component-selector.js +2 -2
- package/src/generators/component-cypress-spec/lib/get-component-selector.js.map +1 -1
- package/src/generators/convert-to-with-mf/convert-to-with-mf.test-data.d.ts +5 -5
- package/src/generators/convert-to-with-mf/convert-to-with-mf.test-data.js +10 -10
- package/src/generators/convert-to-with-mf/lib/get-webpack-config-path.js +2 -1
- package/src/generators/convert-to-with-mf/lib/get-webpack-config-path.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js +1 -1
- package/src/generators/convert-tslint-to-eslint/compat.d.ts +1 -0
- package/src/generators/convert-tslint-to-eslint/compat.js +8 -0
- package/src/generators/convert-tslint-to-eslint/compat.js.map +1 -0
- package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.d.ts +0 -1
- package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js +4 -6
- package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js.map +1 -1
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js +1 -0
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map +1 -1
- package/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__ +1 -1
- package/src/generators/host/files/webpack.server.config.js__tmpl__ +2 -2
- package/src/generators/host/lib/add-ssr.js +2 -2
- package/src/generators/host/lib/add-ssr.js.map +1 -1
- package/src/generators/init/init.js +3 -3
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/library/lib/add-project.js +2 -2
- package/src/generators/library/lib/add-project.js.map +1 -1
- package/src/generators/library/lib/enable-strict-type-checking.js +4 -4
- package/src/generators/library/lib/enable-strict-type-checking.js.map +1 -1
- package/src/generators/move/compat.d.ts +1 -0
- package/src/generators/move/compat.js +8 -0
- package/src/generators/move/compat.js.map +1 -0
- package/src/generators/move/move.d.ts +1 -2
- package/src/generators/move/move.js +2 -4
- package/src/generators/move/move.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js +1 -1
- package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js +1 -1
- package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js +2 -2
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.js +11 -8
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/ngrx/files/base/__directory__/__fileName__.facade.spec.ts__tmpl__ +1 -1
- package/src/generators/remote/files/src/main.server.ts__tmpl__ +1 -1
- package/src/generators/remote/files/webpack.server.config.js__tmpl__ +2 -2
- package/src/generators/remote/lib/add-ssr.js +1 -1
- package/src/generators/remote/lib/add-ssr.js.map +1 -1
- package/src/generators/setup-mf/files/webpack/webpack.config.js__tmpl__ +2 -2
- package/src/generators/setup-mf/files/webpack/webpack.prod.config.js__tmpl__ +2 -2
- package/src/generators/setup-mf/lib/add-cypress-workaround.js +2 -1
- package/src/generators/setup-mf/lib/add-cypress-workaround.js.map +1 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js +1 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js.map +1 -1
- package/src/generators/setup-mf/lib/change-build-target.js +1 -1
- package/src/generators/setup-mf/lib/change-build-target.js.map +1 -1
- package/src/generators/setup-mf/lib/fix-bootstrap.js +1 -1
- package/src/generators/setup-mf/lib/setup-serve-target.js +3 -3
- package/src/generators/setup-mf/lib/setup-serve-target.js.map +1 -1
- package/src/generators/setup-mf/setup-mf.js +1 -1
- package/src/generators/setup-mf/setup-mf.js.map +1 -1
- package/src/generators/setup-tailwind/files/v2/tailwind.config.js__tmpl__ +1 -1
- package/src/generators/setup-tailwind/files/v3/tailwind.config.js__tmpl__ +1 -1
- package/src/generators/setup-tailwind/lib/add-tailwind-config-path-to-project.js +2 -0
- package/src/generators/setup-tailwind/lib/add-tailwind-config-path-to-project.js.map +1 -1
- package/src/generators/utils/storybook-ast/module-info.js +5 -5
- package/src/generators/utils/storybook-ast/module-info.js.map +1 -1
- package/src/generators/utils/storybook-ast/storybook-inputs.js +2 -3
- package/src/generators/utils/storybook-ast/storybook-inputs.js.map +1 -1
- package/src/utils/get-mf-projects.js +12 -9
- package/src/utils/get-mf-projects.js.map +1 -1
- package/src/utils/mf/utils.js +5 -1
- package/src/utils/mf/utils.js.map +1 -1
- package/src/utils/nx-devkit/ast-utils.js +16 -16
- package/src/utils/nx-devkit/ast-utils.js.map +1 -1
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
const { withModuleFederationForSSR } = require('@
|
|
1
|
+
const { withModuleFederationForSSR } = require('@nx/angular/module-federation');
|
|
2
2
|
const config = require('./module-federation.config');
|
|
3
|
-
module.exports = withModuleFederationForSSR(config)
|
|
3
|
+
module.exports = withModuleFederationForSSR(config)
|
|
@@ -20,7 +20,7 @@ function addSsr(tree, { appName, port }) {
|
|
|
20
20
|
});
|
|
21
21
|
// update project.json
|
|
22
22
|
project = (0, devkit_1.readProjectConfiguration)(tree, appName);
|
|
23
|
-
project.targets.server.executor = '@
|
|
23
|
+
project.targets.server.executor = '@nx/angular:webpack-server';
|
|
24
24
|
project.targets.server.options.customWebpackConfig = {
|
|
25
25
|
path: (0, devkit_1.joinPathFragments)(project.root, 'webpack.server.config.js'),
|
|
26
26
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-ssr.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/remote/lib/add-ssr.ts"],"names":[],"mappings":";;;;AACA,uCAMoB;AAEpB,yDAAiD;AACjD,sDAMiC;AAEjC,SAAsB,MAAM,CAC1B,IAAU,EACV,EAAE,OAAO,EAAE,IAAI,EAAqC;;;QAEpD,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE;YACnB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACvD,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAC7D,CAAC;QACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAC5C,8BAA8B,CAC/B,CAAC;QAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1E,OAAO;YACP,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,sBAAsB;QACtB,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAElD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"add-ssr.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/remote/lib/add-ssr.ts"],"names":[],"mappings":";;;;AACA,uCAMoB;AAEpB,yDAAiD;AACjD,sDAMiC;AAEjC,SAAsB,MAAM,CAC1B,IAAU,EACV,EAAE,OAAO,EAAE,IAAI,EAAqC;;;QAEpD,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE;YACnB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACvD,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAC7D,CAAC;QACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAC5C,8BAA8B,CAC/B,CAAC;QAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1E,OAAO;YACP,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,sBAAsB;QACtB,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAElD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,4BAA4B,CAAC;QAC/D,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,GAAG;YACnD,IAAI,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,0BAA0B,CAAC;SAClE,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,mCAC/B,CAAC,MAAA,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,mCAAI,EAAE,CAAC,KAC/C,IAAI,GACL,CAAC;QAEF,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG;YACjC,SAAS,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;YAC9B,QAAQ,EAAE,iBAAiB;YAC3B,OAAO,EAAE;gBACP,OAAO,EAAE,QAAQ,IAAI,SAAS,IAAA,0BAAiB,EAC7C,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EACzC,SAAS,CACV,EAAE;aACJ;SACF,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,IAAI,EAAE,sBAAW;YACjB,OAAO,EAAE,yBAAc;YACvB,yBAAyB,EAAE,sCAA2B;SACvD,EACD;YACE,aAAa,EAAE,2BAAgB;YAC/B,gBAAgB,EAAE,8BAAmB;SACtC,CACF,CAAC;QAEF,OAAO,WAAW,CAAC;;CACpB;AA/DD,wBA+DC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
const { withModuleFederation } = require('@
|
|
1
|
+
const { withModuleFederation } = require('@nx/angular/module-federation');
|
|
2
2
|
const config = require('./module-federation.config');
|
|
3
|
-
module.exports = withModuleFederation(config);
|
|
3
|
+
module.exports = withModuleFederation(config);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const { withModuleFederation } = require('@
|
|
1
|
+
const { withModuleFederation } = require('@nx/angular/module-federation');
|
|
2
2
|
const config = require('./module-federation.config');
|
|
3
3
|
module.exports = withModuleFederation({
|
|
4
4
|
...config,
|
|
@@ -12,4 +12,4 @@ module.exports = withModuleFederation({
|
|
|
12
12
|
* ['app2', 'https://app2.example.com'],
|
|
13
13
|
* ]
|
|
14
14
|
*/
|
|
15
|
-
});
|
|
15
|
+
});
|
|
@@ -22,7 +22,8 @@ function addCypressOnErrorWorkaround(tree, schema) {
|
|
|
22
22
|
`);
|
|
23
23
|
return;
|
|
24
24
|
}
|
|
25
|
-
if (e2eProject.targets.e2e.executor !== '@
|
|
25
|
+
if (e2eProject.targets.e2e.executor !== '@nx/cypress:cypress' &&
|
|
26
|
+
e2eProject.targets.e2e.executor !== '@nx/cypress:cypress') {
|
|
26
27
|
// Not a cypress e2e project, skip
|
|
27
28
|
return;
|
|
28
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-cypress-workaround.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-cypress-workaround.ts"],"names":[],"mappings":";AAAA,6DAA6D;AAC7D,iEAAiE;AACjE,iDAAiD;;;AAGjD,uCAKoB;AAGpB,SAAgB,2BAA2B,CAAC,IAAU,EAAE,MAAc;IACpE,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;IAC7C,IAAI,UAAgC,CAAC;IAErC,IAAI;QACF,UAAU,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;KAC7D;IAAC,WAAM;QACN,eAAM,CAAC,IAAI,CAAC,IAAA,qBAAY,EAAA,gDAAgD,MAAM,CAAC,OAAO,cAAc,cAAc;;;;KAIjH,CAAC,CAAC;QACH,OAAO;KACR;IAED,
|
|
1
|
+
{"version":3,"file":"add-cypress-workaround.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-cypress-workaround.ts"],"names":[],"mappings":";AAAA,6DAA6D;AAC7D,iEAAiE;AACjE,iDAAiD;;;AAGjD,uCAKoB;AAGpB,SAAgB,2BAA2B,CAAC,IAAU,EAAE,MAAc;IACpE,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;IAC7C,IAAI,UAAgC,CAAC;IAErC,IAAI;QACF,UAAU,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;KAC7D;IAAC,WAAM;QACN,eAAM,CAAC,IAAI,CAAC,IAAA,qBAAY,EAAA,gDAAgD,MAAM,CAAC,OAAO,cAAc,cAAc;;;;KAIjH,CAAC,CAAC;QACH,OAAO;KACR;IAED,IACE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,qBAAqB;QACzD,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,qBAAqB,EACzD;QACA,kCAAkC;QAClC,OAAO;KACR;IAED,MAAM,YAAY,GAAG;;;;;MAKjB,CAAC;IAEL,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,UAAU,CAAC,UAAU,EACrB,gBAAgB,CACjB,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC;QACrD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC;QACxC,CAAC,CAAC,EAAE,CAAC;IACP,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,GAAG,eAAe,KAAK,YAAY,EAAE,CAAC,CAAC;AACxE,CAAC;AA3CD,kEA2CC"}
|
|
@@ -71,7 +71,7 @@ function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
|
|
|
71
71
|
const hostRootRoutingFile = tree.read(pathToHostRootRouting, 'utf-8');
|
|
72
72
|
let sourceFile = tsModule.createSourceFile(pathToHostRootRouting, hostRootRoutingFile, tsModule.ScriptTarget.Latest, true);
|
|
73
73
|
if (hostFederationType === 'dynamic') {
|
|
74
|
-
sourceFile = (0, js_1.insertImport)(tree, sourceFile, pathToHostRootRouting, 'loadRemoteModule', '@
|
|
74
|
+
sourceFile = (0, js_1.insertImport)(tree, sourceFile, pathToHostRootRouting, 'loadRemoteModule', '@nx/angular/mf');
|
|
75
75
|
}
|
|
76
76
|
const routePathName = options.standalone ? 'Routes' : 'Module';
|
|
77
77
|
const exportedRemote = options.standalone
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AAGpB,+BAAsC;AACtC,sEAAgE;AAChE,qFAAiF;AAEjF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,kBAAkB,CAAC,YAAoB;IACrD,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACpD,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC/B,CAAC,CAAC,UAAU,KAAK,IAAI;YACnB,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,IAAI;QACR,CAAC,CAAC,KAAK,CAAC;AACZ,CAAC;AAPD,gDAOC;AAED,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,MAAM,WAAW,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACjE,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EACxC,WAAW,CAAC,UAAU,EACtB,wCAAwC,CACzC,CAAC;QACF,MAAM,kBAAkB,GAAG,2BAA2B,CACpD,IAAI,EACJ,gBAAgB,CACjB,CAAC;QAEF,IAAI,kBAAkB,KAAK,QAAQ,EAAE;YACnC,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;SACnD;aAAM,IAAI,kBAAkB,KAAK,SAAS,EAAE;YAC3C,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;SACzD;QAED,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,WAAW,CAAC,UAAU,EACtB,cAAc,CACf,CAAC;QAEF,MAAM,sBAAsB,GAC1B,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC;YAC/B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC;YACzC,CAAC,CAAC,EAAE,CAAC;YACP,qBAAqB,OAAO,CAAC,OAAO,IAClC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAClC,IAAI,CAAC;QACP,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,CAAC;QAExD,iCAAiC,CAAC,IAAI,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;KACtE;AACH,CAAC;AAlCD,0CAkCC;AAED,SAAS,2BAA2B,CAClC,IAAU,EACV,gBAAwB;IAExB,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC9D,CAAC;AAED,SAAS,qBAAqB,CAC5B,IAAU,EACV,OAAe,EACf,WAAiC;IAEjC,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EACxC,WAAW,CAAC,IAAI,EAChB,6BAA6B,CAC9B,CAAC;IAEF,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;QACvD,MAAM,IAAI,KAAK,CACb,kCAAkC,OAAO,CAAC,IAAI,kJAAkJ,CACjM,CAAC;KACH;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC1D,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,OAAO,CAC3B,UAAU,EACV,mDAAmD,EACnD,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC,CAAC,CAA2B,CAAC;IAE/B,MAAM,kBAAkB,GAAG,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,kBAAkB,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;IAElE,MAAM,aAAa,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC,GAChE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EACxB,IAAI,OAAO,CAAC,OAAO,KAAK,YAAY,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAEjE,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAU,EACV,OAAe,EACf,gBAAwB;IAExB,IAAA,mBAAU,EAAC,IAAI,EAAE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,EAAE;QAC9C,uCACK,QAAQ,KACX,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,oBAAoB,OAAO,CAAC,IAAI,EAAE,IACrD;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,wEAAwE;AACxE,SAAS,iCAAiC,CACxC,IAAU,EACV,OAAe,EACf,kBAAwC;IAExC,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnE,MAAM,qBAAqB,GAAG,GAAG,aAAa,CAAC,UAAU,oBAAoB,CAAC;IAE9E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE;QACvC,OAAO;KACR;IAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;IAEtE,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,qBAAqB,EACrB,mBAAmB,EACnB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,IAAI,kBAAkB,KAAK,SAAS,EAAE;QACpC,UAAU,GAAG,IAAA,iBAAY,EACvB,IAAI,EACJ,UAAU,EACV,qBAAqB,EACrB,kBAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ exports.changeBuildTarget = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
function changeBuildTarget(host, options) {
|
|
6
6
|
const appConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
|
|
7
|
-
appConfig.targets.build.executor = '@
|
|
7
|
+
appConfig.targets.build.executor = '@nx/angular:webpack-browser';
|
|
8
8
|
appConfig.targets.build.options = Object.assign(Object.assign({}, appConfig.targets.build.options), { customWebpackConfig: {
|
|
9
9
|
path: `${appConfig.root}/webpack.config.js`,
|
|
10
10
|
} });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-build-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/change-build-target.ts"],"names":[],"mappings":";;;AAGA,uCAGoB;AAEpB,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAAe;IAC3D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG
|
|
1
|
+
{"version":3,"file":"change-build-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/change-build-target.ts"],"names":[],"mappings":";;;AAGA,uCAGoB;AAEpB,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAAe;IAC3D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,6BAA6B,CAAC;IACjE,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,mCAC1B,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KAClC,mBAAmB,EAAE;YACnB,IAAI,EAAE,GAAG,SAAS,CAAC,IAAI,oBAAoB;SAC5C,GACF,CAAC;IAEF,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,mCAC5C,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,KACpD,mBAAmB,EAAE;YACnB,IAAI,EAAE,GAAG,SAAS,CAAC,IAAI,yBAAyB;SACjD,GACF,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC;AAnBD,8CAmBC"}
|
|
@@ -14,7 +14,7 @@ function fixBootstrap(tree, appRoot, options) {
|
|
|
14
14
|
tree.write((0, devkit_1.joinPathFragments)(appRoot, 'src/bootstrap.ts'), bootstrapCode);
|
|
15
15
|
}
|
|
16
16
|
const bootstrapImportCode = `import('./bootstrap').catch(err => console.error(err))`;
|
|
17
|
-
const fetchMFManifestCode = `import { setRemoteDefinitions } from '@
|
|
17
|
+
const fetchMFManifestCode = `import { setRemoteDefinitions } from '@nx/angular/mf';
|
|
18
18
|
|
|
19
19
|
fetch('/assets/module-federation.manifest.json')
|
|
20
20
|
.then((res) => res.json())
|
|
@@ -6,11 +6,11 @@ function setupServeTarget(host, options) {
|
|
|
6
6
|
var _a, _b;
|
|
7
7
|
const appConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
|
|
8
8
|
appConfig.targets['serve'] = Object.assign(Object.assign({}, appConfig.targets['serve']), { executor: options.mfType === 'host'
|
|
9
|
-
? '@
|
|
10
|
-
: '@
|
|
9
|
+
? '@nx/angular:module-federation-dev-server'
|
|
10
|
+
: '@nx/angular:webpack-dev-server', options: Object.assign(Object.assign({}, appConfig.targets['serve'].options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : undefined, publicHost: `http://localhost:${(_b = options.port) !== null && _b !== void 0 ? _b : 4200}` }) });
|
|
11
11
|
if (options.mfType === 'remote') {
|
|
12
12
|
appConfig.targets['serve-static'] = {
|
|
13
|
-
executor: '@
|
|
13
|
+
executor: '@nx/web:file-server',
|
|
14
14
|
defaultConfiguration: 'development',
|
|
15
15
|
options: {
|
|
16
16
|
buildTarget: `${options.appName}:build`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AACA,uCAGoB;AAGpB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EACN,OAAO,CAAC,MAAM,KAAK,MAAM;YACvB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AACA,uCAGoB;AAGpB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EACN,OAAO,CAAC,MAAM,KAAK,MAAM;YACvB,CAAC,CAAC,0CAA0C;YAC5C,CAAC,CAAC,gCAAgC,EACtC,OAAO,kCACF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,KACrC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAS,EAC/B,UAAU,EAAE,oBAAoB,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAAE,MAEzD,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;QAC/B,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG;YAClC,QAAQ,EAAE,qBAAqB;YAC/B,oBAAoB,EAAE,aAAa;YACnC,OAAO,EAAE;gBACP,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,QAAQ;gBACvC,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB;YACD,cAAc,EAAE;gBACd,WAAW,EAAE;oBACX,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,oBAAoB;iBACpD;gBACD,UAAU,EAAE;oBACV,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,mBAAmB;iBACnD;aACF;SACF,CAAC;KACH;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC;AApCD,4CAoCC"}
|
|
@@ -25,7 +25,7 @@ function setupMf(tree, options) {
|
|
|
25
25
|
(0, lib_1.addRemoteToHost)(tree, options);
|
|
26
26
|
(0, lib_1.addRemoteEntry)(tree, options, projectConfig.root);
|
|
27
27
|
(0, lib_1.removeDeadCodeFromRemote)(tree, options);
|
|
28
|
-
installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@
|
|
28
|
+
installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/web': versions_1.nxVersion });
|
|
29
29
|
}
|
|
30
30
|
const remotesWithPorts = (0, lib_1.getRemotesWithPorts)(tree, options);
|
|
31
31
|
(0, lib_1.generateWebpackConfig)(tree, options, projectConfig.root, remotesWithPorts);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-mf.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":";;;;AACA,uCAIoB;AAGpB,+BAae;AACf,0DAAwE;AACxE,mDAAiD;AACjD,mCAA4B;AAE5B,SAAsB,OAAO,CAAC,IAAU,EAAE,OAAe;;;QACvD,MAAM,oBAAoB,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAElE,IAAI,IAAA,WAAE,EAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YACpE,MAAM,IAAI,KAAK,CACb,8EAA8E,oBAAoB,CAAC,OAAO,2FAA2F,CACtM,CAAC;SACH;QACD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,OAAO,CAAC,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,QAAQ,CAAC;QAE5D,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YAC7B,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClC,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;QAED,IAAI,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;QAC3B,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;YAC/B,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/B,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;YAClD,IAAA,8BAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACxC,WAAW,GAAG,IAAA,qCAA4B,EACxC,IAAI,EACJ,EAAE,EACF,EAAE,
|
|
1
|
+
{"version":3,"file":"setup-mf.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":";;;;AACA,uCAIoB;AAGpB,+BAae;AACf,0DAAwE;AACxE,mDAAiD;AACjD,mCAA4B;AAE5B,SAAsB,OAAO,CAAC,IAAU,EAAE,OAAe;;;QACvD,MAAM,oBAAoB,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAElE,IAAI,IAAA,WAAE,EAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YACpE,MAAM,IAAI,KAAK,CACb,8EAA8E,oBAAoB,CAAC,OAAO,2FAA2F,CACtM,CAAC;SACH;QACD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,OAAO,CAAC,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,QAAQ,CAAC;QAE5D,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YAC7B,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClC,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;QAED,IAAI,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;QAC3B,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;YAC/B,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/B,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;YAClD,IAAA,8BAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACxC,WAAW,GAAG,IAAA,qCAA4B,EACxC,IAAI,EACJ,EAAE,EACF,EAAE,SAAS,EAAE,oBAAS,EAAE,CACzB,CAAC;SACH;QAED,MAAM,gBAAgB,GAAG,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5D,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAE3E,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAA,kBAAY,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,IAAA,iCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC5C;QAED,eAAe;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,WAAW,CAAC;;CACpB;AAjDD,0BAiDC;AAED,kBAAe,OAAO,CAAC"}
|
|
@@ -11,6 +11,8 @@ function addTailwindConfigPathToProject(tree, options, project) {
|
|
|
11
11
|
If the project is not a buildable or publishable library, you don't need to setup TailwindCSS for it.`);
|
|
12
12
|
}
|
|
13
13
|
const supportedLibraryExecutors = [
|
|
14
|
+
'@nx/angular:ng-packagr-lite',
|
|
15
|
+
'@nx/angular:package',
|
|
14
16
|
'@nrwl/angular:ng-packagr-lite',
|
|
15
17
|
'@nrwl/angular:package',
|
|
16
18
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-tailwind-config-path-to-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-tailwind/lib/add-tailwind-config-path-to-project.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;AAGpB,SAAgB,8BAA8B,CAC5C,IAAU,EACV,OAAmC,EACnC,OAA6B;;IAE7B,MAAM,WAAW,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3D,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,eAAe,OAAO,CAAC,WAAW,gCAAgC,OAAO,CAAC,OAAO;;4GAES,CACvG,CAAC;KACH;IAED,MAAM,yBAAyB,GAAG;QAChC,+BAA+B;QAC/B,uBAAuB;KACxB,CAAC;IACF,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;QAC7D,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,iCACV,OAAO,CAAC,OACV,uCAAuC,WAAW,CAAC,QAAQ;gCACjC,yBAAyB;aAChD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;aACpB,IAAI,CAAC,IAAI,CAAC,GAAG,CACjB,CAAC;KACH;IAED,IACE,CAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,cAAc;QACnC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,EAC/C;QACA,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,QAAQ,WAAW,CAAC,OAAO,CAAC,cAAc,iDAAiD,OAAO,CAAC,OAAO;kFAC1C,CAC7E,CAAC;KACH;IAED,WAAW,CAAC,OAAO,mCACd,WAAW,CAAC,OAAO,KACtB,cAAc,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,GACtE,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC7D,CAAC;
|
|
1
|
+
{"version":3,"file":"add-tailwind-config-path-to-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-tailwind/lib/add-tailwind-config-path-to-project.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;AAGpB,SAAgB,8BAA8B,CAC5C,IAAU,EACV,OAAmC,EACnC,OAA6B;;IAE7B,MAAM,WAAW,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3D,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,eAAe,OAAO,CAAC,WAAW,gCAAgC,OAAO,CAAC,OAAO;;4GAES,CACvG,CAAC;KACH;IAED,MAAM,yBAAyB,GAAG;QAChC,6BAA6B;QAC7B,qBAAqB;QACrB,+BAA+B;QAC/B,uBAAuB;KACxB,CAAC;IACF,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;QAC7D,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,iCACV,OAAO,CAAC,OACV,uCAAuC,WAAW,CAAC,QAAQ;gCACjC,yBAAyB;aAChD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;aACpB,IAAI,CAAC,IAAI,CAAC,GAAG,CACjB,CAAC;KACH;IAED,IACE,CAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,cAAc;QACnC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,EAC/C;QACA,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,QAAQ,WAAW,CAAC,OAAO,CAAC,cAAc,iDAAiD,OAAO,CAAC,OAAO;kFAC1C,CAC7E,CAAC;KACH;IAED,WAAW,CAAC,OAAO,mCACd,WAAW,CAAC,OAAO,KACtB,cAAc,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,GACtE,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC7D,CAAC;AAhDD,wEAgDC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getModuleFilePaths = exports.getModuleDeclaredComponents = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const js_1 = require("@nx/js");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
8
8
|
const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
|
|
@@ -111,7 +111,7 @@ function getDeclarationsArray(file, declarationsPropertyAssignment, moduleFilePa
|
|
|
111
111
|
// Attempt to follow a class declaration instead of the literal
|
|
112
112
|
declarationArray = getModuleDeclaredComponentsFromClass(file, declarationsPropertyAssignment);
|
|
113
113
|
if (!declarationArray) {
|
|
114
|
-
devkit_1.logger.warn((0, devkit_1.stripIndents) `No stories generated because the declarations in ${moduleFilePath} is not an array literal or the variable could not be found. Hint: you can always generate stories later with the 'nx generate @
|
|
114
|
+
devkit_1.logger.warn((0, devkit_1.stripIndents) `No stories generated because the declarations in ${moduleFilePath} is not an array literal or the variable could not be found. Hint: you can always generate stories later with the 'nx generate @nx/angular:stories --name=${projectName}' command.`);
|
|
115
115
|
}
|
|
116
116
|
return declarationArray;
|
|
117
117
|
}
|
|
@@ -178,7 +178,7 @@ function getClassDeclaration(className, file) {
|
|
|
178
178
|
if (!tsModule) {
|
|
179
179
|
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
180
180
|
}
|
|
181
|
-
const classDeclaration = (0,
|
|
181
|
+
const classDeclaration = (0, js_1.findNodes)(file, tsModule.SyntaxKind.ClassDeclaration).find((classDeclaration) => classDeclaration
|
|
182
182
|
.getChildren()
|
|
183
183
|
.find((node) => node.kind === tsModule.SyntaxKind.Identifier &&
|
|
184
184
|
node.getText() === className));
|
|
@@ -188,7 +188,7 @@ function getVariableDeclaration(variableName, file) {
|
|
|
188
188
|
if (!tsModule) {
|
|
189
189
|
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
190
190
|
}
|
|
191
|
-
const variableDeclaration = (0,
|
|
191
|
+
const variableDeclaration = (0, js_1.findNodes)(file, tsModule.SyntaxKind.VariableDeclaration).find((variableDeclaration) => variableDeclaration
|
|
192
192
|
.getChildren()
|
|
193
193
|
.find((node) => node.kind === tsModule.SyntaxKind.Identifier &&
|
|
194
194
|
node.getText() === variableName));
|
|
@@ -208,7 +208,7 @@ function getNgModuleDeclarationsPropertyAssignment(ngModuleDecorator, moduleFile
|
|
|
208
208
|
node.getChildren()[0].getText() === 'declarations');
|
|
209
209
|
});
|
|
210
210
|
if (!declarationsPropertyAssignment) {
|
|
211
|
-
devkit_1.logger.warn((0, devkit_1.stripIndents) `No stories generated because there were no components declared in ${moduleFilePath}. Hint: you can always generate stories later with the 'nx generate @
|
|
211
|
+
devkit_1.logger.warn((0, devkit_1.stripIndents) `No stories generated because there were no components declared in ${moduleFilePath}. Hint: you can always generate stories later with the 'nx generate @nx/angular:stories --name=${projectName}' command.`);
|
|
212
212
|
}
|
|
213
213
|
return declarationsPropertyAssignment;
|
|
214
214
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/module-info.ts"],"names":[],"mappings":";;;AACA,uCAKoB;AACpB
|
|
1
|
+
{"version":3,"file":"module-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/module-info.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getArgsDefaultValue = exports.getKnobType = exports.getComponentProps = exports.getInputPropertyDeclarations = void 0;
|
|
4
|
-
const typescript_1 = require("nx/src/utils/typescript");
|
|
5
4
|
const js_1 = require("@nx/js");
|
|
6
5
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
6
|
const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
|
|
@@ -13,7 +12,7 @@ function getInputPropertyDeclarations(tree, path) {
|
|
|
13
12
|
const file = (0, ast_utils_1.getTsSourceFile)(tree, path);
|
|
14
13
|
const decorators = (0, js_1.getSourceNodes)(file).filter((node) => node.kind === tsModule.SyntaxKind.Decorator);
|
|
15
14
|
return decorators
|
|
16
|
-
.filter((decorator) => (0,
|
|
15
|
+
.filter((decorator) => (0, js_1.findNodes)(decorator, tsModule.SyntaxKind.Identifier).some((node) => node.getText() === 'Input'))
|
|
17
16
|
.map((node) => node.parent);
|
|
18
17
|
}
|
|
19
18
|
exports.getInputPropertyDeclarations = getInputPropertyDeclarations;
|
|
@@ -22,7 +21,7 @@ function getComponentProps(tree, componentPath, getArgsDefaultValueFn = getArgsD
|
|
|
22
21
|
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
23
22
|
}
|
|
24
23
|
const props = getInputPropertyDeclarations(tree, componentPath).map((node) => {
|
|
25
|
-
const decoratorContent = (0,
|
|
24
|
+
const decoratorContent = (0, js_1.findNodes)((0, js_1.findNodes)(node, tsModule.SyntaxKind.Decorator).find((n) => n.getText().startsWith('@Input')), tsModule.SyntaxKind.StringLiteral);
|
|
26
25
|
const name = useDecoratorName && decoratorContent.length
|
|
27
26
|
? !decoratorContent[0].getText().includes('.')
|
|
28
27
|
? decoratorContent[0].getText().slice(1, -1)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storybook-inputs.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/storybook-inputs.ts"],"names":[],"mappings":";;;AACA
|
|
1
|
+
{"version":3,"file":"storybook-inputs.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/storybook-inputs.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,14 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getMFProjects = void 0;
|
|
4
4
|
const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
|
|
5
|
-
function
|
|
6
|
-
|
|
7
|
-
const CUSTOM_WEBPACK_OPTION = 'customWebpackConfig';
|
|
8
|
-
const MODULE_FEDERATION_IDENTIFIER = legacy
|
|
9
|
-
? 'Identifier[name=ModuleFederationPlugin]'
|
|
10
|
-
: 'Identifier[name=withModuleFederation]';
|
|
11
|
-
const projects = [];
|
|
12
|
-
(0, executor_options_utils_1.forEachExecutorOptions)(tree, NRWL_WEBPACK_BROWSER_BUILDER, (opts, projectName) => {
|
|
5
|
+
function _getMfProjects(tree, CUSTOM_WEBPACK_OPTION, MODULE_FEDERATION_IDENTIFIER, projects) {
|
|
6
|
+
return (opts, projectName) => {
|
|
13
7
|
var _a;
|
|
14
8
|
const webpackPath = (_a = opts[CUSTOM_WEBPACK_OPTION]) === null || _a === void 0 ? void 0 : _a.path;
|
|
15
9
|
if (!webpackPath || !tree.exists(webpackPath)) {
|
|
@@ -26,7 +20,16 @@ function getMFProjects(tree, { legacy } = { legacy: false }) {
|
|
|
26
20
|
return;
|
|
27
21
|
}
|
|
28
22
|
projects.push(projectName);
|
|
29
|
-
}
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
function getMFProjects(tree, { legacy } = { legacy: false }) {
|
|
26
|
+
const CUSTOM_WEBPACK_OPTION = 'customWebpackConfig';
|
|
27
|
+
const MODULE_FEDERATION_IDENTIFIER = legacy
|
|
28
|
+
? 'Identifier[name=ModuleFederationPlugin]'
|
|
29
|
+
: 'Identifier[name=withModuleFederation]';
|
|
30
|
+
const projects = [];
|
|
31
|
+
(0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', _getMfProjects(tree, CUSTOM_WEBPACK_OPTION, MODULE_FEDERATION_IDENTIFIER, projects));
|
|
32
|
+
(0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/angular:webpack-browser', _getMfProjects(tree, CUSTOM_WEBPACK_OPTION, MODULE_FEDERATION_IDENTIFIER, projects));
|
|
30
33
|
return projects;
|
|
31
34
|
}
|
|
32
35
|
exports.getMFProjects = getMFProjects;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-mf-projects.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-mf-projects.ts"],"names":[],"mappings":";;;AACA,6FAA0F;AAE1F,
|
|
1
|
+
{"version":3,"file":"get-mf-projects.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-mf-projects.ts"],"names":[],"mappings":";;;AACA,6FAA0F;AAE1F,SAAS,cAAc,CACrB,IAAU,EACV,qBAA6B,EAC7B,4BAAoC,EACpC,QAAkB;IAElB,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE;;QAC3B,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,qBAAqB,CAAC,0CAAE,IAAI,CAAC;QACtD,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAC7C,OAAO;SACR;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACzD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACvC,MAAM,6BAA6B,GAAG,OAAO,CAC3C,GAAG,EACH,4BAA4B,EAC5B;YACE,gBAAgB,EAAE,IAAI;SACvB,CACF,CAAC;QACF,IACE,CAAC,6BAA6B;YAC9B,6BAA6B,CAAC,MAAM,KAAK,CAAC,EAC1C;YACA,OAAO;SACR;QAED,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,aAAa,CAC3B,IAAU,EACV,EAAE,MAAM,KAA0B,EAAE,MAAM,EAAE,KAAK,EAAE;IAEnD,MAAM,qBAAqB,GAAG,qBAAqB,CAAC;IACpD,MAAM,4BAA4B,GAAG,MAAM;QACzC,CAAC,CAAC,yCAAyC;QAC3C,CAAC,CAAC,uCAAuC,CAAC;IAE5C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAA,+CAAsB,EACpB,IAAI,EACJ,6BAA6B,EAC7B,cAAc,CACZ,IAAI,EACJ,qBAAqB,EACrB,4BAA4B,EAC5B,QAAQ,CACT,CACF,CAAC;IACF,IAAA,+CAAsB,EACpB,IAAI,EACJ,+BAA+B,EAC/B,cAAc,CACZ,IAAI,EACJ,qBAAqB,EACrB,4BAA4B,EAC5B,QAAQ,CACT,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAhCD,sCAgCC"}
|
package/src/utils/mf/utils.js
CHANGED
|
@@ -16,7 +16,11 @@ function applyDefaultEagerPackages(sharedConfig) {
|
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
exports.applyDefaultEagerPackages = applyDefaultEagerPackages;
|
|
19
|
-
exports.DEFAULT_NPM_PACKAGES_TO_AVOID = [
|
|
19
|
+
exports.DEFAULT_NPM_PACKAGES_TO_AVOID = [
|
|
20
|
+
'zone.js',
|
|
21
|
+
'@nx/angular/mf',
|
|
22
|
+
'@nrwl/angular/mf',
|
|
23
|
+
];
|
|
20
24
|
exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE = [
|
|
21
25
|
'@angular/animations',
|
|
22
26
|
'@angular/common',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/utils.ts"],"names":[],"mappings":";;;;AAAA,uCAaoB;AAEpB,SAAgB,yBAAyB,CACvC,YAAiD;IAEjD,MAAM,gCAAgC,GAAG;QACvC,mBAAmB;QACnB,wBAAwB;KACzB,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,gCAAgC,EAAE;QAClD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE;YACtB,SAAS;SACV;QAED,YAAY,CAAC,GAAG,CAAC,mCAAQ,YAAY,CAAC,GAAG,CAAC,KAAE,KAAK,EAAE,IAAI,GAAE,CAAC;KAC3D;AACH,CAAC;AAdD,8DAcC;AAEY,QAAA,6BAA6B,GAAG,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTsSourceFile = exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addEntryComponents = exports.addDeclarationToModule = exports.addProviderToComponent = exports.addProviderToModule = exports.addProviderToBootstrapApplication = exports.addRouteToNgModule = exports.getBootstrapComponent = exports.replaceIntoToTestBed = exports.addDeclarationsToTestBed = exports.addImportToTestBed = exports.addImportToModule = exports.addImportToPipe = exports.addImportToDirective = exports.addImportToComponent = exports.removeFromNgModule = exports.getDecoratorMetadata = exports.isStandalone = void 0;
|
|
4
|
-
const typescript_1 = require("nx/src/utils/typescript");
|
|
5
4
|
const js_1 = require("@nx/js");
|
|
5
|
+
const js_2 = require("@nx/js");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const devkit_1 = require("@nx/devkit");
|
|
8
8
|
const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
|
|
@@ -68,7 +68,7 @@ function getDecoratorMetadata(source, identifier, module) {
|
|
|
68
68
|
if (!tsModule) {
|
|
69
69
|
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
70
70
|
}
|
|
71
|
-
const angularImports = (0,
|
|
71
|
+
const angularImports = (0, js_1.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration)
|
|
72
72
|
.map((node) => _angularImportsFromNode(node, source))
|
|
73
73
|
.reduce((acc, current) => {
|
|
74
74
|
for (const key of Object.keys(current)) {
|
|
@@ -76,7 +76,7 @@ function getDecoratorMetadata(source, identifier, module) {
|
|
|
76
76
|
}
|
|
77
77
|
return acc;
|
|
78
78
|
}, {});
|
|
79
|
-
return (0,
|
|
79
|
+
return (0, js_2.getSourceNodes)(source)
|
|
80
80
|
.filter((node) => {
|
|
81
81
|
return (node.kind == tsModule.SyntaxKind.Decorator &&
|
|
82
82
|
node.expression.kind ==
|
|
@@ -157,7 +157,7 @@ function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, ex
|
|
|
157
157
|
toInsert = `, ${metadataField}: [${expression}]`;
|
|
158
158
|
}
|
|
159
159
|
}
|
|
160
|
-
return (0,
|
|
160
|
+
return (0, js_2.insertChange)(host, source, filePath, position, toInsert);
|
|
161
161
|
}
|
|
162
162
|
const assignment = matchingProperties[0];
|
|
163
163
|
// If it's not an array, nothing we can do really.
|
|
@@ -224,7 +224,7 @@ function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, ex
|
|
|
224
224
|
toInsert = `, ${expression}`;
|
|
225
225
|
}
|
|
226
226
|
}
|
|
227
|
-
return (0,
|
|
227
|
+
return (0, js_2.insertChange)(host, source, filePath, position, toInsert);
|
|
228
228
|
}
|
|
229
229
|
function _addSymbolToNgModuleMetadata(host, source, ngModulePath, metadataField, expression) {
|
|
230
230
|
return _addSymbolToDecoratorMetadata(host, source, ngModulePath, metadataField, expression, 'NgModule');
|
|
@@ -239,7 +239,7 @@ function removeFromNgModule(host, source, modulePath, property) {
|
|
|
239
239
|
// Get all the children property assignment of object literals.
|
|
240
240
|
const matchingProperty = getMatchingProperty(source, property, 'NgModule', '@angular/core');
|
|
241
241
|
if (matchingProperty) {
|
|
242
|
-
return (0,
|
|
242
|
+
return (0, js_2.removeChange)(host, source, modulePath, matchingProperty.getStart(source), matchingProperty.getFullText(source));
|
|
243
243
|
}
|
|
244
244
|
}
|
|
245
245
|
exports.removeFromNgModule = removeFromNgModule;
|
|
@@ -291,7 +291,7 @@ function addImportToTestBed(host, source, specPath, symbolName) {
|
|
|
291
291
|
if (!tsModule) {
|
|
292
292
|
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
293
293
|
}
|
|
294
|
-
const allCalls = ((0,
|
|
294
|
+
const allCalls = ((0, js_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
|
|
295
295
|
const configureTestingModuleObjectLiterals = allCalls
|
|
296
296
|
.filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
|
|
297
297
|
.filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
|
|
@@ -302,7 +302,7 @@ function addImportToTestBed(host, source, specPath, symbolName) {
|
|
|
302
302
|
const startPosition = configureTestingModuleObjectLiterals[0]
|
|
303
303
|
.getFirstToken(source)
|
|
304
304
|
.getEnd();
|
|
305
|
-
return (0,
|
|
305
|
+
return (0, js_2.insertChange)(host, source, specPath, startPosition, `imports: [${symbolName}], `);
|
|
306
306
|
}
|
|
307
307
|
return source;
|
|
308
308
|
}
|
|
@@ -311,7 +311,7 @@ function addDeclarationsToTestBed(host, source, specPath, symbolName) {
|
|
|
311
311
|
if (!tsModule) {
|
|
312
312
|
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
313
313
|
}
|
|
314
|
-
const allCalls = ((0,
|
|
314
|
+
const allCalls = ((0, js_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
|
|
315
315
|
const configureTestingModuleObjectLiterals = allCalls
|
|
316
316
|
.filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
|
|
317
317
|
.filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
|
|
@@ -322,7 +322,7 @@ function addDeclarationsToTestBed(host, source, specPath, symbolName) {
|
|
|
322
322
|
const startPosition = configureTestingModuleObjectLiterals[0]
|
|
323
323
|
.getFirstToken(source)
|
|
324
324
|
.getEnd();
|
|
325
|
-
return (0,
|
|
325
|
+
return (0, js_2.insertChange)(host, source, specPath, startPosition, `declarations: [${symbolName.join(',')}], `);
|
|
326
326
|
}
|
|
327
327
|
return source;
|
|
328
328
|
}
|
|
@@ -331,7 +331,7 @@ function replaceIntoToTestBed(host, source, specPath, newSymbol, previousSymbol)
|
|
|
331
331
|
if (!tsModule) {
|
|
332
332
|
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
333
333
|
}
|
|
334
|
-
const allCalls = ((0,
|
|
334
|
+
const allCalls = ((0, js_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
|
|
335
335
|
const configureTestingModuleObjectLiterals = allCalls
|
|
336
336
|
.filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
|
|
337
337
|
.filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
|
|
@@ -342,7 +342,7 @@ function replaceIntoToTestBed(host, source, specPath, newSymbol, previousSymbol)
|
|
|
342
342
|
const startPosition = configureTestingModuleObjectLiterals[0]
|
|
343
343
|
.getFirstToken(source)
|
|
344
344
|
.getEnd();
|
|
345
|
-
return (0,
|
|
345
|
+
return (0, js_2.replaceChange)(host, source, specPath, startPosition, newSymbol, previousSymbol);
|
|
346
346
|
}
|
|
347
347
|
return source;
|
|
348
348
|
}
|
|
@@ -374,10 +374,10 @@ function addRouteToNgModule(host, ngModulePath, source, route) {
|
|
|
374
374
|
if (!routes)
|
|
375
375
|
return source;
|
|
376
376
|
if (routes.hasTrailingComma || routes.length === 0) {
|
|
377
|
-
return (0,
|
|
377
|
+
return (0, js_2.insertChange)(host, source, ngModulePath, routes.end, route);
|
|
378
378
|
}
|
|
379
379
|
else {
|
|
380
|
-
return (0,
|
|
380
|
+
return (0, js_2.insertChange)(host, source, ngModulePath, routes.end, `, ${route}`);
|
|
381
381
|
}
|
|
382
382
|
}
|
|
383
383
|
exports.addRouteToNgModule = addRouteToNgModule;
|
|
@@ -401,7 +401,7 @@ function getListOfRoutes(source) {
|
|
|
401
401
|
}
|
|
402
402
|
else if (routes.kind === tsModule.SyntaxKind.Identifier) {
|
|
403
403
|
// find the array expression
|
|
404
|
-
const variableDeclarations = (0,
|
|
404
|
+
const variableDeclarations = (0, js_1.findNodes)(source, tsModule.SyntaxKind.VariableDeclaration);
|
|
405
405
|
const routesDeclaration = variableDeclarations.find((x) => {
|
|
406
406
|
return x.name.getText() === routes.getText();
|
|
407
407
|
});
|
|
@@ -485,7 +485,7 @@ function readBootstrapInfo(host, app) {
|
|
|
485
485
|
}
|
|
486
486
|
const mainSource = host.read(mainPath).toString('utf-8');
|
|
487
487
|
const main = tsModule.createSourceFile(mainPath, mainSource, tsModule.ScriptTarget.Latest, true);
|
|
488
|
-
const moduleImports = (0,
|
|
488
|
+
const moduleImports = (0, js_2.getImport)(main, (s) => s.indexOf('.module') > -1);
|
|
489
489
|
if (moduleImports.length !== 1) {
|
|
490
490
|
throw new Error(`main.ts can only import a single module`);
|
|
491
491
|
}
|