@nx/angular 17.0.2 → 17.0.4
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 +9 -4
- package/esm2022/mf/mf.mjs +1 -1
- package/esm2022/src/runtime/nx/data-persistence.mjs +1 -1
- package/executors.d.ts +9 -2
- package/executors.js +7 -2
- package/executors.json +19 -9
- 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 +3 -1
- package/generators.json +7 -2
- package/migrations.json +451 -0
- package/ng-package.json +2 -2
- package/package.json +20 -26
- package/plugins/component-testing.d.ts +1 -26
- package/plugins/component-testing.js +15 -4
- package/src/builders/dev-server/dev-server.impl.d.ts +4 -0
- package/src/builders/dev-server/dev-server.impl.js +160 -0
- package/src/builders/{webpack-dev-server → dev-server}/lib/index.d.ts +1 -0
- package/src/builders/{webpack-dev-server → dev-server}/lib/index.js +1 -0
- package/src/builders/dev-server/lib/normalize-options.d.ts +2 -0
- package/src/builders/dev-server/lib/normalize-options.js +20 -0
- package/src/builders/dev-server/lib/validate-options.d.ts +2 -0
- package/src/builders/dev-server/lib/validate-options.js +22 -0
- package/src/builders/dev-server/schema.d.ts +39 -0
- package/src/builders/{webpack-dev-server → dev-server}/schema.json +42 -5
- 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 +15 -9
- package/src/builders/utilities/module-federation.js +1 -1
- package/src/builders/webpack-browser/schema.d.ts +6 -2
- package/src/builders/webpack-browser/schema.json +15 -15
- package/src/builders/webpack-browser/webpack-browser.impl.js +8 -6
- package/src/builders/webpack-server/schema.d.ts +0 -1
- package/src/builders/webpack-server/schema.json +7 -20
- package/src/builders/webpack-server/validate-options.js +0 -7
- package/src/builders/webpack-server/webpack-server.impl.js +4 -9
- package/src/executors/application/application.impl.d.ts +3 -0
- package/src/executors/application/application.impl.js +37 -0
- package/src/executors/application/schema.d.ts +8 -0
- package/src/executors/application/schema.json +682 -0
- package/src/executors/application/utils/validate-options.d.ts +2 -0
- package/src/executors/application/utils/validate-options.js +52 -0
- package/src/executors/browser-esbuild/browser-esbuild.impl.d.ts +2 -3
- package/src/executors/browser-esbuild/browser-esbuild.impl.js +15 -8
- package/src/executors/browser-esbuild/schema.d.ts +3 -1
- package/src/executors/browser-esbuild/schema.json +38 -8
- package/src/executors/extract-i18n/extract-i18n.impl.d.ts +3 -0
- package/src/executors/extract-i18n/extract-i18n.impl.js +43 -0
- package/src/executors/extract-i18n/schema.d.ts +8 -0
- package/src/executors/extract-i18n/schema.json +45 -0
- package/src/executors/module-federation-dev-server/lib/build-static-remotes.d.ts +4 -0
- package/src/executors/module-federation-dev-server/lib/build-static-remotes.js +56 -0
- package/src/executors/module-federation-dev-server/lib/index.d.ts +5 -0
- package/src/executors/module-federation-dev-server/lib/index.js +8 -0
- package/src/executors/module-federation-dev-server/lib/normalize-options.d.ts +2 -0
- package/src/executors/module-federation-dev-server/lib/normalize-options.js +23 -0
- package/src/executors/module-federation-dev-server/lib/parse-static-remotes-config.d.ts +11 -0
- package/src/executors/module-federation-dev-server/lib/parse-static-remotes-config.js +18 -0
- package/src/executors/module-federation-dev-server/lib/start-dev-remotes.d.ts +9 -0
- package/src/executors/module-federation-dev-server/lib/start-dev-remotes.js +29 -0
- package/src/executors/module-federation-dev-server/lib/start-static-remotes-file-server.d.ts +9 -0
- package/src/executors/module-federation-dev-server/lib/start-static-remotes-file-server.js +46 -0
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.d.ts +4 -0
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +115 -0
- package/src/{builders → executors}/module-federation-dev-server/schema.d.ts +25 -7
- package/src/{builders → executors}/module-federation-dev-server/schema.json +31 -6
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-packagr.d.ts +3 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-packagr.js +34 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/entry-point/compile-ngc.transform.js +6 -4
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/entry-point/write-package.transform.js +25 -13
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ngc → pre-v17/ngc}/compile-source-files.d.ts +1 -2
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ngc → pre-v17/ngc}/compile-source-files.js +14 -9
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{styles → pre-v17/styles}/stylesheet-processor.d.ts +5 -10
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{styles → pre-v17/styles}/stylesheet-processor.js +39 -86
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-bundles.di.d.ts +2 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-bundles.di.js +12 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-bundles.transform.d.ts +8 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-bundles.transform.js +12 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-package.di.d.ts +8 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-package.di.js +18 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-package.transform.d.ts +8 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/v17+/ng-package/entry-point/write-package.transform.js +285 -0
- package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js +5 -17
- 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 +5 -3
- package/src/executors/package/ng-packagr-adjustments/ng-packagr.d.ts +3 -0
- package/src/executors/package/ng-packagr-adjustments/ng-packagr.js +28 -0
- 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 +13 -6
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.d.ts +5 -10
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js +39 -86
- package/src/executors/package/package.impl.d.ts +1 -1
- package/src/executors/package/package.impl.js +5 -15
- package/src/executors/package/schema.json +3 -3
- package/src/executors/utilities/buildable-libs.d.ts +6 -0
- package/src/executors/{browser-esbuild/lib → utilities}/buildable-libs.js +3 -4
- package/src/executors/utilities/esbuild-extensions.d.ts +10 -0
- package/src/executors/utilities/esbuild-extensions.js +50 -0
- package/src/executors/utilities/module-loader.d.ts +15 -0
- package/src/executors/utilities/module-loader.js +52 -0
- package/src/executors/utilities/ng-compiler-cli.d.ts +1 -0
- package/src/executors/utilities/ng-compiler-cli.js +8 -0
- package/src/executors/utilities/ng-packagr/stylesheet-processor.d.ts +49 -0
- package/src/executors/utilities/ng-packagr/stylesheet-processor.di.d.ts +2 -0
- package/src/executors/utilities/ng-packagr/stylesheet-processor.di.js +16 -0
- package/src/executors/utilities/ng-packagr/stylesheet-processor.js +209 -0
- package/src/executors/utilities/ng-packagr/tailwindcss.d.ts +7 -0
- package/src/executors/utilities/{tailwindcss.js → ng-packagr/tailwindcss.js} +5 -22
- package/src/executors/utilities/patch-builder-context.d.ts +3 -0
- package/src/executors/utilities/patch-builder-context.js +41 -0
- 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 +9 -15
- 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 +9 -5
- package/src/generators/add-linting/lib/buildable-project.d.ts +2 -0
- package/src/generators/add-linting/lib/buildable-project.js +9 -0
- 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 +19 -17
- package/src/generators/application/files/base/tsconfig.app.json__tpl__ +1 -1
- package/src/generators/application/files/base/tsconfig.json__tpl__ +6 -2
- package/src/generators/application/files/ng-module/src/app/app.component.spec.ts__tpl__ +3 -1
- package/src/generators/application/files/ng-module/src/app/app.component.ts__tpl__ +4 -2
- 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__ +53 -14
- package/src/generators/application/files/ng-module/src/main.ts__tpl__ +2 -8
- package/src/generators/application/files/standalone-components/src/app/app.component.spec.ts__tpl__ +6 -4
- package/src/generators/application/files/standalone-components/src/app/app.component.ts__tpl__ +4 -2
- 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__ +53 -14
- package/src/generators/application/files/standalone-components/src/main.ts__tpl__ +4 -8
- package/src/generators/application/lib/add-e2e.js +24 -8
- package/src/generators/application/lib/add-unit-test-runner.js +5 -20
- package/src/generators/application/lib/create-files.js +14 -10
- package/src/generators/application/lib/create-project.d.ts +1 -1
- package/src/generators/application/lib/create-project.js +48 -38
- package/src/generators/application/lib/index.d.ts +1 -0
- package/src/generators/application/lib/index.js +1 -0
- package/src/generators/application/lib/normalize-options.d.ts +1 -1
- package/src/generators/application/lib/normalize-options.js +28 -6
- package/src/generators/application/lib/normalized-schema.d.ts +5 -0
- package/src/generators/application/lib/set-generator-defaults.d.ts +3 -0
- package/src/generators/application/lib/set-generator-defaults.js +17 -0
- package/src/generators/application/lib/update-editor-tsconfig.d.ts +1 -1
- package/src/generators/application/lib/update-editor-tsconfig.js +11 -14
- package/src/generators/application/schema.d.ts +1 -0
- package/src/generators/application/schema.json +18 -10
- package/src/generators/component/component.js +4 -1
- package/src/generators/component/files/__fileName__.spec.ts__tpl__ +2 -3
- package/src/generators/component/files/__fileName__.ts__tpl__ +8 -2
- 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 +3 -2
- package/src/generators/component/lib/set-generator-defaults.d.ts +3 -0
- package/src/generators/component/lib/set-generator-defaults.js +14 -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__ +13 -8
- 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 +8 -3
- package/src/generators/component-test/files/__componentFileName__.cy.ts__tpl__ +9 -11
- package/src/generators/component-test/schema.json +1 -1
- package/src/generators/convert-to-application-executor/convert-to-application-executor.d.ts +4 -0
- package/src/generators/convert-to-application-executor/convert-to-application-executor.js +242 -0
- package/src/generators/convert-to-application-executor/schema.d.ts +4 -0
- package/src/generators/convert-to-application-executor/schema.json +26 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.js +3 -1
- package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js +3 -2
- package/src/generators/convert-to-with-mf/schema.d.ts +1 -0
- package/src/generators/convert-to-with-mf/schema.json +6 -0
- package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts +2 -1
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js +43 -24
- package/src/generators/directive/directive.js +0 -1
- package/src/generators/directive/files/__fileName__.ts__tpl__ +1 -3
- package/src/generators/directive/lib/index.d.ts +0 -1
- package/src/generators/directive/lib/index.js +0 -1
- package/src/generators/directive/lib/normalize-options.js +3 -1
- 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 +1 -0
- package/src/generators/federate-module/lib/add-remote.d.ts +1 -1
- package/src/generators/federate-module/lib/add-remote.js +2 -11
- package/src/generators/federate-module/schema.json +10 -10
- package/src/generators/host/files/common/v17+/src/main.server.ts__tmpl__ +67 -0
- package/src/generators/host/files/ts/webpack.server.config.ts__tmpl__ +2 -2
- package/src/generators/host/host.js +8 -9
- package/src/generators/host/lib/index.d.ts +1 -1
- package/src/generators/host/lib/index.js +1 -1
- package/src/generators/host/lib/update-ssr-setup.d.ts +3 -0
- package/src/generators/host/lib/{add-ssr.js → update-ssr-setup.js} +8 -14
- package/src/generators/host/schema.json +6 -6
- package/src/generators/init/init.d.ts +2 -2
- package/src/generators/init/init.js +19 -137
- package/src/generators/init/schema.d.ts +1 -9
- package/src/generators/init/schema.json +8 -59
- 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 +24 -22
- package/src/generators/library/lib/add-standalone-component.d.ts +2 -2
- package/src/generators/library/lib/add-standalone-component.js +5 -4
- package/src/generators/library/lib/normalize-options.js +2 -5
- package/src/generators/library/lib/set-generator-defaults.d.ts +3 -0
- package/src/generators/library/lib/set-generator-defaults.js +15 -0
- package/src/generators/library/lib/update-tsconfig.js +3 -3
- package/src/generators/library/library.js +15 -27
- package/src/generators/library/schema.d.ts +1 -0
- package/src/generators/library/schema.json +13 -13
- package/src/generators/library-secondary-entry-point/files/src/index.ts__tmpl__ +1 -5
- package/src/generators/library-secondary-entry-point/lib/index.d.ts +0 -1
- package/src/generators/library-secondary-entry-point/lib/index.js +0 -1
- package/src/generators/library-secondary-entry-point/library-secondary-entry-point.js +3 -2
- package/src/generators/library-secondary-entry-point/schema.d.ts +1 -0
- package/src/generators/library-secondary-entry-point/schema.json +9 -3
- 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 +50 -7
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js +31 -23
- package/src/generators/ng-add/ng-add.js +1 -8
- 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 +9 -16
- package/src/generators/ngrx/files/{base/__directory__ → __directory__}/__fileName__.models.ts__tmpl__ +1 -1
- package/src/generators/ngrx/files/{base/__directory__ → __directory__}/__fileName__.selectors.spec.ts__tmpl__ +1 -1
- package/src/generators/ngrx/lib/generate-files.js +1 -10
- package/src/generators/ngrx/lib/validate-options.js +0 -23
- package/src/generators/ngrx/schema.json +3 -3
- package/src/generators/ngrx-feature-store/files/{base/__directory__ → __directory__}/__fileName__.models.ts__tmpl__ +1 -1
- package/src/generators/ngrx-feature-store/files/{base/__directory__ → __directory__}/__fileName__.selectors.spec.ts__tmpl__ +1 -1
- package/src/generators/ngrx-feature-store/lib/generate-files.js +1 -12
- package/src/generators/ngrx-feature-store/lib/validate-options.js +0 -22
- 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 +0 -15
- package/src/generators/ngrx-root-store/schema.json +2 -2
- package/src/generators/pipe/files/__fileName__.ts__tpl__ +0 -2
- package/src/generators/pipe/lib/index.d.ts +0 -1
- package/src/generators/pipe/lib/index.js +0 -1
- package/src/generators/pipe/lib/normalize-options.js +1 -0
- package/src/generators/pipe/pipe.js +0 -1
- 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/{src → pre-v17/src}/main.server.ts__tmpl__ +1 -3
- package/src/generators/remote/files/common/v17+/src/main.server.ts__tmpl__ +73 -0
- package/src/generators/remote/lib/index.d.ts +1 -1
- package/src/generators/remote/lib/index.js +1 -1
- package/src/generators/remote/lib/{add-ssr.d.ts → update-ssr-setup.d.ts} +1 -1
- package/src/generators/remote/lib/{add-ssr.js → update-ssr-setup.js} +9 -13
- package/src/generators/remote/remote.js +7 -9
- package/src/generators/remote/schema.json +6 -6
- package/src/generators/scam/lib/convert-component-to-scam.js +2 -1
- 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 +2 -1
- package/src/generators/scam-directive/scam-directive.js +3 -1
- package/src/generators/scam-directive/schema.d.ts +4 -3
- package/src/generators/scam-directive/schema.json +8 -2
- package/src/generators/scam-pipe/lib/convert-pipe-to-scam.js +2 -1
- package/src/generators/scam-pipe/scam-pipe.js +3 -1
- package/src/generators/scam-pipe/schema.d.ts +4 -3
- package/src/generators/scam-pipe/schema.json +8 -2
- package/src/generators/scam-to-standalone/scam-to-standalone.js +0 -7
- package/src/generators/scam-to-standalone/schema.json +2 -2
- package/src/generators/setup-mf/files/host-files/app.component.spec.ts__tmpl__ +3 -1
- package/src/generators/setup-mf/files/ts-webpack/module-federation.config.ts__tmpl__ +12 -0
- package/src/generators/setup-mf/files/ts-webpack/tsconfig.lint.json__tmpl__ +12 -0
- 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__ +13 -1
- package/src/generators/setup-mf/lib/add-cypress-workaround.js +14 -4
- package/src/generators/setup-mf/lib/add-remote-entry.js +2 -11
- package/src/generators/setup-mf/lib/add-remote-to-host.js +1 -1
- package/src/generators/setup-mf/lib/fix-bootstrap.js +10 -18
- package/src/generators/setup-mf/lib/generate-config.js +3 -0
- 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 +2 -1
- package/src/generators/setup-mf/lib/remove-dead-code-from-remote.js +10 -10
- 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/{pipe/lib/validate-options.d.ts → setup-mf/lib/update-tsconfig.d.ts} +1 -1
- package/src/generators/setup-mf/lib/update-tsconfig.js +19 -0
- package/src/generators/setup-mf/schema.d.ts +1 -0
- package/src/generators/setup-mf/schema.json +8 -3
- package/src/generators/setup-mf/setup-mf.js +1 -7
- package/src/generators/setup-ssr/files/ngmodule/base/src/__main__ +1 -1
- package/src/generators/setup-ssr/files/server/application-builder/__serverFileName__ +56 -0
- package/src/generators/setup-ssr/files/{ngmodule/base → server/server-builder/pre-v17}/__serverFileName__ +7 -8
- package/src/generators/setup-ssr/files/{standalone → server/server-builder/v17+}/__serverFileName__ +25 -16
- package/src/generators/setup-ssr/lib/add-dependencies.d.ts +2 -0
- package/src/generators/setup-ssr/lib/add-dependencies.js +36 -0
- package/src/generators/setup-ssr/lib/add-hydration.js +11 -5
- package/src/generators/setup-ssr/lib/add-server-file.d.ts +3 -0
- package/src/generators/setup-ssr/lib/add-server-file.js +31 -0
- package/src/generators/setup-ssr/lib/constants.d.ts +3 -0
- package/src/generators/setup-ssr/lib/constants.js +6 -0
- package/src/generators/setup-ssr/lib/generate-files.d.ts +1 -1
- package/src/generators/setup-ssr/lib/generate-files.js +11 -16
- package/src/generators/setup-ssr/lib/generate-server-ts-config.d.ts +4 -0
- package/src/generators/setup-ssr/lib/generate-server-ts-config.js +29 -0
- package/src/generators/setup-ssr/lib/index.d.ts +4 -0
- package/src/generators/setup-ssr/lib/index.js +4 -0
- package/src/generators/setup-ssr/lib/normalize-options.js +7 -1
- package/src/generators/setup-ssr/lib/set-router-initial-navigation.d.ts +3 -0
- package/src/generators/setup-ssr/lib/set-router-initial-navigation.js +93 -0
- package/src/generators/setup-ssr/lib/update-project-config.d.ts +2 -1
- package/src/generators/setup-ssr/lib/update-project-config.js +46 -13
- package/src/generators/setup-ssr/lib/validate-options.js +15 -2
- package/src/generators/setup-ssr/schema.json +4 -4
- package/src/generators/setup-ssr/setup-ssr.js +18 -12
- 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 +6 -4
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +3 -1
- 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 +8 -5
- package/src/generators/utils/add-jest.d.ts +8 -0
- package/src/generators/utils/add-jest.js +36 -0
- package/src/generators/utils/add-mf-env-to-inputs.d.ts +2 -0
- package/src/generators/utils/add-mf-env-to-inputs.js +27 -0
- package/src/generators/utils/dependencies.js +1 -2
- package/src/generators/utils/ensure-angular-dependencies.d.ts +2 -0
- package/src/generators/utils/ensure-angular-dependencies.js +35 -0
- package/src/generators/utils/export-scam.js +2 -2
- package/src/generators/utils/project.d.ts +0 -1
- package/src/generators/utils/project.js +2 -29
- package/src/generators/utils/selector.d.ts +2 -2
- package/src/generators/utils/selector.js +11 -4
- package/src/generators/utils/testing.js +24 -1
- package/src/generators/utils/update-app-editor-tsconfig-excluded-files.d.ts +2 -0
- package/src/generators/utils/update-app-editor-tsconfig-excluded-files.js +23 -0
- package/src/generators/utils/update-project-root-tsconfig.d.ts +3 -0
- package/src/generators/utils/update-project-root-tsconfig.js +26 -0
- package/src/generators/utils/validations.d.ts +0 -1
- package/src/generators/utils/validations.js +1 -14
- package/src/generators/utils/version-utils.d.ts +2 -2
- package/src/generators/utils/version-utils.js +3 -3
- package/src/migrations/update-17-1-0/browser-target-to-build-target.d.ts +3 -0
- package/src/migrations/update-17-1-0/browser-target-to-build-target.js +50 -0
- package/src/migrations/update-17-1-0/replace-nguniversal-builders.d.ts +2 -0
- package/src/migrations/update-17-1-0/replace-nguniversal-builders.js +75 -0
- package/src/migrations/update-17-1-0/replace-nguniversal-engines.d.ts +2 -0
- package/src/migrations/update-17-1-0/replace-nguniversal-engines.js +183 -0
- package/src/migrations/update-17-1-0/update-angular-cli.d.ts +3 -0
- package/src/migrations/update-17-1-0/update-angular-cli.js +23 -0
- package/src/migrations/update-17-1-0/update-zone-js-deep-import.d.ts +2 -0
- package/src/migrations/update-17-1-0/update-zone-js-deep-import.js +37 -0
- package/src/migrations/update-17-2-0/rename-webpack-dev-server.d.ts +2 -0
- package/src/migrations/update-17-2-0/rename-webpack-dev-server.js +40 -0
- package/src/migrations/update-17-3-0/add-autoprefixer-dependency.d.ts +2 -0
- package/src/migrations/update-17-3-0/add-autoprefixer-dependency.js +26 -0
- package/src/migrations/update-17-3-0/add-browser-sync-dependency.d.ts +2 -0
- package/src/migrations/update-17-3-0/add-browser-sync-dependency.js +26 -0
- package/src/migrations/update-17-3-0/update-angular-cli.d.ts +3 -0
- package/src/migrations/update-17-3-0/update-angular-cli.js +23 -0
- package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.d.ts +2 -0
- package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.js +26 -0
- package/src/migrations/update-18-1-0/update-angular-cli.d.ts +3 -0
- package/src/migrations/update-18-1-0/update-angular-cli.js +23 -0
- package/src/migrations/update-18-1-1/fix-target-defaults-inputs.d.ts +2 -0
- package/src/migrations/update-18-1-1/fix-target-defaults-inputs.js +53 -0
- package/src/migrations/update-18-2-0/update-angular-cli.d.ts +3 -0
- package/src/migrations/update-18-2-0/update-angular-cli.js +23 -0
- package/src/utils/backward-compatible-versions.d.ts +6 -4
- package/src/utils/backward-compatible-versions.js +20 -22
- package/src/utils/{public-api.d.ts → index.d.ts} +5 -0
- package/src/utils/{public-api.js → index.js} +5 -0
- package/src/utils/mf/utils.js +7 -0
- package/src/utils/mf/with-module-federation-ssr.js +3 -0
- package/src/utils/mf/with-module-federation.js +3 -0
- package/src/utils/nx-devkit/ast-utils.js +4 -2
- package/src/utils/nx-devkit/testing.js +27 -31
- package/src/utils/targets.d.ts +2 -0
- package/src/utils/targets.js +17 -0
- package/src/utils/version-utils.d.ts +3 -3
- package/src/utils/versions.d.ts +9 -11
- package/src/utils/versions.js +10 -12
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.d.ts +0 -5
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +0 -136
- package/src/builders/webpack-browser/validate-options.d.ts +0 -2
- package/src/builders/webpack-browser/validate-options.js +0 -40
- package/src/builders/webpack-dev-server/lib/normalize-options.d.ts +0 -2
- package/src/builders/webpack-dev-server/lib/normalize-options.js +0 -14
- package/src/builders/webpack-dev-server/schema.d.ts +0 -21
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.d.ts +0 -4
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js +0 -105
- package/src/executors/browser-esbuild/lib/buildable-libs.d.ts +0 -9
- package/src/executors/browser-esbuild/lib/validate-options.d.ts +0 -2
- package/src/executors/browser-esbuild/lib/validate-options.js +0 -40
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.d.ts +0 -16
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.js +0 -175
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.d.ts +0 -15
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js +0 -197
- package/src/executors/utilities/tailwindcss.d.ts +0 -7
- package/src/generators/application/files/tsconfig.editor.json__tpl__ +0 -5
- package/src/generators/application/files/v14/.browserlistrc__tpl__ +0 -16
- package/src/generators/application/files/v14/src/environments/environment.prod.ts__tpl__ +0 -3
- package/src/generators/application/files/v14/src/environments/environment.ts__tpl__ +0 -16
- package/src/generators/application/files/v14/src/polyfills.ts__tpl__ +0 -53
- package/src/generators/component/lib/validate-options.d.ts +0 -3
- package/src/generators/component/lib/validate-options.js +0 -8
- package/src/generators/directive/lib/validate-options.d.ts +0 -3
- package/src/generators/directive/lib/validate-options.js +0 -8
- package/src/generators/host/lib/add-ssr.d.ts +0 -3
- package/src/generators/library-secondary-entry-point/lib/update-linting-file-patterns.d.ts +0 -3
- package/src/generators/library-secondary-entry-point/lib/update-linting-file-patterns.js +0 -15
- package/src/generators/ngrx/files/no-inject/__directory__/__fileName__.effects.ts__tmpl__ +0 -22
- package/src/generators/ngrx/files/no-inject/__directory__/__fileName__.facade.ts__tmpl__ +0 -27
- package/src/generators/ngrx-feature-store/files/no-inject/__directory__/__fileName__.effects.ts__tmpl__ +0 -22
- package/src/generators/ngrx-feature-store/files/no-inject/__directory__/__fileName__.facade.ts__tmpl__ +0 -27
- package/src/generators/pipe/lib/validate-options.js +0 -8
- package/src/generators/setup-mf/lib/set-tsconfig-target.d.ts +0 -3
- package/src/generators/setup-mf/lib/set-tsconfig-target.js +0 -16
- package/src/generators/setup-ssr/files/ngmodule/v14/src/__main__ +0 -11
- package/src/generators/utils/create-ts-config.d.ts +0 -8
- package/src/generators/utils/create-ts-config.js +0 -35
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/entry-point/compile-ngc.di.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/entry-point/compile-ngc.di.js +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/entry-point/compile-ngc.transform.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/entry-point/entry-point.di.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/entry-point/entry-point.di.js +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/entry-point/entry-point.transform.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/entry-point/entry-point.transform.js +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/entry-point/write-package.di.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/entry-point/write-package.di.js +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/entry-point/write-package.transform.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/options.di.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/options.di.js +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/package.di.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{ng-package → pre-v17/ng-package}/package.di.js +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{styles → pre-v17/styles}/stylesheet-processor.di.d.ts +0 -0
- /package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{styles → pre-v17/styles}/stylesheet-processor.di.js +0 -0
- /package/src/generators/host/files/common/{src → pre-v17/src}/main.server.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{base/__directory__ → __directory__}/__fileName__.actions.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{base/__directory__ → __directory__}/__fileName__.effects.spec.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{base/__directory__ → __directory__}/__fileName__.effects.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{base/__directory__ → __directory__}/__fileName__.facade.spec.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{base/__directory__ → __directory__}/__fileName__.facade.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{base/__directory__ → __directory__}/__fileName__.reducer.spec.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{base/__directory__ → __directory__}/__fileName__.reducer.ts__tmpl__ +0 -0
- /package/src/generators/ngrx/files/{base/__directory__ → __directory__}/__fileName__.selectors.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{base/__directory__ → __directory__}/__fileName__.actions.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{base/__directory__ → __directory__}/__fileName__.effects.spec.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{base/__directory__ → __directory__}/__fileName__.effects.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{base/__directory__ → __directory__}/__fileName__.facade.spec.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{base/__directory__ → __directory__}/__fileName__.facade.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{base/__directory__ → __directory__}/__fileName__.reducer.spec.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{base/__directory__ → __directory__}/__fileName__.reducer.ts__tmpl__ +0 -0
- /package/src/generators/ngrx-feature-store/files/{base/__directory__ → __directory__}/__fileName__.selectors.ts__tmpl__ +0 -0
- /package/src/generators/setup-ssr/files/{base → root}/tsconfig.server.json__tpl__ +0 -0
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.STYLESHEET_PROCESSOR = void 0;
|
|
4
|
+
const stylesheet_processor_di_1 = require("ng-packagr/lib/styles/stylesheet-processor.di");
|
|
5
|
+
const angular_version_utils_1 = require("../angular-version-utils");
|
|
6
|
+
const stylesheet_processor_1 = require("./stylesheet-processor");
|
|
7
|
+
exports.STYLESHEET_PROCESSOR = {
|
|
8
|
+
provide: stylesheet_processor_di_1.STYLESHEET_PROCESSOR_TOKEN,
|
|
9
|
+
useFactory: () => {
|
|
10
|
+
const { version: ngPackagrVersion } = (0, angular_version_utils_1.getInstalledPackageVersionInfo)('ng-packagr');
|
|
11
|
+
return ngPackagrVersion !== '17.2.0'
|
|
12
|
+
? stylesheet_processor_1.StylesheetProcessor
|
|
13
|
+
: stylesheet_processor_1.AsyncStylesheetProcessor;
|
|
14
|
+
},
|
|
15
|
+
deps: [],
|
|
16
|
+
};
|
|
@@ -0,0 +1,209 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Adapted from the original ng-packagr source.
|
|
4
|
+
*
|
|
5
|
+
* Changes made:
|
|
6
|
+
* - Use our own function to get the TailwindCSS config path to support a
|
|
7
|
+
* config at the root of the workspace.
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.AsyncStylesheetProcessor = exports.StylesheetProcessor = exports.CssUrl = void 0;
|
|
11
|
+
const browserslist = require("browserslist");
|
|
12
|
+
const fs_1 = require("fs");
|
|
13
|
+
const path_1 = require("path");
|
|
14
|
+
const Piscina = require('piscina');
|
|
15
|
+
const color_1 = require("ng-packagr/lib/utils/color");
|
|
16
|
+
// using this instead of the one from ng-packagr
|
|
17
|
+
const tailwindcss_1 = require("./tailwindcss");
|
|
18
|
+
const devkit_1 = require("@nx/devkit");
|
|
19
|
+
const semver_1 = require("semver");
|
|
20
|
+
const angular_version_utils_1 = require("../angular-version-utils");
|
|
21
|
+
const maxWorkersVariable = process.env['NG_BUILD_MAX_WORKERS'];
|
|
22
|
+
const maxThreads = typeof maxWorkersVariable === 'string' && maxWorkersVariable !== ''
|
|
23
|
+
? +maxWorkersVariable
|
|
24
|
+
: 4;
|
|
25
|
+
var CssUrl;
|
|
26
|
+
(function (CssUrl) {
|
|
27
|
+
CssUrl["inline"] = "inline";
|
|
28
|
+
CssUrl["none"] = "none";
|
|
29
|
+
})(CssUrl || (exports.CssUrl = CssUrl = {}));
|
|
30
|
+
class StylesheetProcessor {
|
|
31
|
+
constructor(projectBasePath, basePath, cssUrl, includePaths, cacheDirectory) {
|
|
32
|
+
this.projectBasePath = projectBasePath;
|
|
33
|
+
this.basePath = basePath;
|
|
34
|
+
this.cssUrl = cssUrl;
|
|
35
|
+
this.includePaths = includePaths;
|
|
36
|
+
this.cacheDirectory = cacheDirectory;
|
|
37
|
+
// By default, browserslist defaults are too inclusive
|
|
38
|
+
// https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
|
|
39
|
+
// We change the default query to browsers that Angular support.
|
|
40
|
+
// https://angular.io/guide/browser-support
|
|
41
|
+
browserslist.defaults = [
|
|
42
|
+
'last 2 Chrome versions',
|
|
43
|
+
'last 1 Firefox version',
|
|
44
|
+
'last 2 Edge major versions',
|
|
45
|
+
'last 2 Safari major versions',
|
|
46
|
+
'last 2 iOS major versions',
|
|
47
|
+
'Firefox ESR',
|
|
48
|
+
];
|
|
49
|
+
}
|
|
50
|
+
async process({ filePath, content, }) {
|
|
51
|
+
this.createRenderWorker();
|
|
52
|
+
return this.renderWorker.run({ content, filePath });
|
|
53
|
+
}
|
|
54
|
+
/** Destory workers in pool. */
|
|
55
|
+
destroy() {
|
|
56
|
+
void this.renderWorker?.destroy();
|
|
57
|
+
}
|
|
58
|
+
createRenderWorker() {
|
|
59
|
+
if (this.renderWorker) {
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
const styleIncludePaths = [...this.includePaths];
|
|
63
|
+
let prevDir = null;
|
|
64
|
+
let currentDir = this.basePath;
|
|
65
|
+
while (currentDir !== prevDir) {
|
|
66
|
+
const p = (0, path_1.join)(currentDir, 'node_modules');
|
|
67
|
+
if ((0, fs_1.existsSync)(p)) {
|
|
68
|
+
styleIncludePaths.push(p);
|
|
69
|
+
}
|
|
70
|
+
prevDir = currentDir;
|
|
71
|
+
currentDir = (0, path_1.dirname)(prevDir);
|
|
72
|
+
}
|
|
73
|
+
const browserslistData = browserslist(undefined, { path: this.basePath });
|
|
74
|
+
const { version: ngPackagrVersion } = (0, angular_version_utils_1.getInstalledPackageVersionInfo)('ng-packagr');
|
|
75
|
+
let postcssConfiguration;
|
|
76
|
+
if ((0, semver_1.gte)(ngPackagrVersion, '17.3.0')) {
|
|
77
|
+
const { loadPostcssConfiguration, } = require('ng-packagr/lib/styles/postcss-configuration');
|
|
78
|
+
postcssConfiguration = loadPostcssConfiguration(this.projectBasePath);
|
|
79
|
+
}
|
|
80
|
+
this.renderWorker = new Piscina({
|
|
81
|
+
filename: require.resolve('ng-packagr/lib/styles/stylesheet-processor-worker'),
|
|
82
|
+
maxThreads,
|
|
83
|
+
recordTiming: false,
|
|
84
|
+
env: {
|
|
85
|
+
...process.env,
|
|
86
|
+
FORCE_COLOR: '' + color_1.colors.enabled,
|
|
87
|
+
},
|
|
88
|
+
workerData: {
|
|
89
|
+
postcssConfiguration,
|
|
90
|
+
tailwindConfigPath: (0, tailwindcss_1.getTailwindConfigPath)(this.projectBasePath, devkit_1.workspaceRoot),
|
|
91
|
+
projectBasePath: this.projectBasePath,
|
|
92
|
+
browserslistData,
|
|
93
|
+
targets: transformSupportedBrowsersToTargets(browserslistData),
|
|
94
|
+
cacheDirectory: this.cacheDirectory,
|
|
95
|
+
cssUrl: this.cssUrl,
|
|
96
|
+
styleIncludePaths,
|
|
97
|
+
},
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
exports.StylesheetProcessor = StylesheetProcessor;
|
|
102
|
+
/**
|
|
103
|
+
* This class is used when ng-packagr version is 17.2.0. The async `loadPostcssConfiguration` function
|
|
104
|
+
* introduced in ng-packagr 17.2.0 causes a memory leak due to multiple workers being created. We must
|
|
105
|
+
* keep this class to support any workspace that might be using ng-packagr 17.2.0 where that function
|
|
106
|
+
* need to be awaited.
|
|
107
|
+
*/
|
|
108
|
+
class AsyncStylesheetProcessor {
|
|
109
|
+
constructor(projectBasePath, basePath, cssUrl, includePaths, cacheDirectory) {
|
|
110
|
+
this.projectBasePath = projectBasePath;
|
|
111
|
+
this.basePath = basePath;
|
|
112
|
+
this.cssUrl = cssUrl;
|
|
113
|
+
this.includePaths = includePaths;
|
|
114
|
+
this.cacheDirectory = cacheDirectory;
|
|
115
|
+
// By default, browserslist defaults are too inclusive
|
|
116
|
+
// https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
|
|
117
|
+
// We change the default query to browsers that Angular support.
|
|
118
|
+
// https://angular.io/guide/browser-support
|
|
119
|
+
browserslist.defaults = [
|
|
120
|
+
'last 2 Chrome versions',
|
|
121
|
+
'last 1 Firefox version',
|
|
122
|
+
'last 2 Edge major versions',
|
|
123
|
+
'last 2 Safari major versions',
|
|
124
|
+
'last 2 iOS major versions',
|
|
125
|
+
'Firefox ESR',
|
|
126
|
+
];
|
|
127
|
+
}
|
|
128
|
+
async process({ filePath, content, }) {
|
|
129
|
+
await this.createRenderWorker();
|
|
130
|
+
return this.renderWorker.run({ content, filePath });
|
|
131
|
+
}
|
|
132
|
+
/** Destory workers in pool. */
|
|
133
|
+
destroy() {
|
|
134
|
+
void this.renderWorker?.destroy();
|
|
135
|
+
}
|
|
136
|
+
async createRenderWorker() {
|
|
137
|
+
if (this.renderWorker) {
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
const styleIncludePaths = [...this.includePaths];
|
|
141
|
+
let prevDir = null;
|
|
142
|
+
let currentDir = this.basePath;
|
|
143
|
+
while (currentDir !== prevDir) {
|
|
144
|
+
const p = (0, path_1.join)(currentDir, 'node_modules');
|
|
145
|
+
if ((0, fs_1.existsSync)(p)) {
|
|
146
|
+
styleIncludePaths.push(p);
|
|
147
|
+
}
|
|
148
|
+
prevDir = currentDir;
|
|
149
|
+
currentDir = (0, path_1.dirname)(prevDir);
|
|
150
|
+
}
|
|
151
|
+
const browserslistData = browserslist(undefined, { path: this.basePath });
|
|
152
|
+
const { version: ngPackagrVersion } = (0, angular_version_utils_1.getInstalledPackageVersionInfo)('ng-packagr');
|
|
153
|
+
let postcssConfiguration;
|
|
154
|
+
if (ngPackagrVersion === '17.2.0') {
|
|
155
|
+
const { loadPostcssConfiguration } = await Promise.resolve().then(() => require('ng-packagr/lib/styles/postcss-configuration'));
|
|
156
|
+
postcssConfiguration = await loadPostcssConfiguration(this.projectBasePath);
|
|
157
|
+
}
|
|
158
|
+
this.renderWorker = new Piscina({
|
|
159
|
+
filename: require.resolve('ng-packagr/lib/styles/stylesheet-processor-worker'),
|
|
160
|
+
maxThreads,
|
|
161
|
+
recordTiming: false,
|
|
162
|
+
env: {
|
|
163
|
+
...process.env,
|
|
164
|
+
FORCE_COLOR: '' + color_1.colors.enabled,
|
|
165
|
+
},
|
|
166
|
+
workerData: {
|
|
167
|
+
postcssConfiguration,
|
|
168
|
+
tailwindConfigPath: (0, tailwindcss_1.getTailwindConfigPath)(this.projectBasePath, devkit_1.workspaceRoot),
|
|
169
|
+
projectBasePath: this.projectBasePath,
|
|
170
|
+
browserslistData,
|
|
171
|
+
targets: transformSupportedBrowsersToTargets(browserslistData),
|
|
172
|
+
cacheDirectory: this.cacheDirectory,
|
|
173
|
+
cssUrl: this.cssUrl,
|
|
174
|
+
styleIncludePaths,
|
|
175
|
+
},
|
|
176
|
+
});
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
exports.AsyncStylesheetProcessor = AsyncStylesheetProcessor;
|
|
180
|
+
function transformSupportedBrowsersToTargets(supportedBrowsers) {
|
|
181
|
+
const transformed = [];
|
|
182
|
+
// https://esbuild.github.io/api/#target
|
|
183
|
+
const esBuildSupportedBrowsers = new Set([
|
|
184
|
+
'safari',
|
|
185
|
+
'firefox',
|
|
186
|
+
'edge',
|
|
187
|
+
'chrome',
|
|
188
|
+
'ios',
|
|
189
|
+
]);
|
|
190
|
+
for (const browser of supportedBrowsers) {
|
|
191
|
+
let [browserName, version] = browser.split(' ');
|
|
192
|
+
// browserslist uses the name `ios_saf` for iOS Safari whereas esbuild uses `ios`
|
|
193
|
+
if (browserName === 'ios_saf') {
|
|
194
|
+
browserName = 'ios';
|
|
195
|
+
}
|
|
196
|
+
// browserslist uses ranges `15.2-15.3` versions but only the lowest is required
|
|
197
|
+
// to perform minimum supported feature checks. esbuild also expects a single version.
|
|
198
|
+
[version] = version.split('-');
|
|
199
|
+
if (esBuildSupportedBrowsers.has(browserName)) {
|
|
200
|
+
if (browserName === 'safari' && version === 'tp') {
|
|
201
|
+
// esbuild only supports numeric versions so `TP` is converted to a high number (999) since
|
|
202
|
+
// a Technology Preview (TP) of Safari is assumed to support all currently known features.
|
|
203
|
+
version = '999';
|
|
204
|
+
}
|
|
205
|
+
transformed.push(browserName + version);
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
return transformed.length ? transformed : undefined;
|
|
209
|
+
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export interface TailwindSetup {
|
|
2
|
+
tailwindConfigPath: string;
|
|
3
|
+
tailwindPackagePath: string;
|
|
4
|
+
}
|
|
5
|
+
export declare function getTailwindSetup(basePath: string, tailwindConfig?: string): TailwindSetup | undefined;
|
|
6
|
+
export declare function getTailwindConfigPath(projectRoot: string, workspaceRoot: string): string | undefined;
|
|
7
|
+
export declare function getTailwindPostCssPlugin({ tailwindConfigPath, tailwindPackagePath, }: TailwindSetup): any;
|
|
@@ -1,19 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getTailwindPostCssPlugin = exports.getTailwindConfigPath = exports.getTailwindSetup = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const devkit_2 = require("@nx/devkit");
|
|
6
6
|
const fs_1 = require("fs");
|
|
7
7
|
const path_1 = require("path");
|
|
8
|
-
const postcssImport = require("postcss-import");
|
|
9
|
-
exports.tailwindDirectives = [
|
|
10
|
-
'@tailwind',
|
|
11
|
-
'@apply',
|
|
12
|
-
'@layer',
|
|
13
|
-
'@variants',
|
|
14
|
-
'@responsive',
|
|
15
|
-
'@screen',
|
|
16
|
-
];
|
|
17
8
|
function getTailwindSetup(basePath, tailwindConfig) {
|
|
18
9
|
let tailwindConfigPath = tailwindConfig;
|
|
19
10
|
if (!tailwindConfigPath) {
|
|
@@ -58,16 +49,8 @@ function getTailwindConfigPath(projectRoot, workspaceRoot) {
|
|
|
58
49
|
}
|
|
59
50
|
return undefined;
|
|
60
51
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
}
|
|
65
|
-
return [
|
|
66
|
-
postcssImport({
|
|
67
|
-
addModulesDirectories: includePaths ?? [],
|
|
68
|
-
resolve: (url) => (url.startsWith('~') ? url.substring(1) : url),
|
|
69
|
-
}),
|
|
70
|
-
require(tailwindPackagePath)({ config: tailwindConfigPath }),
|
|
71
|
-
];
|
|
52
|
+
exports.getTailwindConfigPath = getTailwindConfigPath;
|
|
53
|
+
function getTailwindPostCssPlugin({ tailwindConfigPath, tailwindPackagePath, }) {
|
|
54
|
+
return require(tailwindPackagePath)({ config: tailwindConfigPath });
|
|
72
55
|
}
|
|
73
|
-
exports.
|
|
56
|
+
exports.getTailwindPostCssPlugin = getTailwindPostCssPlugin;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.patchBuilderContext = void 0;
|
|
4
|
+
const executorToBuilderMap = new Map([
|
|
5
|
+
[
|
|
6
|
+
'@nx/angular:browser-esbuild',
|
|
7
|
+
'@angular-devkit/build-angular:browser-esbuild',
|
|
8
|
+
],
|
|
9
|
+
['@nx/angular:application', '@angular-devkit/build-angular:application'],
|
|
10
|
+
]);
|
|
11
|
+
function patchBuilderContext(context, isUsingEsbuildBuilder, buildTarget) {
|
|
12
|
+
const originalGetBuilderNameForTarget = context.getBuilderNameForTarget;
|
|
13
|
+
context.getBuilderNameForTarget = async (target) => {
|
|
14
|
+
const builderName = await originalGetBuilderNameForTarget(target);
|
|
15
|
+
if (executorToBuilderMap.has(builderName)) {
|
|
16
|
+
return executorToBuilderMap.get(builderName);
|
|
17
|
+
}
|
|
18
|
+
return builderName;
|
|
19
|
+
};
|
|
20
|
+
if (isUsingEsbuildBuilder) {
|
|
21
|
+
const originalGetTargetOptions = context.getTargetOptions;
|
|
22
|
+
context.getTargetOptions = async (target) => {
|
|
23
|
+
const options = await originalGetTargetOptions(target);
|
|
24
|
+
if (target.project === buildTarget.project &&
|
|
25
|
+
target.target === buildTarget.target &&
|
|
26
|
+
target.configuration === buildTarget.configuration) {
|
|
27
|
+
cleanBuildTargetOptions(options);
|
|
28
|
+
}
|
|
29
|
+
return options;
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
exports.patchBuilderContext = patchBuilderContext;
|
|
34
|
+
function cleanBuildTargetOptions(options) {
|
|
35
|
+
delete options.buildLibsFromSource;
|
|
36
|
+
delete options.customWebpackConfig;
|
|
37
|
+
delete options.indexHtmlTransformer;
|
|
38
|
+
delete options.indexFileTransformer;
|
|
39
|
+
delete options.plugins;
|
|
40
|
+
return options;
|
|
41
|
+
}
|
|
@@ -9,9 +9,9 @@
|
|
|
9
9
|
*/
|
|
10
10
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
11
|
exports.parseRemappedTsConfigAndMergeDefaults = void 0;
|
|
12
|
-
const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
|
|
13
12
|
const path_1 = require("path");
|
|
14
13
|
const ts = require("typescript");
|
|
14
|
+
const ng_compiler_cli_1 = require("./ng-compiler-cli");
|
|
15
15
|
async function readDefaultTsConfig(fileName) {
|
|
16
16
|
// these options are mandatory
|
|
17
17
|
const extraOptions = {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GeneratorCallback, Tree } from '@nx/devkit';
|
|
1
|
+
import { type GeneratorCallback, type Tree } from '@nx/devkit';
|
|
2
2
|
import type { AddLintingGeneratorSchema } from './schema';
|
|
3
3
|
export declare function addLintingGenerator(tree: Tree, options: AddLintingGeneratorSchema): Promise<GeneratorCallback>;
|
|
4
4
|
export default addLintingGenerator;
|
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addLintingGenerator = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
|
|
5
6
|
const eslint_1 = require("@nx/eslint");
|
|
6
|
-
const
|
|
7
|
-
const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
|
|
7
|
+
const global_eslint_config_1 = require("@nx/eslint/src/generators/init/global-eslint-config");
|
|
8
8
|
const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
|
|
9
|
-
const
|
|
9
|
+
const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
|
|
10
|
+
const buildable_project_1 = require("./lib/buildable-project");
|
|
10
11
|
async function addLintingGenerator(tree, options) {
|
|
11
12
|
const tasks = [];
|
|
12
13
|
const rootProject = options.projectRoot === '.' || options.projectRoot === '';
|
|
@@ -17,13 +18,11 @@ async function addLintingGenerator(tree, options) {
|
|
|
17
18
|
(0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
|
|
18
19
|
],
|
|
19
20
|
unitTestRunner: options.unitTestRunner,
|
|
20
|
-
eslintFilePatterns: [
|
|
21
|
-
(0, lint_project_1.mapLintPattern)(options.projectRoot, 'ts', rootProject),
|
|
22
|
-
(0, lint_project_1.mapLintPattern)(options.projectRoot, 'html', rootProject),
|
|
23
|
-
],
|
|
24
21
|
setParserOptionsProject: options.setParserOptionsProject,
|
|
25
22
|
skipFormat: true,
|
|
26
23
|
rootProject: rootProject,
|
|
24
|
+
addPlugin: false,
|
|
25
|
+
addExplicitTargets: true,
|
|
27
26
|
});
|
|
28
27
|
tasks.push(lintTask);
|
|
29
28
|
if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {
|
|
@@ -33,6 +32,7 @@ async function addLintingGenerator(tree, options) {
|
|
|
33
32
|
.read((0, devkit_1.joinPathFragments)(options.projectRoot, eslintFile), 'utf8')
|
|
34
33
|
.includes(`${options.projectRoot}/tsconfig.*?.json`);
|
|
35
34
|
(0, eslint_file_1.replaceOverridesInLintConfig)(tree, options.projectRoot, [
|
|
35
|
+
...(rootProject ? [global_eslint_config_1.typeScriptOverride, global_eslint_config_1.javaScriptOverride] : []),
|
|
36
36
|
{
|
|
37
37
|
files: ['*.ts'],
|
|
38
38
|
...(hasParserOptions
|
|
@@ -74,7 +74,7 @@ async function addLintingGenerator(tree, options) {
|
|
|
74
74
|
*/
|
|
75
75
|
rules: {},
|
|
76
76
|
},
|
|
77
|
-
...(isBuildableLibraryProject(tree, options.projectName)
|
|
77
|
+
...((0, buildable_project_1.isBuildableLibraryProject)(tree, options.projectName)
|
|
78
78
|
? [
|
|
79
79
|
{
|
|
80
80
|
files: ['*.json'],
|
|
@@ -88,7 +88,7 @@ async function addLintingGenerator(tree, options) {
|
|
|
88
88
|
]);
|
|
89
89
|
}
|
|
90
90
|
if (!options.skipPackageJson) {
|
|
91
|
-
const installTask = (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree);
|
|
91
|
+
const installTask = (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree, options.projectName);
|
|
92
92
|
tasks.push(installTask);
|
|
93
93
|
}
|
|
94
94
|
if (!options.skipFormat) {
|
|
@@ -97,10 +97,4 @@ async function addLintingGenerator(tree, options) {
|
|
|
97
97
|
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
98
98
|
}
|
|
99
99
|
exports.addLintingGenerator = addLintingGenerator;
|
|
100
|
-
function isBuildableLibraryProject(tree, projectName) {
|
|
101
|
-
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
102
|
-
return (projectConfig.projectType === 'library' &&
|
|
103
|
-
projectConfig.targets?.build &&
|
|
104
|
-
!!projectConfig.targets.build);
|
|
105
|
-
}
|
|
106
100
|
exports.default = addLintingGenerator;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type
|
|
2
|
-
export declare function addAngularEsLintDependencies(tree: Tree): GeneratorCallback;
|
|
1
|
+
import { type GeneratorCallback, type Tree } from '@nx/devkit';
|
|
2
|
+
export declare function addAngularEsLintDependencies(tree: Tree, projectName: string): GeneratorCallback;
|
|
@@ -3,14 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addAngularEsLintDependencies = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const version_utils_1 = require("../../utils/version-utils");
|
|
6
|
-
|
|
6
|
+
const buildable_project_1 = require("./buildable-project");
|
|
7
|
+
function addAngularEsLintDependencies(tree, projectName) {
|
|
7
8
|
const angularEslintVersionToInstall = (0, version_utils_1.versions)(tree).angularEslintVersion;
|
|
8
|
-
const
|
|
9
|
-
return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
9
|
+
const devDependencies = {
|
|
10
10
|
'@angular-eslint/eslint-plugin': angularEslintVersionToInstall,
|
|
11
11
|
'@angular-eslint/eslint-plugin-template': angularEslintVersionToInstall,
|
|
12
12
|
'@angular-eslint/template-parser': angularEslintVersionToInstall,
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
};
|
|
14
|
+
if ((0, buildable_project_1.isBuildableLibraryProject)(tree, projectName)) {
|
|
15
|
+
const jsoncEslintParserVersionToInstall = (0, version_utils_1.versions)(tree).jsoncEslintParserVersion;
|
|
16
|
+
devDependencies['jsonc-eslint-parser'] = jsoncEslintParserVersionToInstall;
|
|
17
|
+
}
|
|
18
|
+
return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
|
|
15
19
|
}
|
|
16
20
|
exports.addAngularEsLintDependencies = addAngularEsLintDependencies;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isBuildableLibraryProject = void 0;
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
function isBuildableLibraryProject(tree, projectName) {
|
|
6
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
7
|
+
return (projectConfig.projectType === 'library' && !!projectConfig.targets?.build);
|
|
8
|
+
}
|
|
9
|
+
exports.isBuildableLibraryProject = isBuildableLibraryProject;
|
|
@@ -29,7 +29,7 @@ export declare const extendAngularEslintJson: (json: Linter.Config, options: Esl
|
|
|
29
29
|
[name: string]: boolean;
|
|
30
30
|
};
|
|
31
31
|
globals?: {
|
|
32
|
-
[name: string]: boolean | "
|
|
32
|
+
[name: string]: boolean | "readable" | "off" | "readonly" | "writable" | "writeable";
|
|
33
33
|
};
|
|
34
34
|
noInlineConfig?: boolean;
|
|
35
35
|
overrides?: Linter.ConfigOverride<Linter.RulesRecord>[];
|
|
@@ -61,7 +61,7 @@ export declare const extendAngularEslintJson: (json: Linter.Config, options: Esl
|
|
|
61
61
|
};
|
|
62
62
|
extends?: string | string[];
|
|
63
63
|
globals?: {
|
|
64
|
-
[name: string]: boolean | "
|
|
64
|
+
[name: string]: boolean | "readable" | "off" | "readonly" | "writable" | "writeable";
|
|
65
65
|
};
|
|
66
66
|
noInlineConfig?: boolean;
|
|
67
67
|
parser?: string;
|
|
@@ -2,12 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const js_1 = require("@nx/js");
|
|
5
6
|
const init_1 = require("../init/init");
|
|
7
|
+
const setup_ssr_1 = require("../setup-ssr/setup-ssr");
|
|
6
8
|
const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
|
|
7
|
-
const
|
|
9
|
+
const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
|
|
8
10
|
const lib_1 = require("./lib");
|
|
9
|
-
const
|
|
10
|
-
const enquirer_1 = require("enquirer");
|
|
11
|
+
const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
|
|
11
12
|
async function applicationGenerator(tree, schema) {
|
|
12
13
|
return await applicationGeneratorInternal(tree, {
|
|
13
14
|
projectNameAndRootFormat: 'derived',
|
|
@@ -16,26 +17,19 @@ async function applicationGenerator(tree, schema) {
|
|
|
16
17
|
}
|
|
17
18
|
exports.applicationGenerator = applicationGenerator;
|
|
18
19
|
async function applicationGeneratorInternal(tree, schema) {
|
|
19
|
-
const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
20
|
-
if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') && schema.standalone) {
|
|
21
|
-
throw new Error((0, devkit_1.stripIndents) `The "standalone" option is only supported in Angular >= 14.1.0. You are currently using ${installedAngularVersionInfo.version}.
|
|
22
|
-
You can resolve this error by removing the "standalone" option or by migrating to Angular 14.1.0.`);
|
|
23
|
-
}
|
|
24
|
-
if ((0, semver_1.gte)(installedAngularVersionInfo.version, '14.1.0') &&
|
|
25
|
-
schema.standalone === undefined &&
|
|
26
|
-
process.env.NX_INTERACTIVE === 'true') {
|
|
27
|
-
schema.standalone = await (0, enquirer_1.prompt)({
|
|
28
|
-
name: 'standalone-components',
|
|
29
|
-
message: 'Would you like to use Standalone Components?',
|
|
30
|
-
type: 'confirm',
|
|
31
|
-
}).then((a) => a['standalone-components']);
|
|
32
|
-
}
|
|
33
20
|
const options = await (0, lib_1.normalizeOptions)(tree, schema);
|
|
34
21
|
const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
|
|
22
|
+
await (0, js_1.initGenerator)(tree, {
|
|
23
|
+
...options,
|
|
24
|
+
tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
|
|
25
|
+
js: false,
|
|
26
|
+
skipFormat: true,
|
|
27
|
+
});
|
|
35
28
|
await (0, init_1.angularInitGenerator)(tree, {
|
|
36
29
|
...options,
|
|
37
30
|
skipFormat: true,
|
|
38
31
|
});
|
|
32
|
+
(0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree);
|
|
39
33
|
(0, lib_1.createProject)(tree, options);
|
|
40
34
|
await (0, lib_1.createFiles)(tree, options, rootOffset);
|
|
41
35
|
if (options.addTailwind) {
|
|
@@ -49,6 +43,7 @@ async function applicationGeneratorInternal(tree, schema) {
|
|
|
49
43
|
await (0, lib_1.addUnitTestRunner)(tree, options);
|
|
50
44
|
await (0, lib_1.addE2e)(tree, options);
|
|
51
45
|
(0, lib_1.updateEditorTsConfig)(tree, options);
|
|
46
|
+
(0, lib_1.setGeneratorDefaults)(tree, options);
|
|
52
47
|
if (options.rootProject) {
|
|
53
48
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
54
49
|
nxJson.defaultProject = options.name;
|
|
@@ -63,11 +58,18 @@ async function applicationGeneratorInternal(tree, schema) {
|
|
|
63
58
|
else {
|
|
64
59
|
(0, lib_1.setApplicationStrictDefault)(tree, false);
|
|
65
60
|
}
|
|
61
|
+
if (options.ssr) {
|
|
62
|
+
await (0, setup_ssr_1.setupSsr)(tree, {
|
|
63
|
+
project: options.name,
|
|
64
|
+
standalone: options.standalone,
|
|
65
|
+
});
|
|
66
|
+
}
|
|
66
67
|
if (!options.skipFormat) {
|
|
67
68
|
await (0, devkit_1.formatFiles)(tree);
|
|
68
69
|
}
|
|
69
70
|
return () => {
|
|
70
71
|
(0, devkit_1.installPackagesTask)(tree);
|
|
72
|
+
(0, log_show_project_command_1.logShowProjectCommand)(options.name);
|
|
71
73
|
};
|
|
72
74
|
}
|
|
73
75
|
exports.applicationGeneratorInternal = applicationGeneratorInternal;
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"outDir": "<%= rootOffset %>dist/out-tsc",
|
|
5
5
|
"types": []
|
|
6
6
|
},
|
|
7
|
-
"files": ["src/main.ts"
|
|
7
|
+
"files": ["src/main.ts"],
|
|
8
8
|
"include": ["src/**/*.d.ts"],
|
|
9
9
|
"exclude": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts"]
|
|
10
10
|
}
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"compilerOptions": {
|
|
3
|
-
"target":
|
|
4
|
-
"useDefineForClassFields": false<%
|
|
3
|
+
"target": "es2022",
|
|
4
|
+
"useDefineForClassFields": false<% if (isUsingApplicationBuilder) { %>,
|
|
5
|
+
"esModuleInterop": true<% } %>
|
|
5
6
|
},
|
|
6
7
|
"files": [],
|
|
7
8
|
"include": [],
|
|
8
9
|
"references": [
|
|
10
|
+
{
|
|
11
|
+
"path": "./tsconfig.editor.json"
|
|
12
|
+
},
|
|
9
13
|
{
|
|
10
14
|
"path": "./tsconfig.app.json"
|
|
11
15
|
}
|
|
@@ -15,7 +15,9 @@ describe('AppComponent', () => {
|
|
|
15
15
|
const fixture = TestBed.createComponent(AppComponent);
|
|
16
16
|
fixture.detectChanges();
|
|
17
17
|
const compiled = fixture.nativeElement as HTMLElement;
|
|
18
|
-
expect(compiled.querySelector('h1')?.textContent).toContain(
|
|
18
|
+
expect(compiled.querySelector('h1')?.textContent).toContain(
|
|
19
|
+
'Welcome <%= appName %>'
|
|
20
|
+
);
|
|
19
21
|
});<% if(!minimal) { %>
|
|
20
22
|
|
|
21
23
|
it(`should have as title '<%= appName %>'`, () => {
|
|
@@ -3,9 +3,11 @@ import { Component<% if(viewEncapsulation) { %>, ViewEncapsulation<% } %> } from
|
|
|
3
3
|
@Component({
|
|
4
4
|
selector: '<%= rootSelector %>',<% if(!inlineTemplate) { %>
|
|
5
5
|
templateUrl: './app.component.html',<% } else { %>
|
|
6
|
-
template: `<% if(minimal) { %><h1>Welcome <%= appName %></h1><% } else { %><<%= nxWelcomeSelector %>></<%= nxWelcomeSelector %>><% } %> <% if(routing) { %><router-outlet></router-outlet><% } %>`,<% } %><% if(!inlineStyle) { %>
|
|
6
|
+
template: `<% if(minimal) { %><h1>Welcome <%= appName %></h1><% } else { %><<%= nxWelcomeSelector %>></<%= nxWelcomeSelector %>><% } %> <% if(routing) { %><router-outlet></router-outlet><% } %>`,<% } %><% if (angularMajorVersion < 17) { if(!inlineStyle) { %>
|
|
7
7
|
styleUrls: ['./app.component.<%= style %>'],<% } else { %>
|
|
8
|
-
styles: [
|
|
8
|
+
styles: [``],<% } %><% } else { if(!inlineStyle) { %>
|
|
9
|
+
styleUrl: './app.component.<%= style %>',<% } else { %>
|
|
10
|
+
styles: ``,<% } %><% } %><% if(viewEncapsulation) { %>
|
|
9
11
|
encapsulation: ViewEncapsulation.<%= viewEncapsulation %>,<% } %>
|
|
10
12
|
})
|
|
11
13
|
export class AppComponent {<% if(!minimal) { %>
|
|
@@ -9,7 +9,7 @@ import { NxWelcomeComponent } from './nx-welcome.component';<% } %>
|
|
|
9
9
|
declarations: [AppComponent<% if(!minimal) { %>, NxWelcomeComponent<% } %>],
|
|
10
10
|
imports: [
|
|
11
11
|
BrowserModule,<% if(routing) { %>
|
|
12
|
-
RouterModule.forRoot(appRoutes
|
|
12
|
+
RouterModule.forRoot(appRoutes),<% } %>
|
|
13
13
|
],
|
|
14
14
|
providers: [],
|
|
15
15
|
bootstrap: [AppComponent],
|