@nrwl/angular 15.8.6 → 15.9.0-beta.1
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 +2 -4
- package/generators.js +2 -4
- package/generators.js.map +1 -1
- package/generators.json +11 -39
- package/migrations.json +104 -1124
- package/package.json +10 -10
- package/plugins/component-testing.d.ts +1 -1
- package/src/builders/utilities/buildable-libs.d.ts +1 -1
- package/src/builders/utilities/buildable-libs.js +1 -1
- package/src/builders/utilities/buildable-libs.js.map +1 -1
- package/src/builders/webpack-browser/schema.d.ts +9 -0
- package/src/builders/webpack-browser/schema.json +1 -1
- package/src/builders/webpack-browser/validate-options.d.ts +2 -0
- package/src/builders/webpack-browser/validate-options.js +41 -0
- package/src/builders/webpack-browser/validate-options.js.map +1 -0
- package/src/builders/webpack-browser/webpack-browser.impl.d.ts +1 -7
- package/src/builders/webpack-browser/webpack-browser.impl.js +2 -9
- package/src/builders/webpack-browser/webpack-browser.impl.js.map +1 -1
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js +12 -15
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js.map +1 -1
- package/src/builders/webpack-server/schema.json +5 -0
- package/src/builders/webpack-server/validate-options.d.ts +2 -0
- package/src/builders/webpack-server/validate-options.js +34 -0
- package/src/builders/webpack-server/validate-options.js.map +1 -0
- package/src/builders/webpack-server/webpack-server.impl.js +5 -14
- package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
- package/src/executors/delegate-build/delegate-build.impl.js +1 -1
- package/src/executors/delegate-build/delegate-build.impl.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js.map +1 -1
- package/src/executors/ng-packagr-lite/schema.json +1 -1
- package/src/executors/package/package.impl.d.ts +1 -1
- package/src/executors/package/package.impl.js +1 -1
- package/src/executors/package/package.impl.js.map +1 -1
- package/src/executors/package/schema.json +1 -1
- package/src/executors/utilities/angular-version-utils.d.ts +1 -2
- package/src/generators/add-linting/add-linting.js +1 -2
- package/src/generators/add-linting/add-linting.js.map +1 -1
- package/src/generators/add-linting/angular-v14/add-linting.js +1 -2
- package/src/generators/add-linting/angular-v14/add-linting.js.map +1 -1
- package/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.js +5 -5
- package/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.js.map +1 -1
- package/src/generators/add-linting/lib/create-eslint-configuration.js +5 -5
- package/src/generators/add-linting/lib/create-eslint-configuration.js.map +1 -1
- package/src/generators/application/angular-v14/lib/add-unit-test-runner.js +0 -7
- package/src/generators/application/angular-v14/lib/add-unit-test-runner.js.map +1 -1
- package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js +26 -5
- package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js.map +1 -1
- package/src/generators/application/angular-v14/lib/root-router-config.js +5 -5
- package/src/generators/application/angular-v14/lib/root-router-config.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-app-component-template.js +4 -4
- package/src/generators/application/angular-v14/lib/update-app-component-template.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-component-spec.js +6 -6
- package/src/generators/application/angular-v14/lib/update-component-spec.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-config-files.js +1 -1
- package/src/generators/application/angular-v14/lib/update-config-files.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-nx-component-template.js +5 -5
- package/src/generators/application/angular-v14/lib/update-nx-component-template.js.map +1 -1
- package/src/generators/application/lib/add-unit-test-runner.js +0 -7
- package/src/generators/application/lib/add-unit-test-runner.js.map +1 -1
- package/src/generators/application/lib/nrwl-home-tpl.js +26 -5
- package/src/generators/application/lib/nrwl-home-tpl.js.map +1 -1
- package/src/generators/application/lib/root-router-config.js +5 -5
- package/src/generators/application/lib/root-router-config.js.map +1 -1
- package/src/generators/application/lib/update-app-component-template.js +4 -4
- package/src/generators/application/lib/update-app-component-template.js.map +1 -1
- package/src/generators/application/lib/update-component-spec.js +6 -6
- package/src/generators/application/lib/update-component-spec.js.map +1 -1
- package/src/generators/application/lib/update-config-files.js +1 -1
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/application/lib/update-nx-component-template.js +5 -5
- package/src/generators/application/lib/update-nx-component-template.js.map +1 -1
- package/src/generators/application/schema.json +1 -1
- package/src/generators/component/component.js +3 -19
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/lib/normalize-options.js +3 -24
- package/src/generators/component/lib/normalize-options.js.map +1 -1
- package/src/generators/component/schema.d.ts +1 -2
- package/src/generators/component/schema.json +3 -0
- package/src/generators/component-cypress-spec/schema.json +3 -0
- package/src/generators/component-test/schema.json +3 -0
- package/src/generators/cypress-component-configuration/schema.json +3 -0
- package/src/generators/directive/directive.d.ts +4 -0
- package/src/generators/directive/directive.js +51 -0
- package/src/generators/directive/directive.js.map +1 -0
- package/src/generators/directive/files/__directiveFileName__/__directiveFileName__.directive.spec.ts__tpl__ +8 -0
- package/src/generators/directive/files/__directiveFileName__/__directiveFileName__.directive.ts__tpl__ +11 -0
- package/src/generators/directive/schema.d.ts +14 -0
- package/src/generators/directive/schema.json +92 -0
- package/src/generators/host/host.js +1 -2
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/host/schema.json +1 -1
- package/src/generators/init/angular-v14/init.js +1 -7
- package/src/generators/init/angular-v14/init.js.map +1 -1
- package/src/generators/init/init.js +1 -7
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/init/schema.json +1 -1
- package/src/generators/library/lib/add-children.js +4 -4
- package/src/generators/library/lib/add-children.js.map +1 -1
- package/src/generators/library/lib/add-lazy-loaded-router-configuration.js +5 -5
- package/src/generators/library/lib/add-lazy-loaded-router-configuration.js.map +1 -1
- package/src/generators/library/lib/add-router-configuration.js +5 -5
- package/src/generators/library/lib/add-router-configuration.js.map +1 -1
- package/src/generators/library/lib/update-project.js +1 -1
- package/src/generators/library/lib/update-project.js.map +1 -1
- package/src/generators/library/library.js +0 -7
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +1 -2
- package/src/generators/move/lib/update-module-name.js +2 -2
- package/src/generators/move/lib/update-module-name.js.map +1 -1
- package/src/generators/move/lib/update-ng-package.js +2 -2
- package/src/generators/move/lib/update-ng-package.js.map +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +36 -53
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js +3 -4
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js.map +1 -1
- package/src/generators/ng-add/schema.d.ts +0 -1
- package/src/generators/ng-add/schema.json +0 -6
- package/src/generators/ng-add/utilities/index.d.ts +0 -1
- package/src/generators/ng-add/utilities/index.js +0 -1
- package/src/generators/ng-add/utilities/index.js.map +1 -1
- package/src/generators/ng-add/utilities/projects.d.ts +0 -1
- package/src/generators/ng-add/utilities/projects.js +1 -12
- package/src/generators/ng-add/utilities/projects.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.d.ts +0 -1
- package/src/generators/ng-add/utilities/workspace.js +4 -18
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/ngrx/lib/add-exports-barrel.js +7 -7
- package/src/generators/ngrx/lib/add-exports-barrel.js.map +1 -1
- package/src/generators/ngrx/lib/add-imports-to-module.js +14 -14
- package/src/generators/ngrx/lib/add-imports-to-module.js.map +1 -1
- package/src/generators/ngrx/lib/add-ngrx-to-package-json.js +9 -9
- package/src/generators/ngrx/lib/add-ngrx-to-package-json.js.map +1 -1
- package/src/generators/pipe/files/__pipeFileName__/__pipeFileName__.pipe.spec.ts__tpl__ +8 -0
- package/src/generators/pipe/files/__pipeFileName__/__pipeFileName__.pipe.ts__tpl__ +13 -0
- package/src/generators/pipe/pipe.d.ts +4 -0
- package/src/generators/pipe/pipe.js +45 -0
- package/src/generators/pipe/pipe.js.map +1 -0
- package/src/generators/pipe/schema.d.ts +12 -0
- package/src/generators/pipe/schema.json +73 -0
- package/src/generators/remote/remote.js +1 -2
- package/src/generators/remote/remote.js.map +1 -1
- package/src/generators/remote/schema.json +1 -1
- package/src/generators/scam/lib/convert-component-to-scam.js +3 -3
- package/src/generators/scam/lib/convert-component-to-scam.js.map +1 -1
- package/src/generators/scam/lib/normalize-options.js +4 -6
- package/src/generators/scam/lib/normalize-options.js.map +1 -1
- package/src/generators/scam/scam.js +1 -3
- package/src/generators/scam/scam.js.map +1 -1
- package/src/generators/scam/schema.d.ts +1 -2
- package/src/generators/scam/schema.json +3 -0
- package/src/generators/scam-directive/lib/convert-directive-to-scam.js +3 -3
- package/src/generators/scam-directive/lib/convert-directive-to-scam.js.map +1 -1
- package/src/generators/scam-directive/lib/normalize-options.js +4 -6
- package/src/generators/scam-directive/lib/normalize-options.js.map +1 -1
- package/src/generators/scam-directive/scam-directive.js +1 -3
- package/src/generators/scam-directive/scam-directive.js.map +1 -1
- package/src/generators/scam-directive/schema.d.ts +1 -2
- package/src/generators/scam-directive/schema.json +3 -0
- package/src/generators/scam-pipe/lib/convert-pipe-to-scam.js +3 -3
- package/src/generators/scam-pipe/lib/convert-pipe-to-scam.js.map +1 -1
- package/src/generators/scam-pipe/lib/normalize-options.js +4 -6
- package/src/generators/scam-pipe/lib/normalize-options.js.map +1 -1
- package/src/generators/scam-pipe/scam-pipe.js +1 -3
- package/src/generators/scam-pipe/scam-pipe.js.map +1 -1
- package/src/generators/scam-pipe/schema.d.ts +1 -2
- package/src/generators/scam-pipe/schema.json +3 -0
- package/src/generators/setup-mf/files/webpack/webpack.prod.config.js__tmpl__ +1 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js +2 -2
- package/src/generators/setup-mf/lib/add-remote-to-host.js.map +1 -1
- package/src/generators/setup-tailwind/lib/detect-tailwind-installed-version.js +5 -5
- package/src/generators/setup-tailwind/lib/detect-tailwind-installed-version.js.map +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map +1 -1
- package/src/generators/storybook-configuration/schema.d.ts +1 -1
- package/src/generators/storybook-configuration/schema.json +4 -3
- package/src/generators/utils/file-info.d.ts +1 -1
- package/src/generators/utils/file-info.js +3 -4
- package/src/generators/utils/file-info.js.map +1 -1
- package/src/generators/utils/find-module.d.ts +4 -0
- package/src/generators/utils/find-module.js +59 -0
- package/src/generators/utils/find-module.js.map +1 -0
- package/src/generators/utils/get-new-project-name.d.ts +6 -0
- package/src/generators/utils/get-new-project-name.js +13 -0
- package/src/generators/utils/get-new-project-name.js.map +1 -0
- package/src/generators/utils/index.d.ts +1 -0
- package/src/generators/utils/index.js +1 -0
- package/src/generators/utils/index.js.map +1 -1
- package/src/generators/utils/insert-ngmodule-import.d.ts +1 -2
- package/src/generators/utils/insert-ngmodule-import.js +42 -21
- package/src/generators/utils/insert-ngmodule-import.js.map +1 -1
- package/src/generators/utils/path.d.ts +2 -0
- package/src/generators/utils/path.js +16 -1
- package/src/generators/utils/path.js.map +1 -1
- package/src/generators/utils/storybook-ast/storybook-inputs.js +2 -2
- package/src/generators/utils/storybook-ast/storybook-inputs.js.map +1 -1
- package/src/generators/utils/testing.d.ts +8 -0
- package/src/generators/utils/testing.js +44 -2
- package/src/generators/utils/testing.js.map +1 -1
- package/src/generators/web-worker/schema.json +3 -0
- package/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.js +1 -1
- package/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.js.map +1 -1
- package/src/migrations/update-15-0-0/add-karma-inputs.js +1 -1
- package/src/migrations/update-15-0-0/add-karma-inputs.js.map +1 -1
- package/src/migrations/update-15-2-0/remove-platform-server-exports.d.ts +2 -9
- package/src/migrations/update-15-2-0/remove-platform-server-exports.js +53 -74
- package/src/migrations/update-15-2-0/remove-platform-server-exports.js.map +1 -1
- package/src/migrations/update-15-2-0/update-karma-main-file.d.ts +2 -9
- package/src/migrations/update-15-2-0/update-karma-main-file.js +23 -43
- package/src/migrations/update-15-2-0/update-karma-main-file.js.map +1 -1
- package/src/migrations/update-15-7-0/install-required-packages.js +14 -1
- package/src/migrations/update-15-7-0/install-required-packages.js.map +1 -1
- package/src/utils/backward-compatible-versions.js +0 -5
- package/src/utils/backward-compatible-versions.js.map +1 -1
- package/src/utils/cli-config-utils.d.ts +1 -0
- package/src/utils/cli-config-utils.js +46 -0
- package/src/utils/cli-config-utils.js.map +1 -0
- package/src/{generators/ng-add/utilities → utils}/file-change-recorder.d.ts +1 -1
- package/src/{generators/ng-add/utilities → utils}/file-change-recorder.js +2 -2
- package/src/utils/file-change-recorder.js.map +1 -0
- package/src/utils/get-mf-projects.js +1 -1
- package/src/utils/get-mf-projects.js.map +1 -1
- package/src/utils/mf/utils.js +8 -0
- package/src/utils/mf/utils.js.map +1 -1
- package/src/utils/nx-devkit/ast-utils.js +12 -12
- package/src/utils/nx-devkit/ast-utils.js.map +1 -1
- package/src/utils/nx-devkit/route-utils.js +4 -4
- package/src/utils/nx-devkit/route-utils.js.map +1 -1
- package/src/utils/test-runners.d.ts +0 -1
- package/src/utils/test-runners.js +0 -1
- package/src/utils/test-runners.js.map +1 -1
- package/src/utils/versions.d.ts +0 -5
- package/src/utils/versions.js +1 -6
- package/src/utils/versions.js.map +1 -1
- package/tailwind.js +1 -1
- package/tailwind.js.map +1 -1
- package/src/generators/downgrade-module/compat.d.ts +0 -2
- package/src/generators/downgrade-module/compat.js +0 -6
- package/src/generators/downgrade-module/compat.js.map +0 -1
- package/src/generators/downgrade-module/downgrade-module.d.ts +0 -4
- package/src/generators/downgrade-module/downgrade-module.js +0 -26
- package/src/generators/downgrade-module/downgrade-module.js.map +0 -1
- package/src/generators/downgrade-module/files/main.ts__tmpl__ +0 -26
- package/src/generators/downgrade-module/lib/add-entry-components-to-module.d.ts +0 -3
- package/src/generators/downgrade-module/lib/add-entry-components-to-module.js +0 -10
- package/src/generators/downgrade-module/lib/add-entry-components-to-module.js.map +0 -1
- package/src/generators/downgrade-module/lib/index.d.ts +0 -4
- package/src/generators/downgrade-module/lib/index.js +0 -8
- package/src/generators/downgrade-module/lib/index.js.map +0 -1
- package/src/generators/downgrade-module/lib/normalize-options.d.ts +0 -2
- package/src/generators/downgrade-module/lib/normalize-options.js +0 -9
- package/src/generators/downgrade-module/lib/normalize-options.js.map +0 -1
- package/src/generators/downgrade-module/lib/update-main.d.ts +0 -3
- package/src/generators/downgrade-module/lib/update-main.js +0 -20
- package/src/generators/downgrade-module/lib/update-main.js.map +0 -1
- package/src/generators/downgrade-module/lib/update-module-bootstrap.d.ts +0 -3
- package/src/generators/downgrade-module/lib/update-module-bootstrap.js +0 -15
- package/src/generators/downgrade-module/lib/update-module-bootstrap.js.map +0 -1
- package/src/generators/downgrade-module/schema.d.ts +0 -7
- package/src/generators/downgrade-module/schema.json +0 -43
- package/src/generators/karma/angular-v14/files/karma.conf.js__tmpl__ +0 -44
- package/src/generators/karma/angular-v14/karma.d.ts +0 -4
- package/src/generators/karma/angular-v14/karma.js +0 -58
- package/src/generators/karma/angular-v14/karma.js.map +0 -1
- package/src/generators/karma/angular-v14/schema.d.ts +0 -3
- package/src/generators/karma/compat.d.ts +0 -2
- package/src/generators/karma/compat.js +0 -6
- package/src/generators/karma/compat.js.map +0 -1
- package/src/generators/karma/files/karma.conf.js__tmpl__ +0 -44
- package/src/generators/karma/karma.d.ts +0 -4
- package/src/generators/karma/karma.js +0 -69
- package/src/generators/karma/karma.js.map +0 -1
- package/src/generators/karma/schema.d.ts +0 -3
- package/src/generators/karma/schema.json +0 -24
- package/src/generators/karma-project/compat.d.ts +0 -2
- package/src/generators/karma-project/compat.js +0 -6
- package/src/generators/karma-project/compat.js.map +0 -1
- package/src/generators/karma-project/files/common/karma.conf.js__tmpl__ +0 -16
- package/src/generators/karma-project/files/common/tsconfig.spec.json +0 -8
- package/src/generators/karma-project/files/root-project/karma.conf.js__tmpl__ +0 -44
- package/src/generators/karma-project/files/workspace-with-root-project/karma.conf.js__tmpl__ +0 -28
- package/src/generators/karma-project/karma-project.d.ts +0 -4
- package/src/generators/karma-project/karma-project.js +0 -26
- package/src/generators/karma-project/karma-project.js.map +0 -1
- package/src/generators/karma-project/lib/check-test-target.d.ts +0 -2
- package/src/generators/karma-project/lib/check-test-target.js +0 -12
- package/src/generators/karma-project/lib/check-test-target.js.map +0 -1
- package/src/generators/karma-project/lib/generate-karma-project-files.d.ts +0 -2
- package/src/generators/karma-project/lib/generate-karma-project-files.js +0 -55
- package/src/generators/karma-project/lib/generate-karma-project-files.js.map +0 -1
- package/src/generators/karma-project/lib/update-tsconfig.d.ts +0 -2
- package/src/generators/karma-project/lib/update-tsconfig.js +0 -37
- package/src/generators/karma-project/lib/update-tsconfig.js.map +0 -1
- package/src/generators/karma-project/lib/update-workspace-config.d.ts +0 -2
- package/src/generators/karma-project/lib/update-workspace-config.js +0 -32
- package/src/generators/karma-project/lib/update-workspace-config.js.map +0 -1
- package/src/generators/karma-project/lib/v14-test-file.d.ts +0 -3
- package/src/generators/karma-project/lib/v14-test-file.js +0 -29
- package/src/generators/karma-project/lib/v14-test-file.js.map +0 -1
- package/src/generators/karma-project/schema.d.ts +0 -5
- package/src/generators/karma-project/schema.json +0 -31
- package/src/generators/ng-add/files/prettier/__dot__prettierignore +0 -4
- package/src/generators/ng-add/utilities/file-change-recorder.js.map +0 -1
- package/src/generators/upgrade-module/compat.d.ts +0 -2
- package/src/generators/upgrade-module/compat.js +0 -6
- package/src/generators/upgrade-module/compat.js.map +0 -1
- package/src/generators/upgrade-module/files/__name__-setup.ts__tmpl__ +0 -39
- package/src/generators/upgrade-module/files/hybrid.spec.ts__tmpl__ +0 -32
- package/src/generators/upgrade-module/lib/add-imports-to-module.d.ts +0 -3
- package/src/generators/upgrade-module/lib/add-imports-to-module.js +0 -17
- package/src/generators/upgrade-module/lib/add-imports-to-module.js.map +0 -1
- package/src/generators/upgrade-module/lib/create-files.d.ts +0 -3
- package/src/generators/upgrade-module/lib/create-files.js +0 -13
- package/src/generators/upgrade-module/lib/create-files.js.map +0 -1
- package/src/generators/upgrade-module/lib/index.d.ts +0 -4
- package/src/generators/upgrade-module/lib/index.js +0 -8
- package/src/generators/upgrade-module/lib/index.js.map +0 -1
- package/src/generators/upgrade-module/lib/normalize-options.d.ts +0 -2
- package/src/generators/upgrade-module/lib/normalize-options.js +0 -9
- package/src/generators/upgrade-module/lib/normalize-options.js.map +0 -1
- package/src/generators/upgrade-module/lib/update-module-bootstrap.d.ts +0 -3
- package/src/generators/upgrade-module/lib/update-module-bootstrap.js +0 -24
- package/src/generators/upgrade-module/lib/update-module-bootstrap.js.map +0 -1
- package/src/generators/upgrade-module/schema.d.ts +0 -9
- package/src/generators/upgrade-module/schema.json +0 -53
- package/src/generators/upgrade-module/upgrade-module.d.ts +0 -4
- package/src/generators/upgrade-module/upgrade-module.js +0 -26
- package/src/generators/upgrade-module/upgrade-module.js.map +0 -1
- package/src/generators/utils/upgrade.d.ts +0 -2
- package/src/generators/utils/upgrade.js +0 -25
- package/src/generators/utils/upgrade.js.map +0 -1
- package/src/migrations/update-13-0-0/add-postcss-packages.d.ts +0 -2
- package/src/migrations/update-13-0-0/add-postcss-packages.js +0 -23
- package/src/migrations/update-13-0-0/add-postcss-packages.js.map +0 -1
- package/src/migrations/update-13-2-0/opt-out-testbed-teardown.d.ts +0 -2
- package/src/migrations/update-13-2-0/opt-out-testbed-teardown.js +0 -231
- package/src/migrations/update-13-2-0/opt-out-testbed-teardown.js.map +0 -1
- package/src/migrations/update-13-2-0/update-angular-config.d.ts +0 -2
- package/src/migrations/update-13-2-0/update-angular-config.js +0 -37
- package/src/migrations/update-13-2-0/update-angular-config.js.map +0 -1
- package/src/migrations/update-13-2-0/update-angular-jest-config.d.ts +0 -3
- package/src/migrations/update-13-2-0/update-angular-jest-config.js +0 -79
- package/src/migrations/update-13-2-0/update-angular-jest-config.js.map +0 -1
- package/src/migrations/update-13-2-0/update-libraries.d.ts +0 -2
- package/src/migrations/update-13-2-0/update-libraries.js +0 -59
- package/src/migrations/update-13-2-0/update-libraries.js.map +0 -1
- package/src/migrations/update-13-2-0/update-testing-imports.d.ts +0 -2
- package/src/migrations/update-13-2-0/update-testing-imports.js +0 -108
- package/src/migrations/update-13-2-0/update-testing-imports.js.map +0 -1
- package/src/migrations/update-13-3-0/update-mfe-webpack-config.d.ts +0 -6
- package/src/migrations/update-13-3-0/update-mfe-webpack-config.js +0 -120
- package/src/migrations/update-13-3-0/update-mfe-webpack-config.js.map +0 -1
- package/src/migrations/update-13-5-0/remove-library-generator-style-default.d.ts +0 -2
- package/src/migrations/update-13-5-0/remove-library-generator-style-default.js +0 -24
- package/src/migrations/update-13-5-0/remove-library-generator-style-default.js.map +0 -1
- package/src/migrations/update-13-5-0/update-mfe-config.test-data.d.ts +0 -20
- package/src/migrations/update-13-5-0/update-mfe-config.test-data.js +0 -718
- package/src/migrations/update-13-5-0/update-mfe-config.test-data.js.map +0 -1
- package/src/migrations/update-13-5-0/update-mfe-configs.d.ts +0 -5
- package/src/migrations/update-13-5-0/update-mfe-configs.js +0 -157
- package/src/migrations/update-13-5-0/update-mfe-configs.js.map +0 -1
- package/src/migrations/update-13-8-1/add-cypress-mf-workaround.d.ts +0 -2
- package/src/migrations/update-13-8-1/add-cypress-mf-workaround.js +0 -38
- package/src/migrations/update-13-8-1/add-cypress-mf-workaround.js.map +0 -1
- package/src/migrations/update-13-8-4/migrate-karma-conf.d.ts +0 -2
- package/src/migrations/update-13-8-4/migrate-karma-conf.js +0 -39
- package/src/migrations/update-13-8-4/migrate-karma-conf.js.map +0 -1
- package/src/migrations/update-13-9-0/set-build-libs-from-source.d.ts +0 -2
- package/src/migrations/update-13-9-0/set-build-libs-from-source.js +0 -27
- package/src/migrations/update-13-9-0/set-build-libs-from-source.js.map +0 -1
- package/src/migrations/update-14-0-0/rename-mf-config.d.ts +0 -2
- package/src/migrations/update-14-0-0/rename-mf-config.js +0 -27
- package/src/migrations/update-14-0-0/rename-mf-config.js.map +0 -1
- package/src/migrations/update-14-5-7/update-rxjs.d.ts +0 -2
- package/src/migrations/update-14-5-7/update-rxjs.js +0 -30
- package/src/migrations/update-14-5-7/update-rxjs.js.map +0 -1
|
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateConfigFiles = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const cli_config_utils_1 = require("@nrwl/workspace/src/utils/cli-config-utils");
|
|
7
6
|
const js_1 = require("@nrwl/js");
|
|
8
7
|
const test_runners_1 = require("../../../utils/test-runners");
|
|
9
8
|
const create_ts_config_1 = require("../../utils/create-ts-config");
|
|
9
|
+
const cli_config_utils_1 = require("../../../utils/cli-config-utils");
|
|
10
10
|
function updateConfigFiles(host, options) {
|
|
11
11
|
updateTsConfigOptions(host, options);
|
|
12
12
|
updateAppAndE2EProjectConfigurations(host, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":";;;;AACA,yCAQsB;AACtB,
|
|
1
|
+
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateNxComponentTemplate = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
4
|
+
const js_1 = require("@nrwl/js");
|
|
5
|
+
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
6
6
|
const nrwl_home_tpl_1 = require("./nrwl-home-tpl");
|
|
7
7
|
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
8
8
|
let tsModule;
|
|
@@ -11,8 +11,8 @@ function updateNxComponentTemplate(host, options) {
|
|
|
11
11
|
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
12
12
|
}
|
|
13
13
|
const componentPath = `${options.appProjectRoot}/src/app/nx-welcome.component.ts`;
|
|
14
|
-
const templateNodeValue = (0,
|
|
15
|
-
(0,
|
|
14
|
+
const templateNodeValue = (0, ast_utils_1.getDecoratorPropertyValueNode)(host, componentPath, 'Component', 'template', '@angular/core');
|
|
15
|
+
(0, js_1.replaceNodeValue)(host, tsModule.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), tsModule.ScriptTarget.Latest, true), componentPath, templateNodeValue, `\`\n${nrwl_home_tpl_1.nrwlHomeTemplate.template(options.name)}\n\``);
|
|
16
16
|
// Fixing extra comma issue `,,`
|
|
17
17
|
let sourceFile = tsModule.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), tsModule.ScriptTarget.Latest, true);
|
|
18
18
|
const componentFile = host
|
|
@@ -29,7 +29,7 @@ function updateNxComponentTemplate(host, options) {
|
|
|
29
29
|
});
|
|
30
30
|
// Add ESLint ignore to pass the lint step
|
|
31
31
|
sourceFile = tsModule.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), tsModule.ScriptTarget.Latest, true);
|
|
32
|
-
(0,
|
|
32
|
+
(0, js_1.addGlobal)(host, sourceFile, componentPath, '/* eslint-disable */');
|
|
33
33
|
}
|
|
34
34
|
exports.updateNxComponentTemplate = updateNxComponentTemplate;
|
|
35
35
|
//# sourceMappingURL=update-nx-component-template.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-nx-component-template.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-nx-component-template.ts"],"names":[],"mappings":";;;AAGA,
|
|
1
|
+
{"version":3,"file":"update-nx-component-template.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-nx-component-template.ts"],"names":[],"mappings":";;;AAGA,iCAAuD;AACvD,kEAAmF;AACnF,mDAAmD;AACnD,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAAyB;IAEzB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,cAAc,kCAAkC,CAAC;IAClF,MAAM,iBAAiB,GAAG,IAAA,yCAA6B,EACrD,IAAI,EACJ,aAAa,EACb,WAAW,EACX,UAAU,EACV,eAAe,CAChB,CAAC;IAEF,IAAA,qBAAgB,EACd,IAAI,EACJ,QAAQ,CAAC,gBAAgB,CACvB,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,EACD,aAAa,EACb,iBAAiB,EACjB,OAAO,gCAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CACrD,CAAC;IAEF,gCAAgC;IAChC,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IACF,MAAM,aAAa,GAAG,IAAI;SACvB,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC;SAC5B,QAAQ,EAAE;SACV,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACxB,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IACzC,UAAU,CAAC,MAAM,CAAC,aAAa,EAAE;QAC/B,SAAS,EAAE,aAAa,CAAC,MAAM;QAC/B,IAAI,EAAE;YACJ,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM;YAC9B,KAAK,EAAE,CAAC;SACT;KACF,CAAC,CAAC;IAEH,0CAA0C;IAC1C,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACpC,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IACF,IAAA,cAAS,EAAC,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,sBAAsB,CAAC,CAAC;AACrE,CAAC;AA1DD,8DA0DC"}
|
|
@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.componentGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const semver_1 = require("semver");
|
|
6
7
|
const path_1 = require("../utils/path");
|
|
8
|
+
const version_utils_1 = require("../utils/version-utils");
|
|
7
9
|
const component_1 = require("./lib/component");
|
|
8
10
|
const normalize_options_1 = require("./lib/normalize-options");
|
|
9
|
-
const version_utils_1 = require("../utils/version-utils");
|
|
10
|
-
const semver_1 = require("semver");
|
|
11
11
|
function componentGenerator(tree, rawOptions) {
|
|
12
12
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
13
|
const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
@@ -18,7 +18,7 @@ function componentGenerator(tree, rawOptions) {
|
|
|
18
18
|
}
|
|
19
19
|
const options = yield (0, normalize_options_1.normalizeOptions)(tree, rawOptions);
|
|
20
20
|
const { projectSourceRoot } = options, schematicOptions = tslib_1.__rest(options, ["projectSourceRoot"]);
|
|
21
|
-
checkPathUnderProjectRoot(tree, options);
|
|
21
|
+
(0, path_1.checkPathUnderProjectRoot)(tree, options.project, options.path);
|
|
22
22
|
const { wrapAngularDevkitSchematic } = require('@nrwl/devkit/ngcli-adapter');
|
|
23
23
|
const angularComponentSchematic = wrapAngularDevkitSchematic('@schematics/angular', 'component');
|
|
24
24
|
yield angularComponentSchematic(tree, schematicOptions);
|
|
@@ -27,21 +27,5 @@ function componentGenerator(tree, rawOptions) {
|
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
29
|
exports.componentGenerator = componentGenerator;
|
|
30
|
-
function checkPathUnderProjectRoot(tree, schema) {
|
|
31
|
-
var _a;
|
|
32
|
-
if (!schema.path) {
|
|
33
|
-
return;
|
|
34
|
-
}
|
|
35
|
-
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
|
|
36
|
-
const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
37
|
-
let pathToComponent = (0, devkit_1.normalizePath)(schema.path);
|
|
38
|
-
pathToComponent = pathToComponent.startsWith('/')
|
|
39
|
-
? pathToComponent.slice(1)
|
|
40
|
-
: pathToComponent;
|
|
41
|
-
if (!(0, path_1.pathStartsWith)(pathToComponent, root)) {
|
|
42
|
-
throw new Error(`The path provided for the component (${schema.path}) does not exist under the project root (${root}). ` +
|
|
43
|
-
`Please make sure to provide a path that exists under the project root.`);
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
30
|
exports.default = componentGenerator;
|
|
47
31
|
//# sourceMappingURL=component.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,yCAAyD;AACzD,mCAA4B;AAC5B,wCAA0D;AAC1D,0DAAwE;AACxE,+CAA8D;AAC9D,+DAA2D;AAG3D,SAAsB,kBAAkB,CAAC,IAAU,EAAE,UAAkB;;QACrE,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IACE,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC;YACjD,UAAU,CAAC,UAAU,EACrB;YACA,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,MAAM,OAAO,GAAG,MAAM,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzD,MAAM,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAApD,qBAA0C,CAAU,CAAC;QAE3D,IAAA,gCAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAE/D,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC7E,MAAM,yBAAyB,GAAG,0BAA0B,CAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAExD,IAAA,uCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA1BD,gDA0BC;AAED,kBAAe,kBAAkB,CAAC"}
|
|
@@ -3,34 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
|
|
7
|
-
function findProjectFromOptions(options) {
|
|
8
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
10
|
-
const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(projectGraph.nodes);
|
|
11
|
-
// path can be undefined when running on the root of the workspace, we default to the root
|
|
12
|
-
// to handle standalone layouts
|
|
13
|
-
return (0, find_project_for_path_1.findProjectForPath)(options.path || '', projectRootMappings);
|
|
14
|
-
});
|
|
15
|
-
}
|
|
16
6
|
function normalizeOptions(tree, options) {
|
|
17
|
-
var _a
|
|
7
|
+
var _a;
|
|
18
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
|
-
const
|
|
20
|
-
if (!project) {
|
|
21
|
-
// path is hidden, so if not provided we don't suggest setting it
|
|
22
|
-
if (!options.path) {
|
|
23
|
-
throw new Error('No "project" was specified and "defaultProject" is not set in the workspace configuration. Please provide the "project" option and try again.');
|
|
24
|
-
}
|
|
25
|
-
// path was provided, so it's wrong and we should mention it
|
|
26
|
-
throw new Error('The provided "path" is wrong and no "project" was specified and "defaultProject" is not set in the workspace configuration. ' +
|
|
27
|
-
'Please provide a correct "path" or provide the "project" option instead and try again.');
|
|
28
|
-
}
|
|
29
|
-
const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
9
|
+
const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
30
10
|
const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
|
|
31
|
-
const path = (
|
|
11
|
+
const path = (_a = options.path) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
|
|
32
12
|
return Object.assign(Object.assign({}, options), { path,
|
|
33
|
-
project,
|
|
34
13
|
projectSourceRoot });
|
|
35
14
|
});
|
|
36
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":";;;;AACA,yCAA2E;AAG3E,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAAe;;;QAEf,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;QACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;QAEJ,uCACK,OAAO,KACV,IAAI;YACJ,iBAAiB,IACjB;;CACH;AArBD,4CAqBC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export interface Schema {
|
|
2
2
|
name: string;
|
|
3
|
+
project: string;
|
|
3
4
|
path?: string;
|
|
4
|
-
project?: string;
|
|
5
5
|
displayBlock?: boolean;
|
|
6
6
|
inlineStyle?: boolean;
|
|
7
7
|
inlineTemplate?: boolean;
|
|
@@ -21,6 +21,5 @@ export interface Schema {
|
|
|
21
21
|
|
|
22
22
|
export interface NormalizedSchema extends Schema {
|
|
23
23
|
path: string;
|
|
24
|
-
project: string;
|
|
25
24
|
projectSourceRoot: string;
|
|
26
25
|
}
|
|
@@ -8,6 +8,9 @@
|
|
|
8
8
|
"project": {
|
|
9
9
|
"type": "string",
|
|
10
10
|
"description": "The name of the project where the component is located.",
|
|
11
|
+
"$default": {
|
|
12
|
+
"$source": "projectName"
|
|
13
|
+
},
|
|
11
14
|
"x-dropdown": "projects",
|
|
12
15
|
"x-prompt": "What project is the component located in?",
|
|
13
16
|
"x-priority": "important"
|
|
@@ -9,6 +9,9 @@
|
|
|
9
9
|
"project": {
|
|
10
10
|
"type": "string",
|
|
11
11
|
"description": "The name of the project to add cypress component testing configuration to",
|
|
12
|
+
"$default": {
|
|
13
|
+
"$source": "projectName"
|
|
14
|
+
},
|
|
12
15
|
"x-dropdown": "projects",
|
|
13
16
|
"x-prompt": "What project should we add Cypress component testing to?",
|
|
14
17
|
"x-priority": "important"
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.directiveGenerator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const path_1 = require("../utils/path");
|
|
7
|
+
const utils_1 = require("../utils");
|
|
8
|
+
let tsModule;
|
|
9
|
+
function directiveGenerator(tree, schema) {
|
|
10
|
+
var _a, _b, _c;
|
|
11
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
+
const projects = (0, devkit_1.getProjects)(tree);
|
|
13
|
+
if (!projects.has(schema.project)) {
|
|
14
|
+
throw new Error(`Project "${schema.project}" does not exist!`);
|
|
15
|
+
}
|
|
16
|
+
(0, path_1.checkPathUnderProjectRoot)(tree, schema.project, schema.path);
|
|
17
|
+
const project = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
|
|
18
|
+
const path = (_a = schema.path) !== null && _a !== void 0 ? _a : `${project.sourceRoot}`;
|
|
19
|
+
const directiveNames = (0, devkit_1.names)(schema.name);
|
|
20
|
+
const selector = (_b = schema.selector) !== null && _b !== void 0 ? _b : buildSelector(tree, schema.name, (_c = schema.prefix) !== null && _c !== void 0 ? _c : project.prefix);
|
|
21
|
+
const pathToGenerateFiles = schema.flat
|
|
22
|
+
? './files/__directiveFileName__'
|
|
23
|
+
: './files';
|
|
24
|
+
yield (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, pathToGenerateFiles), path, {
|
|
25
|
+
selector,
|
|
26
|
+
directiveClassName: directiveNames.className,
|
|
27
|
+
directiveFileName: directiveNames.fileName,
|
|
28
|
+
standalone: schema.standalone,
|
|
29
|
+
tpl: '',
|
|
30
|
+
});
|
|
31
|
+
if (schema.skipTests) {
|
|
32
|
+
const pathToSpecFile = (0, devkit_1.joinPathFragments)(path, `${!schema.flat ? `${directiveNames.fileName}/` : ``}${directiveNames.fileName}.directive.spec.ts`);
|
|
33
|
+
tree.delete(pathToSpecFile);
|
|
34
|
+
}
|
|
35
|
+
if (!schema.skipImport && !schema.standalone) {
|
|
36
|
+
const modulePath = (0, utils_1.findModule)(tree, path, schema.module);
|
|
37
|
+
(0, utils_1.addToNgModule)(tree, path, modulePath, directiveNames.fileName, `${directiveNames.className}Directive`, `${directiveNames.fileName}.directive`, 'declarations', schema.flat, schema.export);
|
|
38
|
+
}
|
|
39
|
+
if (!schema.skipFormat) {
|
|
40
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
exports.directiveGenerator = directiveGenerator;
|
|
45
|
+
function buildSelector(tree, name, prefix) {
|
|
46
|
+
let selector = (0, devkit_1.names)(name).fileName;
|
|
47
|
+
const selectorPrefix = (0, devkit_1.names)(prefix !== null && prefix !== void 0 ? prefix : (0, devkit_1.readNxJson)(tree).npmScope).fileName;
|
|
48
|
+
return (0, devkit_1.names)(`${selectorPrefix}-${selector}`).propertyName;
|
|
49
|
+
}
|
|
50
|
+
exports.default = directiveGenerator;
|
|
51
|
+
//# sourceMappingURL=directive.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"directive.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/directive/directive.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { <%= directiveClassName %>Directive } from './<%= directiveFileName %>.directive';
|
|
2
|
+
|
|
3
|
+
describe('<%= directiveClassName %>Directive', () => {
|
|
4
|
+
it('should create an instance', () => {
|
|
5
|
+
const directive = new <%= directiveClassName %>Directive();
|
|
6
|
+
expect(directive).toBeTruthy();
|
|
7
|
+
});
|
|
8
|
+
});
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export interface Schema {
|
|
2
|
+
name: string;
|
|
3
|
+
project: string;
|
|
4
|
+
path?: string;
|
|
5
|
+
prefix?: string;
|
|
6
|
+
skipTests?: boolean;
|
|
7
|
+
skipImport?: boolean;
|
|
8
|
+
selector?: string;
|
|
9
|
+
standalone?: boolean;
|
|
10
|
+
flat?: boolean;
|
|
11
|
+
module?: string;
|
|
12
|
+
export?: boolean;
|
|
13
|
+
skipFormat?: boolean;
|
|
14
|
+
}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/draft-07/schema",
|
|
3
|
+
"$id": "GeneratorAngularDirective",
|
|
4
|
+
"cli": "nx",
|
|
5
|
+
"title": "Nx Angular Directive Options Schema",
|
|
6
|
+
"type": "object",
|
|
7
|
+
"description": "Creates a new, generic directive definition in the given project.",
|
|
8
|
+
"additionalProperties": false,
|
|
9
|
+
"properties": {
|
|
10
|
+
"name": {
|
|
11
|
+
"type": "string",
|
|
12
|
+
"description": "The name of the new directive.",
|
|
13
|
+
"$default": {
|
|
14
|
+
"$source": "argv",
|
|
15
|
+
"index": 0
|
|
16
|
+
},
|
|
17
|
+
"x-prompt": "What name would you like to use for the directive?"
|
|
18
|
+
},
|
|
19
|
+
"path": {
|
|
20
|
+
"type": "string",
|
|
21
|
+
"format": "path",
|
|
22
|
+
"$default": {
|
|
23
|
+
"$source": "workingDirectory"
|
|
24
|
+
},
|
|
25
|
+
"description": "The path at which to create the interface that defines the directive, relative to the workspace root.",
|
|
26
|
+
"visible": false
|
|
27
|
+
},
|
|
28
|
+
"project": {
|
|
29
|
+
"type": "string",
|
|
30
|
+
"description": "The name of the project.",
|
|
31
|
+
"$default": {
|
|
32
|
+
"$source": "projectName"
|
|
33
|
+
},
|
|
34
|
+
"x-dropdown": "projects"
|
|
35
|
+
},
|
|
36
|
+
"prefix": {
|
|
37
|
+
"type": "string",
|
|
38
|
+
"description": "A prefix to apply to generated selectors.",
|
|
39
|
+
"alias": "p",
|
|
40
|
+
"oneOf": [
|
|
41
|
+
{
|
|
42
|
+
"maxLength": 0
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
"minLength": 1,
|
|
46
|
+
"format": "html-selector"
|
|
47
|
+
}
|
|
48
|
+
]
|
|
49
|
+
},
|
|
50
|
+
"skipTests": {
|
|
51
|
+
"type": "boolean",
|
|
52
|
+
"description": "Do not create \"spec.ts\" test files for the new class.",
|
|
53
|
+
"default": false
|
|
54
|
+
},
|
|
55
|
+
"skipImport": {
|
|
56
|
+
"type": "boolean",
|
|
57
|
+
"description": "Do not import this directive into the owning NgModule.",
|
|
58
|
+
"default": false
|
|
59
|
+
},
|
|
60
|
+
"selector": {
|
|
61
|
+
"type": "string",
|
|
62
|
+
"format": "html-selector",
|
|
63
|
+
"description": "The HTML selector to use for this directive."
|
|
64
|
+
},
|
|
65
|
+
"standalone": {
|
|
66
|
+
"description": "Whether the generated directive is standalone.",
|
|
67
|
+
"type": "boolean",
|
|
68
|
+
"default": false
|
|
69
|
+
},
|
|
70
|
+
"flat": {
|
|
71
|
+
"type": "boolean",
|
|
72
|
+
"description": "When true (the default), creates the new files at the top level of the current project.",
|
|
73
|
+
"default": true
|
|
74
|
+
},
|
|
75
|
+
"module": {
|
|
76
|
+
"type": "string",
|
|
77
|
+
"description": "The filename of the declaring NgModule.",
|
|
78
|
+
"alias": "m"
|
|
79
|
+
},
|
|
80
|
+
"export": {
|
|
81
|
+
"type": "boolean",
|
|
82
|
+
"default": false,
|
|
83
|
+
"description": "The declaring NgModule exports this directive."
|
|
84
|
+
},
|
|
85
|
+
"skipFormat": {
|
|
86
|
+
"type": "boolean",
|
|
87
|
+
"default": false,
|
|
88
|
+
"description": "Skip formatting of files."
|
|
89
|
+
}
|
|
90
|
+
},
|
|
91
|
+
"required": ["name", "project"]
|
|
92
|
+
}
|
|
@@ -9,7 +9,6 @@ const project_1 = require("../utils/project");
|
|
|
9
9
|
const setup_mf_1 = require("../setup-mf/setup-mf");
|
|
10
10
|
const test_runners_1 = require("../../utils/test-runners");
|
|
11
11
|
const lib_1 = require("./lib");
|
|
12
|
-
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
13
12
|
const version_utils_1 = require("../utils/version-utils");
|
|
14
13
|
const semver_1 = require("semver");
|
|
15
14
|
function host(tree, options) {
|
|
@@ -59,7 +58,7 @@ function host(tree, options) {
|
|
|
59
58
|
if (!options.skipFormat) {
|
|
60
59
|
yield (0, devkit_1.formatFiles)(tree);
|
|
61
60
|
}
|
|
62
|
-
return (0,
|
|
61
|
+
return (0, devkit_1.runTasksInSerial)(...installTasks);
|
|
63
62
|
});
|
|
64
63
|
}
|
|
65
64
|
exports.host = host;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,8 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
7
7
|
const jest_1 = require("@nrwl/jest");
|
|
8
8
|
const linter_1 = require("@nrwl/linter");
|
|
9
9
|
const js_1 = require("@nrwl/js");
|
|
10
|
-
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
11
10
|
const backward_compatible_versions_1 = require("../../../utils/backward-compatible-versions");
|
|
12
11
|
const test_runners_1 = require("../../../utils/test-runners");
|
|
13
|
-
const karma_1 = require("../../karma/karma");
|
|
14
12
|
const version_utils_1 = require("../../utils/version-utils");
|
|
15
13
|
function angularInitGenerator(host, rawOptions) {
|
|
16
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -52,7 +50,7 @@ function angularInitGenerator(host, rawOptions) {
|
|
|
52
50
|
if (!options.skipFormat) {
|
|
53
51
|
yield (0, devkit_1.formatFiles)(host);
|
|
54
52
|
}
|
|
55
|
-
return (0,
|
|
53
|
+
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
56
54
|
});
|
|
57
55
|
}
|
|
58
56
|
exports.angularInitGenerator = angularInitGenerator;
|
|
@@ -103,10 +101,6 @@ function updateDependencies(tree) {
|
|
|
103
101
|
function addUnitTestRunner(tree, options) {
|
|
104
102
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
105
103
|
switch (options.unitTestRunner) {
|
|
106
|
-
case test_runners_1.UnitTestRunner.Karma:
|
|
107
|
-
return yield (0, karma_1.karmaGenerator)(tree, {
|
|
108
|
-
skipPackageJson: options.skipPackageJson,
|
|
109
|
-
});
|
|
110
104
|
case test_runners_1.UnitTestRunner.Jest:
|
|
111
105
|
if (!options.skipPackageJson) {
|
|
112
106
|
(0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/init/angular-v14/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/init/angular-v14/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,9 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
7
7
|
const jest_1 = require("@nrwl/jest");
|
|
8
8
|
const linter_1 = require("@nrwl/linter");
|
|
9
9
|
const js_1 = require("@nrwl/js");
|
|
10
|
-
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
11
10
|
const path_1 = require("path");
|
|
12
11
|
const test_runners_1 = require("../../utils/test-runners");
|
|
13
12
|
const versions_1 = require("../../utils/versions");
|
|
14
|
-
const karma_1 = require("../karma/karma");
|
|
15
13
|
const version_utils_1 = require("../utils/version-utils");
|
|
16
14
|
function angularInitGenerator(tree, rawOptions) {
|
|
17
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -60,7 +58,7 @@ function angularInitGenerator(tree, rawOptions) {
|
|
|
60
58
|
if (!options.skipFormat) {
|
|
61
59
|
yield (0, devkit_1.formatFiles)(tree);
|
|
62
60
|
}
|
|
63
|
-
return (0,
|
|
61
|
+
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
64
62
|
});
|
|
65
63
|
}
|
|
66
64
|
exports.angularInitGenerator = angularInitGenerator;
|
|
@@ -111,10 +109,6 @@ function updateDependencies(tree) {
|
|
|
111
109
|
function addUnitTestRunner(tree, options) {
|
|
112
110
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
113
111
|
switch (options.unitTestRunner) {
|
|
114
|
-
case test_runners_1.UnitTestRunner.Karma:
|
|
115
|
-
return yield (0, karma_1.karmaGenerator)(tree, {
|
|
116
|
-
skipPackageJson: options.skipPackageJson,
|
|
117
|
-
});
|
|
118
112
|
case test_runners_1.UnitTestRunner.Jest:
|
|
119
113
|
if (!options.skipPackageJson) {
|
|
120
114
|
(0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|