@nrwl/angular 15.8.4 → 15.9.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/generators.d.ts +0 -4
- package/generators.js +0 -4
- package/generators.js.map +1 -1
- package/generators.json +0 -40
- 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-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/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/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/schema.json +2 -3
- package/src/generators/host/host.js +1 -2
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/host/schema.json +3 -2
- 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/remote/remote.js +1 -2
- package/src/generators/remote/remote.js.map +1 -1
- package/src/generators/remote/schema.json +3 -2
- 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/schema.json +2 -3
- 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/schema.json +2 -3
- 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/schema.json +2 -3
- 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 +2 -2
- 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/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 +39 -2
- package/src/generators/utils/testing.js.map +1 -1
- 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/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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,8DAAoC;AACpC,mDAAyB;AACzB,8DAAoC;AACpC,qDAA2B;AAC3B,kDAAwB;AACxB,+DAAqC;AACrC,sDAA4B"}
|
|
@@ -2,4 +2,3 @@ import { Tree } from '@nrwl/devkit';
|
|
|
2
2
|
import type { WorkspaceProjects } from './types';
|
|
3
3
|
export declare function getAllProjects(tree: Tree): WorkspaceProjects;
|
|
4
4
|
export declare function convertToNxProject(tree: Tree, projectName: string): void;
|
|
5
|
-
export declare function convertAllToNxProjects(tree: Tree): void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.convertToNxProject = exports.getAllProjects = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const angular_json_1 = require("nx/src/adapter/angular-json");
|
|
6
6
|
function getAllProjects(tree) {
|
|
@@ -33,15 +33,4 @@ function convertToNxProject(tree, projectName) {
|
|
|
33
33
|
(0, devkit_1.writeJson)(tree, 'angular.json', Object.assign(Object.assign({}, angularJson), { version: 1 }));
|
|
34
34
|
}
|
|
35
35
|
exports.convertToNxProject = convertToNxProject;
|
|
36
|
-
function convertAllToNxProjects(tree) {
|
|
37
|
-
const angularJson = (0, devkit_1.readJson)(tree, 'angular.json');
|
|
38
|
-
const projects = (0, angular_json_1.toNewFormat)(angularJson).projects;
|
|
39
|
-
for (const projectName of Object.keys(projects)) {
|
|
40
|
-
projects[projectName].name = projectName;
|
|
41
|
-
(0, devkit_1.addProjectConfiguration)(tree, projectName, projects[projectName]);
|
|
42
|
-
delete angularJson.projects[projectName];
|
|
43
|
-
}
|
|
44
|
-
(0, devkit_1.writeJson)(tree, 'angular.json', Object.assign(Object.assign({}, angularJson), { version: 1 }));
|
|
45
|
-
}
|
|
46
|
-
exports.convertAllToNxProjects = convertAllToNxProjects;
|
|
47
36
|
//# sourceMappingURL=projects.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projects.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/projects.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,
|
|
1
|
+
{"version":3,"file":"projects.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/projects.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,8DAA0D;AAG1D,SAAgB,cAAc,CAAC,IAAU;IACvC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,MAAM,GAAsB;QAChC,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,EAAE;KACT,CAAC;IAEF,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QACtC,MAAM,gBAAgB,GAAkC;YACtD,MAAM,EAAE,OAAO;YACf,IAAI;SACL,CAAC;QAEF,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACpC;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACpC;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,wCAqBC;AAED,SAAgB,kBAAkB,CAAC,IAAU,EAAE,WAAmB;IAChE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,IAAA,0BAAW,EAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC/D,OAAO,CAAC,IAAI,GAAG,WAAW,CAAC;IAC3B,IAAA,gCAAuB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACpD,OAAO,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACzC,IAAA,kBAAS,EAAC,IAAI,EAAE,cAAc,kCAAO,WAAW,KAAE,OAAO,EAAE,CAAC,IAAG,CAAC;AAClE,CAAC;AAPD,gDAOC"}
|
|
@@ -13,6 +13,5 @@ export declare function createWorkspaceFiles(tree: Tree): Promise<void>;
|
|
|
13
13
|
export declare function createRootKarmaConfig(tree: Tree): void;
|
|
14
14
|
export declare function getWorkspaceRootFileTypesInfo(tree: Tree, migrators: ProjectMigrator[]): WorkspaceRootFileTypesInfo;
|
|
15
15
|
export declare function updateVsCodeRecommendedExtensions(tree: Tree): void;
|
|
16
|
-
export declare function updatePrettierConfig(tree: Tree): Promise<void>;
|
|
17
16
|
export declare function deleteAngularJson(tree: Tree): void;
|
|
18
17
|
export declare function deleteGitKeepFilesIfNotNeeded(tree: Tree): void;
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.deleteGitKeepFilesIfNotNeeded = exports.deleteAngularJson = exports.
|
|
3
|
+
exports.deleteGitKeepFilesIfNotNeeded = exports.deleteAngularJson = exports.updateVsCodeRecommendedExtensions = exports.getWorkspaceRootFileTypesInfo = exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.cleanupEsLintPackages = exports.updateRootEsLintConfig = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.createNxJson = exports.validateWorkspace = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const linter_1 = require("@nrwl/linter");
|
|
7
|
-
const generate_workspace_files_1 = require("@nrwl/workspace/src/generators/new/generate-workspace-files");
|
|
8
|
-
const default_base_1 = require("@nrwl/workspace/src/utilities/default-base");
|
|
9
|
-
const prettier_1 = require("@nrwl/workspace/src/utilities/prettier");
|
|
10
7
|
const js_1 = require("@nrwl/js");
|
|
11
|
-
const
|
|
8
|
+
const default_base_1 = require("nx/src/utils/default-base");
|
|
9
|
+
const versions_1 = require("@nrwl/js/src/utils/versions");
|
|
12
10
|
const angular_json_1 = require("nx/src/adapter/angular-json");
|
|
13
11
|
const versions_2 = require("../../../utils/versions");
|
|
14
12
|
function validateWorkspace(tree) {
|
|
@@ -221,7 +219,7 @@ exports.cleanupEsLintPackages = cleanupEsLintPackages;
|
|
|
221
219
|
function createWorkspaceFiles(tree) {
|
|
222
220
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
223
221
|
updateVsCodeRecommendedExtensions(tree);
|
|
224
|
-
yield
|
|
222
|
+
yield (0, js_1.initGenerator)(tree, {});
|
|
225
223
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/root'), '.', {
|
|
226
224
|
tmpl: '',
|
|
227
225
|
dot: '.',
|
|
@@ -288,18 +286,6 @@ function updateVsCodeRecommendedExtensions(tree) {
|
|
|
288
286
|
}
|
|
289
287
|
}
|
|
290
288
|
exports.updateVsCodeRecommendedExtensions = updateVsCodeRecommendedExtensions;
|
|
291
|
-
function updatePrettierConfig(tree) {
|
|
292
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
293
|
-
const existingPrettierConfig = yield (0, prettier_1.resolveUserExistingPrettierConfig)();
|
|
294
|
-
if (!existingPrettierConfig) {
|
|
295
|
-
(0, devkit_1.writeJson)(tree, '.prettierrc', generate_workspace_files_1.DEFAULT_NRWL_PRETTIER_CONFIG);
|
|
296
|
-
}
|
|
297
|
-
if (!tree.exists('.prettierignore')) {
|
|
298
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/prettier'), '.', { tmpl: '', dot: '.' });
|
|
299
|
-
}
|
|
300
|
-
});
|
|
301
|
-
}
|
|
302
|
-
exports.updatePrettierConfig = updatePrettierConfig;
|
|
303
289
|
function deleteAngularJson(tree) {
|
|
304
290
|
const projects = (0, angular_json_1.toNewFormat)((0, devkit_1.readJson)(tree, 'angular.json')).projects;
|
|
305
291
|
if (!Object.keys(projects).length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":";;;;AACA,yCASsB;AACtB,yCAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addExportsToBarrel = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
6
|
-
const
|
|
6
|
+
const js_1 = require("@nrwl/js");
|
|
7
7
|
let tsModule;
|
|
8
8
|
/**
|
|
9
9
|
* Add ngrx feature exports to the public barrel in the feature library
|
|
@@ -25,21 +25,21 @@ function addExportsToBarrel(tree, options) {
|
|
|
25
25
|
// Public API for the feature interfaces, selectors, and facade
|
|
26
26
|
const { className, fileName } = (0, devkit_1.names)(options.name);
|
|
27
27
|
const statePath = `./lib/${options.directory}/${fileName}`;
|
|
28
|
-
sourceFile = (0,
|
|
28
|
+
sourceFile = (0, js_1.addGlobal)(tree, sourceFile, indexFilePath, options.barrels
|
|
29
29
|
? `import * as ${className}Actions from '${statePath}.actions';`
|
|
30
30
|
: `export * from '${statePath}.actions';`);
|
|
31
|
-
sourceFile = (0,
|
|
31
|
+
sourceFile = (0, js_1.addGlobal)(tree, sourceFile, indexFilePath, options.barrels
|
|
32
32
|
? `import * as ${className}Feature from '${statePath}.reducer';`
|
|
33
33
|
: `export * from '${statePath}.reducer';`);
|
|
34
|
-
sourceFile = (0,
|
|
34
|
+
sourceFile = (0, js_1.addGlobal)(tree, sourceFile, indexFilePath, options.barrels
|
|
35
35
|
? `import * as ${className}Selectors from '${statePath}.selectors';`
|
|
36
36
|
: `export * from '${statePath}.selectors';`);
|
|
37
37
|
if (options.barrels) {
|
|
38
|
-
sourceFile = (0,
|
|
38
|
+
sourceFile = (0, js_1.addGlobal)(tree, sourceFile, indexFilePath, `export { ${className}Actions, ${className}Feature, ${className}Selectors };`);
|
|
39
39
|
}
|
|
40
|
-
sourceFile = (0,
|
|
40
|
+
sourceFile = (0, js_1.addGlobal)(tree, sourceFile, indexFilePath, `export * from '${statePath}.models';`);
|
|
41
41
|
if (options.facade) {
|
|
42
|
-
sourceFile = (0,
|
|
42
|
+
sourceFile = (0, js_1.addGlobal)(tree, sourceFile, indexFilePath, `export * from '${statePath}.facade';`);
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
exports.addExportsToBarrel = addExportsToBarrel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-exports-barrel.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-exports-barrel.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"add-exports-barrel.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-exports-barrel.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,iCAAqC;AAGrC,IAAI,QAAqC,CAAC;AAE1C;;GAEG;AACH,SAAgB,kBAAkB,CAChC,IAAU,EACV,OAAuC;IAEvC,6EAA6E;IAC7E,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,OAAO;KACR;IAED,MAAM,aAAa,GAAG,IAAA,0BAAiB,EACrC,OAAO,CAAC,eAAe,EACvB,IAAI,EACJ,UAAU,CACX,CAAC;IACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,aAAa,EACb,eAAe,EACf,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,+DAA+D;IAC/D,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,SAAS,OAAO,CAAC,SAAS,IAAI,QAAQ,EAAE,CAAC;IAE3D,UAAU,GAAG,IAAA,cAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,eAAe,SAAS,iBAAiB,SAAS,YAAY;QAChE,CAAC,CAAC,kBAAkB,SAAS,YAAY,CAC5C,CAAC;IACF,UAAU,GAAG,IAAA,cAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,eAAe,SAAS,iBAAiB,SAAS,YAAY;QAChE,CAAC,CAAC,kBAAkB,SAAS,YAAY,CAC5C,CAAC;IACF,UAAU,GAAG,IAAA,cAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,eAAe,SAAS,mBAAmB,SAAS,cAAc;QACpE,CAAC,CAAC,kBAAkB,SAAS,cAAc,CAC9C,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,UAAU,GAAG,IAAA,cAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,YAAY,SAAS,YAAY,SAAS,YAAY,SAAS,cAAc,CAC9E,CAAC;KACH;IAED,UAAU,GAAG,IAAA,cAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,kBAAkB,SAAS,WAAW,CACvC,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,UAAU,GAAG,IAAA,cAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,kBAAkB,SAAS,WAAW,CACvC,CAAC;KACH;AACH,CAAC;AAlFD,gDAkFC"}
|
|
@@ -2,68 +2,68 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addImportsToModule = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const js_1 = require("@nrwl/js");
|
|
6
6
|
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
7
|
-
const
|
|
7
|
+
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
8
8
|
const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
|
|
9
9
|
let tsModule;
|
|
10
10
|
function addRootStoreImport(tree, isParentStandalone, route, sourceFile, parentPath, provideRootStore, storeForRoot) {
|
|
11
11
|
if (isParentStandalone) {
|
|
12
12
|
if (tree.read(parentPath, 'utf-8').includes('bootstrapApplication')) {
|
|
13
|
-
(0,
|
|
13
|
+
(0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, provideRootStore);
|
|
14
14
|
}
|
|
15
15
|
else {
|
|
16
16
|
(0, route_utils_1.addProviderToRoute)(tree, parentPath, route, provideRootStore);
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
else {
|
|
20
|
-
sourceFile = (0,
|
|
20
|
+
sourceFile = (0, ast_utils_1.addImportToModule)(tree, sourceFile, parentPath, storeForRoot);
|
|
21
21
|
}
|
|
22
22
|
return sourceFile;
|
|
23
23
|
}
|
|
24
24
|
function addRootEffectsImport(tree, isParentStandalone, route, sourceFile, parentPath, provideRootEffects, effectsForEmptyRoot) {
|
|
25
25
|
if (isParentStandalone) {
|
|
26
26
|
if (tree.read(parentPath, 'utf-8').includes('bootstrapApplication')) {
|
|
27
|
-
(0,
|
|
27
|
+
(0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, provideRootEffects);
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
30
30
|
(0, route_utils_1.addProviderToRoute)(tree, parentPath, route, provideRootEffects);
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
else {
|
|
34
|
-
sourceFile = (0,
|
|
34
|
+
sourceFile = (0, ast_utils_1.addImportToModule)(tree, sourceFile, parentPath, effectsForEmptyRoot);
|
|
35
35
|
}
|
|
36
36
|
return sourceFile;
|
|
37
37
|
}
|
|
38
38
|
function addRouterStoreImport(tree, sourceFile, addImport, parentPath, storeRouterModule) {
|
|
39
39
|
sourceFile = addImport(sourceFile, 'StoreRouterConnectingModule', '@ngrx/router-store');
|
|
40
|
-
return (0,
|
|
40
|
+
return (0, ast_utils_1.addImportToModule)(tree, sourceFile, parentPath, storeRouterModule);
|
|
41
41
|
}
|
|
42
42
|
function addStoreForFeatureImport(tree, isParentStandalone, route, sourceFile, parentPath, provideStoreForFeature, storeForFeature) {
|
|
43
43
|
if (isParentStandalone) {
|
|
44
44
|
if (tree.read(parentPath, 'utf-8').includes('bootstrapApplication')) {
|
|
45
|
-
(0,
|
|
45
|
+
(0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, provideStoreForFeature);
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
48
48
|
(0, route_utils_1.addProviderToRoute)(tree, parentPath, route, provideStoreForFeature);
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
else {
|
|
52
|
-
sourceFile = (0,
|
|
52
|
+
sourceFile = (0, ast_utils_1.addImportToModule)(tree, sourceFile, parentPath, storeForFeature);
|
|
53
53
|
}
|
|
54
54
|
return sourceFile;
|
|
55
55
|
}
|
|
56
56
|
function addEffectsForFeatureImport(tree, isParentStandalone, route, sourceFile, parentPath, provideEffectsForFeature, effectsForFeature) {
|
|
57
57
|
if (isParentStandalone) {
|
|
58
58
|
if (tree.read(parentPath, 'utf-8').includes('bootstrapApplication')) {
|
|
59
|
-
(0,
|
|
59
|
+
(0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, provideEffectsForFeature);
|
|
60
60
|
}
|
|
61
61
|
else {
|
|
62
62
|
(0, route_utils_1.addProviderToRoute)(tree, parentPath, route, provideEffectsForFeature);
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
else {
|
|
66
|
-
sourceFile = (0,
|
|
66
|
+
sourceFile = (0, ast_utils_1.addImportToModule)(tree, sourceFile, parentPath, effectsForFeature);
|
|
67
67
|
}
|
|
68
68
|
return sourceFile;
|
|
69
69
|
}
|
|
@@ -77,7 +77,7 @@ function addImportsToModule(tree, options) {
|
|
|
77
77
|
let sourceFile = tsModule.createSourceFile(parentPath, sourceText, tsModule.ScriptTarget.Latest, true);
|
|
78
78
|
const isParentStandalone = !sourceText.includes('@NgModule');
|
|
79
79
|
const addImport = (source, symbolName, fileName, isDefault = false) => {
|
|
80
|
-
return (0,
|
|
80
|
+
return (0, js_1.insertImport)(tree, source, parentPath, symbolName, fileName, isDefault);
|
|
81
81
|
};
|
|
82
82
|
const dir = `./${(0, devkit_1.names)(options.directory).fileName}`;
|
|
83
83
|
const pathPrefix = `${dir}/${(0, devkit_1.names)(options.name).fileName}`;
|
|
@@ -133,14 +133,14 @@ function addImportsToModule(tree, options) {
|
|
|
133
133
|
sourceFile = addImport(sourceFile, facadeName, facadePath);
|
|
134
134
|
if (isParentStandalone) {
|
|
135
135
|
if (tree.read(parentPath, 'utf-8').includes('bootstrapApplication')) {
|
|
136
|
-
(0,
|
|
136
|
+
(0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, facadeName);
|
|
137
137
|
}
|
|
138
138
|
else {
|
|
139
139
|
(0, route_utils_1.addProviderToRoute)(tree, parentPath, options.route, facadeName);
|
|
140
140
|
}
|
|
141
141
|
}
|
|
142
142
|
else {
|
|
143
|
-
sourceFile = (0,
|
|
143
|
+
sourceFile = (0, ast_utils_1.addProviderToModule)(tree, sourceFile, parentPath, facadeName);
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
146
|
return sourceFile;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-imports-to-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-imports-to-module.ts"],"names":[],"mappings":";;;AACA,yCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"add-imports-to-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-imports-to-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,22 +2,22 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addNgRxToPackageJson = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
const
|
|
5
|
+
const semver_1 = require("@nrwl/devkit/src/utils/semver");
|
|
6
|
+
const semver_2 = require("semver");
|
|
7
|
+
const version_utils_1 = require("../../../utils/version-utils");
|
|
8
8
|
const versions_1 = require("../../../utils/versions");
|
|
9
|
-
const
|
|
9
|
+
const version_utils_2 = require("../../utils/version-utils");
|
|
10
10
|
function addNgRxToPackageJson(tree) {
|
|
11
11
|
let rxjsVersion;
|
|
12
12
|
try {
|
|
13
|
-
rxjsVersion = (0,
|
|
13
|
+
rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
|
|
14
14
|
}
|
|
15
15
|
catch (_a) {
|
|
16
|
-
rxjsVersion = (0,
|
|
16
|
+
rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
|
|
17
17
|
}
|
|
18
|
-
const jasmineMarblesVersion = (0,
|
|
19
|
-
const angularMajorVersion = (0,
|
|
20
|
-
const ngrxVersion = (0,
|
|
18
|
+
const jasmineMarblesVersion = (0, semver_2.gte)(rxjsVersion, '7.0.0') ? '~0.9.1' : '~0.8.3';
|
|
19
|
+
const angularMajorVersion = (0, version_utils_2.getInstalledAngularMajorVersion)(tree);
|
|
20
|
+
const ngrxVersion = (0, version_utils_1.getPkgVersionForAngularMajorVersion)('ngrxVersion', angularMajorVersion);
|
|
21
21
|
return (0, devkit_1.addDependenciesToPackageJson)(tree, {
|
|
22
22
|
'@ngrx/store': ngrxVersion,
|
|
23
23
|
'@ngrx/effects': ngrxVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-ngrx-to-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-ngrx-to-package-json.ts"],"names":[],"mappings":";;;AACA,yCAAsE;AACtE
|
|
1
|
+
{"version":3,"file":"add-ngrx-to-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-ngrx-to-package-json.ts"],"names":[],"mappings":";;;AACA,yCAAsE;AACtE,0DAAwE;AACxE,mCAA6B;AAC7B,gEAAmF;AACnF,sDAA4E;AAC5E,6DAA4E;AAE5E,SAAgB,oBAAoB,CAAC,IAAU;IAC7C,IAAI,WAAmB,CAAC;IACxB,IAAI;QACF,WAAW,GAAG,IAAA,gCAAuB,EACnC,MAAM,EACN,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CACpD,CAAC;KACH;IAAC,WAAM;QACN,WAAW,GAAG,IAAA,gCAAuB,EAAC,MAAM,EAAE,sBAAkB,CAAC,CAAC;KACnE;IACD,MAAM,qBAAqB,GAAG,IAAA,YAAG,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAE9E,MAAM,mBAAmB,GAAG,IAAA,+CAA+B,EAAC,IAAI,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,IAAA,mDAAmC,EACrD,aAAa,EACb,mBAAmB,CACpB,CAAC;IAEF,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,aAAa,EAAE,WAAW;QAC1B,eAAe,EAAE,WAAW;QAC5B,cAAc,EAAE,WAAW;QAC3B,oBAAoB,EAAE,WAAW;QACjC,uBAAuB,EAAE,WAAW;KACrC,EACD;QACE,kBAAkB,EAAE,WAAW;QAC/B,sBAAsB,EAAE,WAAW;QACnC,iBAAiB,EAAE,qBAAqB;KACzC,CACF,CAAC;AACJ,CAAC;AAjCD,oDAiCC"}
|
|
@@ -8,7 +8,6 @@ const project_1 = require("../utils/project");
|
|
|
8
8
|
const setup_mf_1 = require("../setup-mf/setup-mf");
|
|
9
9
|
const test_runners_1 = require("../../utils/test-runners");
|
|
10
10
|
const lib_1 = require("./lib");
|
|
11
|
-
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
12
11
|
const version_utils_1 = require("../utils/version-utils");
|
|
13
12
|
const semver_1 = require("semver");
|
|
14
13
|
function remote(tree, options) {
|
|
@@ -47,7 +46,7 @@ function remote(tree, options) {
|
|
|
47
46
|
if (!options.skipFormat) {
|
|
48
47
|
yield (0, devkit_1.formatFiles)(tree);
|
|
49
48
|
}
|
|
50
|
-
return (0,
|
|
49
|
+
return (0, devkit_1.runTasksInSerial)(...installTasks);
|
|
51
50
|
});
|
|
52
51
|
}
|
|
53
52
|
exports.remote = remote;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AAEtB,4DAA8D;AAC9D,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAAsD;AAEtD,0DAAwE;AACxE,mCAA4B;AAE5B,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe;;;QACtD,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IAAI,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YAC3E,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,2EAA2E,OAAO,CAAC,IAAI,GAAG,CAC3F,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACtE,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAA,2BAAqB,EAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCACjD,OAAO,KACV,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK,EACvC,OAAO,EAAE,IAAI,EACb,IAAI,IACJ,CAAC;QAEH,MAAM,OAAO,GACX,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,CAAC;QAEzE,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE;YAClB,OAAO;YACP,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI;YACJ,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,UAAU,EAAE,IAAI;YAChB,OAAO;YACP,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;YACtD,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;QAEH,IAAI,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,IAAI,cAAc,GAAG,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;;CAC1C;AApDD,wBAoDC;AAED,kBAAe,MAAM,CAAC"}
|
|
@@ -18,7 +18,8 @@
|
|
|
18
18
|
"$default": {
|
|
19
19
|
"$source": "argv",
|
|
20
20
|
"index": 0
|
|
21
|
-
}
|
|
21
|
+
},
|
|
22
|
+
"pattern": "^[a-zA-Z].*$"
|
|
22
23
|
},
|
|
23
24
|
"host": {
|
|
24
25
|
"type": "string",
|
|
@@ -99,7 +100,7 @@
|
|
|
99
100
|
},
|
|
100
101
|
"unitTestRunner": {
|
|
101
102
|
"type": "string",
|
|
102
|
-
"enum": ["
|
|
103
|
+
"enum": ["jest", "none"],
|
|
103
104
|
"description": "Test runner to use for unit tests.",
|
|
104
105
|
"default": "jest"
|
|
105
106
|
},
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.convertComponentToScam = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
6
|
-
const
|
|
6
|
+
const js_1 = require("@nrwl/js");
|
|
7
7
|
let tsModule;
|
|
8
8
|
function convertComponentToScam(tree, componentFileInfo, options) {
|
|
9
9
|
var _a;
|
|
@@ -19,8 +19,8 @@ function convertComponentToScam(tree, componentFileInfo, options) {
|
|
|
19
19
|
if (options.inlineScam) {
|
|
20
20
|
const currentComponentContents = tree.read(componentFileInfo.filePath, 'utf-8');
|
|
21
21
|
let source = tsModule.createSourceFile(componentFileInfo.filePath, currentComponentContents, tsModule.ScriptTarget.Latest, true);
|
|
22
|
-
source = (0,
|
|
23
|
-
source = (0,
|
|
22
|
+
source = (0, js_1.insertImport)(tree, source, componentFileInfo.filePath, 'NgModule', '@angular/core');
|
|
23
|
+
source = (0, js_1.insertImport)(tree, source, componentFileInfo.filePath, 'CommonModule', '@angular/common');
|
|
24
24
|
let updatedComponentSource = source.getText();
|
|
25
25
|
updatedComponentSource = `${updatedComponentSource}${getNgModuleDeclaration(componentClassName)}`;
|
|
26
26
|
tree.write(componentFileInfo.filePath, updatedComponentSource);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-component-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/convert-component-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"convert-component-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/convert-component-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,iCAAwC;AAIxC,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CACpC,IAAU,EACV,iBAA2B,EAC3B,OAAyB;;IAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CACb,mCAAmC,iBAAiB,CAAC,QAAQ,qBAAqB,CACnF,CAAC;KACH;IAED,MAAM,cAAc,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,MAAA,OAAO,CAAC,IAAI,mCAAI,WAAW,CAAC,CAAC;IACrD,MAAM,kBAAkB,GAAG,GAAG,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAE/E,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,wBAAwB,GAAG,IAAI,CAAC,IAAI,CACxC,iBAAiB,CAAC,QAAQ,EAC1B,OAAO,CACR,CAAC;QACF,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,iBAAiB,CAAC,QAAQ,EAC1B,wBAAwB,EACxB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,UAAU,EACV,eAAe,CAChB,CAAC;QACF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,IAAI,sBAAsB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAC9C,sBAAsB,GAAG,GAAG,sBAAsB,GAAG,sBAAsB,CACzE,kBAAkB,CACnB,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;QAC/D,OAAO;KACR;IAED,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,iBAAiB,CAAC,SAAS,EAC3B,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,cAAc,EACd,oBAAoB,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CACrE,CAAC;AACJ,CAAC;AAhED,wDAgEC;AAED,SAAS,oBAAoB,CAC3B,kBAA0B,EAC1B,iBAAyB;IAEzB,OAAO;;WAEE,kBAAkB,cAAc,iBAAiB;EAC1D,sBAAsB,CAAC,kBAAkB,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED,SAAS,sBAAsB,CAAC,kBAA0B;IACxD,OAAO;;;mBAGU,kBAAkB;cACvB,kBAAkB;;eAEjB,kBAAkB,WAAW,CAAC;AAC7C,CAAC"}
|
|
@@ -22,8 +22,7 @@
|
|
|
22
22
|
"project": {
|
|
23
23
|
"type": "string",
|
|
24
24
|
"description": "The name of the project.",
|
|
25
|
-
"x-dropdown": "projects"
|
|
26
|
-
"x-priority": "important"
|
|
25
|
+
"x-dropdown": "projects"
|
|
27
26
|
},
|
|
28
27
|
"name": {
|
|
29
28
|
"type": "string",
|
|
@@ -123,5 +122,5 @@
|
|
|
123
122
|
"x-priority": "important"
|
|
124
123
|
}
|
|
125
124
|
},
|
|
126
|
-
"required": ["name"]
|
|
125
|
+
"required": ["name", "project"]
|
|
127
126
|
}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.convertDirectiveToScam = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
6
|
-
const
|
|
6
|
+
const js_1 = require("@nrwl/js");
|
|
7
7
|
let tsModule;
|
|
8
8
|
function convertDirectiveToScam(tree, directiveFileInfo, options) {
|
|
9
9
|
if (!tree.exists(directiveFileInfo.filePath)) {
|
|
@@ -18,8 +18,8 @@ function convertDirectiveToScam(tree, directiveFileInfo, options) {
|
|
|
18
18
|
if (options.inlineScam) {
|
|
19
19
|
const currentDirectiveContents = tree.read(directiveFileInfo.filePath, 'utf-8');
|
|
20
20
|
let source = tsModule.createSourceFile(directiveFileInfo.filePath, currentDirectiveContents, tsModule.ScriptTarget.Latest, true);
|
|
21
|
-
source = (0,
|
|
22
|
-
source = (0,
|
|
21
|
+
source = (0, js_1.insertImport)(tree, source, directiveFileInfo.filePath, 'NgModule', '@angular/core');
|
|
22
|
+
source = (0, js_1.insertImport)(tree, source, directiveFileInfo.filePath, 'CommonModule', '@angular/common');
|
|
23
23
|
let updatedDirectiveSource = source.getText();
|
|
24
24
|
updatedDirectiveSource = `${updatedDirectiveSource}${getNgModuleDeclaration(directiveClassName)}`;
|
|
25
25
|
tree.write(directiveFileInfo.filePath, updatedDirectiveSource);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-directive-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/convert-directive-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"convert-directive-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/convert-directive-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,iCAAwC;AAIxC,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CACpC,IAAU,EACV,iBAA2B,EAC3B,OAAyB;IAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CACb,mCAAmC,iBAAiB,CAAC,QAAQ,qBAAqB,CACnF,CAAC;KACH;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,cAAc,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC;IACrC,MAAM,kBAAkB,GAAG,GAAG,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAE/E,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,wBAAwB,GAAG,IAAI,CAAC,IAAI,CACxC,iBAAiB,CAAC,QAAQ,EAC1B,OAAO,CACR,CAAC;QACF,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,iBAAiB,CAAC,QAAQ,EAC1B,wBAAwB,EACxB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,UAAU,EACV,eAAe,CAChB,CAAC;QACF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,IAAI,sBAAsB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAC9C,sBAAsB,GAAG,GAAG,sBAAsB,GAAG,sBAAsB,CACzE,kBAAkB,CACnB,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;QAC/D,OAAO;KACR;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,iBAAiB,CAAC,SAAS,EAC3B,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,oBAAoB,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CACrE,CAAC;AACJ,CAAC;AA/DD,wDA+DC;AAED,SAAS,oBAAoB,CAC3B,kBAA0B,EAC1B,iBAAyB;IAEzB,OAAO;;WAEE,kBAAkB,cAAc,iBAAiB;EAC1D,sBAAsB,CAAC,kBAAkB,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED,SAAS,sBAAsB,CAAC,kBAA0B;IACxD,OAAO;;;mBAGU,kBAAkB;cACvB,kBAAkB;;eAEjB,kBAAkB,WAAW,CAAC;AAC7C,CAAC"}
|
|
@@ -22,8 +22,7 @@
|
|
|
22
22
|
"project": {
|
|
23
23
|
"type": "string",
|
|
24
24
|
"description": "The name of the project.",
|
|
25
|
-
"x-dropdown": "projects"
|
|
26
|
-
"x-priority": "important"
|
|
25
|
+
"x-dropdown": "projects"
|
|
27
26
|
},
|
|
28
27
|
"name": {
|
|
29
28
|
"type": "string",
|
|
@@ -77,5 +76,5 @@
|
|
|
77
76
|
"x-priority": "important"
|
|
78
77
|
}
|
|
79
78
|
},
|
|
80
|
-
"required": ["name"]
|
|
79
|
+
"required": ["name", "project"]
|
|
81
80
|
}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.convertPipeToScam = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
6
|
-
const
|
|
6
|
+
const js_1 = require("@nrwl/js");
|
|
7
7
|
let tsModule;
|
|
8
8
|
function convertPipeToScam(tree, pipeFileInfo, options) {
|
|
9
9
|
if (!tree.exists(pipeFileInfo.filePath)) {
|
|
@@ -18,8 +18,8 @@ function convertPipeToScam(tree, pipeFileInfo, options) {
|
|
|
18
18
|
if (options.inlineScam) {
|
|
19
19
|
const currentPipeContents = tree.read(pipeFileInfo.filePath, 'utf-8');
|
|
20
20
|
let source = tsModule.createSourceFile(pipeFileInfo.filePath, currentPipeContents, tsModule.ScriptTarget.Latest, true);
|
|
21
|
-
source = (0,
|
|
22
|
-
source = (0,
|
|
21
|
+
source = (0, js_1.insertImport)(tree, source, pipeFileInfo.filePath, 'NgModule', '@angular/core');
|
|
22
|
+
source = (0, js_1.insertImport)(tree, source, pipeFileInfo.filePath, 'CommonModule', '@angular/common');
|
|
23
23
|
let updatedPipeSource = source.getText();
|
|
24
24
|
updatedPipeSource = `${updatedPipeSource}${getNgModuleDeclaration(pipeClassName)}`;
|
|
25
25
|
tree.write(pipeFileInfo.filePath, updatedPipeSource);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-pipe-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/convert-pipe-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"convert-pipe-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/convert-pipe-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,iCAAwC;AAIxC,IAAI,QAAqC,CAAC;AAE1C,SAAgB,iBAAiB,CAC/B,IAAU,EACV,YAAsB,EACtB,OAAyB;IAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CACb,8BAA8B,YAAY,CAAC,QAAQ,qBAAqB,CACzE,CAAC;KACH;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,CAAC;IAChC,MAAM,aAAa,GAAG,GAAG,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAErE,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtE,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,YAAY,CAAC,QAAQ,EACrB,mBAAmB,EACnB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,YAAY,CAAC,QAAQ,EACrB,UAAU,EACV,eAAe,CAChB,CAAC;QACF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,YAAY,CAAC,QAAQ,EACrB,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,IAAI,iBAAiB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QACzC,iBAAiB,GAAG,GAAG,iBAAiB,GAAG,sBAAsB,CAC/D,aAAa,CACd,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QACrD,OAAO;KACR;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,YAAY,CAAC,SAAS,EACtB,GAAG,SAAS,CAAC,QAAQ,YAAY,CAClC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,oBAAoB,CAAC,aAAa,EAAE,YAAY,CAAC,QAAQ,CAAC,CAC3D,CAAC;AACJ,CAAC;AA5DD,8CA4DC;AAED,SAAS,oBAAoB,CAC3B,aAAqB,EACrB,YAAoB;IAEpB,OAAO;;WAEE,aAAa,cAAc,YAAY;EAChD,sBAAsB,CAAC,aAAa,CAAC,EAAE,CAAC;AAC1C,CAAC;AAED,SAAS,sBAAsB,CAAC,aAAqB;IACnD,OAAO;;;mBAGU,aAAa;cAClB,aAAa;;eAEZ,aAAa,WAAW,CAAC;AACxC,CAAC"}
|
|
@@ -22,8 +22,7 @@
|
|
|
22
22
|
"project": {
|
|
23
23
|
"type": "string",
|
|
24
24
|
"description": "The name of the project.",
|
|
25
|
-
"x-dropdown": "projects"
|
|
26
|
-
"x-priority": "important"
|
|
25
|
+
"x-dropdown": "projects"
|
|
27
26
|
},
|
|
28
27
|
"name": {
|
|
29
28
|
"type": "string",
|
|
@@ -58,5 +57,5 @@
|
|
|
58
57
|
"x-priority": "important"
|
|
59
58
|
}
|
|
60
59
|
},
|
|
61
|
-
"required": ["name"]
|
|
60
|
+
"required": ["name", "project"]
|
|
62
61
|
}
|
|
@@ -4,7 +4,7 @@ module.exports = withModuleFederation({
|
|
|
4
4
|
...config,
|
|
5
5
|
/*
|
|
6
6
|
* Remote overrides for production.
|
|
7
|
-
* Each entry is a pair of
|
|
7
|
+
* Each entry is a pair of a unique name and the URL where it is deployed.
|
|
8
8
|
*
|
|
9
9
|
* e.g.
|
|
10
10
|
* remotes: [
|