@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
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.9.0-beta.1",
|
|
4
4
|
"private": false,
|
|
5
|
-
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress,
|
|
5
|
+
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/nrwl/nx.git",
|
|
@@ -63,13 +63,13 @@
|
|
|
63
63
|
"migrations": "./migrations.json"
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@nrwl/cypress": "15.
|
|
67
|
-
"@nrwl/devkit": "15.
|
|
68
|
-
"@nrwl/jest": "15.
|
|
69
|
-
"@nrwl/js": "15.
|
|
70
|
-
"@nrwl/linter": "15.
|
|
71
|
-
"@nrwl/webpack": "15.
|
|
72
|
-
"@nrwl/workspace": "15.
|
|
66
|
+
"@nrwl/cypress": "15.9.0-beta.1",
|
|
67
|
+
"@nrwl/devkit": "15.9.0-beta.1",
|
|
68
|
+
"@nrwl/jest": "15.9.0-beta.1",
|
|
69
|
+
"@nrwl/js": "15.9.0-beta.1",
|
|
70
|
+
"@nrwl/linter": "15.9.0-beta.1",
|
|
71
|
+
"@nrwl/webpack": "15.9.0-beta.1",
|
|
72
|
+
"@nrwl/workspace": "15.9.0-beta.1",
|
|
73
73
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
74
74
|
"chalk": "^4.1.0",
|
|
75
75
|
"chokidar": "^3.5.1",
|
|
@@ -108,5 +108,5 @@
|
|
|
108
108
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
109
109
|
"typings": "index.d.ts",
|
|
110
110
|
"sideEffects": false,
|
|
111
|
-
"gitHead": "
|
|
111
|
+
"gitHead": "0ef06e4af7c17cf84717a2941f82f3e41e5c2c89"
|
|
112
112
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { NxComponentTestingOptions } from '@nrwl/cypress/plugins/cypress-preset';
|
|
2
|
-
import type { BrowserBuilderSchema } from '../src/builders/webpack-browser/
|
|
2
|
+
import type { BrowserBuilderSchema } from '../src/builders/webpack-browser/schema';
|
|
3
3
|
/**
|
|
4
4
|
* Angular nx preset for Cypress Component Testing
|
|
5
5
|
*
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DependentBuildableProjectNode } from '@nrwl/
|
|
1
|
+
import { DependentBuildableProjectNode } from '@nrwl/js/src/utils/buildable-libs-utils';
|
|
2
2
|
import { ProjectGraph } from '@nrwl/devkit';
|
|
3
3
|
export declare function createTmpTsConfigForBuildableLibs(tsConfigPath: string, context: import('@angular-devkit/architect').BuilderContext, options?: {
|
|
4
4
|
projectGraph?: ProjectGraph;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createTmpTsConfigForBuildableLibs = void 0;
|
|
4
|
-
const buildable_libs_utils_1 = require("@nrwl/
|
|
4
|
+
const buildable_libs_utils_1 = require("@nrwl/js/src/utils/buildable-libs-utils");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
function createTmpTsConfigForBuildableLibs(tsConfigPath, context, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildable-libs.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/buildable-libs.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"buildable-libs.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/buildable-libs.ts"],"names":[],"mappings":";;;AAAA,kFAIiD;AACjD,yCAAoE;AACpE,+BAA4B;AAE5B,SAAgB,iCAAiC,CAC/C,YAAoB,EACpB,OAA2D,EAC3D,OAA0D;;IAE1D,IAAI,YAA6C,CAAC;IAClD,MAAM,MAAM,GAAG,IAAA,mDAA4B,EACzC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,mCAAI,IAAA,+BAAsB,GAAE,EACjD,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EACxC,OAAO,CAAC,MAAM,CAAC,aAAa,CAC7B,CAAC;IACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;IAEnC,MAAM,eAAe,GAAG,IAAA,wCAAiB,EACvC,IAAA,WAAI,EAAC,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,EACzC,OAAO,CAAC,aAAa,EACrB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EACvB,YAAY,CACb,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,eAAe,CAAC;IAE/C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC;AACzD,CAAC;AAxBD,8EAwBC"}
|
|
@@ -278,7 +278,7 @@
|
|
|
278
278
|
},
|
|
279
279
|
"vendorChunk": {
|
|
280
280
|
"type": "boolean",
|
|
281
|
-
"description": "Generate a seperate bundle containing only vendor libraries. This option should only used for development.",
|
|
281
|
+
"description": "Generate a seperate bundle containing only vendor libraries. This option should only be used for development to reduce the incremental compilation time.",
|
|
282
282
|
"default": false
|
|
283
283
|
},
|
|
284
284
|
"commonChunk": {
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validateOptions = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
|
|
7
|
+
function validateOptions(options) {
|
|
8
|
+
const angularVersionInfo = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
|
|
9
|
+
validatePolyfills(options, angularVersionInfo);
|
|
10
|
+
validateStyles(options, angularVersionInfo);
|
|
11
|
+
}
|
|
12
|
+
exports.validateOptions = validateOptions;
|
|
13
|
+
function validatePolyfills(options, { major, version }) {
|
|
14
|
+
if (major < 15 && Array.isArray(options.polyfills)) {
|
|
15
|
+
throw new Error((0, devkit_1.stripIndents) `The array syntax for the "polyfills" option is supported from Angular >= 15.0.0. You are currently using "${version}".
|
|
16
|
+
You can resolve this error by removing the "polyfills" option, setting it to a string value or migrating to Angular 15.0.0.`);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
function validateStyles(options, { major, version }) {
|
|
20
|
+
if (!options.styles || !options.styles.length) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
if (major < 15) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
const stylusFiles = [];
|
|
27
|
+
options.styles.forEach((style) => {
|
|
28
|
+
const styleFile = typeof style === 'string' ? style : style.input;
|
|
29
|
+
if ((0, path_1.extname)(styleFile) === '.styl') {
|
|
30
|
+
stylusFiles.push(styleFile);
|
|
31
|
+
}
|
|
32
|
+
});
|
|
33
|
+
if (stylusFiles.length) {
|
|
34
|
+
throw new Error((0, devkit_1.stripIndents) `Stylus is not supported since Angular v15. You're currently using "${version}".
|
|
35
|
+
You have the "styles" option with the following file(s) using the ".styl" extension: ${stylusFiles
|
|
36
|
+
.map((x) => `"${x}"`)
|
|
37
|
+
.join(', ')}.
|
|
38
|
+
Make sure to convert them to a supported extension (".css", ".scss", ".sass", ".less").`);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=validate-options.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/validate-options.ts"],"names":[],"mappings":";;;AAAA,yCAA4C;AAC5C,+BAA+B;AAE/B,2FAAiG;AAGjG,SAAgB,eAAe,CAAC,OAA6B;IAC3D,MAAM,kBAAkB,GAAG,IAAA,sDAA8B,GAAE,CAAC;IAC5D,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAC/C,cAAc,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;AAC9C,CAAC;AAJD,0CAIC;AAED,SAAS,iBAAiB,CACxB,OAA6B,EAC7B,EAAE,KAAK,EAAE,OAAO,EAAe;IAE/B,IAAI,KAAK,GAAG,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAClD,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,6GAA6G,OAAO;kIAClB,CAAC,CAAC;KACjI;AACH,CAAC;AAED,SAAS,cAAc,CACrB,OAA6B,EAC7B,EAAE,KAAK,EAAE,OAAO,EAAe;IAE/B,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAC7C,OAAO;KACR;IAED,IAAI,KAAK,GAAG,EAAE,EAAE;QACd,OAAO;KACR;IAED,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC/B,MAAM,SAAS,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;QAClE,IAAI,IAAA,cAAO,EAAC,SAAS,CAAC,KAAK,OAAO,EAAE;YAClC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC7B;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,WAAW,CAAC,MAAM,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,sEAAsE,OAAO;6FAChB,WAAW;aAC/F,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;aACpB,IAAI,CAAC,IAAI,CAAC;8FAC2E,CAAC,CAAC;KAC7F;AACH,CAAC"}
|
|
@@ -1,11 +1,5 @@
|
|
|
1
1
|
import { Observable } from 'rxjs';
|
|
2
|
-
|
|
3
|
-
customWebpackConfig?: {
|
|
4
|
-
path: string;
|
|
5
|
-
};
|
|
6
|
-
indexFileTransformer?: string;
|
|
7
|
-
buildLibsFromSource?: boolean;
|
|
8
|
-
};
|
|
2
|
+
import type { BrowserBuilderSchema } from './schema';
|
|
9
3
|
export declare function executeWebpackBrowserBuilder(options: BrowserBuilderSchema, context: import('@angular-devkit/architect').BuilderContext): Observable<import('@angular-devkit/architect').BuilderOutput>;
|
|
10
4
|
declare const _default: any;
|
|
11
5
|
export default _default;
|
|
@@ -10,16 +10,9 @@ const operators_1 = require("nx/src/project-graph/operators");
|
|
|
10
10
|
const utils_1 = require("nx/src/tasks-runner/utils");
|
|
11
11
|
const rxjs_1 = require("rxjs");
|
|
12
12
|
const operators_2 = require("rxjs/operators");
|
|
13
|
-
const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
|
|
14
13
|
const buildable_libs_1 = require("../utilities/buildable-libs");
|
|
15
14
|
const webpack_1 = require("../utilities/webpack");
|
|
16
|
-
|
|
17
|
-
const { major, version } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
|
|
18
|
-
if (major < 15 && Array.isArray(options.polyfills)) {
|
|
19
|
-
throw new Error((0, devkit_1.stripIndents) `The array syntax for the "polyfills" option is supported from Angular >= 15.0.0. You are currently using ${version}.
|
|
20
|
-
You can resolve this error by removing the "polyfills" option, setting it to a string value or migrating to Angular 15.0.0.`);
|
|
21
|
-
}
|
|
22
|
-
}
|
|
15
|
+
const validate_options_1 = require("./validate-options");
|
|
23
16
|
function shouldSkipInitialTargetRun(projectGraph, project, target) {
|
|
24
17
|
var _a;
|
|
25
18
|
const nxJson = (0, file_utils_1.readNxJson)();
|
|
@@ -33,7 +26,7 @@ function shouldSkipInitialTargetRun(projectGraph, project, target) {
|
|
|
33
26
|
}
|
|
34
27
|
function executeWebpackBrowserBuilder(options, context) {
|
|
35
28
|
var _a;
|
|
36
|
-
validateOptions(options);
|
|
29
|
+
(0, validate_options_1.validateOptions)(options);
|
|
37
30
|
(_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : (options.buildLibsFromSource = true);
|
|
38
31
|
const { buildLibsFromSource, customWebpackConfig, indexFileTransformer } = options, delegateBuilderOptions = tslib_1.__rest(options, ["buildLibsFromSource", "customWebpackConfig", "indexFileTransformer"]);
|
|
39
32
|
const pathToWebpackConfig = (customWebpackConfig === null || customWebpackConfig === void 0 ? void 0 : customWebpackConfig.path) &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,38 +14,35 @@ const rxjs_1 = require("rxjs");
|
|
|
14
14
|
const operators_2 = require("rxjs/operators");
|
|
15
15
|
const typescript_1 = require("nx/src/utils/typescript");
|
|
16
16
|
function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
17
|
-
var _a, _b, _c
|
|
17
|
+
var _a, _b, _c;
|
|
18
18
|
process.env.NX_TSCONFIG_PATH = (0, typescript_1.getRootTsConfigPath)();
|
|
19
19
|
const options = (0, lib_1.normalizeOptions)(rawOptions);
|
|
20
20
|
const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, (0, devkit_1.readCachedProjectGraph)());
|
|
21
21
|
const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBrowserTarget.project);
|
|
22
22
|
const buildTarget = browserTargetProjectConfiguration.targets[parsedBrowserTarget.target];
|
|
23
|
-
const
|
|
23
|
+
const buildTargetOptions = Object.assign(Object.assign({}, buildTarget.options), (parsedBrowserTarget.configuration
|
|
24
24
|
? buildTarget.configurations[parsedBrowserTarget.configuration]
|
|
25
25
|
: buildTarget.defaultConfiguration
|
|
26
26
|
? buildTarget.configurations[buildTarget.defaultConfiguration]
|
|
27
|
-
:
|
|
28
|
-
const buildLibsFromSource = (
|
|
29
|
-
const customWebpackConfig = (_d = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.customWebpackConfig) !== null && _d !== void 0 ? _d : buildTarget.options.customWebpackConfig;
|
|
27
|
+
: {}));
|
|
28
|
+
const buildLibsFromSource = (_b = (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : buildTargetOptions.buildLibsFromSource) !== null && _b !== void 0 ? _b : true;
|
|
30
29
|
let pathToWebpackConfig;
|
|
31
|
-
if (customWebpackConfig
|
|
32
|
-
pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, customWebpackConfig.path);
|
|
30
|
+
if ((_c = buildTargetOptions.customWebpackConfig) === null || _c === void 0 ? void 0 : _c.path) {
|
|
31
|
+
pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetOptions.customWebpackConfig.path);
|
|
33
32
|
if (pathToWebpackConfig && !(0, fs_1.existsSync)(pathToWebpackConfig)) {
|
|
34
33
|
throw new Error(`Custom Webpack Config File Not Found!\nTo use a custom webpack config, please ensure the path to the custom webpack file is correct: \n${pathToWebpackConfig}`);
|
|
35
34
|
}
|
|
36
35
|
}
|
|
37
|
-
const indexFileTransformer = (_e = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.indexFileTransformer) !== null && _e !== void 0 ? _e : buildTarget.options.indexFileTransformer;
|
|
38
36
|
let pathToIndexFileTransformer;
|
|
39
|
-
if (indexFileTransformer) {
|
|
40
|
-
pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, indexFileTransformer);
|
|
37
|
+
if (buildTargetOptions.indexFileTransformer) {
|
|
38
|
+
pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetOptions.indexFileTransformer);
|
|
41
39
|
if (pathToIndexFileTransformer && !(0, fs_1.existsSync)(pathToIndexFileTransformer)) {
|
|
42
40
|
throw new Error(`File containing Index File Transformer function Not Found!\n Please ensure the path to the file containing the function is correct: \n${pathToIndexFileTransformer}`);
|
|
43
41
|
}
|
|
44
42
|
}
|
|
45
43
|
let dependencies;
|
|
46
44
|
if (!buildLibsFromSource) {
|
|
47
|
-
const
|
|
48
|
-
const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetTsConfigPath, context, {
|
|
45
|
+
const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetOptions.buildTargetTsConfigPath, context, {
|
|
49
46
|
target: parsedBrowserTarget.target,
|
|
50
47
|
});
|
|
51
48
|
dependencies = foundDependencies;
|
|
@@ -65,7 +62,7 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
|
65
62
|
// otherwise the build will fail if customWebpack function/file is referencing
|
|
66
63
|
// local libs. This synchronize the behavior with webpack-browser and
|
|
67
64
|
// webpack-server implementation.
|
|
68
|
-
|
|
65
|
+
buildTargetOptions.tsConfig = tsConfigPath;
|
|
69
66
|
}
|
|
70
67
|
return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeDevServerBuilder }) => executeDevServerBuilder(options, context, Object.assign({ webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
71
68
|
if (!buildLibsFromSource) {
|
|
@@ -83,10 +80,10 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
|
83
80
|
if (!pathToWebpackConfig) {
|
|
84
81
|
return baseWebpackConfig;
|
|
85
82
|
}
|
|
86
|
-
return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig,
|
|
83
|
+
return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, buildTargetOptions, context.target);
|
|
87
84
|
}) }, (pathToIndexFileTransformer
|
|
88
85
|
? {
|
|
89
|
-
indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer,
|
|
86
|
+
indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, buildTargetOptions.tsConfig, context.target),
|
|
90
87
|
}
|
|
91
88
|
: {})))));
|
|
92
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yCAIsB;AACtB,yHAAkH;AAElH,sEAAoF;AACpF,2BAAgC;AAChC,8DAA8D;AAC9D,kDAG8B;AAC9B,+BAAyC;AAEzC,gEAAgF;AAChF,+BAA4B;AAC5B,8CAA2C;AAC3C,wDAA8D;AAE9D,SAAgB,8BAA8B,CAC5C,UAAkB,EAClB,OAA2D;;IAE3D,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,IAAA,gCAAmB,GAAE,CAAC;IAErD,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;IAE7C,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,OAAO,CAAC,aAAa,EACrB,IAAA,+BAAsB,GAAE,CACzB,CAAC;IACF,MAAM,iCAAiC,GAAG,IAAA,8CAA8B,EACtE,mBAAmB,CAAC,OAAO,CAC5B,CAAC;IAEF,MAAM,WAAW,GACf,iCAAiC,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAExE,MAAM,
|
|
1
|
+
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -126,6 +126,11 @@
|
|
|
126
126
|
"description": "URL where files will be deployed.",
|
|
127
127
|
"x-deprecated": "Use \"baseHref\" browser builder option, \"APP_BASE_HREF\" DI token or a combination of both instead. For more information, see https://angular.io/guide/deployment#the-deploy-url."
|
|
128
128
|
},
|
|
129
|
+
"vendorChunk": {
|
|
130
|
+
"type": "boolean",
|
|
131
|
+
"description": "Generate a seperate bundle containing only vendor libraries. This option should only be used for development to reduce the incremental compilation time. _Note: supported in Angular versions >= 15.1.0_",
|
|
132
|
+
"default": false
|
|
133
|
+
},
|
|
129
134
|
"verbose": {
|
|
130
135
|
"type": "boolean",
|
|
131
136
|
"description": "Adds more details to output logging.",
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validateOptions = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const semver_1 = require("semver");
|
|
6
|
+
const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
|
|
7
|
+
function validateOptions(options) {
|
|
8
|
+
const angularVersionInfo = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
|
|
9
|
+
validateAssets(options, angularVersionInfo);
|
|
10
|
+
validateBundleDependencies(options, angularVersionInfo);
|
|
11
|
+
validateVendorChunk(options, angularVersionInfo);
|
|
12
|
+
}
|
|
13
|
+
exports.validateOptions = validateOptions;
|
|
14
|
+
function validateAssets(options, { version }) {
|
|
15
|
+
if ((0, semver_1.lt)(version, '15.1.0') &&
|
|
16
|
+
Array.isArray(options.assets) &&
|
|
17
|
+
options.assets.length > 0) {
|
|
18
|
+
throw new Error((0, devkit_1.stripIndents) `The "assets" option is supported from Angular >= 15.1.0. You are currently using "${version}".
|
|
19
|
+
You can resolve this error by removing the "assets" option or by migrating to Angular 15.1.0.`);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
function validateBundleDependencies(options, { major, version }) {
|
|
23
|
+
if (major >= 15 && options.bundleDependencies) {
|
|
24
|
+
throw new Error((0, devkit_1.stripIndents) `The "bundleDependencies" option was removed in Angular version 15. You are currently using "${version}".
|
|
25
|
+
You can resolve this error by removing the "bundleDependencies" option.`);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
function validateVendorChunk(options, { version }) {
|
|
29
|
+
if ((0, semver_1.lt)(version, '15.1.0') && options.vendorChunk) {
|
|
30
|
+
throw new Error((0, devkit_1.stripIndents) `The "vendorChunk" option is supported from Angular >= 15.1.0. You are currently using "${version}".
|
|
31
|
+
You can resolve this error by removing the "vendorChunk" option or by migrating to Angular 15.1.0.`);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=validate-options.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/validate-options.ts"],"names":[],"mappings":";;;AAAA,yCAA4C;AAC5C,mCAA4B;AAE5B,2FAAiG;AAGjG,SAAgB,eAAe,CAAC,OAAe;IAC7C,MAAM,kBAAkB,GAAG,IAAA,sDAA8B,GAAE,CAAC;IAC5D,cAAc,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAC5C,0BAA0B,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IACxD,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;AACnD,CAAC;AALD,0CAKC;AAED,SAAS,cAAc,CAAC,OAAe,EAAE,EAAE,OAAO,EAAe;IAC/D,IACE,IAAA,WAAE,EAAC,OAAO,EAAE,QAAQ,CAAC;QACrB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;QAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EACzB;QACA,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,qFAAqF,OAAO;kGAC1B,CAAC,CAAC;KACjG;AACH,CAAC;AAED,SAAS,0BAA0B,CACjC,OAAe,EACf,EAAE,KAAK,EAAE,OAAO,EAAe;IAE/B,IAAI,KAAK,IAAI,EAAE,IAAI,OAAO,CAAC,kBAAkB,EAAE;QAC7C,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,+FAA+F,OAAO;4EAC1D,CAAC,CAAC;KAC3E;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAe,EAAE,EAAE,OAAO,EAAe;IACpE,IAAI,IAAA,WAAE,EAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,WAAW,EAAE;QAChD,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,0FAA0F,OAAO;uGAC1B,CAAC,CAAC;KACtG;AACH,CAAC"}
|
|
@@ -5,11 +5,12 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const fs_1 = require("fs");
|
|
7
7
|
const rxjs_1 = require("rxjs");
|
|
8
|
-
const webpack_1 = require("../utilities/webpack");
|
|
9
|
-
const buildable_libs_1 = require("../utilities/buildable-libs");
|
|
10
8
|
const operators_1 = require("rxjs/operators");
|
|
11
|
-
const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
|
|
12
9
|
const semver_1 = require("semver");
|
|
10
|
+
const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
|
|
11
|
+
const buildable_libs_1 = require("../utilities/buildable-libs");
|
|
12
|
+
const webpack_1 = require("../utilities/webpack");
|
|
13
|
+
const validate_options_1 = require("./validate-options");
|
|
13
14
|
function buildServerApp(options, context) {
|
|
14
15
|
const { buildLibsFromSource, customWebpackConfig } = options, delegateOptions = tslib_1.__rest(options, ["buildLibsFromSource", "customWebpackConfig"]);
|
|
15
16
|
// If there is a path to custom webpack config
|
|
@@ -49,18 +50,8 @@ function buildServerAppWithCustomWebpackConfiguration(options, context, pathToWe
|
|
|
49
50
|
}
|
|
50
51
|
function executeWebpackServerBuilder(options, context) {
|
|
51
52
|
var _a;
|
|
53
|
+
(0, validate_options_1.validateOptions)(options);
|
|
52
54
|
const installedAngularVersionInfo = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
|
|
53
|
-
if ((0, semver_1.lt)(installedAngularVersionInfo.version, '15.1.0') &&
|
|
54
|
-
Array.isArray(options.assets) &&
|
|
55
|
-
options.assets.length > 0) {
|
|
56
|
-
throw new Error((0, devkit_1.stripIndents) `The "assets" option is only supported in Angular >= 15.1.0. You are currently using ${installedAngularVersionInfo.version}.
|
|
57
|
-
You can resolve this error by removing the "assets" option or by migrating to Angular 15.1.0.`);
|
|
58
|
-
}
|
|
59
|
-
if ((0, semver_1.gte)(installedAngularVersionInfo.version, '15.0.0') &&
|
|
60
|
-
options.bundleDependencies) {
|
|
61
|
-
throw new Error((0, devkit_1.stripIndents) `The "bundleDependencies" option was removed in Angular version 15. You are currently using ${installedAngularVersionInfo.version}.
|
|
62
|
-
You can resolve this error by removing the "bundleDependencies" option.`);
|
|
63
|
-
}
|
|
64
55
|
// default bundleDependencies to true if supported by Angular version
|
|
65
56
|
if ((0, semver_1.lt)(installedAngularVersionInfo.version, '15.0.0') &&
|
|
66
57
|
options.bundleDependencies === undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.delegateBuildExecutor = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const buildable_libs_utils_1 = require("@nrwl/
|
|
6
|
+
const buildable_libs_utils_1 = require("@nrwl/js/src/utils/buildable-libs-utils");
|
|
7
7
|
function delegateBuildExecutor(options, context) {
|
|
8
8
|
return tslib_1.__asyncGenerator(this, arguments, function* delegateBuildExecutor_1() {
|
|
9
9
|
const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delegate-build.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/delegate-build/delegate-build.impl.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AACtB,
|
|
1
|
+
{"version":3,"file":"delegate-build.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/delegate-build/delegate-build.impl.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AACtB,kFAIiD;AAGjD,SAAuB,qBAAqB,CAC1C,OAAoC,EACpC,OAAwB;;QAExB,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,mDAA4B,EAC3D,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;QAEF,OAAO,CAAC,QAAQ,GAAG,IAAA,wCAAiB,EAClC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,EACjD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,IAAI,CAAC,IAAI,EAChB,YAAY,CACb,CAAC;QAEF,IACE,CAAC,IAAA,0DAAmC,EAClC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,YAAY,CACb,EACD;YACA,6BAAO,EAAE,OAAO,EAAE,KAAK,EAAE,EAAC;SAC3B;QAED,MAAM,EAAE,WAAW,KAAuB,OAAO,EAAzB,aAAa,kBAAK,OAAO,EAA3C,eAAiC,CAAU,CAAC;QAClD,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAE5E,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,sBAAM,IAAA,oBAAW,EAAC,cAAc,EAAE,aAAa,EAAE,OAAO,CAAC,CAAA,CAAA,CAAA,CAAA,CAAC;IACnE,CAAC;CAAA;AAlCD,sDAkCC;AAED,kBAAe,qBAAqB,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ngPackagrLiteExecutor = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const buildable_libs_utils_1 = require("@nrwl/
|
|
5
|
+
const buildable_libs_utils_1 = require("@nrwl/js/src/utils/buildable-libs-utils");
|
|
6
6
|
const ng_packagr_1 = require("ng-packagr");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const package_impl_1 = require("../package/package.impl");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ng-packagr-lite.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-lite.impl.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"ng-packagr-lite.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-lite.impl.ts"],"names":[],"mappings":";;;;AACA,kFAGiD;AACjD,2CAAuC;AACvC,+BAA+B;AAC/B,0DAAgE;AAEhE,wDAAgF;AAChF,mGAA0G;AAC1G,+EAAkF;AAClF,+EAGwD;AAExD,SAAe,sBAAsB,CACnC,OAA2C,EAC3C,OAAwB,EACxB,mBAAoD;;QAEpD,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAAC;YAC7B,sCAAsC;YACtC,GAAG,iCAAoB;YACvB,GAAG,yCAAwB;YAC3B,IAAA,6BAAgB,EAAC;gBACf,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,KAAK,EAAE,OAAO,CAAC,KAAK;aACrB,CAAC;SACH,CAAC,CAAC;QACH,QAAQ,CAAC,UAAU,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5D,QAAQ,CAAC,kBAAkB,CAAC,iCAAoB,CAAC,OAAO,CAAC,CAAC;QAE1D,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,MAAM,wBAAwB,GAAG,IAAA,wCAAiB,EAChD,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACjE,mBAAmB,CACpB,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,IAAA,kDAAqC,EAC1D,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,QAAQ,EAChB,wBAAwB,CACzB,CAAC;YACF,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;SACjC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAEY,QAAA,qBAAqB,GAAG,IAAA,oCAAqB,EACxD,sBAAsB,CACvB,CAAC;AAEF,kBAAe,6BAAqB,CAAC"}
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
},
|
|
40
40
|
"updateBuildableProjectDepsInPackageJson": {
|
|
41
41
|
"type": "boolean",
|
|
42
|
-
"description": "Whether to update the buildable project dependencies in package.json.",
|
|
42
|
+
"description": "Whether to update the buildable project dependencies in the build output package.json.",
|
|
43
43
|
"default": true
|
|
44
44
|
},
|
|
45
45
|
"buildableProjectDepsInPackageJsonType": {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ExecutorContext } from '@nrwl/devkit';
|
|
2
|
-
import { DependentBuildableProjectNode } from '@nrwl/
|
|
2
|
+
import { DependentBuildableProjectNode } from '@nrwl/js/src/utils/buildable-libs-utils';
|
|
3
3
|
import type { NgPackagr } from 'ng-packagr';
|
|
4
4
|
import type { BuildAngularLibraryExecutorOptions } from './schema';
|
|
5
5
|
/**
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.packageExecutor = exports.createLibraryExecutor = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const rxjs_for_await_1 = require("@nrwl/devkit/src/utils/rxjs-for-await");
|
|
6
|
-
const buildable_libs_utils_1 = require("@nrwl/
|
|
6
|
+
const buildable_libs_utils_1 = require("@nrwl/js/src/utils/buildable-libs-utils");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const rxjs_1 = require("rxjs");
|
|
9
9
|
const operators_1 = require("rxjs/operators");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":";;;;AACA,0EAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
},
|
|
40
40
|
"updateBuildableProjectDepsInPackageJson": {
|
|
41
41
|
"type": "boolean",
|
|
42
|
-
"description": "Whether to update the buildable project dependencies in package.json.",
|
|
42
|
+
"description": "Whether to update the buildable project dependencies in the build output package.json.",
|
|
43
43
|
"default": true
|
|
44
44
|
},
|
|
45
45
|
"buildableProjectDepsInPackageJsonType": {
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
type VersionInfo = {
|
|
1
|
+
export type VersionInfo = {
|
|
2
2
|
major: number;
|
|
3
3
|
version: string;
|
|
4
4
|
};
|
|
5
5
|
export declare function getInstalledAngularVersionInfo(): VersionInfo | null;
|
|
6
6
|
export declare function getInstalledPackageVersionInfo(pkgName: string): VersionInfo | null;
|
|
7
|
-
export {};
|
|
@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const linter_1 = require("@nrwl/linter");
|
|
7
7
|
const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
|
|
8
|
-
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
9
8
|
const path_1 = require("path");
|
|
10
9
|
const version_utils_1 = require("../utils/version-utils");
|
|
11
10
|
const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
|
|
@@ -42,7 +41,7 @@ function addLintingGenerator(tree, options) {
|
|
|
42
41
|
const installTask = yield (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree);
|
|
43
42
|
tasks.push(installTask);
|
|
44
43
|
}
|
|
45
|
-
return (0,
|
|
44
|
+
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
46
45
|
});
|
|
47
46
|
}
|
|
48
47
|
exports.addLintingGenerator = addLintingGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,yCAA4D;AAC5D,wFAAuF;AACvF,+BAA4B;AAC5B,0DAAyF;AACzF,2FAAqF;AACrF,mFAA4E;AAG5E,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;;QAElC,MAAM,kBAAkB,GACtB,IAAA,+DAA+C,EAAC,IAAI,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACtB,IAAI,iBAAiB,GAAG,YACtB,IAAA,WAAI,EAAC,SAAS,EAAE,kBAAkB,EAAE,aAAa,CAAC,4CACnD,CAAC;YACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/C,OAAO;SACR;QAED,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC;QAC9E,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aAC5D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE;gBAClB,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;gBACtD,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC;aACzD;YACD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,WAAW;SACzB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,qDAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,CACjD,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,MAAM,WAAW,GAAG,MAAM,IAAA,8DAA4B,EAAC,IAAI,CAAC,CAAC;YAC7D,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AA7CD,kDA6CC;AAED,kBAAe,mBAAmB,CAAC"}
|
|
@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const linter_1 = require("@nrwl/linter");
|
|
7
7
|
const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
|
|
8
|
-
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
9
8
|
const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
|
|
10
9
|
const create_eslint_configuration_1 = require("./lib/create-eslint-configuration");
|
|
11
10
|
function addLintingGenerator(tree, options) {
|
|
@@ -33,7 +32,7 @@ function addLintingGenerator(tree, options) {
|
|
|
33
32
|
const installTask = yield (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree);
|
|
34
33
|
tasks.push(installTask);
|
|
35
34
|
}
|
|
36
|
-
return (0,
|
|
35
|
+
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
37
36
|
});
|
|
38
37
|
}
|
|
39
38
|
exports.addLintingGenerator = addLintingGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/angular-v14/add-linting.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/angular-v14/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,yCAA4D;AAC5D,wFAAuF;AAEvF,2FAAqF;AACrF,mFAA4E;AAG5E,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC;QAC9E,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aAC5D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE;gBAClB,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;gBACtD,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC;aACzD;YACD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,WAAW;SACzB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,qDAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,CACjD,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,MAAM,WAAW,GAAG,MAAM,IAAA,8DAA4B,EAAC,IAAI,CAAC,CAAC;YAC7D,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAnCD,kDAmCC;AAED,kBAAe,mBAAmB,CAAC"}
|