@nx/angular 17.0.5 → 17.0.6
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/LICENSE +1 -1
- package/README.md +4 -9
- package/esm2022/mf/mf.mjs +1 -1
- package/esm2022/src/runtime/nx/data-persistence.mjs +1 -1
- package/executors.d.ts +2 -9
- package/executors.js +2 -7
- package/executors.json +9 -19
- package/fesm2022/nx-angular-mf.mjs.map +1 -1
- package/fesm2022/nx-angular.mjs.map +1 -1
- package/generators.d.ts +1 -1
- package/generators.js +1 -3
- package/generators.json +2 -7
- package/migrations.json +0 -451
- package/ng-package.json +2 -2
- package/package.json +26 -20
- package/plugins/component-testing.d.ts +26 -1
- package/plugins/component-testing.js +4 -15
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.d.ts +5 -0
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +137 -0
- package/src/{executors → builders}/module-federation-dev-server/schema.d.ts +7 -25
- package/src/{executors → builders}/module-federation-dev-server/schema.json +6 -31
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.d.ts +1 -1
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js +9 -15
- package/src/builders/utilities/module-federation.js +1 -1
- package/src/builders/webpack-browser/schema.d.ts +2 -6
- package/src/builders/webpack-browser/schema.json +15 -15
- package/src/builders/webpack-browser/validate-options.d.ts +2 -0
- package/src/builders/webpack-browser/validate-options.js +40 -0
- package/src/builders/webpack-browser/webpack-browser.impl.js +6 -8
- package/src/builders/{dev-server → webpack-dev-server}/lib/index.d.ts +0 -1
- package/src/builders/{dev-server → webpack-dev-server}/lib/index.js +0 -1
- package/src/builders/webpack-dev-server/lib/normalize-options.d.ts +2 -0
- package/src/builders/webpack-dev-server/lib/normalize-options.js +14 -0
- package/src/builders/webpack-dev-server/schema.d.ts +21 -0
- package/src/builders/{dev-server → webpack-dev-server}/schema.json +5 -42
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.d.ts +4 -0
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js +105 -0
- package/src/builders/webpack-server/schema.d.ts +1 -0
- package/src/builders/webpack-server/schema.json +20 -7
- package/src/builders/webpack-server/validate-options.js +7 -0
- package/src/builders/webpack-server/webpack-server.impl.js +9 -4
- package/src/executors/browser-esbuild/browser-esbuild.impl.d.ts +3 -2
- package/src/executors/browser-esbuild/browser-esbuild.impl.js +8 -15
- package/src/executors/browser-esbuild/lib/buildable-libs.d.ts +9 -0
- package/src/executors/{utilities → browser-esbuild/lib}/buildable-libs.js +4 -3
- package/src/executors/browser-esbuild/lib/validate-options.d.ts +2 -0
- package/src/executors/browser-esbuild/lib/validate-options.js +40 -0
- package/src/executors/browser-esbuild/schema.d.ts +1 -3
- package/src/executors/browser-esbuild/schema.json +8 -38
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/entry-point/compile-ngc.transform.js +4 -6
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/entry-point/write-package.transform.js +13 -25
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ngc → ngc}/compile-source-files.d.ts +2 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ngc → ngc}/compile-source-files.js +9 -14
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/styles → styles}/stylesheet-processor.d.ts +10 -5
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/styles → styles}/stylesheet-processor.js +86 -39
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.d.ts +16 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.js +175 -0
- package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js +17 -5
- package/src/executors/ng-packagr-lite/schema.json +1 -1
- package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js +3 -5
- package/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.d.ts +1 -1
- package/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.js +6 -13
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.d.ts +10 -5
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js +86 -39
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.d.ts +15 -0
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js +197 -0
- package/src/executors/package/package.impl.d.ts +1 -1
- package/src/executors/package/package.impl.js +15 -5
- package/src/executors/package/schema.json +3 -3
- package/src/executors/utilities/tailwindcss.d.ts +7 -0
- package/src/executors/utilities/{ng-packagr/tailwindcss.js → tailwindcss.js} +22 -5
- package/src/executors/utilities/typescript.js +1 -1
- package/src/generators/add-linting/add-linting.d.ts +1 -1
- package/src/generators/add-linting/add-linting.js +15 -9
- package/src/generators/add-linting/lib/add-angular-eslint-dependencies.d.ts +2 -2
- package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js +5 -9
- package/src/generators/add-linting/lib/create-eslint-configuration.d.ts +2 -2
- package/src/generators/add-linting/schema.json +1 -1
- package/src/generators/application/application.js +17 -19
- package/src/generators/application/files/base/tsconfig.app.json__tpl__ +1 -1
- package/src/generators/application/files/base/tsconfig.json__tpl__ +2 -6
- package/src/generators/application/files/ng-module/src/app/app.component.spec.ts__tpl__ +1 -3
- package/src/generators/application/files/ng-module/src/app/app.component.ts__tpl__ +2 -4
- package/src/generators/application/files/ng-module/src/app/app.module.ts__tpl__ +1 -1
- package/src/generators/application/files/ng-module/src/app/nx-welcome.component.ts__tpl__ +14 -53
- package/src/generators/application/files/ng-module/src/main.ts__tpl__ +8 -2
- package/src/generators/application/files/standalone-components/src/app/app.component.spec.ts__tpl__ +4 -6
- package/src/generators/application/files/standalone-components/src/app/app.component.ts__tpl__ +2 -4
- package/src/generators/application/files/standalone-components/src/app/app.config.ts__tpl__ +3 -3
- package/src/generators/application/files/standalone-components/src/app/nx-welcome.component.ts__tpl__ +14 -53
- package/src/generators/application/files/standalone-components/src/main.ts__tpl__ +8 -4
- package/src/generators/application/files/tsconfig.editor.json__tpl__ +5 -0
- package/src/generators/application/files/v14/.browserlistrc__tpl__ +16 -0
- package/src/generators/application/files/v14/src/environments/environment.prod.ts__tpl__ +3 -0
- package/src/generators/application/files/v14/src/environments/environment.ts__tpl__ +16 -0
- package/src/generators/application/files/v14/src/polyfills.ts__tpl__ +53 -0
- package/src/generators/application/lib/add-e2e.js +8 -22
- package/src/generators/application/lib/add-unit-test-runner.js +20 -5
- package/src/generators/application/lib/create-files.js +10 -14
- package/src/generators/application/lib/create-project.d.ts +1 -1
- package/src/generators/application/lib/create-project.js +38 -48
- package/src/generators/application/lib/index.d.ts +0 -1
- package/src/generators/application/lib/index.js +0 -1
- package/src/generators/application/lib/normalize-options.d.ts +1 -1
- package/src/generators/application/lib/normalize-options.js +6 -28
- package/src/generators/application/lib/normalized-schema.d.ts +0 -5
- package/src/generators/application/lib/update-editor-tsconfig.d.ts +1 -1
- package/src/generators/application/lib/update-editor-tsconfig.js +14 -11
- package/src/generators/application/schema.d.ts +0 -1
- package/src/generators/application/schema.json +10 -18
- package/src/generators/component/component.js +1 -4
- package/src/generators/component/files/__fileName__.spec.ts__tpl__ +3 -2
- package/src/generators/component/files/__fileName__.ts__tpl__ +2 -8
- package/src/generators/component/lib/component.js +1 -1
- package/src/generators/component/lib/index.d.ts +1 -1
- package/src/generators/component/lib/index.js +1 -1
- package/src/generators/component/lib/normalize-options.js +2 -3
- package/src/generators/{setup-mf/lib/update-tsconfig.d.ts → component/lib/validate-options.d.ts} +1 -1
- package/src/generators/component/lib/validate-options.js +8 -0
- package/src/generators/component/schema.d.ts +3 -3
- package/src/generators/component/schema.json +4 -4
- package/src/generators/component-cypress-spec/files/__componentFileName__.__fileExt__ +8 -13
- package/src/generators/component-cypress-spec/schema.json +1 -1
- package/src/generators/component-story/files/__componentFileName__.stories.ts__tmpl__ +2 -2
- package/src/generators/component-test/component-test.d.ts +1 -1
- package/src/generators/component-test/component-test.js +3 -8
- package/src/generators/component-test/files/__componentFileName__.cy.ts__tpl__ +11 -9
- package/src/generators/component-test/schema.json +1 -1
- package/src/generators/convert-to-with-mf/convert-to-with-mf.js +1 -3
- package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js +2 -3
- package/src/generators/convert-to-with-mf/schema.d.ts +0 -1
- package/src/generators/convert-to-with-mf/schema.json +0 -6
- package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts +1 -2
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js +24 -43
- package/src/generators/directive/directive.js +1 -0
- package/src/generators/directive/files/__fileName__.ts__tpl__ +3 -1
- package/src/generators/directive/lib/index.d.ts +1 -0
- package/src/generators/directive/lib/index.js +1 -0
- package/src/generators/directive/lib/normalize-options.js +1 -3
- package/src/generators/directive/lib/validate-options.d.ts +3 -0
- package/src/generators/directive/lib/validate-options.js +8 -0
- package/src/generators/directive/schema.d.ts +3 -3
- package/src/generators/directive/schema.json +4 -4
- package/src/generators/federate-module/federate-module.js +0 -1
- package/src/generators/federate-module/lib/add-remote.d.ts +1 -1
- package/src/generators/federate-module/lib/add-remote.js +11 -2
- package/src/generators/federate-module/schema.json +3 -3
- package/src/generators/host/files/ts/webpack.server.config.ts__tmpl__ +2 -2
- package/src/generators/host/host.js +9 -8
- package/src/generators/host/lib/add-ssr.d.ts +3 -0
- package/src/generators/host/lib/{update-ssr-setup.js → add-ssr.js} +14 -8
- package/src/generators/host/lib/index.d.ts +1 -1
- package/src/generators/host/lib/index.js +1 -1
- package/src/generators/host/schema.json +6 -6
- package/src/generators/init/init.d.ts +2 -2
- package/src/generators/init/init.js +137 -19
- package/src/generators/init/schema.d.ts +9 -1
- package/src/generators/init/schema.json +59 -8
- package/src/generators/library/files/ng-module/src/lib/lib.routes.ts__tpl__ +1 -1
- package/src/generators/library/files/standalone-components/src/lib/lib.routes.ts__tpl__ +1 -1
- package/src/generators/library/lib/add-load-children.js +2 -2
- package/src/generators/library/lib/add-project.js +22 -24
- package/src/generators/library/lib/add-standalone-component.d.ts +2 -2
- package/src/generators/library/lib/add-standalone-component.js +4 -5
- package/src/generators/library/lib/normalize-options.js +5 -2
- package/src/generators/library/lib/update-tsconfig.js +3 -3
- package/src/generators/library/library.js +27 -15
- package/src/generators/library/schema.d.ts +0 -1
- package/src/generators/library/schema.json +13 -13
- package/src/generators/library-secondary-entry-point/files/src/index.ts__tmpl__ +5 -1
- package/src/generators/library-secondary-entry-point/lib/index.d.ts +1 -0
- package/src/generators/library-secondary-entry-point/lib/index.js +1 -0
- package/src/generators/library-secondary-entry-point/lib/update-linting-file-patterns.d.ts +3 -0
- package/src/generators/library-secondary-entry-point/lib/update-linting-file-patterns.js +15 -0
- package/src/generators/library-secondary-entry-point/library-secondary-entry-point.js +2 -3
- package/src/generators/library-secondary-entry-point/schema.d.ts +0 -1
- package/src/generators/library-secondary-entry-point/schema.json +3 -9
- package/src/generators/move/schema.json +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +1 -1
- package/src/generators/ng-add/migrators/projects/app.migrator.js +7 -50
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js +23 -31
- package/src/generators/ng-add/ng-add.js +8 -1
- package/src/generators/ng-add/schema.json +1 -1
- package/src/generators/ng-add/utilities/workspace.d.ts +1 -1
- package/src/generators/ng-add/utilities/workspace.js +16 -9
- package/src/generators/ngrx/files/{__directory__ → base/__directory__}/__fileName__.models.ts__tmpl__ +1 -1
- package/src/generators/ngrx/files/{__directory__ → base/__directory__}/__fileName__.selectors.spec.ts__tmpl__ +1 -1
- package/src/generators/ngrx/files/no-inject/__directory__/__fileName__.effects.ts__tmpl__ +22 -0
- package/src/generators/ngrx/files/no-inject/__directory__/__fileName__.facade.ts__tmpl__ +27 -0
- package/src/generators/ngrx/lib/generate-files.js +10 -1
- package/src/generators/ngrx/lib/validate-options.js +23 -0
- package/src/generators/ngrx/schema.json +3 -3
- package/src/generators/ngrx-feature-store/files/{__directory__ → base/__directory__}/__fileName__.models.ts__tmpl__ +1 -1
- package/src/generators/ngrx-feature-store/files/{__directory__ → base/__directory__}/__fileName__.selectors.spec.ts__tmpl__ +1 -1
- package/src/generators/ngrx-feature-store/files/no-inject/__directory__/__fileName__.effects.ts__tmpl__ +22 -0
- package/src/generators/ngrx-feature-store/files/no-inject/__directory__/__fileName__.facade.ts__tmpl__ +27 -0
- package/src/generators/ngrx-feature-store/lib/generate-files.js +12 -1
- package/src/generators/ngrx-feature-store/lib/validate-options.js +22 -0
- package/src/generators/ngrx-feature-store/schema.json +3 -3
- package/src/generators/ngrx-root-store/lib/normalize-options.js +1 -1
- package/src/generators/ngrx-root-store/lib/validate-options.js +15 -0
- package/src/generators/ngrx-root-store/schema.json +2 -2
- package/src/generators/pipe/files/__fileName__.ts__tpl__ +2 -0
- package/src/generators/pipe/lib/index.d.ts +1 -0
- package/src/generators/pipe/lib/index.js +1 -0
- package/src/generators/pipe/lib/normalize-options.js +0 -1
- package/src/generators/pipe/lib/validate-options.d.ts +3 -0
- package/src/generators/pipe/lib/validate-options.js +8 -0
- package/src/generators/pipe/pipe.js +1 -0
- package/src/generators/pipe/schema.d.ts +3 -3
- package/src/generators/pipe/schema.json +4 -4
- package/src/generators/remote/files/base-ts/webpack.server.config.ts__tmpl__ +2 -2
- package/src/generators/remote/files/common/{pre-v17/src → src}/main.server.ts__tmpl__ +3 -1
- package/src/generators/remote/lib/{update-ssr-setup.d.ts → add-ssr.d.ts} +1 -1
- package/src/generators/remote/lib/{update-ssr-setup.js → add-ssr.js} +13 -9
- package/src/generators/remote/lib/index.d.ts +1 -1
- package/src/generators/remote/lib/index.js +1 -1
- package/src/generators/remote/remote.js +9 -7
- package/src/generators/remote/schema.json +6 -6
- package/src/generators/scam/lib/convert-component-to-scam.js +1 -2
- package/src/generators/scam/schema.d.ts +3 -3
- package/src/generators/scam/schema.json +2 -2
- package/src/generators/scam-directive/lib/convert-directive-to-scam.js +1 -2
- package/src/generators/scam-directive/scam-directive.js +1 -3
- package/src/generators/scam-directive/schema.d.ts +3 -4
- package/src/generators/scam-directive/schema.json +2 -8
- package/src/generators/scam-pipe/lib/convert-pipe-to-scam.js +1 -2
- package/src/generators/scam-pipe/scam-pipe.js +1 -3
- package/src/generators/scam-pipe/schema.d.ts +3 -4
- package/src/generators/scam-pipe/schema.json +2 -8
- package/src/generators/scam-to-standalone/scam-to-standalone.js +7 -0
- package/src/generators/scam-to-standalone/schema.json +2 -2
- package/src/generators/setup-mf/files/host-files/app.component.spec.ts__tmpl__ +1 -3
- package/src/generators/setup-mf/files/ts-webpack/module-federation.config.ts__tmpl__ +0 -12
- package/src/generators/setup-mf/files/ts-webpack/webpack.config.ts__tmpl__ +1 -1
- package/src/generators/setup-mf/files/ts-webpack/webpack.prod.config.ts__tmpl__ +12 -12
- package/src/generators/setup-mf/files/webpack/module-federation.config.js__tmpl__ +1 -13
- package/src/generators/setup-mf/lib/add-cypress-workaround.js +4 -14
- package/src/generators/setup-mf/lib/add-remote-entry.js +11 -2
- package/src/generators/setup-mf/lib/add-remote-to-host.js +1 -1
- package/src/generators/setup-mf/lib/fix-bootstrap.js +18 -10
- package/src/generators/setup-mf/lib/generate-config.js +0 -3
- package/src/generators/setup-mf/lib/index.d.ts +1 -1
- package/src/generators/setup-mf/lib/index.js +1 -1
- package/src/generators/setup-mf/lib/normalize-options.js +1 -2
- package/src/generators/setup-mf/lib/remove-dead-code-from-remote.js +10 -10
- package/src/generators/setup-mf/lib/set-tsconfig-target.d.ts +3 -0
- package/src/generators/setup-mf/lib/set-tsconfig-target.js +16 -0
- package/src/generators/setup-mf/lib/setup-serve-target.js +1 -1
- package/src/generators/setup-mf/lib/update-host-app-routes.js +2 -2
- package/src/generators/setup-mf/schema.d.ts +0 -1
- package/src/generators/setup-mf/schema.json +3 -8
- package/src/generators/setup-mf/setup-mf.js +7 -1
- package/src/generators/setup-ssr/files/{server/server-builder/pre-v17 → ngmodule/base}/__serverFileName__ +8 -7
- package/src/generators/setup-ssr/files/ngmodule/base/src/__main__ +1 -1
- package/src/generators/setup-ssr/files/ngmodule/v14/src/__main__ +11 -0
- package/src/generators/setup-ssr/files/{server/server-builder/v17+ → standalone}/__serverFileName__ +16 -25
- package/src/generators/setup-ssr/lib/add-hydration.js +5 -11
- package/src/generators/setup-ssr/lib/generate-files.d.ts +1 -1
- package/src/generators/setup-ssr/lib/generate-files.js +16 -11
- package/src/generators/setup-ssr/lib/index.d.ts +0 -4
- package/src/generators/setup-ssr/lib/index.js +0 -4
- package/src/generators/setup-ssr/lib/normalize-options.js +1 -7
- package/src/generators/setup-ssr/lib/update-project-config.d.ts +1 -2
- package/src/generators/setup-ssr/lib/update-project-config.js +13 -46
- package/src/generators/setup-ssr/lib/validate-options.js +2 -15
- package/src/generators/setup-ssr/schema.json +4 -4
- package/src/generators/setup-ssr/setup-ssr.js +12 -18
- package/src/generators/setup-tailwind/schema.json +1 -1
- package/src/generators/stories/schema.json +1 -1
- package/src/generators/stories/stories.js +2 -2
- package/src/generators/storybook-configuration/lib/generate-stories.js +4 -6
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +1 -3
- package/src/generators/storybook-configuration/schema.d.ts +1 -1
- package/src/generators/storybook-configuration/schema.json +7 -7
- package/src/generators/storybook-configuration/storybook-configuration.js +5 -8
- package/src/generators/utils/create-ts-config.d.ts +8 -0
- package/src/generators/utils/create-ts-config.js +35 -0
- package/src/generators/utils/dependencies.js +2 -1
- package/src/generators/utils/export-scam.js +2 -2
- package/src/generators/utils/project.d.ts +1 -0
- package/src/generators/utils/project.js +29 -2
- package/src/generators/utils/selector.d.ts +2 -2
- package/src/generators/utils/selector.js +4 -11
- package/src/generators/utils/testing.js +1 -24
- package/src/generators/utils/validations.d.ts +1 -0
- package/src/generators/utils/validations.js +14 -1
- package/src/generators/utils/version-utils.d.ts +2 -2
- package/src/generators/utils/version-utils.js +3 -3
- package/src/utils/backward-compatible-versions.d.ts +4 -6
- package/src/utils/backward-compatible-versions.js +22 -20
- package/src/utils/mf/utils.js +0 -7
- package/src/utils/mf/with-module-federation-ssr.js +0 -3
- package/src/utils/mf/with-module-federation.js +0 -3
- package/src/utils/nx-devkit/ast-utils.js +2 -4
- package/src/utils/nx-devkit/testing.js +31 -27
- package/src/utils/{index.d.ts → public-api.d.ts} +0 -5
- package/src/utils/{index.js → public-api.js} +0 -5
- package/src/utils/version-utils.d.ts +3 -3
- package/src/utils/versions.d.ts +11 -9
- package/src/utils/versions.js +12 -10
- package/src/builders/dev-server/dev-server.impl.d.ts +0 -4
- package/src/builders/dev-server/dev-server.impl.js +0 -160
- package/src/builders/dev-server/lib/normalize-options.d.ts +0 -2
- package/src/builders/dev-server/lib/normalize-options.js +0 -20
- package/src/builders/dev-server/lib/validate-options.d.ts +0 -2
- package/src/builders/dev-server/lib/validate-options.js +0 -22
- package/src/builders/dev-server/schema.d.ts +0 -39
- package/src/executors/application/application.impl.d.ts +0 -3
- package/src/executors/application/application.impl.js +0 -37
- package/src/executors/application/schema.d.ts +0 -8
- package/src/executors/application/schema.json +0 -682
- package/src/executors/application/utils/validate-options.d.ts +0 -2
- package/src/executors/application/utils/validate-options.js +0 -52
- package/src/executors/extract-i18n/extract-i18n.impl.d.ts +0 -3
- package/src/executors/extract-i18n/extract-i18n.impl.js +0 -43
- package/src/executors/extract-i18n/schema.d.ts +0 -8
- package/src/executors/extract-i18n/schema.json +0 -45
- package/src/executors/module-federation-dev-server/lib/build-static-remotes.d.ts +0 -4
- package/src/executors/module-federation-dev-server/lib/build-static-remotes.js +0 -56
- package/src/executors/module-federation-dev-server/lib/index.d.ts +0 -5
- package/src/executors/module-federation-dev-server/lib/index.js +0 -8
- package/src/executors/module-federation-dev-server/lib/normalize-options.d.ts +0 -2
- package/src/executors/module-federation-dev-server/lib/normalize-options.js +0 -23
- package/src/executors/module-federation-dev-server/lib/parse-static-remotes-config.d.ts +0 -11
- package/src/executors/module-federation-dev-server/lib/parse-static-remotes-config.js +0 -18
- package/src/executors/module-federation-dev-server/lib/start-dev-remotes.d.ts +0 -5
- package/src/executors/module-federation-dev-server/lib/start-dev-remotes.js +0 -29
- package/src/executors/module-federation-dev-server/lib/start-static-remotes-file-server.d.ts +0 -9
- package/src/executors/module-federation-dev-server/lib/start-static-remotes-file-server.js +0 -46
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.d.ts +0 -4
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +0 -116
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-packagr.d.ts +0 -3
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-packagr.js +0 -34
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-bundles.di.d.ts +0 -2
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-bundles.di.js +0 -12
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-bundles.transform.d.ts +0 -8
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-bundles.transform.js +0 -12
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-package.di.d.ts +0 -8
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-package.di.js +0 -18
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-package.transform.d.ts +0 -8
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-package.transform.js +0 -285
- package/src/executors/package/ng-packagr-adjustments/ng-packagr.d.ts +0 -3
- package/src/executors/package/ng-packagr-adjustments/ng-packagr.js +0 -28
- package/src/executors/utilities/buildable-libs.d.ts +0 -6
- package/src/executors/utilities/esbuild-extensions.d.ts +0 -10
- package/src/executors/utilities/esbuild-extensions.js +0 -50
- package/src/executors/utilities/module-loader.d.ts +0 -15
- package/src/executors/utilities/module-loader.js +0 -52
- package/src/executors/utilities/ng-compiler-cli.d.ts +0 -1
- package/src/executors/utilities/ng-compiler-cli.js +0 -8
- package/src/executors/utilities/ng-packagr/stylesheet-processor.d.ts +0 -49
- package/src/executors/utilities/ng-packagr/stylesheet-processor.di.d.ts +0 -2
- package/src/executors/utilities/ng-packagr/stylesheet-processor.di.js +0 -16
- package/src/executors/utilities/ng-packagr/stylesheet-processor.js +0 -209
- package/src/executors/utilities/ng-packagr/tailwindcss.d.ts +0 -7
- package/src/executors/utilities/patch-builder-context.d.ts +0 -3
- package/src/executors/utilities/patch-builder-context.js +0 -41
- package/src/generators/add-linting/lib/buildable-project.d.ts +0 -2
- package/src/generators/add-linting/lib/buildable-project.js +0 -9
- package/src/generators/application/lib/set-generator-defaults.d.ts +0 -3
- package/src/generators/application/lib/set-generator-defaults.js +0 -17
- package/src/generators/component/lib/set-generator-defaults.d.ts +0 -3
- package/src/generators/component/lib/set-generator-defaults.js +0 -14
- package/src/generators/convert-to-application-executor/convert-to-application-executor.d.ts +0 -4
- package/src/generators/convert-to-application-executor/convert-to-application-executor.js +0 -242
- package/src/generators/convert-to-application-executor/schema.d.ts +0 -4
- package/src/generators/convert-to-application-executor/schema.json +0 -26
- package/src/generators/host/files/common/v17+/src/main.server.ts__tmpl__ +0 -67
- package/src/generators/host/lib/update-ssr-setup.d.ts +0 -3
- package/src/generators/library/lib/set-generator-defaults.d.ts +0 -3
- package/src/generators/library/lib/set-generator-defaults.js +0 -15
- package/src/generators/remote/files/common/v17+/src/main.server.ts__tmpl__ +0 -73
- package/src/generators/setup-mf/files/ts-webpack/tsconfig.lint.json__tmpl__ +0 -12
- package/src/generators/setup-mf/lib/update-tsconfig.js +0 -19
- package/src/generators/setup-ssr/files/server/application-builder/__serverFileName__ +0 -56
- package/src/generators/setup-ssr/lib/add-dependencies.d.ts +0 -2
- package/src/generators/setup-ssr/lib/add-dependencies.js +0 -36
- package/src/generators/setup-ssr/lib/add-server-file.d.ts +0 -3
- package/src/generators/setup-ssr/lib/add-server-file.js +0 -31
- package/src/generators/setup-ssr/lib/constants.d.ts +0 -3
- package/src/generators/setup-ssr/lib/constants.js +0 -6
- package/src/generators/setup-ssr/lib/generate-server-ts-config.d.ts +0 -4
- package/src/generators/setup-ssr/lib/generate-server-ts-config.js +0 -29
- package/src/generators/setup-ssr/lib/set-router-initial-navigation.d.ts +0 -3
- package/src/generators/setup-ssr/lib/set-router-initial-navigation.js +0 -93
- package/src/generators/utils/add-jest.d.ts +0 -8
- package/src/generators/utils/add-jest.js +0 -36
- package/src/generators/utils/add-mf-env-to-inputs.d.ts +0 -2
- package/src/generators/utils/add-mf-env-to-inputs.js +0 -27
- package/src/generators/utils/ensure-angular-dependencies.d.ts +0 -2
- package/src/generators/utils/ensure-angular-dependencies.js +0 -35
- package/src/generators/utils/update-app-editor-tsconfig-excluded-files.d.ts +0 -2
- package/src/generators/utils/update-app-editor-tsconfig-excluded-files.js +0 -23
- package/src/generators/utils/update-project-root-tsconfig.d.ts +0 -3
- package/src/generators/utils/update-project-root-tsconfig.js +0 -26
- package/src/migrations/update-17-1-0/browser-target-to-build-target.d.ts +0 -3
- package/src/migrations/update-17-1-0/browser-target-to-build-target.js +0 -50
- package/src/migrations/update-17-1-0/replace-nguniversal-builders.d.ts +0 -2
- package/src/migrations/update-17-1-0/replace-nguniversal-builders.js +0 -75
- package/src/migrations/update-17-1-0/replace-nguniversal-engines.d.ts +0 -2
- package/src/migrations/update-17-1-0/replace-nguniversal-engines.js +0 -183
- package/src/migrations/update-17-1-0/update-angular-cli.d.ts +0 -3
- package/src/migrations/update-17-1-0/update-angular-cli.js +0 -23
- package/src/migrations/update-17-1-0/update-zone-js-deep-import.d.ts +0 -2
- package/src/migrations/update-17-1-0/update-zone-js-deep-import.js +0 -37
- package/src/migrations/update-17-2-0/rename-webpack-dev-server.d.ts +0 -2
- package/src/migrations/update-17-2-0/rename-webpack-dev-server.js +0 -40
- package/src/migrations/update-17-3-0/add-autoprefixer-dependency.d.ts +0 -2
- package/src/migrations/update-17-3-0/add-autoprefixer-dependency.js +0 -26
- package/src/migrations/update-17-3-0/add-browser-sync-dependency.d.ts +0 -2
- package/src/migrations/update-17-3-0/add-browser-sync-dependency.js +0 -26
- package/src/migrations/update-17-3-0/update-angular-cli.d.ts +0 -3
- package/src/migrations/update-17-3-0/update-angular-cli.js +0 -23
- package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.d.ts +0 -2
- package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.js +0 -26
- package/src/migrations/update-18-1-0/update-angular-cli.d.ts +0 -3
- package/src/migrations/update-18-1-0/update-angular-cli.js +0 -23
- package/src/migrations/update-18-1-1/fix-target-defaults-inputs.d.ts +0 -2
- package/src/migrations/update-18-1-1/fix-target-defaults-inputs.js +0 -53
- package/src/migrations/update-18-2-0/update-angular-cli.d.ts +0 -3
- package/src/migrations/update-18-2-0/update-angular-cli.js +0 -23
- package/src/utils/targets.d.ts +0 -2
- package/src/utils/targets.js +0 -17
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/entry-point/compile-ngc.di.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/entry-point/compile-ngc.di.js +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/entry-point/compile-ngc.transform.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/entry-point/entry-point.di.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/entry-point/entry-point.di.js +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/entry-point/entry-point.transform.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/entry-point/entry-point.transform.js +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/entry-point/write-package.di.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/entry-point/write-package.di.js +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/entry-point/write-package.transform.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/options.di.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/options.di.js +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/package.di.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/package.di.js +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/styles → styles}/stylesheet-processor.di.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/styles → styles}/stylesheet-processor.di.js +0 -0
- /package/src/generators/host/files/common/{pre-v17/src → src}/main.server.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{__directory__ → base/__directory__}/__fileName__.actions.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{__directory__ → base/__directory__}/__fileName__.effects.spec.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{__directory__ → base/__directory__}/__fileName__.effects.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{__directory__ → base/__directory__}/__fileName__.facade.spec.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{__directory__ → base/__directory__}/__fileName__.facade.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{__directory__ → base/__directory__}/__fileName__.reducer.spec.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{__directory__ → base/__directory__}/__fileName__.reducer.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{__directory__ → base/__directory__}/__fileName__.selectors.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{__directory__ → base/__directory__}/__fileName__.actions.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{__directory__ → base/__directory__}/__fileName__.effects.spec.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{__directory__ → base/__directory__}/__fileName__.effects.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{__directory__ → base/__directory__}/__fileName__.facade.spec.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{__directory__ → base/__directory__}/__fileName__.facade.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{__directory__ → base/__directory__}/__fileName__.reducer.spec.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{__directory__ → base/__directory__}/__fileName__.reducer.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{__directory__ → base/__directory__}/__fileName__.selectors.ts__tmpl__ +0 -0
- /package/src/generators/setup-ssr/files/{root → base}/tsconfig.server.json__tpl__ +0 -0
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
-
"$schema": "
|
|
2
|
+
"$schema": "http://json-schema.org/schema",
|
|
3
3
|
"$id": "NxAngularStorybookConfigurationGenerator",
|
|
4
4
|
"title": "Adds Storybook configuration to a project.",
|
|
5
5
|
"description": "Adds Storybook configuration to a project to be able to use and create stories.",
|
|
6
6
|
"cli": "nx",
|
|
7
7
|
"type": "object",
|
|
8
8
|
"properties": {
|
|
9
|
-
"
|
|
9
|
+
"name": {
|
|
10
10
|
"type": "string",
|
|
11
|
-
"aliases": ["
|
|
11
|
+
"aliases": ["project", "projectName"],
|
|
12
12
|
"description": "Project for which to generate Storybook configuration.",
|
|
13
13
|
"$default": {
|
|
14
14
|
"$source": "argv",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"configureCypress": {
|
|
30
30
|
"type": "boolean",
|
|
31
31
|
"description": "Specifies whether to configure Cypress or not.",
|
|
32
|
-
"x-deprecated": "Use interactionTests instead. This option will be removed in
|
|
32
|
+
"x-deprecated": "Use interactionTests instead. This option will be removed in v18."
|
|
33
33
|
},
|
|
34
34
|
"generateStories": {
|
|
35
35
|
"type": "boolean",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"generateCypressSpecs": {
|
|
42
42
|
"type": "boolean",
|
|
43
43
|
"description": "Specifies whether to automatically generate test files in the generated Cypress e2e app.",
|
|
44
|
-
"x-deprecated": "Use interactionTests instead. This option will be removed in
|
|
44
|
+
"x-deprecated": "Use interactionTests instead. This option will be removed in v18."
|
|
45
45
|
},
|
|
46
46
|
"configureStaticServe": {
|
|
47
47
|
"type": "boolean",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"cypressDirectory": {
|
|
54
54
|
"type": "string",
|
|
55
55
|
"description": "A directory where the Cypress project will be placed. Placed at the root by default.",
|
|
56
|
-
"x-deprecated": "Use interactionTests instead. This option will be removed in
|
|
56
|
+
"x-deprecated": "Use interactionTests instead. This option will be removed in v18."
|
|
57
57
|
},
|
|
58
58
|
"linter": {
|
|
59
59
|
"description": "The tool to use for running lint checks.",
|
|
@@ -93,6 +93,6 @@
|
|
|
93
93
|
}
|
|
94
94
|
},
|
|
95
95
|
"additionalProperties": false,
|
|
96
|
-
"required": ["
|
|
96
|
+
"required": ["name"],
|
|
97
97
|
"examplesFile": "../../../docs/storybook-configuration-examples.md"
|
|
98
98
|
}
|
|
@@ -2,18 +2,17 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.storybookConfigurationGenerator = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app-editor-tsconfig-excluded-files");
|
|
6
5
|
const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-storybook-version");
|
|
7
6
|
const generate_stories_1 = require("./lib/generate-stories");
|
|
8
7
|
const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
|
|
9
8
|
const validate_options_1 = require("./lib/validate-options");
|
|
10
|
-
// TODO(katerina): Nx
|
|
9
|
+
// TODO(katerina): Nx 18 -> remove Cypress
|
|
11
10
|
async function storybookConfigurationGenerator(tree, options) {
|
|
12
11
|
(0, assert_compatible_storybook_version_1.assertCompatibleStorybookVersion)();
|
|
13
12
|
(0, validate_options_1.validateOptions)(options);
|
|
14
13
|
const storybookGeneratorInstallTask = await (0, generate_storybook_configuration_1.generateStorybookConfiguration)(tree, {
|
|
15
14
|
...options,
|
|
16
|
-
interactionTests: options.interactionTests ?? true,
|
|
15
|
+
interactionTests: options.interactionTests ?? true,
|
|
17
16
|
tsConfiguration: options.tsConfiguration ?? true, // default is true
|
|
18
17
|
});
|
|
19
18
|
if (options.generateStories) {
|
|
@@ -23,14 +22,12 @@ async function storybookConfigurationGenerator(tree, options) {
|
|
|
23
22
|
skipFormat: true,
|
|
24
23
|
});
|
|
25
24
|
}
|
|
26
|
-
const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
27
|
-
if (project.projectType === 'application') {
|
|
28
|
-
(0, update_app_editor_tsconfig_excluded_files_1.updateAppEditorTsConfigExcludedFiles)(tree, project);
|
|
29
|
-
}
|
|
30
25
|
if (!options.skipFormat) {
|
|
31
26
|
await (0, devkit_1.formatFiles)(tree);
|
|
32
27
|
}
|
|
33
|
-
return
|
|
28
|
+
return () => {
|
|
29
|
+
storybookGeneratorInstallTask();
|
|
30
|
+
};
|
|
34
31
|
}
|
|
35
32
|
exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
|
|
36
33
|
exports.default = storybookConfigurationGenerator;
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { Tree } from '@nx/devkit';
|
|
2
|
+
export { extractTsConfigBase } from '@nx/js';
|
|
3
|
+
export declare function createTsConfig(host: Tree, projectRoot: string, type: 'app' | 'lib', options: {
|
|
4
|
+
strict?: boolean;
|
|
5
|
+
style?: string;
|
|
6
|
+
bundler?: string;
|
|
7
|
+
rootProject?: boolean;
|
|
8
|
+
}, relativePathToRootTsConfig: string): void;
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createTsConfig = exports.extractTsConfigBase = void 0;
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const js_1 = require("@nx/js");
|
|
6
|
+
const version_utils_1 = require("./version-utils");
|
|
7
|
+
var js_2 = require("@nx/js");
|
|
8
|
+
Object.defineProperty(exports, "extractTsConfigBase", { enumerable: true, get: function () { return js_2.extractTsConfigBase; } });
|
|
9
|
+
function createTsConfig(host, projectRoot, type, options, relativePathToRootTsConfig) {
|
|
10
|
+
const majorAngularVersion = (0, version_utils_1.getInstalledAngularMajorVersion)(host);
|
|
11
|
+
const json = {
|
|
12
|
+
compilerOptions: {
|
|
13
|
+
target: majorAngularVersion === 14 ? 'es2020' : 'es2022',
|
|
14
|
+
useDefineForClassFields: false,
|
|
15
|
+
},
|
|
16
|
+
files: [],
|
|
17
|
+
include: [],
|
|
18
|
+
references: [
|
|
19
|
+
{
|
|
20
|
+
path: type === 'app' ? './tsconfig.app.json' : './tsconfig.lib.json',
|
|
21
|
+
},
|
|
22
|
+
],
|
|
23
|
+
};
|
|
24
|
+
// inline tsconfig.base.json into the project
|
|
25
|
+
if (options.rootProject) {
|
|
26
|
+
json.compileOnSave = false;
|
|
27
|
+
json.compilerOptions = { ...js_1.tsConfigBaseOptions, ...json.compilerOptions };
|
|
28
|
+
json.exclude = ['node_modules', 'tmp'];
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
json.extends = relativePathToRootTsConfig;
|
|
32
|
+
}
|
|
33
|
+
(0, devkit_1.writeJson)(host, `${projectRoot}/tsconfig.json`, json);
|
|
34
|
+
}
|
|
35
|
+
exports.createTsConfig = createTsConfig;
|
|
@@ -7,7 +7,8 @@ function addBuildableLibrariesPostCssDependencies(tree) {
|
|
|
7
7
|
const pkgVersions = (0, version_utils_1.versions)(tree);
|
|
8
8
|
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
9
9
|
postcss: pkgVersions.postcssVersion,
|
|
10
|
-
|
|
10
|
+
'postcss-import': pkgVersions.postcssImportVersion,
|
|
11
|
+
'postcss-preset-env': pkgVersions.postcssPresetEnvVersion,
|
|
11
12
|
'postcss-url': pkgVersions.postcssUrlVersion,
|
|
12
13
|
});
|
|
13
14
|
}
|
|
@@ -25,12 +25,12 @@ function exportScam(tree, options) {
|
|
|
25
25
|
const relativePathFromEntryPoint = (0, path_1.getRelativeImportToFile)(entryPointPath, options.filePath);
|
|
26
26
|
const entryPointContent = tree.read(entryPointPath, 'utf-8');
|
|
27
27
|
let updatedEntryPointContent = (0, devkit_1.stripIndents) `${entryPointContent}
|
|
28
|
-
export * from
|
|
28
|
+
export * from "${relativePathFromEntryPoint}";`;
|
|
29
29
|
if (!options.inlineScam) {
|
|
30
30
|
const moduleFilePath = (0, devkit_1.joinPathFragments)(options.directory, `${(0, devkit_1.names)(options.name).fileName}.module.ts`);
|
|
31
31
|
const relativePathFromModule = (0, path_1.getRelativeImportToFile)(entryPointPath, moduleFilePath);
|
|
32
32
|
updatedEntryPointContent = (0, devkit_1.stripIndents) `${updatedEntryPointContent}
|
|
33
|
-
export * from
|
|
33
|
+
export * from "${relativePathFromModule}";`;
|
|
34
34
|
}
|
|
35
35
|
tree.write(entryPointPath, updatedEntryPointContent);
|
|
36
36
|
}
|
|
@@ -1,8 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getProjectPrefix = void 0;
|
|
3
|
+
exports.getProjectPrefix = exports.normalizeNewProjectPrefix = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
|
|
6
|
+
function normalizeNewProjectPrefix(prefix, npmScope, fallbackPrefix) {
|
|
7
|
+
// Prefix needs to be a valid html selector, if npmScope it's not valid, we don't default
|
|
8
|
+
// to it and let it fall through to the Angular schematic to handle it
|
|
9
|
+
// https://github.com/angular/angular-cli/blob/aa9f0528f174e856a4923cb24861fdf6e6f96b48/packages/schematics/angular/component/index.ts#L64
|
|
10
|
+
const htmlSelectorRegex = /^[a-zA-Z][.0-9a-zA-Z]*((:?-[0-9]+)*|(:?-[a-zA-Z][.0-9a-zA-Z]*(:?-[0-9]+)*)*)$/;
|
|
11
|
+
if (prefix) {
|
|
12
|
+
if (!htmlSelectorRegex.test(prefix)) {
|
|
13
|
+
throw new Error('The provided "prefix" is invalid. The prefix must start with a letter, and must contain only alphanumeric characters or dashes.');
|
|
14
|
+
}
|
|
15
|
+
return prefix;
|
|
16
|
+
}
|
|
17
|
+
if (npmScope && !htmlSelectorRegex.test(npmScope)) {
|
|
18
|
+
throw new Error(`The "--prefix" option was not provided, therefore attempted to use the "npmScope" defined in "nx.json" to set the application's selector prefix, but it is invalid.
|
|
19
|
+
|
|
20
|
+
There are two options that can be followed to resolve this issue:
|
|
21
|
+
- Pass a valid "--prefix" option.
|
|
22
|
+
- Update the "npmScope" in "nx.json" (Note: this can be an involved process, as other libraries and applications may need to be updated to match the new scope).
|
|
23
|
+
|
|
24
|
+
If you encountered this error when creating a new Nx Workspace, the workspace name or "npmScope" is invalid to use as the selector prefix for the application being generated.
|
|
25
|
+
|
|
26
|
+
Valid selector prefixes must start with a letter, and must contain only alphanumeric characters or dashes.`);
|
|
27
|
+
}
|
|
28
|
+
return npmScope || fallbackPrefix;
|
|
29
|
+
}
|
|
30
|
+
exports.normalizeNewProjectPrefix = normalizeNewProjectPrefix;
|
|
5
31
|
function getProjectPrefix(tree, project) {
|
|
6
|
-
return (0, devkit_1.readProjectConfiguration)(tree, project)
|
|
32
|
+
return ((0, devkit_1.readProjectConfiguration)(tree, project)
|
|
33
|
+
.prefix ?? (0, get_npm_scope_1.getNpmScope)(tree));
|
|
7
34
|
}
|
|
8
35
|
exports.getProjectPrefix = getProjectPrefix;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
+
import type { Tree } from '@nx/devkit';
|
|
1
2
|
import { names } from '@nx/devkit';
|
|
2
|
-
export declare function buildSelector(name: string, prefix: string | undefined, projectPrefix: string | undefined, casing: keyof Pick<ReturnType<typeof names>, 'fileName' | 'propertyName'>): string;
|
|
3
|
-
export declare function validateHtmlSelector(selector: string): void;
|
|
3
|
+
export declare function buildSelector(tree: Tree, name: string, prefix: string | undefined, projectPrefix: string | undefined, casing: keyof Pick<ReturnType<typeof names>, 'fileName' | 'propertyName'>): string;
|
|
@@ -1,21 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.buildSelector = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
|
|
5
|
+
const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
|
|
6
|
+
function buildSelector(tree, name, prefix, projectPrefix, casing) {
|
|
6
7
|
let selector = name;
|
|
7
|
-
prefix ??= projectPrefix;
|
|
8
|
+
prefix ??= projectPrefix ?? (0, get_npm_scope_1.getNpmScope)(tree);
|
|
8
9
|
if (prefix) {
|
|
9
10
|
selector = `${prefix}-${selector}`;
|
|
10
11
|
}
|
|
11
12
|
return (0, devkit_1.names)(selector)[casing];
|
|
12
13
|
}
|
|
13
14
|
exports.buildSelector = buildSelector;
|
|
14
|
-
// https://github.com/angular/angular-cli/blob/main/packages/schematics/angular/utility/validation.ts#L11-L14
|
|
15
|
-
const htmlSelectorRegex = /^[a-zA-Z][.0-9a-zA-Z]*((:?-[0-9]+)*|(:?-[a-zA-Z][.0-9a-zA-Z]*(:?-[0-9]+)*)*)$/;
|
|
16
|
-
function validateHtmlSelector(selector) {
|
|
17
|
-
if (selector && !htmlSelectorRegex.test(selector)) {
|
|
18
|
-
throw new Error(`The selector "${selector}" is invalid.`);
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
exports.validateHtmlSelector = validateHtmlSelector;
|
|
@@ -51,16 +51,13 @@ async function createStorybookTestWorkspaceForLib(libName) {
|
|
|
51
51
|
linter: eslint_1.Linter.EsLint,
|
|
52
52
|
publishable: false,
|
|
53
53
|
simpleName: false,
|
|
54
|
-
skipFormat:
|
|
54
|
+
skipFormat: false,
|
|
55
55
|
unitTestRunner: test_runners_1.UnitTestRunner.Jest,
|
|
56
56
|
projectNameAndRootFormat: 'as-provided',
|
|
57
|
-
standalone: false,
|
|
58
57
|
});
|
|
59
58
|
await (0, component_1.componentGenerator)(tree, {
|
|
60
59
|
name: 'test-button',
|
|
61
60
|
project: libName,
|
|
62
|
-
standalone: false,
|
|
63
|
-
skipFormat: true,
|
|
64
61
|
});
|
|
65
62
|
tree.write(`${libName}/src/lib/test-button/test-button.component.ts`, `import { Component, Input } from '@angular/core';
|
|
66
63
|
|
|
@@ -91,8 +88,6 @@ export class TestButtonComponent {
|
|
|
91
88
|
project: libName,
|
|
92
89
|
path: `${libName}/src/lib/barrel`,
|
|
93
90
|
module: 'barrel',
|
|
94
|
-
standalone: false,
|
|
95
|
-
skipFormat: true,
|
|
96
91
|
});
|
|
97
92
|
tree.write(`${libName}/src/lib/barrel/barrel-button/index.ts`, `export * from './barrel-button.component';`);
|
|
98
93
|
tree.write(`${libName}/src/lib/barrel/barrel.module.ts`, `import { NgModule } from '@angular/core';
|
|
@@ -114,16 +109,12 @@ export class BarrelModule {}`);
|
|
|
114
109
|
project: libName,
|
|
115
110
|
path: `${libName}/src/lib/variable-declare`,
|
|
116
111
|
module: 'variable-declare',
|
|
117
|
-
standalone: false,
|
|
118
|
-
skipFormat: true,
|
|
119
112
|
});
|
|
120
113
|
await (0, component_1.componentGenerator)(tree, {
|
|
121
114
|
name: 'variable-declare-view',
|
|
122
115
|
project: libName,
|
|
123
116
|
path: `${libName}/src/lib/variable-declare`,
|
|
124
117
|
module: 'variable-declare',
|
|
125
|
-
standalone: false,
|
|
126
|
-
skipFormat: true,
|
|
127
118
|
});
|
|
128
119
|
tree.write(`${libName}/src/lib/variable-declare/variable-declare.module.ts`, `import { NgModule } from '@angular/core';
|
|
129
120
|
import { CommonModule } from '@angular/common';
|
|
@@ -151,24 +142,18 @@ export class VariableDeclareModule {}`);
|
|
|
151
142
|
project: libName,
|
|
152
143
|
path: `${libName}/src/lib/variable-spread-declare`,
|
|
153
144
|
module: 'variable-spread-declare',
|
|
154
|
-
standalone: false,
|
|
155
|
-
skipFormat: true,
|
|
156
145
|
});
|
|
157
146
|
await (0, component_1.componentGenerator)(tree, {
|
|
158
147
|
name: 'variable-spread-declare-view',
|
|
159
148
|
project: libName,
|
|
160
149
|
path: `${libName}/src/lib/variable-spread-declare`,
|
|
161
150
|
module: 'variable-spread-declare',
|
|
162
|
-
standalone: false,
|
|
163
|
-
skipFormat: true,
|
|
164
151
|
});
|
|
165
152
|
await (0, component_1.componentGenerator)(tree, {
|
|
166
153
|
name: 'variable-spread-declare-anotherview',
|
|
167
154
|
project: libName,
|
|
168
155
|
path: `${libName}/src/lib/variable-spread-declare`,
|
|
169
156
|
module: 'variable-spread-declare',
|
|
170
|
-
standalone: false,
|
|
171
|
-
skipFormat: true,
|
|
172
157
|
});
|
|
173
158
|
tree.write(`${libName}/src/lib/variable-spread-declare/variable-spread-declare.module.ts`, `import { NgModule } from '@angular/core';
|
|
174
159
|
import { CommonModule } from '@angular/common';
|
|
@@ -196,16 +181,12 @@ export class VariableSpreadDeclareModule {}`);
|
|
|
196
181
|
project: libName,
|
|
197
182
|
path: `${libName}/src/lib/static-member-declarations`,
|
|
198
183
|
module: 'static-member-declarations',
|
|
199
|
-
standalone: false,
|
|
200
|
-
skipFormat: true,
|
|
201
184
|
});
|
|
202
185
|
await (0, component_1.componentGenerator)(tree, {
|
|
203
186
|
name: 'cmp2',
|
|
204
187
|
project: libName,
|
|
205
188
|
path: `${libName}/src/lib/static-member-declarations`,
|
|
206
189
|
module: 'static-member-declarations',
|
|
207
|
-
standalone: false,
|
|
208
|
-
skipFormat: true,
|
|
209
190
|
});
|
|
210
191
|
tree.write(`${libName}/src/lib/static-member-declarations/static-member-declarations.module.ts`, `import { NgModule } from '@angular/core';
|
|
211
192
|
import { CommonModule } from '@angular/common';
|
|
@@ -231,14 +212,10 @@ export class StaticMemberDeclarationsModule {
|
|
|
231
212
|
project: libName,
|
|
232
213
|
module: 'nested',
|
|
233
214
|
path: `${libName}/src/lib/nested`,
|
|
234
|
-
standalone: false,
|
|
235
|
-
skipFormat: true,
|
|
236
215
|
});
|
|
237
216
|
await (0, component_1.componentGenerator)(tree, {
|
|
238
217
|
name: 'test-other',
|
|
239
218
|
project: libName,
|
|
240
|
-
standalone: false,
|
|
241
|
-
skipFormat: true,
|
|
242
219
|
});
|
|
243
220
|
return tree;
|
|
244
221
|
}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.validateProject = void 0;
|
|
3
|
+
exports.validateStandaloneOption = exports.validateProject = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const semver_1 = require("semver");
|
|
6
|
+
const version_utils_1 = require("./version-utils");
|
|
5
7
|
function validateProject(tree, projectName) {
|
|
6
8
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
7
9
|
if (!projects.has(projectName)) {
|
|
@@ -9,3 +11,14 @@ function validateProject(tree, projectName) {
|
|
|
9
11
|
}
|
|
10
12
|
}
|
|
11
13
|
exports.validateProject = validateProject;
|
|
14
|
+
function validateStandaloneOption(tree, standalone, angularVersion) {
|
|
15
|
+
if (!standalone) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
const installedAngularVersion = angularVersion ?? (0, version_utils_1.getInstalledAngularVersionInfo)(tree).version;
|
|
19
|
+
if ((0, semver_1.lt)(installedAngularVersion, '14.1.0')) {
|
|
20
|
+
throw new Error((0, devkit_1.stripIndents) `The "standalone" option is only supported in Angular >= 14.1.0. You are currently using "${installedAngularVersion}".
|
|
21
|
+
You can resolve this error by removing the "standalone" option or by migrating to Angular 14.1.0.`);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
exports.validateStandaloneOption = validateStandaloneOption;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { GeneratorCallback, Tree } from '@nx/devkit';
|
|
2
|
-
import
|
|
2
|
+
import * as latestVersions from '../../utils/versions';
|
|
3
3
|
export declare function getInstalledAngularVersion(tree: Tree): string;
|
|
4
4
|
export declare function getInstalledAngularMajorVersion(tree: Tree): number;
|
|
5
5
|
export declare function getInstalledAngularVersionInfo(tree: Tree): {
|
|
@@ -12,4 +12,4 @@ export declare function getInstalledPackageVersionInfo(tree: Tree, pkgName: stri
|
|
|
12
12
|
version: string;
|
|
13
13
|
};
|
|
14
14
|
export declare function addDependenciesToPackageJsonIfDontExist(tree: Tree, dependencies: Record<string, string>, devDependencies: Record<string, string>, packageJsonPath?: string): GeneratorCallback;
|
|
15
|
-
export declare function versions(tree: Tree):
|
|
15
|
+
export declare function versions(tree: Tree): typeof latestVersions | import("../../utils/backward-compatible-versions").PackageVersions;
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.versions = exports.addDependenciesToPackageJsonIfDontExist = exports.getInstalledPackageVersionInfo = exports.getInstalledPackageVersion = exports.getInstalledAngularVersionInfo = exports.getInstalledAngularMajorVersion = exports.getInstalledAngularVersion = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const semver_1 = require("semver");
|
|
6
|
-
const backward_compatible_versions_1 = require("../../utils/backward-compatible-versions");
|
|
7
6
|
const latestVersions = require("../../utils/versions");
|
|
8
7
|
const versions_1 = require("../../utils/versions");
|
|
8
|
+
const backward_compatible_versions_1 = require("../../utils/backward-compatible-versions");
|
|
9
9
|
function getInstalledAngularVersion(tree) {
|
|
10
10
|
const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
11
11
|
const installedAngularVersion = pkgJson.dependencies && pkgJson.dependencies['@angular/core'];
|
|
@@ -55,10 +55,10 @@ exports.addDependenciesToPackageJsonIfDontExist = addDependenciesToPackageJsonIf
|
|
|
55
55
|
function versions(tree) {
|
|
56
56
|
const majorAngularVersion = getInstalledAngularMajorVersion(tree);
|
|
57
57
|
switch (majorAngularVersion) {
|
|
58
|
+
case 14:
|
|
59
|
+
return backward_compatible_versions_1.backwardCompatibleVersions.angularV14;
|
|
58
60
|
case 15:
|
|
59
61
|
return backward_compatible_versions_1.backwardCompatibleVersions.angularV15;
|
|
60
|
-
case 16:
|
|
61
|
-
return backward_compatible_versions_1.backwardCompatibleVersions.angularV16;
|
|
62
62
|
default:
|
|
63
63
|
return latestVersions;
|
|
64
64
|
}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import * as latestVersions from './versions';
|
|
2
|
-
type SupportedVersions = '
|
|
3
|
-
export type
|
|
4
|
-
export type
|
|
5
|
-
export
|
|
6
|
-
export type PackageCompatVersions = Record<CompatPackageVersionNames, string>;
|
|
7
|
-
export declare const backwardCompatibleVersions: Record<SupportedVersions, PackageCompatVersions>;
|
|
2
|
+
type SupportedVersions = 'angularV14' | 'angularV15';
|
|
3
|
+
export type PackageVersionNames = Exclude<keyof typeof latestVersions, 'nxVersion'>;
|
|
4
|
+
export type PackageVersions = Record<PackageVersionNames, string>;
|
|
5
|
+
export declare const backwardCompatibleVersions: Record<SupportedVersions, PackageVersions>;
|
|
8
6
|
export {};
|
|
@@ -2,56 +2,58 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.backwardCompatibleVersions = void 0;
|
|
4
4
|
exports.backwardCompatibleVersions = {
|
|
5
|
-
|
|
6
|
-
angularVersion: '~
|
|
7
|
-
angularDevkitVersion: '~
|
|
8
|
-
ngPackagrVersion: '~
|
|
9
|
-
ngrxVersion: '~
|
|
5
|
+
angularV14: {
|
|
6
|
+
angularVersion: '~14.2.0',
|
|
7
|
+
angularDevkitVersion: '~14.2.0',
|
|
8
|
+
ngPackagrVersion: '~14.2.0',
|
|
9
|
+
ngrxVersion: '~14.0.0',
|
|
10
10
|
rxjsVersion: '~7.8.0',
|
|
11
|
-
zoneJsVersion: '~0.
|
|
11
|
+
zoneJsVersion: '~0.11.4',
|
|
12
12
|
angularJsVersion: '1.7.9',
|
|
13
13
|
tsLibVersion: '^2.3.0',
|
|
14
|
-
ngUniversalVersion: '~
|
|
14
|
+
ngUniversalVersion: '~14.2.0',
|
|
15
15
|
corsVersion: '~2.8.5',
|
|
16
16
|
typesCorsVersion: '~2.8.5',
|
|
17
17
|
expressVersion: '~4.18.2',
|
|
18
18
|
typesExpressVersion: '4.17.14',
|
|
19
|
-
browserSyncVersion: '^3.0.0',
|
|
20
19
|
moduleFederationNodeVersion: '~1.0.5',
|
|
21
|
-
angularEslintVersion: '~
|
|
20
|
+
angularEslintVersion: '~14.0.4',
|
|
22
21
|
tailwindVersion: '^3.0.2',
|
|
23
22
|
postcssVersion: '^8.4.5',
|
|
23
|
+
postcssImportVersion: '~14.1.0',
|
|
24
|
+
postcssPresetEnvVersion: '~7.5.0',
|
|
24
25
|
postcssUrlVersion: '~10.1.3',
|
|
25
26
|
autoprefixerVersion: '^10.4.0',
|
|
26
27
|
tsNodeVersion: '10.9.1',
|
|
27
|
-
jestPresetAngularVersion: '~
|
|
28
|
+
jestPresetAngularVersion: '~12.2.3',
|
|
28
29
|
typesNodeVersion: '16.11.7',
|
|
29
30
|
jasmineMarblesVersion: '^0.9.2',
|
|
30
31
|
jsoncEslintParserVersion: '^2.1.0',
|
|
31
32
|
},
|
|
32
|
-
|
|
33
|
-
angularVersion: '~
|
|
34
|
-
angularDevkitVersion: '~
|
|
35
|
-
ngPackagrVersion: '~
|
|
36
|
-
ngrxVersion: '~
|
|
33
|
+
angularV15: {
|
|
34
|
+
angularVersion: '~15.2.0',
|
|
35
|
+
angularDevkitVersion: '~15.2.0',
|
|
36
|
+
ngPackagrVersion: '~15.2.2',
|
|
37
|
+
ngrxVersion: '~15.3.0',
|
|
37
38
|
rxjsVersion: '~7.8.0',
|
|
38
|
-
zoneJsVersion: '~0.
|
|
39
|
+
zoneJsVersion: '~0.12.0',
|
|
39
40
|
angularJsVersion: '1.7.9',
|
|
40
41
|
tsLibVersion: '^2.3.0',
|
|
41
|
-
ngUniversalVersion: '~
|
|
42
|
+
ngUniversalVersion: '~15.1.0',
|
|
42
43
|
corsVersion: '~2.8.5',
|
|
43
44
|
typesCorsVersion: '~2.8.5',
|
|
44
45
|
expressVersion: '~4.18.2',
|
|
45
46
|
typesExpressVersion: '4.17.14',
|
|
46
|
-
browserSyncVersion: '^3.0.0',
|
|
47
47
|
moduleFederationNodeVersion: '~1.0.5',
|
|
48
|
-
angularEslintVersion: '~
|
|
48
|
+
angularEslintVersion: '~15.0.0',
|
|
49
49
|
tailwindVersion: '^3.0.2',
|
|
50
50
|
postcssVersion: '^8.4.5',
|
|
51
|
+
postcssImportVersion: '~14.1.0',
|
|
52
|
+
postcssPresetEnvVersion: '~7.5.0',
|
|
51
53
|
postcssUrlVersion: '~10.1.3',
|
|
52
54
|
autoprefixerVersion: '^10.4.0',
|
|
53
55
|
tsNodeVersion: '10.9.1',
|
|
54
|
-
jestPresetAngularVersion: '~13.
|
|
56
|
+
jestPresetAngularVersion: '~13.0.0',
|
|
55
57
|
typesNodeVersion: '16.11.7',
|
|
56
58
|
jasmineMarblesVersion: '^0.9.2',
|
|
57
59
|
jsoncEslintParserVersion: '^2.1.0',
|
package/src/utils/mf/utils.js
CHANGED
|
@@ -30,13 +30,6 @@ function getFunctionDeterminateRemoteUrl(isServer = false) {
|
|
|
30
30
|
const target = 'serve';
|
|
31
31
|
const remoteEntry = isServer ? 'server/remoteEntry.js' : 'remoteEntry.mjs';
|
|
32
32
|
return function (remote) {
|
|
33
|
-
const mappedStaticRemotesFromEnv = process.env
|
|
34
|
-
.NX_MF_DEV_SERVER_STATIC_REMOTES
|
|
35
|
-
? JSON.parse(process.env.NX_MF_DEV_SERVER_STATIC_REMOTES)
|
|
36
|
-
: undefined;
|
|
37
|
-
if (mappedStaticRemotesFromEnv && mappedStaticRemotesFromEnv[remote]) {
|
|
38
|
-
return `${mappedStaticRemotesFromEnv[remote]}/${remoteEntry}`;
|
|
39
|
-
}
|
|
40
33
|
let remoteConfiguration = null;
|
|
41
34
|
try {
|
|
42
35
|
remoteConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
|
|
@@ -3,9 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.withModuleFederationForSSR = void 0;
|
|
4
4
|
const utils_1 = require("./utils");
|
|
5
5
|
async function withModuleFederationForSSR(options) {
|
|
6
|
-
if (global.NX_GRAPH_CREATION) {
|
|
7
|
-
return (config) => config;
|
|
8
|
-
}
|
|
9
6
|
const { sharedLibraries, sharedDependencies, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options, {
|
|
10
7
|
isServer: true,
|
|
11
8
|
});
|
|
@@ -4,9 +4,6 @@ exports.withModuleFederation = void 0;
|
|
|
4
4
|
const utils_1 = require("./utils");
|
|
5
5
|
const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
|
|
6
6
|
async function withModuleFederation(options) {
|
|
7
|
-
if (global.NX_GRAPH_CREATION) {
|
|
8
|
-
return (config) => config;
|
|
9
|
-
}
|
|
10
7
|
const { sharedLibraries, sharedDependencies, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options);
|
|
11
8
|
return (config) => ({
|
|
12
9
|
...(config ?? {}),
|
|
@@ -416,8 +416,7 @@ function getListOfRoutes(source) {
|
|
|
416
416
|
}
|
|
417
417
|
function isNgStandaloneApp(tree, projectName) {
|
|
418
418
|
const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
419
|
-
const mainFile = project.targets?.build?.options?.main
|
|
420
|
-
project.targets?.build?.options?.browser;
|
|
419
|
+
const mainFile = project.targets?.build?.options?.main;
|
|
421
420
|
if (project.projectType !== 'application' || !mainFile) {
|
|
422
421
|
return false;
|
|
423
422
|
}
|
|
@@ -516,8 +515,7 @@ function readBootstrapInfo(host, app) {
|
|
|
516
515
|
const config = (0, devkit_1.readProjectConfiguration)(host, app);
|
|
517
516
|
let mainPath;
|
|
518
517
|
try {
|
|
519
|
-
mainPath =
|
|
520
|
-
config.targets.build.options.main ?? config.targets.build.options.browser;
|
|
518
|
+
mainPath = config.targets.build.options.main;
|
|
521
519
|
}
|
|
522
520
|
catch (e) {
|
|
523
521
|
throw new Error('Main file cannot be located');
|
|
@@ -19,24 +19,26 @@ function createApp(tree, appName, routing = true) {
|
|
|
19
19
|
appName,
|
|
20
20
|
appModule: `${appName}/src/app/app.module.ts`,
|
|
21
21
|
};
|
|
22
|
-
tree.write(appConfig.appModule, `
|
|
23
|
-
import {
|
|
24
|
-
|
|
25
|
-
import {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
22
|
+
tree.write(appConfig.appModule, `
|
|
23
|
+
import { NgModule } from '@angular/core';
|
|
24
|
+
import { BrowserModule } from '@angular/platform-browser';
|
|
25
|
+
${routing ? "import { RouterModule } from '@angular/router'" : ''};
|
|
26
|
+
import { AppComponent } from './app.component';
|
|
27
|
+
@NgModule({
|
|
28
|
+
imports: [BrowserModule, ${routing ? 'RouterModule.forRoot([])' : ''}],
|
|
29
|
+
declarations: [AppComponent],
|
|
30
|
+
bootstrap: [AppComponent]
|
|
31
|
+
})
|
|
32
|
+
export class AppModule {}
|
|
33
|
+
`);
|
|
34
|
+
tree.write(`${appName}/src/main.ts`, `
|
|
35
|
+
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
|
|
34
36
|
|
|
35
|
-
import { AppModule } from './app/app.module';
|
|
37
|
+
import { AppModule } from './app/app.module';
|
|
36
38
|
|
|
37
|
-
platformBrowserDynamic()
|
|
38
|
-
|
|
39
|
-
|
|
39
|
+
platformBrowserDynamic()
|
|
40
|
+
.bootstrapModule(AppModule)
|
|
41
|
+
.catch(err => console.log(err));
|
|
40
42
|
`);
|
|
41
43
|
tree.write(`${appName}/tsconfig.app.json`, JSON.stringify({
|
|
42
44
|
include: ['**/*.ts'],
|
|
@@ -68,17 +70,19 @@ function createLib(tree, libName) {
|
|
|
68
70
|
module: `${propertyName}/src/lib/${fileName}.module.ts`,
|
|
69
71
|
barrel: `${propertyName}/src/index.ts`,
|
|
70
72
|
};
|
|
71
|
-
tree.write(libConfig.module, `
|
|
72
|
-
import {
|
|
73
|
-
@
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
73
|
+
tree.write(libConfig.module, `
|
|
74
|
+
import { NgModule } from '@angular/core';
|
|
75
|
+
import { CommonModule } from '@angular/common';
|
|
76
|
+
@NgModule({
|
|
77
|
+
imports: [
|
|
78
|
+
CommonModule
|
|
79
|
+
],
|
|
80
|
+
providers: []
|
|
81
|
+
})
|
|
82
|
+
export class ${className}Module { }
|
|
83
|
+
`);
|
|
84
|
+
tree.write(libConfig.barrel, `
|
|
85
|
+
export * from './lib/${fileName}.module';
|
|
80
86
|
`);
|
|
81
|
-
tree.write(libConfig.barrel, `export * from './lib/${fileName}.module';
|
|
82
|
-
`);
|
|
83
87
|
}
|
|
84
88
|
exports.createLib = createLib;
|