@nx/angular 23.0.0-beta.2 → 23.0.0-beta.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/generators.d.ts +0 -2
- package/generators.d.ts.map +1 -1
- package/generators.js +0 -2
- package/generators.json +8 -17
- package/migrations.json +19 -536
- package/package.json +9 -11
- package/plugins/component-testing.js +8 -8
- package/src/builders/utilities/buildable-libs.d.ts +1 -1
- package/src/builders/utilities/buildable-libs.d.ts.map +1 -1
- package/src/builders/utilities/buildable-libs.js +3 -3
- package/src/builders/utilities/module-federation.d.ts.map +1 -1
- package/src/builders/utilities/module-federation.js +9 -11
- package/src/builders/utilities/webpack.d.ts.map +1 -1
- package/src/builders/utilities/webpack.js +3 -7
- package/src/executors/delegate-build/delegate-build.impl.js +3 -3
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.d.ts.map +1 -1
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +6 -5
- package/src/executors/module-federation-dev-server/schema.json +1 -0
- package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.d.ts.map +1 -1
- package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js +6 -5
- package/src/executors/module-federation-ssr-dev-server/schema.json +1 -0
- package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js +2 -2
- package/src/executors/package/package.impl.d.ts +1 -1
- package/src/executors/package/package.impl.d.ts.map +1 -1
- package/src/executors/package/package.impl.js +5 -5
- package/src/executors/utilities/angular-version-utils.d.ts.map +1 -1
- package/src/executors/utilities/angular-version-utils.js +3 -8
- package/src/executors/utilities/buildable-libs.d.ts +1 -1
- package/src/executors/utilities/buildable-libs.d.ts.map +1 -1
- package/src/executors/utilities/buildable-libs.js +3 -3
- package/src/executors/utilities/esbuild-extensions.d.ts.map +1 -1
- package/src/executors/utilities/esbuild-extensions.js +5 -24
- package/src/executors/utilities/module-loader.d.ts +1 -1
- package/src/executors/utilities/module-loader.d.ts.map +1 -1
- package/src/executors/utilities/module-loader.js +24 -20
- package/src/generators/add-linting/add-linting.d.ts.map +1 -1
- package/src/generators/add-linting/add-linting.js +17 -17
- package/src/generators/add-linting/lib/add-angular-eslint-dependencies.d.ts.map +1 -1
- package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js +4 -5
- package/src/generators/application/application.d.ts.map +1 -1
- package/src/generators/application/application.js +7 -4
- package/src/generators/application/lib/add-e2e.d.ts.map +1 -1
- package/src/generators/application/lib/add-e2e.js +5 -7
- package/src/generators/application/lib/add-unit-test-runner.d.ts +2 -2
- package/src/generators/application/lib/add-unit-test-runner.d.ts.map +1 -1
- package/src/generators/application/lib/add-unit-test-runner.js +5 -5
- package/src/generators/application/lib/create-project.d.ts.map +1 -1
- package/src/generators/application/lib/create-project.js +3 -3
- package/src/generators/application/lib/normalize-options.js +3 -3
- package/src/generators/application/lib/update-tsconfig-files.js +3 -3
- package/src/generators/component/component.d.ts.map +1 -1
- package/src/generators/component/component.js +2 -0
- package/src/generators/component/lib/component.js +2 -2
- package/src/generators/component/lib/normalize-options.js +2 -2
- package/src/generators/component-story/component-story.d.ts.map +1 -1
- package/src/generators/component-story/component-story.js +2 -0
- package/src/generators/component-test/component-test.d.ts.map +1 -1
- package/src/generators/component-test/component-test.js +2 -0
- package/src/generators/convert-to-application-executor/convert-to-application-executor.d.ts.map +1 -1
- package/src/generators/convert-to-application-executor/convert-to-application-executor.js +2 -0
- package/src/generators/convert-to-rspack/convert-to-rspack.d.ts.map +1 -1
- package/src/generators/convert-to-rspack/convert-to-rspack.js +5 -4
- package/src/generators/convert-to-rspack/lib/create-config.js +1 -1
- package/src/generators/convert-to-rspack/lib/get-custom-webpack-config.js +2 -2
- package/src/generators/convert-to-with-mf/convert-to-with-mf.d.ts +1 -1
- package/src/generators/convert-to-with-mf/convert-to-with-mf.d.ts.map +1 -1
- package/src/generators/convert-to-with-mf/convert-to-with-mf.js +5 -0
- package/src/generators/convert-to-with-mf/lib/check-name-matches.js +2 -2
- package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js +2 -2
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js +4 -4
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js +2 -2
- package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js +1 -1
- package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts.map +1 -1
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js +8 -6
- package/src/generators/directive/directive.d.ts.map +1 -1
- package/src/generators/directive/directive.js +2 -0
- package/src/generators/directive/lib/normalize-options.js +2 -2
- package/src/generators/federate-module/federate-module.d.ts.map +1 -1
- package/src/generators/federate-module/federate-module.js +4 -0
- package/src/generators/federate-module/lib/add-path-to-exposes.js +6 -6
- package/src/generators/federate-module/lib/add-remote.js +2 -2
- package/src/generators/host/host.d.ts.map +1 -1
- package/src/generators/host/host.js +12 -7
- package/src/generators/host/lib/update-ssr-setup.js +2 -2
- package/src/generators/host/schema.d.ts +1 -0
- package/src/generators/host/schema.json +4 -0
- package/src/generators/init/init.d.ts.map +1 -1
- package/src/generators/init/init.js +4 -2
- package/src/generators/library/lib/add-children.js +2 -2
- package/src/generators/library/lib/add-load-children.js +2 -2
- package/src/generators/library/lib/add-project.js +4 -4
- package/src/generators/library/lib/create-files.js +2 -2
- package/src/generators/library/lib/normalize-options.js +3 -3
- package/src/generators/library/lib/update-tsconfig-files.js +3 -3
- package/src/generators/library/library.d.ts.map +1 -1
- package/src/generators/library/library.js +16 -11
- package/src/generators/library-secondary-entry-point/library-secondary-entry-point.d.ts.map +1 -1
- package/src/generators/library-secondary-entry-point/library-secondary-entry-point.js +2 -0
- package/src/generators/move/lib/update-module-name.js +2 -2
- package/src/generators/ng-add/migrators/migrator.d.ts.map +1 -1
- package/src/generators/ng-add/migrators/migrator.js +10 -5
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js +6 -6
- package/src/generators/ng-add/ng-add.d.ts.map +1 -1
- package/src/generators/ng-add/ng-add.js +2 -0
- package/src/generators/ng-add/utilities/workspace.js +8 -8
- package/src/generators/ngrx-feature-store/lib/add-exports-barrel.js +2 -2
- package/src/generators/ngrx-feature-store/lib/add-imports.js +2 -2
- package/src/generators/ngrx-feature-store/lib/normalize-options.js +5 -5
- package/src/generators/ngrx-feature-store/ngrx-feature-store.d.ts.map +1 -1
- package/src/generators/ngrx-feature-store/ngrx-feature-store.js +2 -0
- package/src/generators/ngrx-root-store/lib/add-imports.js +2 -2
- package/src/generators/ngrx-root-store/lib/normalize-options.js +5 -5
- package/src/generators/ngrx-root-store/ngrx-root-store.d.ts.map +1 -1
- package/src/generators/ngrx-root-store/ngrx-root-store.js +2 -0
- package/src/generators/pipe/lib/normalize-options.js +2 -2
- package/src/generators/pipe/pipe.d.ts.map +1 -1
- package/src/generators/pipe/pipe.js +2 -0
- package/src/generators/remote/lib/update-ssr-setup.js +2 -2
- package/src/generators/remote/remote.d.ts.map +1 -1
- package/src/generators/remote/remote.js +9 -5
- package/src/generators/scam/lib/convert-component-to-scam.js +2 -2
- package/src/generators/scam/lib/normalize-options.js +2 -2
- package/src/generators/scam/scam.d.ts.map +1 -1
- package/src/generators/scam/scam.js +2 -0
- package/src/generators/scam-directive/lib/convert-directive-to-scam.js +2 -2
- package/src/generators/scam-directive/lib/normalize-options.js +2 -2
- package/src/generators/scam-directive/scam-directive.d.ts.map +1 -1
- package/src/generators/scam-directive/scam-directive.js +2 -0
- package/src/generators/scam-pipe/lib/convert-pipe-to-scam.js +2 -2
- package/src/generators/scam-pipe/lib/normalize-options.js +2 -2
- package/src/generators/scam-pipe/scam-pipe.d.ts.map +1 -1
- package/src/generators/scam-pipe/scam-pipe.js +2 -0
- package/src/generators/scam-to-standalone/scam-to-standalone.d.ts.map +1 -1
- package/src/generators/scam-to-standalone/scam-to-standalone.js +2 -0
- package/src/generators/setup-mf/files/ts-webpack/module-federation.config.ts__tmpl__ +1 -1
- package/src/generators/setup-mf/lib/add-cypress-workaround.js +3 -3
- package/src/generators/setup-mf/lib/add-remote-to-host.d.ts.map +1 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js +5 -6
- package/src/generators/setup-mf/lib/change-build-target.d.ts.map +1 -1
- package/src/generators/setup-mf/lib/change-build-target.js +2 -2
- package/src/generators/setup-mf/lib/remove-dead-code-from-remote.js +2 -2
- package/src/generators/setup-mf/setup-mf.d.ts.map +1 -1
- package/src/generators/setup-mf/setup-mf.js +10 -0
- package/src/generators/setup-ssr/lib/add-hydration.d.ts.map +1 -1
- package/src/generators/setup-ssr/lib/add-hydration.js +3 -4
- package/src/generators/setup-ssr/lib/add-server-file.js +2 -2
- package/src/generators/setup-ssr/lib/generate-files.js +2 -2
- package/src/generators/setup-ssr/lib/generate-server-ts-config.js +2 -2
- package/src/generators/setup-ssr/lib/normalize-options.d.ts.map +1 -1
- package/src/generators/setup-ssr/lib/normalize-options.js +2 -2
- package/src/generators/setup-ssr/lib/update-project-config.d.ts.map +1 -1
- package/src/generators/setup-ssr/lib/update-project-config.js +19 -7
- package/src/generators/setup-ssr/setup-ssr.d.ts.map +1 -1
- package/src/generators/setup-ssr/setup-ssr.js +2 -0
- package/src/generators/stories/stories.d.ts.map +1 -1
- package/src/generators/stories/stories.js +2 -0
- package/src/generators/storybook-configuration/storybook-configuration.d.ts.map +1 -1
- package/src/generators/storybook-configuration/storybook-configuration.js +2 -0
- package/src/generators/utils/add-mf-env-to-inputs.d.ts.map +1 -1
- package/src/generators/utils/add-mf-env-to-inputs.js +16 -9
- package/src/generators/utils/add-vitest.d.ts +3 -3
- package/src/generators/utils/add-vitest.d.ts.map +1 -1
- package/src/generators/utils/add-vitest.js +41 -26
- package/src/generators/utils/app-components-info.js +2 -2
- package/src/generators/utils/find-module.js +2 -2
- package/src/generators/utils/insert-ngmodule-import.js +6 -6
- package/src/generators/utils/storybook-ast/component-info.js +5 -5
- package/src/generators/utils/storybook-ast/module-info.js +9 -9
- package/src/generators/utils/storybook-ast/storybook-inputs.js +4 -4
- package/src/generators/utils/testing.js +2 -2
- package/src/generators/utils/tsconfig-utils.js +2 -2
- package/src/generators/utils/validations.js +2 -2
- package/src/generators/utils/version-utils.d.ts.map +1 -1
- package/src/generators/utils/version-utils.js +2 -7
- package/src/generators/web-worker/web-worker.d.ts.map +1 -1
- package/src/generators/web-worker/web-worker.js +2 -0
- package/src/migrations/update-19-6-1/ensure-depends-on-for-mf.d.ts.map +1 -1
- package/src/migrations/update-19-6-1/ensure-depends-on-for-mf.js +26 -19
- package/src/migrations/update-20-2-0/disable-angular-eslint-prefer-standalone.js +8 -8
- package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.d.ts.map +1 -1
- package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.js +2 -2
- package/src/migrations/update-20-2-0/remove-angular-eslint-rules.js +6 -6
- package/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.d.ts.map +1 -1
- package/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.js +45 -12
- package/src/migrations/update-20-3-0/ensure-nx-module-federation-package.d.ts.map +1 -1
- package/src/migrations/update-20-3-0/ensure-nx-module-federation-package.js +2 -2
- package/src/migrations/update-21-0-0/change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence.js +2 -2
- package/src/migrations/update-21-5-0/utils/karma-config-analyzer.js +2 -2
- package/src/migrations/update-22-3-0/update-module-resolution.js +2 -2
- package/src/migrations/update-22-3-0/update-ssr-webpack-config.js +2 -2
- package/src/migrations/{update-17-2-0/rename-webpack-dev-server.d.ts → update-23-0-0/migrate-ngrx-generator-defaults.d.ts} +1 -1
- package/src/migrations/update-23-0-0/migrate-ngrx-generator-defaults.d.ts.map +1 -0
- package/src/migrations/update-23-0-0/migrate-ngrx-generator-defaults.js +120 -0
- package/src/migrations/update-23-0-0/migrate-with-mf-import-to-new-package.d.ts +3 -0
- package/src/migrations/update-23-0-0/migrate-with-mf-import-to-new-package.d.ts.map +1 -0
- package/src/migrations/update-23-0-0/migrate-with-mf-import-to-new-package.js +45 -0
- package/src/plugins/plugin.d.ts.map +1 -1
- package/src/plugins/plugin.js +54 -22
- package/src/utils/assert-supported-angular-version.d.ts +3 -0
- package/src/utils/assert-supported-angular-version.d.ts.map +1 -0
- package/src/utils/assert-supported-angular-version.js +9 -0
- package/src/utils/backward-compatible-versions.js +2 -2
- package/src/utils/get-mf-projects.js +3 -3
- package/src/utils/index.d.ts +1 -0
- package/src/utils/index.d.ts.map +1 -1
- package/src/utils/index.js +3 -1
- package/src/utils/module-federation-deprecation.d.ts +13 -0
- package/src/utils/module-federation-deprecation.d.ts.map +1 -0
- package/src/utils/module-federation-deprecation.js +49 -0
- package/src/utils/nx-devkit/ast-utils.d.ts.map +1 -1
- package/src/utils/nx-devkit/ast-utils.js +17 -18
- package/src/utils/nx-devkit/route-utils.js +3 -3
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.d.ts.map +1 -1
- package/src/utils/versions.js +8 -3
- package/tailwind.js +2 -2
- package/module-federation/index.d.ts +0 -6
- package/module-federation/index.d.ts.map +0 -1
- package/module-federation/index.js +0 -6
- package/src/generators/add-linting/lib/create-eslint-configuration.d.ts +0 -16
- package/src/generators/add-linting/lib/create-eslint-configuration.d.ts.map +0 -1
- package/src/generators/add-linting/lib/create-eslint-configuration.js +0 -121
- package/src/generators/move/move.d.ts +0 -7
- package/src/generators/move/move.d.ts.map +0 -1
- package/src/generators/move/move.js +0 -11
- package/src/generators/move/schema.d.ts +0 -8
- package/src/generators/move/schema.json +0 -56
- package/src/generators/ngrx/files/__directory__/__fileName__.actions.ts__tmpl__ +0 -16
- package/src/generators/ngrx/files/__directory__/__fileName__.effects.spec.ts__tmpl__ +0 -37
- package/src/generators/ngrx/files/__directory__/__fileName__.effects.ts__tmpl__ +0 -22
- package/src/generators/ngrx/files/__directory__/__fileName__.facade.spec.ts__tmpl__ +0 -103
- package/src/generators/ngrx/files/__directory__/__fileName__.facade.ts__tmpl__ +0 -27
- package/src/generators/ngrx/files/__directory__/__fileName__.models.ts__tmpl__ +0 -7
- package/src/generators/ngrx/files/__directory__/__fileName__.reducer.spec.ts__tmpl__ +0 -37
- package/src/generators/ngrx/files/__directory__/__fileName__.reducer.ts__tmpl__ +0 -41
- package/src/generators/ngrx/files/__directory__/__fileName__.selectors.spec.ts__tmpl__ +0 -58
- package/src/generators/ngrx/files/__directory__/__fileName__.selectors.ts__tmpl__ +0 -38
- package/src/generators/ngrx/lib/add-exports-barrel.d.ts +0 -7
- package/src/generators/ngrx/lib/add-exports-barrel.d.ts.map +0 -1
- package/src/generators/ngrx/lib/add-exports-barrel.js +0 -44
- package/src/generators/ngrx/lib/add-imports-to-module.d.ts +0 -4
- package/src/generators/ngrx/lib/add-imports-to-module.d.ts.map +0 -1
- package/src/generators/ngrx/lib/add-imports-to-module.js +0 -181
- package/src/generators/ngrx/lib/add-ngrx-to-package-json.d.ts +0 -4
- package/src/generators/ngrx/lib/add-ngrx-to-package-json.d.ts.map +0 -1
- package/src/generators/ngrx/lib/add-ngrx-to-package-json.js +0 -23
- package/src/generators/ngrx/lib/generate-files.d.ts +0 -7
- package/src/generators/ngrx/lib/generate-files.d.ts.map +0 -1
- package/src/generators/ngrx/lib/generate-files.js +0 -23
- package/src/generators/ngrx/lib/index.d.ts +0 -7
- package/src/generators/ngrx/lib/index.d.ts.map +0 -1
- package/src/generators/ngrx/lib/index.js +0 -15
- package/src/generators/ngrx/lib/normalize-options.d.ts +0 -9
- package/src/generators/ngrx/lib/normalize-options.d.ts.map +0 -1
- package/src/generators/ngrx/lib/normalize-options.js +0 -30
- package/src/generators/ngrx/lib/validate-options.d.ts +0 -4
- package/src/generators/ngrx/lib/validate-options.d.ts.map +0 -1
- package/src/generators/ngrx/lib/validate-options.js +0 -14
- package/src/generators/ngrx/ngrx.d.ts +0 -8
- package/src/generators/ngrx/ngrx.d.ts.map +0 -1
- package/src/generators/ngrx/ngrx.js +0 -28
- package/src/generators/ngrx/schema.d.ts +0 -14
- package/src/generators/ngrx/schema.json +0 -102
- package/src/migrations/update-17-1-0/browser-target-to-build-target.d.ts +0 -4
- package/src/migrations/update-17-1-0/browser-target-to-build-target.d.ts.map +0 -1
- 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 -3
- package/src/migrations/update-17-1-0/replace-nguniversal-builders.d.ts.map +0 -1
- 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 -3
- package/src/migrations/update-17-1-0/replace-nguniversal-engines.d.ts.map +0 -1
- package/src/migrations/update-17-1-0/replace-nguniversal-engines.js +0 -184
- package/src/migrations/update-17-1-0/update-angular-cli.d.ts +0 -4
- package/src/migrations/update-17-1-0/update-angular-cli.d.ts.map +0 -1
- package/src/migrations/update-17-1-0/update-angular-cli.js +0 -14
- package/src/migrations/update-17-1-0/update-zone-js-deep-import.d.ts +0 -3
- package/src/migrations/update-17-1-0/update-zone-js-deep-import.d.ts.map +0 -1
- 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.map +0 -1
- 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 -3
- package/src/migrations/update-17-3-0/add-autoprefixer-dependency.d.ts.map +0 -1
- package/src/migrations/update-17-3-0/add-autoprefixer-dependency.js +0 -25
- package/src/migrations/update-17-3-0/add-browser-sync-dependency.d.ts +0 -3
- package/src/migrations/update-17-3-0/add-browser-sync-dependency.d.ts.map +0 -1
- package/src/migrations/update-17-3-0/add-browser-sync-dependency.js +0 -25
- package/src/migrations/update-17-3-0/update-angular-cli.d.ts +0 -4
- package/src/migrations/update-17-3-0/update-angular-cli.d.ts.map +0 -1
- package/src/migrations/update-17-3-0/update-angular-cli.js +0 -14
- package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.d.ts +0 -3
- package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.d.ts.map +0 -1
- 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 -4
- package/src/migrations/update-18-1-0/update-angular-cli.d.ts.map +0 -1
- package/src/migrations/update-18-1-0/update-angular-cli.js +0 -14
- package/src/migrations/update-18-1-1/fix-target-defaults-inputs.d.ts +0 -3
- package/src/migrations/update-18-1-1/fix-target-defaults-inputs.d.ts.map +0 -1
- 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 -4
- package/src/migrations/update-18-2-0/update-angular-cli.d.ts.map +0 -1
- package/src/migrations/update-18-2-0/update-angular-cli.js +0 -14
- package/src/migrations/update-19-1-0/update-angular-cli.d.ts +0 -4
- package/src/migrations/update-19-1-0/update-angular-cli.d.ts.map +0 -1
- package/src/migrations/update-19-1-0/update-angular-cli.js +0 -14
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = normalizeOptions;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
6
6
|
const artifact_types_1 = require("../../utils/artifact-types");
|
|
7
7
|
const validations_1 = require("../../utils/validations");
|
|
8
8
|
const version_utils_1 = require("../../utils/version-utils");
|
|
@@ -11,7 +11,7 @@ async function normalizeOptions(tree, options) {
|
|
|
11
11
|
if (angularMajorVersion < 20) {
|
|
12
12
|
options.type ??= 'directive';
|
|
13
13
|
}
|
|
14
|
-
const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0,
|
|
14
|
+
const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
|
|
15
15
|
name: options.name,
|
|
16
16
|
path: options.path,
|
|
17
17
|
suffix: options.type,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scam-directive.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-directive/scam-directive.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"scam-directive.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-directive/scam-directive.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAMvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,iBAiB1E;AAED,eAAe,sBAAsB,CAAC"}
|
|
@@ -2,10 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.scamDirectiveGenerator = scamDirectiveGenerator;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
|
|
5
6
|
const directive_1 = require("../directive/directive");
|
|
6
7
|
const export_scam_1 = require("../utils/export-scam");
|
|
7
8
|
const lib_1 = require("./lib");
|
|
8
9
|
async function scamDirectiveGenerator(tree, rawOptions) {
|
|
10
|
+
(0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
|
|
9
11
|
const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
|
|
10
12
|
await (0, directive_1.directiveGenerator)(tree, {
|
|
11
13
|
...options,
|
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertPipeToScam = convertPipeToScam;
|
|
4
4
|
const js_1 = require("@nx/js");
|
|
5
|
-
const
|
|
5
|
+
const internal_1 = require("@nx/js/internal");
|
|
6
6
|
let tsModule;
|
|
7
7
|
function convertPipeToScam(tree, options) {
|
|
8
8
|
if (!tree.exists(options.filePath)) {
|
|
9
9
|
throw new Error(`Couldn't find pipe at path ${options.filePath} to add SCAM setup.`);
|
|
10
10
|
}
|
|
11
11
|
if (!tsModule) {
|
|
12
|
-
tsModule = (0,
|
|
12
|
+
tsModule = (0, internal_1.ensureTypescript)();
|
|
13
13
|
}
|
|
14
14
|
if (options.inlineScam) {
|
|
15
15
|
const currentPipeContents = tree.read(options.filePath, 'utf-8');
|
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = normalizeOptions;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
6
6
|
const artifact_types_1 = require("../../utils/artifact-types");
|
|
7
7
|
const validations_1 = require("../../utils/validations");
|
|
8
8
|
const version_utils_1 = require("../../utils/version-utils");
|
|
9
9
|
async function normalizeOptions(tree, options) {
|
|
10
10
|
const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
11
11
|
options.typeSeparator ??= angularMajorVersion < 20 ? '.' : '-';
|
|
12
|
-
const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0,
|
|
12
|
+
const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
|
|
13
13
|
name: options.name,
|
|
14
14
|
path: options.path,
|
|
15
15
|
suffix: 'pipe',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scam-pipe.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-pipe/scam-pipe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"scam-pipe.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-pipe/scam-pipe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAMvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,iBAiBrE;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -2,10 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.scamPipeGenerator = scamPipeGenerator;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
|
|
5
6
|
const pipe_1 = require("../pipe/pipe");
|
|
6
7
|
const export_scam_1 = require("../utils/export-scam");
|
|
7
8
|
const lib_1 = require("./lib");
|
|
8
9
|
async function scamPipeGenerator(tree, rawOptions) {
|
|
10
|
+
(0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
|
|
9
11
|
const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
|
|
10
12
|
await (0, pipe_1.pipeGenerator)(tree, {
|
|
11
13
|
...options,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scam-to-standalone.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-to-standalone/scam-to-standalone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"scam-to-standalone.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-to-standalone/scam-to-standalone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAWvC,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,MAAM,iBAmDxD;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.scamToStandalone = scamToStandalone;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
|
|
5
6
|
const lib_1 = require("./lib");
|
|
6
7
|
async function scamToStandalone(tree, { component, project: projectName, skipFormat }) {
|
|
8
|
+
(0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
|
|
7
9
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
8
10
|
let project = (0, lib_1.getTargetProject)(projectName, projects);
|
|
9
11
|
const normalizedComponentPath = (0, devkit_1.joinPathFragments)(project.root, component);
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.addCypressOnErrorWorkaround = addCypressOnErrorWorkaround;
|
|
7
7
|
const devkit_1 = require("@nx/devkit");
|
|
8
|
-
const
|
|
8
|
+
const internal_1 = require("@nx/js/internal");
|
|
9
9
|
function addCypressOnErrorWorkaround(tree, schema) {
|
|
10
10
|
if (!schema.e2eProjectName) {
|
|
11
11
|
return;
|
|
@@ -26,7 +26,7 @@ function addCypressOnErrorWorkaround(tree, schema) {
|
|
|
26
26
|
if (e2eProject.targets?.e2e?.executor !== '@nx/cypress:cypress') {
|
|
27
27
|
try {
|
|
28
28
|
// don't ensure package is installed, if it's not installed, we don't need to add the workaround
|
|
29
|
-
const { CYPRESS_CONFIG_FILE_NAME_PATTERN, } = require('@nx/cypress/
|
|
29
|
+
const { CYPRESS_CONFIG_FILE_NAME_PATTERN, } = require('@nx/cypress/internal');
|
|
30
30
|
if (!(0, devkit_1.glob)(tree, [`${e2eProject.root}/${CYPRESS_CONFIG_FILE_NAME_PATTERN}`])
|
|
31
31
|
.length) {
|
|
32
32
|
// Not a cypress e2e project, skip
|
|
@@ -44,7 +44,7 @@ function addCypressOnErrorWorkaround(tree, schema) {
|
|
|
44
44
|
}
|
|
45
45
|
return true;
|
|
46
46
|
});`;
|
|
47
|
-
const pathToCommandsFile = (0, devkit_1.joinPathFragments)((0,
|
|
47
|
+
const pathToCommandsFile = (0, devkit_1.joinPathFragments)((0, internal_1.getProjectSourceRoot)(e2eProject, tree), 'support/e2e.ts');
|
|
48
48
|
const commandsContent = tree.exists(pathToCommandsFile)
|
|
49
49
|
? tree.read(pathToCommandsFile, 'utf-8')
|
|
50
50
|
: '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-remote-to-host.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"add-remote-to-host.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AAQpB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,WAOtD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QA4BpE"}
|
|
@@ -4,8 +4,7 @@ exports.checkIsCommaNeeded = checkIsCommaNeeded;
|
|
|
4
4
|
exports.addRemoteToHost = addRemoteToHost;
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const js_1 = require("@nx/js");
|
|
7
|
-
const
|
|
8
|
-
const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
|
|
7
|
+
const internal_1 = require("@nx/js/internal");
|
|
9
8
|
const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
|
|
10
9
|
let tsModule;
|
|
11
10
|
function checkIsCommaNeeded(mfRemoteText) {
|
|
@@ -26,7 +25,7 @@ function addRemoteToHost(tree, options) {
|
|
|
26
25
|
addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescriptConfig);
|
|
27
26
|
}
|
|
28
27
|
else if (hostFederationType === 'dynamic') {
|
|
29
|
-
addRemoteToDynamicHost(tree, options, pathToMFManifest, (0,
|
|
28
|
+
addRemoteToDynamicHost(tree, options, pathToMFManifest, (0, internal_1.getProjectSourceRoot)(hostProject, tree));
|
|
30
29
|
}
|
|
31
30
|
addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType);
|
|
32
31
|
}
|
|
@@ -40,7 +39,7 @@ function getDynamicManifestFile(tree, project) {
|
|
|
40
39
|
// at the old path.
|
|
41
40
|
return [
|
|
42
41
|
(0, devkit_1.joinPathFragments)(project.root, 'public/module-federation.manifest.json'),
|
|
43
|
-
(0, devkit_1.joinPathFragments)((0,
|
|
42
|
+
(0, devkit_1.joinPathFragments)((0, internal_1.getProjectSourceRoot)(project, tree), 'assets/module-federation.manifest.json'),
|
|
44
43
|
].find((path) => tree.exists(path));
|
|
45
44
|
}
|
|
46
45
|
function addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescript) {
|
|
@@ -73,10 +72,10 @@ function addRemoteToDynamicHost(tree, options, pathToMfManifest, hostSourceRoot)
|
|
|
73
72
|
}
|
|
74
73
|
function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
|
|
75
74
|
if (!tsModule) {
|
|
76
|
-
tsModule = (0,
|
|
75
|
+
tsModule = (0, internal_1.ensureTypescript)();
|
|
77
76
|
}
|
|
78
77
|
const hostAppConfig = (0, devkit_1.readProjectConfiguration)(tree, options.host);
|
|
79
|
-
const sourceRoot = (0,
|
|
78
|
+
const sourceRoot = (0, internal_1.getProjectSourceRoot)(hostAppConfig, tree);
|
|
80
79
|
const pathToHostRootRouting = `${sourceRoot}/app/app.routes.ts`;
|
|
81
80
|
if (!tree.exists(pathToHostRootRouting)) {
|
|
82
81
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-build-target.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/change-build-target.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"change-build-target.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/change-build-target.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAOxC,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAuB5D"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.changeBuildTarget = changeBuildTarget;
|
|
4
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
4
5
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
|
|
6
6
|
function changeBuildTarget(host, options) {
|
|
7
7
|
const appConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
|
|
8
8
|
const configExtName = options.typescriptConfiguration ? 'ts' : 'js';
|
|
@@ -20,5 +20,5 @@ function changeBuildTarget(host, options) {
|
|
|
20
20
|
},
|
|
21
21
|
};
|
|
22
22
|
(0, devkit_1.updateProjectConfiguration)(host, options.appName, appConfig);
|
|
23
|
-
(0,
|
|
23
|
+
(0, internal_1.addBuildTargetDefaults)(host, '@nx/angular:webpack-browser');
|
|
24
24
|
}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.removeDeadCodeFromRemote = removeDeadCodeFromRemote;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const internal_1 = require("@nx/js/internal");
|
|
6
6
|
function removeDeadCodeFromRemote(tree, options) {
|
|
7
7
|
const projectName = options.appName;
|
|
8
8
|
const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
9
|
-
const sourceRoot = (0,
|
|
9
|
+
const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
|
|
10
10
|
const { appComponentInfo, nxWelcomeComponentInfo, entryModuleFileName } = options;
|
|
11
11
|
['css', 'less', 'scss', 'sass'].forEach((style) => {
|
|
12
12
|
const pathToComponentStyle = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${appComponentInfo.extensionlessFileName}.${style}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-mf.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"setup-mf.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AA6BpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,wBAAsB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BA2H3D;AAED,eAAe,OAAO,CAAC"}
|
|
@@ -2,10 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setupMf = setupMf;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
|
|
5
6
|
const versions_1 = require("../../utils/versions");
|
|
6
7
|
const version_utils_1 = require("../utils/version-utils");
|
|
7
8
|
const lib_1 = require("./lib");
|
|
9
|
+
const module_federation_deprecation_1 = require("../../utils/module-federation-deprecation");
|
|
8
10
|
async function setupMf(tree, rawOptions) {
|
|
11
|
+
(0, module_federation_deprecation_1.warnAngularSetupMfGeneratorDeprecation)();
|
|
12
|
+
(0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
|
|
9
13
|
const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
|
|
10
14
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
|
|
11
15
|
const tasks = [];
|
|
@@ -65,6 +69,12 @@ async function setupMf(tree, rawOptions) {
|
|
|
65
69
|
if (!options.skipE2E) {
|
|
66
70
|
(0, lib_1.addCypressOnErrorWorkaround)(tree, options);
|
|
67
71
|
}
|
|
72
|
+
if (!options.skipPackageJson && options.typescriptConfiguration) {
|
|
73
|
+
// Angular custom-webpack loads webpack.config.ts at build time. Node native
|
|
74
|
+
// TS strip can't resolve the extensionless `./module-federation.config`
|
|
75
|
+
// import under strict ESM, so loadTsFile needs ts-node as the fallback.
|
|
76
|
+
tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { 'ts-node': versions_1.tsNodeVersion }, undefined, true));
|
|
77
|
+
}
|
|
68
78
|
if (!options.skipPackageJson) {
|
|
69
79
|
const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
70
80
|
if (angularMajorVersion >= 20) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-hydration.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/add-hydration.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"add-hydration.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/add-hydration.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAK5D,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,0BAA0B,QA0E3E"}
|
|
@@ -3,16 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addHydration = addHydration;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const js_1 = require("@nx/js");
|
|
6
|
-
const
|
|
7
|
-
const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
|
|
6
|
+
const internal_1 = require("@nx/js/internal");
|
|
8
7
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
9
8
|
let tsModule;
|
|
10
9
|
let tsquery;
|
|
11
10
|
function addHydration(tree, options) {
|
|
12
11
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
13
|
-
const sourceRoot = (0,
|
|
12
|
+
const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfig, tree);
|
|
14
13
|
if (!tsModule) {
|
|
15
|
-
tsModule = (0,
|
|
14
|
+
tsModule = (0, internal_1.ensureTypescript)();
|
|
16
15
|
tsquery = require('@phenomnomnominal/tsquery').tsquery;
|
|
17
16
|
}
|
|
18
17
|
let pathToClientConfigFile;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addServerFile = addServerFile;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const internal_1 = require("@nx/js/internal");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const zoneless_1 = require("../../../utils/zoneless");
|
|
8
8
|
const version_utils_1 = require("../../utils/version-utils");
|
|
@@ -27,7 +27,7 @@ function addServerFile(tree, options) {
|
|
|
27
27
|
(options.serverRouting ? '' : '-common-engine')
|
|
28
28
|
: 'server-builder', 'server');
|
|
29
29
|
}
|
|
30
|
-
const sourceRoot = (0,
|
|
30
|
+
const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
|
|
31
31
|
const zoneless = (0, zoneless_1.isZonelessApp)(project);
|
|
32
32
|
(0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, {
|
|
33
33
|
...options,
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateSSRFiles = generateSSRFiles;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const internal_1 = require("@nx/js/internal");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const semver_1 = require("semver");
|
|
8
8
|
const app_components_info_1 = require("../../utils/app-components-info");
|
|
@@ -29,7 +29,7 @@ function generateSSRFiles(tree, options) {
|
|
|
29
29
|
? 'application-builder'
|
|
30
30
|
: 'server-builder', options.standalone ? 'standalone-src' : 'ngmodule-src');
|
|
31
31
|
}
|
|
32
|
-
const sourceRoot = (0,
|
|
32
|
+
const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
|
|
33
33
|
const ssrVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/ssr');
|
|
34
34
|
const cleanedSsrVersion = ssrVersion
|
|
35
35
|
? ((0, semver_1.clean)(ssrVersion) ?? (0, semver_1.coerce)(ssrVersion).version)
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setServerTsConfigOptionsForApplicationBuilder = setServerTsConfigOptionsForApplicationBuilder;
|
|
4
4
|
exports.generateTsConfigServerJsonForBrowserBuilder = generateTsConfigServerJsonForBrowserBuilder;
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const
|
|
6
|
+
const internal_1 = require("@nx/js/internal");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const tsconfig_utils_1 = require("../../utils/tsconfig-utils");
|
|
9
9
|
const version_utils_1 = require("../../utils/version-utils");
|
|
@@ -75,7 +75,7 @@ function generateTsConfigServerJsonForBrowserBuilder(tree, options) {
|
|
|
75
75
|
});
|
|
76
76
|
// read the parsed compiler options from tsconfig.server.json
|
|
77
77
|
const compilerOptions = (0, tsconfig_utils_1.readCompilerOptionsFromTsConfig)(tree, tsconfigServerPath);
|
|
78
|
-
const ts = (0,
|
|
78
|
+
const ts = (0, internal_1.ensureTypescript)();
|
|
79
79
|
if (compilerOptions.module === ts.ModuleKind.Preserve &&
|
|
80
80
|
compilerOptions.moduleResolution === ts.ModuleResolutionKind.Bundler) {
|
|
81
81
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/normalize-options.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/normalize-options.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEpE,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,0BAA0B,CAAC,CA+CrC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = normalizeOptions;
|
|
4
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
4
5
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const prompt_1 = require("@nx/devkit/src/generators/prompt");
|
|
6
6
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
7
|
const version_utils_1 = require("../../utils/version-utils");
|
|
8
8
|
async function normalizeOptions(tree, options) {
|
|
@@ -13,7 +13,7 @@ async function normalizeOptions(tree, options) {
|
|
|
13
13
|
if (options.serverRouting === undefined && isUsingApplicationBuilder) {
|
|
14
14
|
const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
15
15
|
if (angularMajorVersion === 19) {
|
|
16
|
-
options.serverRouting = await (0,
|
|
16
|
+
options.serverRouting = await (0, internal_1.promptWhenInteractive)({
|
|
17
17
|
type: 'confirm',
|
|
18
18
|
name: 'serverRouting',
|
|
19
19
|
message: 'Would you like to use the Server Routing and App Engine APIs (Developer Preview) for this server application?',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"update-project-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAGV,IAAI,EACL,MAAM,YAAY,CAAC;AAWpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAO5D,wBAAgB,wCAAwC,CACtD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,GAClC,IAAI,CAmDN;AAED,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QAoFpC"}
|
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateProjectConfigForApplicationBuilder = updateProjectConfigForApplicationBuilder;
|
|
4
4
|
exports.updateProjectConfigForBrowserBuilder = updateProjectConfigForBrowserBuilder;
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const
|
|
6
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
7
|
+
const internal_2 = require("@nx/js/internal");
|
|
7
8
|
const constants_1 = require("./constants");
|
|
8
9
|
function updateProjectConfigForApplicationBuilder(tree, options) {
|
|
9
10
|
const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
@@ -28,7 +29,7 @@ function updateProjectConfigForApplicationBuilder(tree, options) {
|
|
|
28
29
|
}
|
|
29
30
|
}
|
|
30
31
|
}
|
|
31
|
-
const sourceRoot = (0,
|
|
32
|
+
const sourceRoot = (0, internal_2.getProjectSourceRoot)(project, tree);
|
|
32
33
|
buildTarget.options ??= {};
|
|
33
34
|
buildTarget.options.outputPath = outputPath;
|
|
34
35
|
buildTarget.options.server = (0, devkit_1.joinPathFragments)(sourceRoot, options.main);
|
|
@@ -55,7 +56,7 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
|
|
|
55
56
|
configurations[key] = getServerOptions(options);
|
|
56
57
|
}
|
|
57
58
|
}
|
|
58
|
-
const sourceRoot = (0,
|
|
59
|
+
const sourceRoot = (0, internal_2.getProjectSourceRoot)(projectConfig, tree);
|
|
59
60
|
projectConfig.targets.server = {
|
|
60
61
|
dependsOn: ['build'],
|
|
61
62
|
executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')
|
|
@@ -103,16 +104,27 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
|
|
|
103
104
|
defaultConfiguration: 'production',
|
|
104
105
|
};
|
|
105
106
|
(0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
|
|
106
|
-
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
107
|
+
const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
|
|
107
108
|
if (nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations &&
|
|
108
109
|
!nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('server')) {
|
|
109
110
|
nxJson.tasksRunnerOptions.default.options.cacheableOperations.push('server');
|
|
110
111
|
}
|
|
111
|
-
nxJson.targetDefaults
|
|
112
|
-
|
|
113
|
-
|
|
112
|
+
const existing = findServerDefault(nxJson.targetDefaults);
|
|
113
|
+
if (!existing || existing.cache === undefined) {
|
|
114
|
+
(0, internal_1.upsertTargetDefault)(tree, nxJson, { target: 'server', cache: true });
|
|
115
|
+
}
|
|
114
116
|
(0, devkit_1.updateNxJson)(tree, nxJson);
|
|
115
117
|
}
|
|
118
|
+
function findServerDefault(td) {
|
|
119
|
+
if (!td)
|
|
120
|
+
return undefined;
|
|
121
|
+
if (Array.isArray(td)) {
|
|
122
|
+
return td.find((e) => e.target === 'server' &&
|
|
123
|
+
e.projects === undefined &&
|
|
124
|
+
e.plugin === undefined);
|
|
125
|
+
}
|
|
126
|
+
return td['server'];
|
|
127
|
+
}
|
|
116
128
|
function getServerOptions(options = {}) {
|
|
117
129
|
return {
|
|
118
130
|
buildOptimizer: options?.buildOptimizer,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-ssr.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"setup-ssr.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAoBvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,uBAmCxD;AAED,eAAe,QAAQ,CAAC"}
|
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setupSsr = setupSsr;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
|
|
5
6
|
const lib_1 = require("./lib");
|
|
6
7
|
async function setupSsr(tree, schema) {
|
|
8
|
+
(0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
|
|
7
9
|
(0, lib_1.validateOptions)(tree, schema);
|
|
8
10
|
const options = await (0, lib_1.normalizeOptions)(tree, schema);
|
|
9
11
|
if (!schema.skipPackageJson) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stories.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/stories/stories.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,IAAI,EACL,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"stories.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/stories/stories.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,IAAI,EACL,MAAM,YAAY,CAAC;AAUpB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAIxD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,iBA6CjC;AAED,eAAe,uBAAuB,CAAC"}
|
|
@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.angularStoriesGenerator = angularStoriesGenerator;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
+
const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
|
|
6
7
|
const component_story_1 = tslib_1.__importDefault(require("../component-story/component-story"));
|
|
7
8
|
const component_info_1 = require("../utils/storybook-ast/component-info");
|
|
8
9
|
const entry_point_1 = require("../utils/storybook-ast/entry-point");
|
|
9
10
|
const module_info_1 = require("../utils/storybook-ast/module-info");
|
|
10
11
|
const picomatch = require("picomatch");
|
|
11
12
|
async function angularStoriesGenerator(tree, options) {
|
|
13
|
+
(0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
|
|
12
14
|
const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.name);
|
|
13
15
|
const componentsInfo = [];
|
|
14
16
|
for (const entryPoint of entryPoints) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storybook-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"storybook-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AAMpB,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AAE9D,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,iBAAiB,CAAC,CA+B5B;AAED,eAAe,+BAA+B,CAAC"}
|
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
|
|
5
6
|
const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app-editor-tsconfig-excluded-files");
|
|
6
7
|
const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-storybook-version");
|
|
7
8
|
const generate_stories_1 = require("./lib/generate-stories");
|
|
8
9
|
const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
|
|
9
10
|
async function storybookConfigurationGenerator(tree, options) {
|
|
11
|
+
(0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
|
|
10
12
|
(0, assert_compatible_storybook_version_1.assertCompatibleStorybookVersion)();
|
|
11
13
|
const storybookGeneratorInstallTask = await (0, generate_storybook_configuration_1.generateStorybookConfiguration)(tree, {
|
|
12
14
|
...options,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-mf-env-to-inputs.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-mf-env-to-inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAA4B,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"add-mf-env-to-inputs.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-mf-env-to-inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAA4B,MAAM,YAAY,CAAC;AAMjE,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,QAsCvD"}
|
|
@@ -2,29 +2,36 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addMfEnvToTargetDefaultInputs = addMfEnvToTargetDefaultInputs;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
5
6
|
function addMfEnvToTargetDefaultInputs(tree) {
|
|
6
|
-
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
7
|
+
const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
|
|
7
8
|
const webpackExecutor = '@nx/angular:webpack-browser';
|
|
8
9
|
const mfEnvVar = 'NX_MF_DEV_REMOTES';
|
|
9
|
-
const
|
|
10
|
+
const defaultInputs = [
|
|
10
11
|
...(nxJson.namedInputs && 'production' in nxJson.namedInputs
|
|
11
12
|
? ['production', '^production']
|
|
12
13
|
: ['default', '^default']),
|
|
13
14
|
];
|
|
14
|
-
nxJson.targetDefaults
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
const existing = (0, internal_1.normalizeTargetDefaults)(nxJson.targetDefaults).find((e) => e.executor === webpackExecutor &&
|
|
16
|
+
e.target === undefined &&
|
|
17
|
+
e.projects === undefined &&
|
|
18
|
+
e.plugin === undefined);
|
|
19
|
+
const inputs = [...(existing?.inputs ?? defaultInputs)];
|
|
18
20
|
let mfEnvVarExists = false;
|
|
19
|
-
for (const input of
|
|
21
|
+
for (const input of inputs) {
|
|
20
22
|
if (typeof input === 'object' && input['env'] === mfEnvVar) {
|
|
21
23
|
mfEnvVarExists = true;
|
|
22
24
|
break;
|
|
23
25
|
}
|
|
24
26
|
}
|
|
25
27
|
if (!mfEnvVarExists) {
|
|
26
|
-
|
|
28
|
+
inputs.push({ env: mfEnvVar });
|
|
27
29
|
}
|
|
28
|
-
|
|
30
|
+
(0, internal_1.upsertTargetDefault)(tree, nxJson, {
|
|
31
|
+
executor: webpackExecutor,
|
|
32
|
+
cache: true,
|
|
33
|
+
inputs,
|
|
34
|
+
dependsOn: existing?.dependsOn ?? ['^build'],
|
|
35
|
+
});
|
|
29
36
|
(0, devkit_1.updateNxJson)(tree, nxJson);
|
|
30
37
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Tree } from '@nx/devkit';
|
|
1
|
+
import { type GeneratorCallback, type Tree } from '@nx/devkit';
|
|
2
2
|
export type AddVitestAngularOptions = {
|
|
3
3
|
name: string;
|
|
4
4
|
projectRoot: string;
|
|
@@ -14,6 +14,6 @@ export type AddVitestAnalogOptions = {
|
|
|
14
14
|
zoneless: boolean;
|
|
15
15
|
addPlugin?: boolean;
|
|
16
16
|
};
|
|
17
|
-
export declare function addVitestAngular(tree: Tree, options: AddVitestAngularOptions): Promise<
|
|
18
|
-
export declare function addVitestAnalog(tree: Tree, options: AddVitestAnalogOptions): Promise<
|
|
17
|
+
export declare function addVitestAngular(tree: Tree, options: AddVitestAngularOptions): Promise<GeneratorCallback>;
|
|
18
|
+
export declare function addVitestAnalog(tree: Tree, options: AddVitestAnalogOptions): Promise<GeneratorCallback>;
|
|
19
19
|
//# sourceMappingURL=add-vitest.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-vitest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-vitest.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"add-vitest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-vitest.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EAQtB,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAcpB,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CAqD5B;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAuD5B"}
|