From 80fde793741dc6c0fe8a249c624e980d98dc489b Mon Sep 17 00:00:00 2001 From: Colum Ferry Date: Fri, 13 Oct 2023 17:14:16 +0100 Subject: [PATCH] feat(misc): remove deprecated Angular CLI usage of schematics and builders (#19557) --- docs/generated/devkit/ngcli_adapter/README.md | 1 - .../overrideCollectionResolutionForTesting.md | 32 ---- .../devkit/documents/ngcli_adapter.md | 1 - e2e/angular-core/src/ng-add.test.ts | 12 +- packages/angular/executors.json | 20 --- packages/angular/generators.json | 154 ------------------ packages/angular/package.json | 4 +- .../src/executors/browser-esbuild/compat.ts | 5 - .../src/executors/delegate-build/compat.ts | 5 - .../src/executors/ng-packagr-lite/compat.ts | 5 - .../angular/src/executors/package/compat.ts | 5 - .../src/generators/add-linting/compat.ts | 5 - .../application/application.compat.ts | 7 - .../component-cypress-spec/compat.ts | 7 - .../src/generators/component-story/compat.ts | 7 - .../src/generators/component-test/compat.ts | 7 - .../generators/component/component.compat.ts | 5 - .../convert-to-with-mf.compat.ts | 5 - .../cypress-component-configuration/compat.ts | 7 - .../federate-module/federate-module.compat.ts | 5 - .../src/generators/host/host.compat.ts | 5 - .../src/generators/init/init.compat.ts | 7 - .../library-secondary-entry-point/compat.ts | 7 - .../src/generators/library/library.compat.ts | 7 - .../angular/src/generators/move/compat.ts | 7 - .../angular/src/generators/ng-add/compat.ts | 4 - .../angular/src/generators/ngrx/compat.ts | 5 - .../src/generators/remote/remote.compat.ts | 5 - .../scam-directive/scam-directive.compat.ts | 5 - .../generators/scam-pipe/scam-pipe.compat.ts | 5 - .../generators/scam-to-standalone/compat.ts | 5 - .../src/generators/scam/scam.compat.ts | 5 - .../generators/setup-mf/setup-mf.compat.ts | 5 - .../generators/setup-ssr/setup-ssr.compat.ts | 5 - .../setup-tailwind/setup-tailwind.compat.ts | 7 - .../angular/src/generators/stories/compat.ts | 7 - .../storybook-configuration/compat.ts | 7 - .../storybook-utilities.spec.ts} | 42 ++--- .../utils/warn-for-schematic-usage.ts | 7 - .../src/generators/web-worker/compat.ts | 5 - packages/cypress/executors.json | 7 - packages/cypress/generators.json | 31 ---- packages/cypress/package.json | 4 +- .../cypress/src/executors/cypress/compat.ts | 5 - .../component-configuration.ts | 2 - .../generators/configuration/configuration.ts | 3 +- .../cypress-project/cypress-project.ts | 4 - packages/cypress/src/generators/init/init.ts | 2 - packages/detox/generators.json | 15 -- packages/detox/package.json | 4 +- packages/detox/src/executors/build/compat.ts | 5 - packages/detox/src/executors/test/compat.ts | 5 - .../src/generators/application/application.ts | 10 +- packages/detox/src/generators/init/init.ts | 2 - packages/devkit/ngcli-adapter.ts | 1 - packages/esbuild/executors.json | 7 - packages/esbuild/generators.json | 14 -- packages/esbuild/package.json | 4 +- .../esbuild/src/executors/esbuild/compat.ts | 5 - .../generators/configuration/configuration.ts | 3 - packages/esbuild/src/generators/init/init.ts | 9 +- packages/expo/executors.json | 57 ------- packages/expo/generators.json | 28 ---- packages/expo/package.json | 4 +- .../expo/src/executors/build-list/compat.ts | 5 - packages/expo/src/executors/build/compat.ts | 5 - .../src/executors/ensure-symlink/compat.ts | 5 - packages/expo/src/executors/export/compat.ts | 5 - packages/expo/src/executors/install/compat.ts | 5 - .../expo/src/executors/prebuild/compat.ts | 5 - packages/expo/src/executors/run/compat.ts | 5 - packages/expo/src/executors/start/compat.ts | 5 - packages/expo/src/executors/submit/compat.ts | 5 - .../expo/src/executors/sync-deps/compat.ts | 5 - packages/expo/src/executors/update/compat.ts | 5 - .../src/generators/application/application.ts | 4 - .../src/generators/component/component.ts | 4 - packages/expo/src/generators/init/init.ts | 2 - .../expo/src/generators/library/library.ts | 2 - packages/express/generators.json | 18 -- packages/express/package.json | 2 +- .../src/generators/application/application.ts | 3 +- packages/express/src/generators/init/init.ts | 2 - packages/jest/executors.json | 7 - packages/jest/generators.json | 15 -- packages/jest/package.json | 4 +- packages/jest/src/executors/jest/compat.ts | 5 - .../generators/configuration/configuration.ts | 3 - packages/jest/src/generators/init/init.ts | 4 - packages/js/executors.json | 22 --- packages/js/generators.json | 35 ---- packages/js/package.json | 2 - packages/js/src/executors/node/compat.ts | 4 - packages/js/src/executors/swc/compat.ts | 4 - packages/js/src/executors/tsc/compat.ts | 5 - packages/js/src/executors/verdaccio/compat.ts | 5 - .../convert-to-swc/convert-to-swc.ts | 2 - packages/js/src/generators/init/init.ts | 4 - packages/js/src/generators/library/library.ts | 3 +- .../src/generators/setup-build/generator.ts | 2 - .../generators/setup-verdaccio/generator.ts | 2 - packages/linter/executors.json | 7 - packages/linter/generators.json | 13 -- packages/linter/package.json | 4 +- .../linter/src/executors/eslint/compat.ts | 5 - .../workspace-rule/workspace-rule.ts | 5 - .../workspace-rules-project.ts | 5 - packages/nest/generators.json | 98 ----------- packages/nest/package.json | 2 +- .../src/generators/application/application.ts | 4 +- packages/nest/src/generators/class/class.ts | 3 - .../src/generators/controller/controller.ts | 3 - .../src/generators/decorator/decorator.ts | 3 - packages/nest/src/generators/filter/filter.ts | 3 - .../nest/src/generators/gateway/gateway.ts | 3 - packages/nest/src/generators/guard/guard.ts | 3 - packages/nest/src/generators/init/init.ts | 4 +- .../src/generators/interceptor/interceptor.ts | 3 - .../src/generators/interface/interface.ts | 3 - .../nest/src/generators/library/library.ts | 4 +- .../src/generators/middleware/middleware.ts | 3 - packages/nest/src/generators/module/module.ts | 3 - packages/nest/src/generators/pipe/pipe.ts | 3 - .../nest/src/generators/provider/provider.ts | 3 - .../nest/src/generators/resolver/resolver.ts | 3 - .../nest/src/generators/resource/resource.ts | 3 - .../nest/src/generators/service/service.ts | 3 - packages/next/executors.json | 18 -- packages/next/generators.json | 30 ---- packages/next/package.json | 4 +- packages/next/src/executors/build/compat.ts | 5 - packages/next/src/executors/export/compat.ts | 5 - packages/next/src/executors/server/compat.ts | 5 - .../src/generators/application/application.ts | 3 - .../src/generators/component/component.ts | 2 - .../generators/custom-server/custom-server.ts | 3 - packages/next/src/generators/init/init.ts | 2 - .../next/src/generators/library/library.ts | 2 - packages/next/src/generators/page/page.ts | 2 - packages/node/generators.json | 28 ---- packages/node/package.json | 2 +- .../src/generators/application/application.ts | 2 - .../src/generators/e2e-project/e2e-project.ts | 2 - packages/node/src/generators/init/init.ts | 2 - .../node/src/generators/library/library.ts | 2 - .../generators/setup-docker/setup-docker.ts | 2 - packages/nuxt/src/generators/init/init.ts | 2 - packages/nx/executors.json | 12 -- packages/nx/src/adapter/ngcli-adapter.ts | 25 +-- .../angular/integrated-workspace.ts | 2 +- .../nx/src/executors/run-commands/compat.ts | 4 - .../nx/src/executors/run-script/compat.ts | 5 - packages/playwright/executors.json | 7 - packages/playwright/generators.json | 12 -- .../src/executors/playwright/compat.ts | 4 - .../generators/configuration/configuration.ts | 4 - .../playwright/src/generators/init/init.ts | 2 - packages/plugin/executors.json | 8 - packages/plugin/generators.json | 32 ---- packages/plugin/package.json | 4 +- packages/plugin/src/executors/e2e/compat.ts | 4 - .../create-package/create-package.ts | 4 - .../plugin/src/generators/e2e-project/e2e.ts | 2 - .../src/generators/executor/executor.ts | 2 - .../src/generators/generator/generator.ts | 2 - .../src/generators/migration/migration.ts | 3 +- .../plugin/src/generators/plugin/plugin.ts | 2 - packages/react-native/executors.json | 52 ------ packages/react-native/generators.json | 52 ------ packages/react-native/package.json | 4 +- .../src/executors/build-android/compat.ts | 5 - .../src/executors/build-ios/compat.ts | 5 - .../src/executors/bundle/compat.ts | 5 - .../src/executors/ensure-symlink/compat.ts | 5 - .../src/executors/pod-install/compat.ts | 5 - .../src/executors/run-android/compat.ts | 5 - .../src/executors/run-ios/compat.ts | 5 - .../src/executors/start/compat.ts | 5 - .../src/executors/storybook/compat.ts | 5 - .../src/executors/sync-deps/compat.ts | 5 - .../src/generators/application/application.ts | 4 - .../component-story/component-story.ts | 4 - .../src/generators/component/component.ts | 5 +- .../react-native/src/generators/init/init.ts | 4 - .../src/generators/library/library.ts | 4 - .../src/generators/stories/stories.ts | 2 - .../storybook-configuration/configuration.ts | 4 - .../upgrade-native/upgrade-native.ts | 4 - packages/react/executors.json | 12 -- packages/react/generators.json | 125 -------------- packages/react/package.json | 4 +- .../module-federation-dev-server/compat.ts | 5 - .../compat.ts | 5 - .../src/generators/application/application.ts | 2 - .../component-cypress-spec.ts | 4 - .../component-story/component-story.ts | 4 - .../src/generators/component/component.ts | 3 - .../federate-module/federate-module.ts | 5 - packages/react/src/generators/hook/hook.ts | 4 +- packages/react/src/generators/init/init.ts | 3 - .../react/src/generators/library/library.ts | 2 - packages/react/src/generators/redux/redux.ts | 2 - .../src/generators/setup-ssr/setup-ssr.ts | 3 - .../setup-tailwind/setup-tailwind.ts | 5 - .../react/src/generators/stories/stories.ts | 2 - .../storybook-configuration/configuration.ts | 4 - packages/rollup/executors.json | 7 - packages/rollup/generators.json | 14 -- packages/rollup/package.json | 4 +- .../rollup/src/executors/rollup/compat.ts | 5 - .../generators/configuration/configuration.ts | 3 - packages/rollup/src/generators/init/init.ts | 4 - packages/storybook/executors.json | 12 -- packages/storybook/generators.json | 27 --- packages/storybook/package.json | 4 +- .../src/executors/build-storybook/compat.ts | 4 - .../src/executors/storybook/compat.ts | 4 - .../generators/configuration/configuration.ts | 4 - .../cypress-project/cypress-project.ts | 5 - .../storybook/src/generators/init/init.ts | 2 - .../src/generators/migrate-7/migrate-7.ts | 2 - packages/vite/generators.json | 21 --- packages/vite/package.json | 4 +- .../generators/configuration/configuration.ts | 4 - packages/vite/src/generators/init/init.ts | 2 - .../src/generators/vitest/vitest-generator.ts | 2 - .../vue/src/generators/stories/stories.ts | 2 - .../storybook-configuration/configuration.ts | 10 +- packages/web/generators.json | 20 --- packages/web/package.json | 4 +- .../web/src/executors/file-server/compat.ts | 5 +- .../src/generators/application/application.ts | 2 - packages/web/src/generators/init/init.ts | 2 - .../static-serve-configuration.ts | 3 +- packages/webpack/executors.json | 17 -- packages/webpack/generators.json | 15 -- packages/webpack/package.json | 4 +- .../src/executors/dev-server/compat.ts | 5 - .../src/executors/ssr-dev-server/compat.ts | 5 - .../webpack/src/executors/webpack/compat.ts | 5 - .../generators/configuration/configuration.ts | 3 - packages/webpack/src/generators/init/init.ts | 3 - packages/workspace/generators.json | 31 ---- packages/workspace/index.ts | 5 +- packages/workspace/package.json | 4 +- .../src/generators/ci-workflow/ci-workflow.ts | 1 - .../convert-to-monorepo.ts | 3 - .../convert-to-nx-project.ts | 5 - .../workspace/src/generators/move/move.ts | 3 - .../src/generators/npm-package/npm-package.ts | 4 +- .../workspace/src/generators/remove/remove.ts | 9 +- .../generators/run-commands/run-commands.ts | 3 - 252 files changed, 76 insertions(+), 1975 deletions(-) delete mode 100644 docs/generated/devkit/ngcli_adapter/overrideCollectionResolutionForTesting.md delete mode 100644 packages/angular/src/executors/browser-esbuild/compat.ts delete mode 100644 packages/angular/src/executors/delegate-build/compat.ts delete mode 100644 packages/angular/src/executors/ng-packagr-lite/compat.ts delete mode 100644 packages/angular/src/executors/package/compat.ts delete mode 100644 packages/angular/src/generators/add-linting/compat.ts delete mode 100644 packages/angular/src/generators/application/application.compat.ts delete mode 100644 packages/angular/src/generators/component-cypress-spec/compat.ts delete mode 100644 packages/angular/src/generators/component-story/compat.ts delete mode 100644 packages/angular/src/generators/component-test/compat.ts delete mode 100644 packages/angular/src/generators/component/component.compat.ts delete mode 100644 packages/angular/src/generators/convert-to-with-mf/convert-to-with-mf.compat.ts delete mode 100644 packages/angular/src/generators/cypress-component-configuration/compat.ts delete mode 100644 packages/angular/src/generators/federate-module/federate-module.compat.ts delete mode 100644 packages/angular/src/generators/host/host.compat.ts delete mode 100644 packages/angular/src/generators/init/init.compat.ts delete mode 100644 packages/angular/src/generators/library-secondary-entry-point/compat.ts delete mode 100644 packages/angular/src/generators/library/library.compat.ts delete mode 100644 packages/angular/src/generators/move/compat.ts delete mode 100644 packages/angular/src/generators/ng-add/compat.ts delete mode 100644 packages/angular/src/generators/ngrx/compat.ts delete mode 100644 packages/angular/src/generators/remote/remote.compat.ts delete mode 100644 packages/angular/src/generators/scam-directive/scam-directive.compat.ts delete mode 100644 packages/angular/src/generators/scam-pipe/scam-pipe.compat.ts delete mode 100644 packages/angular/src/generators/scam-to-standalone/compat.ts delete mode 100644 packages/angular/src/generators/scam/scam.compat.ts delete mode 100644 packages/angular/src/generators/setup-mf/setup-mf.compat.ts delete mode 100644 packages/angular/src/generators/setup-ssr/setup-ssr.compat.ts delete mode 100644 packages/angular/src/generators/setup-tailwind/setup-tailwind.compat.ts delete mode 100644 packages/angular/src/generators/stories/compat.ts delete mode 100644 packages/angular/src/generators/storybook-configuration/compat.ts rename packages/{storybook/src/utils/utilities.spec.ts => angular/src/generators/storybook-configuration/storybook-utilities.spec.ts} (91%) delete mode 100644 packages/angular/src/generators/utils/warn-for-schematic-usage.ts delete mode 100644 packages/angular/src/generators/web-worker/compat.ts delete mode 100644 packages/cypress/src/executors/cypress/compat.ts delete mode 100644 packages/detox/src/executors/build/compat.ts delete mode 100644 packages/detox/src/executors/test/compat.ts delete mode 100644 packages/esbuild/src/executors/esbuild/compat.ts delete mode 100644 packages/expo/src/executors/build-list/compat.ts delete mode 100644 packages/expo/src/executors/build/compat.ts delete mode 100644 packages/expo/src/executors/ensure-symlink/compat.ts delete mode 100644 packages/expo/src/executors/export/compat.ts delete mode 100644 packages/expo/src/executors/install/compat.ts delete mode 100644 packages/expo/src/executors/prebuild/compat.ts delete mode 100644 packages/expo/src/executors/run/compat.ts delete mode 100644 packages/expo/src/executors/start/compat.ts delete mode 100644 packages/expo/src/executors/submit/compat.ts delete mode 100644 packages/expo/src/executors/sync-deps/compat.ts delete mode 100644 packages/expo/src/executors/update/compat.ts delete mode 100644 packages/jest/src/executors/jest/compat.ts delete mode 100644 packages/js/src/executors/node/compat.ts delete mode 100644 packages/js/src/executors/swc/compat.ts delete mode 100644 packages/js/src/executors/tsc/compat.ts delete mode 100644 packages/js/src/executors/verdaccio/compat.ts delete mode 100644 packages/linter/src/executors/eslint/compat.ts delete mode 100644 packages/next/src/executors/build/compat.ts delete mode 100644 packages/next/src/executors/export/compat.ts delete mode 100644 packages/next/src/executors/server/compat.ts delete mode 100644 packages/nx/src/executors/run-commands/compat.ts delete mode 100644 packages/nx/src/executors/run-script/compat.ts delete mode 100644 packages/playwright/src/executors/playwright/compat.ts delete mode 100644 packages/plugin/src/executors/e2e/compat.ts delete mode 100644 packages/react-native/src/executors/build-android/compat.ts delete mode 100644 packages/react-native/src/executors/build-ios/compat.ts delete mode 100644 packages/react-native/src/executors/bundle/compat.ts delete mode 100644 packages/react-native/src/executors/ensure-symlink/compat.ts delete mode 100644 packages/react-native/src/executors/pod-install/compat.ts delete mode 100644 packages/react-native/src/executors/run-android/compat.ts delete mode 100644 packages/react-native/src/executors/run-ios/compat.ts delete mode 100644 packages/react-native/src/executors/start/compat.ts delete mode 100644 packages/react-native/src/executors/storybook/compat.ts delete mode 100644 packages/react-native/src/executors/sync-deps/compat.ts delete mode 100644 packages/react/src/executors/module-federation-dev-server/compat.ts delete mode 100644 packages/react/src/executors/module-federation-ssr-dev-server/compat.ts delete mode 100644 packages/rollup/src/executors/rollup/compat.ts delete mode 100644 packages/storybook/src/executors/build-storybook/compat.ts delete mode 100644 packages/storybook/src/executors/storybook/compat.ts delete mode 100644 packages/webpack/src/executors/dev-server/compat.ts delete mode 100644 packages/webpack/src/executors/ssr-dev-server/compat.ts delete mode 100644 packages/webpack/src/executors/webpack/compat.ts diff --git a/docs/generated/devkit/ngcli_adapter/README.md b/docs/generated/devkit/ngcli_adapter/README.md index 8250da93e4..9bfb21f93f 100644 --- a/docs/generated/devkit/ngcli_adapter/README.md +++ b/docs/generated/devkit/ngcli_adapter/README.md @@ -9,5 +9,4 @@ ### Functions - [mockSchematicsForTesting](../../devkit/documents/ngcli_adapter/mockSchematicsForTesting) -- [overrideCollectionResolutionForTesting](../../devkit/documents/ngcli_adapter/overrideCollectionResolutionForTesting) - [wrapAngularDevkitSchematic](../../devkit/documents/ngcli_adapter/wrapAngularDevkitSchematic) diff --git a/docs/generated/devkit/ngcli_adapter/overrideCollectionResolutionForTesting.md b/docs/generated/devkit/ngcli_adapter/overrideCollectionResolutionForTesting.md deleted file mode 100644 index 0861f2e510..0000000000 --- a/docs/generated/devkit/ngcli_adapter/overrideCollectionResolutionForTesting.md +++ /dev/null @@ -1,32 +0,0 @@ -# Function: overrideCollectionResolutionForTesting - -▸ **overrideCollectionResolutionForTesting**(`collections`): `void` - -By default, Angular Devkit schematic collections will be resolved using the Node resolution. -This doesn't work if you are testing schematics that refer to other schematics in the -same repo. - -This function can can be used to override the resolution behaviour. - -Example: - -```typescript -overrideCollectionResolutionForTesting({ - '@nx/workspace': path.join( - __dirname, - '../../../../workspace/generators.json' - ), - '@nx/angular': path.join(__dirname, '../../../../angular/generators.json'), - '@nx/linter': path.join(__dirname, '../../../../linter/generators.json'), -}); -``` - -#### Parameters - -| Name | Type | -| :------------ | :------- | -| `collections` | `Object` | - -#### Returns - -`void` diff --git a/docs/generated/packages/devkit/documents/ngcli_adapter.md b/docs/generated/packages/devkit/documents/ngcli_adapter.md index 8250da93e4..9bfb21f93f 100644 --- a/docs/generated/packages/devkit/documents/ngcli_adapter.md +++ b/docs/generated/packages/devkit/documents/ngcli_adapter.md @@ -9,5 +9,4 @@ ### Functions - [mockSchematicsForTesting](../../devkit/documents/ngcli_adapter/mockSchematicsForTesting) -- [overrideCollectionResolutionForTesting](../../devkit/documents/ngcli_adapter/overrideCollectionResolutionForTesting) - [wrapAngularDevkitSchematic](../../devkit/documents/ngcli_adapter/wrapAngularDevkitSchematic) diff --git a/e2e/angular-core/src/ng-add.test.ts b/e2e/angular-core/src/ng-add.test.ts index 59b39c3c9b..cb6433b88a 100644 --- a/e2e/angular-core/src/ng-add.test.ts +++ b/e2e/angular-core/src/ng-add.test.ts @@ -68,6 +68,8 @@ describe('convert Angular CLI workspace to an Nx workspace', () => { // TODO: solve issues with pnpm and remove this fallback packageManager = packageManager === 'pnpm' ? 'yarn' : packageManager; project = runNgNew(packageManager); + packageInstall('nx', null, 'latest'); + packageInstall('@nx/angular', null, 'latest'); }); afterEach(() => { @@ -105,7 +107,7 @@ describe('convert Angular CLI workspace to an Nx workspace', () => { expect(packageJson.devDependencies['@nx/workspace']).not.toBeDefined(); // run ng add - runNgAdd('@nx/angular', '--npm-scope projscope --default-base main'); + runCLI('g @nx/angular:ng-add --npm-scope projscope --default-base main'); // check that prettier config exits and that files have been moved checkFilesExist( @@ -262,7 +264,7 @@ describe('convert Angular CLI workspace to an Nx workspace', () => { it('should handle a workspace with cypress v9', () => { addCypress9(); - runNgAdd('@nx/angular', '--npm-scope projscope --skip-install'); + runCLI('g @nx/angular:ng-add --npm-scope projscope --skip-install'); const e2eProject = `${project}-e2e`; //check e2e project files @@ -329,7 +331,7 @@ describe('convert Angular CLI workspace to an Nx workspace', () => { it('should handle a workspace with cypress v10', () => { addCypress10(); - runNgAdd('@nx/angular', '--npm-scope projscope --skip-install'); + runCLI('g @nx/angular:ng-add --npm-scope projscope --skip-install'); const e2eProject = `${project}-e2e`; //check e2e project files @@ -399,7 +401,7 @@ describe('convert Angular CLI workspace to an Nx workspace', () => { it.skip('should handle a workspace with ESLint', () => { addEsLint(); - runNgAdd('@nx/angular', '--npm-scope projscope'); + runCLI('g @nx/angular:ng-add --npm-scope projscope'); checkFilesExist(`apps/${project}/.eslintrc.json`, `.eslintrc.json`); @@ -436,7 +438,7 @@ describe('convert Angular CLI workspace to an Nx workspace', () => { runCommand(`ng g @schematics/angular:application ${app1} --no-interactive`); runCommand(`ng g @schematics/angular:library ${lib1} --no-interactive`); - runNgAdd('@nx/angular', '--npm-scope projscope'); + runCLI('g @nx/angular:ng-add --npm-scope projscope'); // check angular.json does not exist checkFilesDoNotExist('angular.json'); diff --git a/packages/angular/executors.json b/packages/angular/executors.json index 9d4063da6c..154989ca4e 100644 --- a/packages/angular/executors.json +++ b/packages/angular/executors.json @@ -22,21 +22,6 @@ } }, "builders": { - "delegate-build": { - "implementation": "./src/executors/delegate-build/compat", - "schema": "./src/executors/delegate-build/schema.json", - "description": "Delegates the build to a different target while supporting incremental builds." - }, - "ng-packagr-lite": { - "implementation": "./src/executors/ng-packagr-lite/compat", - "schema": "./src/executors/ng-packagr-lite/schema.json", - "description": "Builds a library with support for incremental builds.\nThis executor is meant to be used with buildable libraries in an incremental build scenario. It is similar to the `@nrwl/angular:package` executor but with some key differences:\n- It doesn't run `ngcc` automatically (`ngcc` needs to be run separately beforehand if needed, this can be done in a `postinstall` hook on `package.json`)\n- It only produces ESM2020 bundles\n- It doesn't generate package exports in the `package.json`" - }, - "package": { - "implementation": "./src/executors/package/compat", - "schema": "./src/executors/package/schema.json", - "description": "Builds and packages an Angular library to be distributed as an NPM package. It supports incremental builds." - }, "webpack-browser": { "implementation": "./src/builders/webpack-browser/webpack-browser.impl", "schema": "./src/builders/webpack-browser/schema.json", @@ -61,11 +46,6 @@ "implementation": "./src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl", "schema": "./src/builders/module-federation-dev-ssr/schema.json", "description": "The module-federation-dev-ssr executor is reserved exclusively for use with host Module Federation applications that use SSR. It allows the user to specify which remote applications should be served with the host." - }, - "browser-esbuild": { - "implementation": "./src/executors/browser-esbuild/compat", - "schema": "./src/executors/browser-esbuild/schema.json", - "description": "Builds your application with esbuild and adds support for incremental builds." } } } diff --git a/packages/angular/generators.json b/packages/angular/generators.json index 90906d24f3..7a81ee936f 100644 --- a/packages/angular/generators.json +++ b/packages/angular/generators.json @@ -2,160 +2,6 @@ "name": "Nx Angular", "version": "0.1", "extends": ["@schematics/angular", "@nx/workspace"], - "schematics": { - "add-linting": { - "factory": "./src/generators/add-linting/compat", - "schema": "./src/generators/add-linting/schema.json", - "description": "Adds linting configuration to an Angular project.", - "hidden": true - }, - "application": { - "factory": "./src/generators/application/application.compat#applicationSchematic", - "schema": "./src/generators/application/schema.json", - "aliases": ["app"], - "x-type": "application", - "description": "Creates an Angular application." - }, - "component": { - "factory": "./src/generators/component/component.compat", - "schema": "./src/generators/component/schema.json", - "aliases": ["c"], - "description": "Generate an Angular Component." - }, - "component-cypress-spec": { - "factory": "./src/generators/component-cypress-spec/compat", - "schema": "./src/generators/component-cypress-spec/schema.json", - "description": "Creates a Cypress spec for a UI component that has a story.", - "hidden": true - }, - "component-story": { - "factory": "./src/generators/component-story/compat", - "schema": "./src/generators/component-story/schema.json", - "description": "Creates a `stories.ts` file for a component.", - "hidden": true - }, - "component-test": { - "factory": "./src/generators/component-test/compat", - "schema": "./src/generators/component-test/schema.json", - "description": "Creates a cypress component test file for a component." - }, - "init": { - "factory": "./src/generators/init/init.compat#initSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initializes the `@nrwl/angular` plugin.", - "hidden": true - }, - "library": { - "factory": "./src/generators/library/library.compat#librarySchematic", - "schema": "./src/generators/library/schema.json", - "aliases": ["lib"], - "x-type": "library", - "description": "Creates an Angular library." - }, - "library-secondary-entry-point": { - "factory": "./src/generators/library-secondary-entry-point/compat", - "schema": "./src/generators/library-secondary-entry-point/schema.json", - "aliases": ["secondary-entry-point", "entry-point"], - "description": "Creates a secondary entry point for an Angular publishable library." - }, - "remote": { - "factory": "./src/generators/remote/remote.compat", - "schema": "./src/generators/remote/schema.json", - "x-type": "application", - "description": "Generate a Remote Angular Module Federation Application." - }, - "move": { - "factory": "./src/generators/move/compat", - "schema": "./src/generators/move/schema.json", - "aliases": ["mv"], - "description": "Moves an Angular application or library to another folder within the workspace and updates the project configuration.", - "x-deprecated": "Use the `@nx/workspace:move` generator instead. This generator will be removed in Nx v18." - }, - "convert-to-with-mf": { - "factory": "./src/generators/convert-to-with-mf/convert-to-with-mf.compat", - "schema": "./src/generators/convert-to-with-mf/schema.json", - "description": "Converts an old micro frontend configuration to use the new `withModuleFederation` helper. It will run successfully if the following conditions are met: \n - Is either a host or remote application \n - Shared npm package configurations have not been modified \n - Name used to identify the Micro Frontend application matches the project name \n\n{% callout type=\"warning\" title=\"Overrides\" %}This generator will overwrite your webpack config. If you have additional custom configuration in your config file, it will be lost!{% /callout %}" - }, - "federate-module": { - "factory": "./src/generators/federate-module/federate-module.compat", - "schema": "./src/generators/federate-module/schema.json", - "x-type": "application", - "description": "Create a federated module, which is exposed by a remote and can be subsequently loaded by a host." - }, - "host": { - "factory": "./src/generators/host/host.compat", - "schema": "./src/generators/host/schema.json", - "x-type": "application", - "description": "Generate a Host Angular Module Federation Application." - }, - "ng-add": { - "factory": "./src/generators/ng-add/compat", - "schema": "./src/generators/ng-add/schema.json", - "description": "Migrates an Angular CLI workspace to Nx or adds the Angular plugin to an Nx workspace.", - "hidden": true - }, - "ngrx": { - "factory": "./src/generators/ngrx/compat", - "schema": "./src/generators/ngrx/schema.json", - "description": "Adds NgRx support to an application or library.", - "x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Use the 'ngrx-root-store' and 'ngrx-feature-store' generators instead." - }, - "scam-to-standalone": { - "factory": "./src/generators/scam-to-standalone/compat", - "schema": "./src/generators/scam-to-standalone/schema.json", - "description": "Convert an existing Single Component Angular Module (SCAM) to a Standalone Component." - }, - "scam": { - "factory": "./src/generators/scam/scam.compat", - "schema": "./src/generators/scam/schema.json", - "description": "Generate a component with an accompanying Single Component Angular Module (SCAM)." - }, - "scam-directive": { - "factory": "./src/generators/scam-directive/scam-directive.compat", - "schema": "./src/generators/scam-directive/schema.json", - "description": "Generate a directive with an accompanying Single Component Angular Module (SCAM)." - }, - "scam-pipe": { - "factory": "./src/generators/scam-pipe/scam-pipe.compat", - "schema": "./src/generators/scam-pipe/schema.json", - "description": "Generate a pipe with an accompanying Single Component Angular Module (SCAM)." - }, - "setup-mf": { - "factory": "./src/generators/setup-mf/setup-mf.compat", - "schema": "./src/generators/setup-mf/schema.json", - "description": "Generate a Module Federation configuration for a given Angular application." - }, - "setup-ssr": { - "factory": "./src/generators/setup-ssr/setup-ssr.compat", - "schema": "./src/generators/setup-ssr/schema.json", - "description": "Generate Angular Universal (SSR) setup for an Angular application." - }, - "setup-tailwind": { - "factory": "./src/generators/setup-tailwind/setup-tailwind.compat", - "schema": "./src/generators/setup-tailwind/schema.json", - "description": "Configures Tailwind CSS for an application or a buildable/publishable library." - }, - "stories": { - "factory": "./src/generators/stories/compat", - "schema": "./src/generators/stories/schema.json", - "description": "Creates stories/specs for all components declared in a project." - }, - "storybook-configuration": { - "factory": "./src/generators/storybook-configuration/compat", - "schema": "./src/generators/storybook-configuration/schema.json", - "description": "Adds Storybook configuration to a project." - }, - "cypress-component-configuration": { - "factory": "./src/generators/cypress-component-configuration/compat", - "schema": "./src/generators/cypress-component-configuration/schema.json", - "description": "Setup Cypress component testing for a project." - }, - "web-worker": { - "factory": "./src/generators/web-worker/compat", - "schema": "./src/generators/web-worker/schema.json", - "description": "Creates a Web Worker." - } - }, "generators": { "add-linting": { "factory": "./src/generators/add-linting/add-linting", diff --git a/packages/angular/package.json b/packages/angular/package.json index 747bc78336..e2f0af305d 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -39,8 +39,8 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "builders": "./executors.json", - "schematics": "./generators.json", + "executors": "./executors.json", + "generators": "./generators.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/angular/src/executors/browser-esbuild/compat.ts b/packages/angular/src/executors/browser-esbuild/compat.ts deleted file mode 100644 index 13353169d9..0000000000 --- a/packages/angular/src/executors/browser-esbuild/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import nxBrowserEsBuild from './browser-esbuild.impl'; - -export default convertNxExecutor(nxBrowserEsBuild); diff --git a/packages/angular/src/executors/delegate-build/compat.ts b/packages/angular/src/executors/delegate-build/compat.ts deleted file mode 100644 index 910a004384..0000000000 --- a/packages/angular/src/executors/delegate-build/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import { delegateBuildExecutor } from './delegate-build.impl'; - -export default convertNxExecutor(delegateBuildExecutor); diff --git a/packages/angular/src/executors/ng-packagr-lite/compat.ts b/packages/angular/src/executors/ng-packagr-lite/compat.ts deleted file mode 100644 index 9602cbe987..0000000000 --- a/packages/angular/src/executors/ng-packagr-lite/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import { ngPackagrLiteExecutor } from './ng-packagr-lite.impl'; - -export default convertNxExecutor(ngPackagrLiteExecutor); diff --git a/packages/angular/src/executors/package/compat.ts b/packages/angular/src/executors/package/compat.ts deleted file mode 100644 index 26939a7823..0000000000 --- a/packages/angular/src/executors/package/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import { packageExecutor } from './package.impl'; - -export default convertNxExecutor(packageExecutor); diff --git a/packages/angular/src/generators/add-linting/compat.ts b/packages/angular/src/generators/add-linting/compat.ts deleted file mode 100644 index 73002df462..0000000000 --- a/packages/angular/src/generators/add-linting/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { addLintingGenerator } from './add-linting'; - -export default warnForSchematicUsage(convertNxGenerator(addLintingGenerator)); diff --git a/packages/angular/src/generators/application/application.compat.ts b/packages/angular/src/generators/application/application.compat.ts deleted file mode 100644 index 90809af8c3..0000000000 --- a/packages/angular/src/generators/application/application.compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import application from './application'; - -export const applicationSchematic = warnForSchematicUsage( - convertNxGenerator(application) -); diff --git a/packages/angular/src/generators/component-cypress-spec/compat.ts b/packages/angular/src/generators/component-cypress-spec/compat.ts deleted file mode 100644 index 336397f5de..0000000000 --- a/packages/angular/src/generators/component-cypress-spec/compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { componentCypressSpecGenerator } from './component-cypress-spec'; - -export default warnForSchematicUsage( - convertNxGenerator(componentCypressSpecGenerator) -); diff --git a/packages/angular/src/generators/component-story/compat.ts b/packages/angular/src/generators/component-story/compat.ts deleted file mode 100644 index fed22609bd..0000000000 --- a/packages/angular/src/generators/component-story/compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { componentStoryGenerator } from './component-story'; - -export default warnForSchematicUsage( - convertNxGenerator(componentStoryGenerator) -); diff --git a/packages/angular/src/generators/component-test/compat.ts b/packages/angular/src/generators/component-test/compat.ts deleted file mode 100644 index fdcda1d20e..0000000000 --- a/packages/angular/src/generators/component-test/compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { componentTestGenerator } from './component-test'; - -export default warnForSchematicUsage( - convertNxGenerator(componentTestGenerator) -); diff --git a/packages/angular/src/generators/component/component.compat.ts b/packages/angular/src/generators/component/component.compat.ts deleted file mode 100644 index ec0a114263..0000000000 --- a/packages/angular/src/generators/component/component.compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { componentGenerator } from './component'; - -export default warnForSchematicUsage(convertNxGenerator(componentGenerator)); diff --git a/packages/angular/src/generators/convert-to-with-mf/convert-to-with-mf.compat.ts b/packages/angular/src/generators/convert-to-with-mf/convert-to-with-mf.compat.ts deleted file mode 100644 index 4148cde7d0..0000000000 --- a/packages/angular/src/generators/convert-to-with-mf/convert-to-with-mf.compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import convertToWithMF from './convert-to-with-mf'; - -export default warnForSchematicUsage(convertNxGenerator(convertToWithMF)); diff --git a/packages/angular/src/generators/cypress-component-configuration/compat.ts b/packages/angular/src/generators/cypress-component-configuration/compat.ts deleted file mode 100644 index bf69a3cb55..0000000000 --- a/packages/angular/src/generators/cypress-component-configuration/compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { cypressComponentConfiguration } from './cypress-component-configuration'; - -export default warnForSchematicUsage( - convertNxGenerator(cypressComponentConfiguration) -); diff --git a/packages/angular/src/generators/federate-module/federate-module.compat.ts b/packages/angular/src/generators/federate-module/federate-module.compat.ts deleted file mode 100644 index 49e0658a27..0000000000 --- a/packages/angular/src/generators/federate-module/federate-module.compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import federateModule from './federate-module'; - -export default warnForSchematicUsage(convertNxGenerator(federateModule)); diff --git a/packages/angular/src/generators/host/host.compat.ts b/packages/angular/src/generators/host/host.compat.ts deleted file mode 100644 index 80b6456539..0000000000 --- a/packages/angular/src/generators/host/host.compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import host from './host'; - -export default warnForSchematicUsage(convertNxGenerator(host)); diff --git a/packages/angular/src/generators/init/init.compat.ts b/packages/angular/src/generators/init/init.compat.ts deleted file mode 100644 index fc18cd0dac..0000000000 --- a/packages/angular/src/generators/init/init.compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { angularInitGenerator } from './init'; - -export const initSchematic = warnForSchematicUsage( - convertNxGenerator(angularInitGenerator) -); diff --git a/packages/angular/src/generators/library-secondary-entry-point/compat.ts b/packages/angular/src/generators/library-secondary-entry-point/compat.ts deleted file mode 100644 index 39811b2cef..0000000000 --- a/packages/angular/src/generators/library-secondary-entry-point/compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { librarySecondaryEntryPointGenerator } from './library-secondary-entry-point'; - -export default warnForSchematicUsage( - convertNxGenerator(librarySecondaryEntryPointGenerator) -); diff --git a/packages/angular/src/generators/library/library.compat.ts b/packages/angular/src/generators/library/library.compat.ts deleted file mode 100644 index 984242c8fe..0000000000 --- a/packages/angular/src/generators/library/library.compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import library from './library'; - -export const librarySchematic = warnForSchematicUsage( - convertNxGenerator(library) -); diff --git a/packages/angular/src/generators/move/compat.ts b/packages/angular/src/generators/move/compat.ts deleted file mode 100644 index c7b5746b8d..0000000000 --- a/packages/angular/src/generators/move/compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { angularMoveGenerator } from './move'; - -export const angularMoveSchematic = warnForSchematicUsage( - convertNxGenerator(angularMoveGenerator) -); diff --git a/packages/angular/src/generators/ng-add/compat.ts b/packages/angular/src/generators/ng-add/compat.ts deleted file mode 100644 index a6d120fbe3..0000000000 --- a/packages/angular/src/generators/ng-add/compat.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { ngAddGenerator } from './ng-add'; - -export default convertNxGenerator(ngAddGenerator, true); diff --git a/packages/angular/src/generators/ngrx/compat.ts b/packages/angular/src/generators/ngrx/compat.ts deleted file mode 100644 index 2b9b2934bb..0000000000 --- a/packages/angular/src/generators/ngrx/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { ngrxGenerator } from './ngrx'; - -export default warnForSchematicUsage(convertNxGenerator(ngrxGenerator)); diff --git a/packages/angular/src/generators/remote/remote.compat.ts b/packages/angular/src/generators/remote/remote.compat.ts deleted file mode 100644 index 5a898b9211..0000000000 --- a/packages/angular/src/generators/remote/remote.compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import remote from './remote'; - -export default warnForSchematicUsage(convertNxGenerator(remote)); diff --git a/packages/angular/src/generators/scam-directive/scam-directive.compat.ts b/packages/angular/src/generators/scam-directive/scam-directive.compat.ts deleted file mode 100644 index 19d1fbcdaa..0000000000 --- a/packages/angular/src/generators/scam-directive/scam-directive.compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import scamGenerator from './scam-directive'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { convertNxGenerator } from '@nx/devkit'; - -export default warnForSchematicUsage(convertNxGenerator(scamGenerator)); diff --git a/packages/angular/src/generators/scam-pipe/scam-pipe.compat.ts b/packages/angular/src/generators/scam-pipe/scam-pipe.compat.ts deleted file mode 100644 index aa2b976cfb..0000000000 --- a/packages/angular/src/generators/scam-pipe/scam-pipe.compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import scamPipeGenerator from './scam-pipe'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { convertNxGenerator } from '@nx/devkit'; - -export default warnForSchematicUsage(convertNxGenerator(scamPipeGenerator)); diff --git a/packages/angular/src/generators/scam-to-standalone/compat.ts b/packages/angular/src/generators/scam-to-standalone/compat.ts deleted file mode 100644 index 3cfba0da6f..0000000000 --- a/packages/angular/src/generators/scam-to-standalone/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { scamToStandalone } from './scam-to-standalone'; - -export default warnForSchematicUsage(convertNxGenerator(scamToStandalone)); diff --git a/packages/angular/src/generators/scam/scam.compat.ts b/packages/angular/src/generators/scam/scam.compat.ts deleted file mode 100644 index db6c9c0e26..0000000000 --- a/packages/angular/src/generators/scam/scam.compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import scamGenerator from './scam'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { convertNxGenerator } from '@nx/devkit'; - -export default warnForSchematicUsage(convertNxGenerator(scamGenerator)); diff --git a/packages/angular/src/generators/setup-mf/setup-mf.compat.ts b/packages/angular/src/generators/setup-mf/setup-mf.compat.ts deleted file mode 100644 index 5b23788501..0000000000 --- a/packages/angular/src/generators/setup-mf/setup-mf.compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { setupMf } from './setup-mf'; - -export default warnForSchematicUsage(convertNxGenerator(setupMf)); diff --git a/packages/angular/src/generators/setup-ssr/setup-ssr.compat.ts b/packages/angular/src/generators/setup-ssr/setup-ssr.compat.ts deleted file mode 100644 index 0b1da67ed2..0000000000 --- a/packages/angular/src/generators/setup-ssr/setup-ssr.compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { setupSsr } from './setup-ssr'; - -export default warnForSchematicUsage(convertNxGenerator(setupSsr)); diff --git a/packages/angular/src/generators/setup-tailwind/setup-tailwind.compat.ts b/packages/angular/src/generators/setup-tailwind/setup-tailwind.compat.ts deleted file mode 100644 index 96fe2d2054..0000000000 --- a/packages/angular/src/generators/setup-tailwind/setup-tailwind.compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { setupTailwindGenerator } from './setup-tailwind'; - -export default warnForSchematicUsage( - convertNxGenerator(setupTailwindGenerator) -); diff --git a/packages/angular/src/generators/stories/compat.ts b/packages/angular/src/generators/stories/compat.ts deleted file mode 100644 index 1b0c9fa07f..0000000000 --- a/packages/angular/src/generators/stories/compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { angularStoriesGenerator } from './stories'; - -export default warnForSchematicUsage( - convertNxGenerator(angularStoriesGenerator) -); diff --git a/packages/angular/src/generators/storybook-configuration/compat.ts b/packages/angular/src/generators/storybook-configuration/compat.ts deleted file mode 100644 index 6fcff020e1..0000000000 --- a/packages/angular/src/generators/storybook-configuration/compat.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { storybookConfigurationGenerator } from './storybook-configuration'; - -export default warnForSchematicUsage( - convertNxGenerator(storybookConfigurationGenerator) -); diff --git a/packages/storybook/src/utils/utilities.spec.ts b/packages/angular/src/generators/storybook-configuration/storybook-utilities.spec.ts similarity index 91% rename from packages/storybook/src/utils/utilities.spec.ts rename to packages/angular/src/generators/storybook-configuration/storybook-utilities.spec.ts index 3a4ca203c5..5b42d24f0c 100644 --- a/packages/storybook/src/utils/utilities.spec.ts +++ b/packages/angular/src/generators/storybook-configuration/storybook-utilities.spec.ts @@ -1,15 +1,15 @@ import { joinPathFragments, Tree, writeJson } from '@nx/devkit'; -import { - overrideCollectionResolutionForTesting, - wrapAngularDevkitSchematic, -} from '@nx/devkit/ngcli-adapter'; import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { findStorybookAndBuildTargetsAndCompiler, isTheFileAStory, -} from './utilities'; -import { nxVersion, storybookVersion } from './versions'; -import * as targetVariations from './test-configs/different-target-variations.json'; +} from '@nx/storybook/src/utils/utilities'; +import { nxVersion, storybookVersion } from '@nx/storybook/src/utils/versions'; +import * as targetVariations from '@nx/storybook/src/utils/test-configs/different-target-variations.json'; +import libraryGenerator from '../library/library'; +import componentGenerator from '../component/component'; +import storybookConfigurationGenerator from '../storybook-configuration/storybook-configuration'; +import { Linter } from '@nx/linter'; // nested code imports graph from the repo, which might have innacurate graph version jest.mock('nx/src/project-graph/project-graph', () => ({ @@ -19,38 +19,18 @@ jest.mock('nx/src/project-graph/project-graph', () => ({ .mockImplementation(async () => ({ nodes: {}, dependencies: {} })), })); -const componentSchematic = wrapAngularDevkitSchematic( - '@schematics/angular', - 'component' -); -const runAngularLibrarySchematic = wrapAngularDevkitSchematic( - '@schematics/angular', - 'library' -); -const runAngularStorybookSchematic = wrapAngularDevkitSchematic( - '@nx/angular', - 'storybook-configuration' -); - describe('testing utilities', () => { describe('Test functions that need workspace tree', () => { let appTree: Tree; beforeEach(async () => { - overrideCollectionResolutionForTesting({ - '@nx/storybook': joinPathFragments( - __dirname, - '../../../../generators.json' - ), - }); - appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' }); - await runAngularLibrarySchematic(appTree, { + await libraryGenerator(appTree, { name: 'test-ui-lib', }); - await componentSchematic(appTree, { + await componentGenerator(appTree, { name: 'button', project: 'test-ui-lib', }); @@ -64,10 +44,12 @@ describe('testing utilities', () => { }); writeJson(appTree, 'test-ui-lib/tsconfig.json', {}); - await runAngularStorybookSchematic(appTree, { + await storybookConfigurationGenerator(appTree, { name: 'test-ui-lib', configureCypress: true, configureStaticServe: false, + linter: Linter.EsLint, + generateStories: false, }); appTree.write( diff --git a/packages/angular/src/generators/utils/warn-for-schematic-usage.ts b/packages/angular/src/generators/utils/warn-for-schematic-usage.ts deleted file mode 100644 index 5f847a61fe..0000000000 --- a/packages/angular/src/generators/utils/warn-for-schematic-usage.ts +++ /dev/null @@ -1,7 +0,0 @@ -export function warnForSchematicUsage(convertedGenerator: T): T { - console.warn( - 'Running generators as schematics is deprecated and will be removed in v17. Prefer `callRule(convertNxGenerator(generator)(options), tree, context)` where "generator" is the name of the generator you wish to use.' - ); - - return convertedGenerator; -} diff --git a/packages/angular/src/generators/web-worker/compat.ts b/packages/angular/src/generators/web-worker/compat.ts deleted file mode 100644 index b2a38e1e72..0000000000 --- a/packages/angular/src/generators/web-worker/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxGenerator } from '@nx/devkit'; -import { warnForSchematicUsage } from '../utils/warn-for-schematic-usage'; -import { webWorkerGenerator } from './web-worker'; - -export default warnForSchematicUsage(convertNxGenerator(webWorkerGenerator)); diff --git a/packages/cypress/executors.json b/packages/cypress/executors.json index f04e75ca73..fb6d6b7008 100644 --- a/packages/cypress/executors.json +++ b/packages/cypress/executors.json @@ -1,11 +1,4 @@ { - "builders": { - "cypress": { - "implementation": "./src/executors/cypress/compat", - "schema": "./src/executors/cypress/schema.json", - "description": "Run Cypress E2E tests." - } - }, "executors": { "cypress": { "implementation": "./src/executors/cypress/cypress.impl", diff --git a/packages/cypress/generators.json b/packages/cypress/generators.json index 954808225a..45e5f3f23a 100644 --- a/packages/cypress/generators.json +++ b/packages/cypress/generators.json @@ -1,37 +1,6 @@ { "name": "Nx Cypress", "version": "0.1", - "schematics": { - "init": { - "factory": "./src/generators/init/init#cypressInitSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize the `@nrwl/cypress` plugin.", - "aliases": ["ng-add"], - "hidden": true - }, - "cypress-project": { - "factory": "./src/generators/cypress-project/cypress-project#cypressProjectSchematic", - "schema": "./src/generators/cypress-project/schema.json", - "description": "Add a Cypress E2E Project." - }, - "configuration": { - "aliases": ["cypress-e2e-configuration", "e2e", "e2e-config"], - "factory": "./src/generators/configuration/configuration#compat", - "schema": "./src/generators/configuration/schema.json", - "description": "Add a Cypress E2E Configuration to an existing project." - }, - "component-configuration": { - "aliases": ["cypress-component-configuration"], - "factory": "./src/generators/component-configuration/component-configuration#compat", - "schema": "./src/generators/component-configuration/schema.json", - "description": "Set up Cypress Component Test for a project" - }, - "migrate-to-cypress-11": { - "factory": "./src/generators/migrate-to-cypress-11/migrate-to-cypress-11#migrateCypressProject", - "schema": "./src/generators/migrate-to-cypress-11/schema.json", - "description": "Migrate existing Cypress e2e projects to Cypress v11" - } - }, "generators": { "init": { "factory": "./src/generators/init/init#cypressInitGenerator", diff --git a/packages/cypress/package.json b/packages/cypress/package.json index 892ea88470..82310de6cc 100644 --- a/packages/cypress/package.json +++ b/packages/cypress/package.json @@ -27,8 +27,8 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", - "builders": "./executors.json", + "generators": "./generators.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/cypress/src/executors/cypress/compat.ts b/packages/cypress/src/executors/cypress/compat.ts deleted file mode 100644 index 73ff03fab9..0000000000 --- a/packages/cypress/src/executors/cypress/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import { default as cypressExecutor } from './cypress.impl'; - -export default convertNxExecutor(cypressExecutor); diff --git a/packages/cypress/src/generators/component-configuration/component-configuration.ts b/packages/cypress/src/generators/component-configuration/component-configuration.ts index 1a9bbfd5c0..b8187b649c 100644 --- a/packages/cypress/src/generators/component-configuration/component-configuration.ts +++ b/packages/cypress/src/generators/component-configuration/component-configuration.ts @@ -11,7 +11,6 @@ import { updateJson, updateProjectConfiguration, updateNxJson, - convertNxGenerator, } from '@nx/devkit'; import { installedCypressVersion } from '../../utils/cypress-version'; @@ -210,4 +209,3 @@ export function updateTsConfigForComponentTesting( } export default componentConfigurationGenerator; -export const compat = convertNxGenerator(componentConfigurationGenerator); diff --git a/packages/cypress/src/generators/configuration/configuration.ts b/packages/cypress/src/generators/configuration/configuration.ts index a4aa0f33bf..7973c4c922 100644 --- a/packages/cypress/src/generators/configuration/configuration.ts +++ b/packages/cypress/src/generators/configuration/configuration.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, generateFiles, GeneratorCallback, @@ -37,6 +36,7 @@ export interface CypressE2EConfigSchema { linter?: Linter; port?: number | 'cypress-auto'; } + type NormalizedSchema = ReturnType; export async function configurationGenerator( @@ -221,4 +221,3 @@ function addTarget(tree: Tree, opts: NormalizedSchema) { } export default configurationGenerator; -export const compat = convertNxGenerator(configurationGenerator); diff --git a/packages/cypress/src/generators/cypress-project/cypress-project.ts b/packages/cypress/src/generators/cypress-project/cypress-project.ts index 634d2880f0..7fd389de55 100644 --- a/packages/cypress/src/generators/cypress-project/cypress-project.ts +++ b/packages/cypress/src/generators/cypress-project/cypress-project.ts @@ -1,7 +1,6 @@ import { addDependenciesToPackageJson, addProjectConfiguration, - convertNxGenerator, formatFiles, generateFiles, GeneratorCallback, @@ -266,6 +265,3 @@ async function normalizeOptions( } export default cypressProjectGenerator; -export const cypressProjectSchematic = convertNxGenerator( - cypressProjectGenerator -); diff --git a/packages/cypress/src/generators/init/init.ts b/packages/cypress/src/generators/init/init.ts index 20d1a7dbee..688c28a270 100644 --- a/packages/cypress/src/generators/init/init.ts +++ b/packages/cypress/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, GeneratorCallback, readNxJson, removeDependenciesFromPackageJson, @@ -70,4 +69,3 @@ export async function cypressInitGenerator(tree: Tree, options: Schema) { } export default cypressInitGenerator; -export const cypressInitSchematic = convertNxGenerator(cypressInitGenerator); diff --git a/packages/detox/generators.json b/packages/detox/generators.json index c0c41461d4..629445d13d 100644 --- a/packages/detox/generators.json +++ b/packages/detox/generators.json @@ -2,21 +2,6 @@ "name": "Nx Detox", "version": "0.1", "extends": ["@nx/workspace"], - "schematics": { - "init": { - "factory": "./src/generators/init/init#detoxInitSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize the `@nrwl/detox` plugin.", - "hidden": true - }, - "application": { - "factory": "./src/generators/application/application#detoxApplicationSchematic", - "schema": "./src/generators/application/schema.json", - "aliases": ["app"], - "x-type": "application", - "description": "Create a Detox application." - } - }, "generators": { "init": { "factory": "./src/generators/init/init#detoxInitGenerator", diff --git a/packages/detox/package.json b/packages/detox/package.json index 8437047ae1..fcc63ca1dc 100644 --- a/packages/detox/package.json +++ b/packages/detox/package.json @@ -35,12 +35,12 @@ "peerDependencies": { "detox": "^20.9.0" }, - "builders": "./executors.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" }, - "schematics": "./generators.json", + "generators": "./generators.json", "publishConfig": { "access": "public" } diff --git a/packages/detox/src/executors/build/compat.ts b/packages/detox/src/executors/build/compat.ts deleted file mode 100644 index 49a0fc3698..0000000000 --- a/packages/detox/src/executors/build/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import detoxBuildExecutor from './build.impl'; - -export default convertNxExecutor(detoxBuildExecutor); diff --git a/packages/detox/src/executors/test/compat.ts b/packages/detox/src/executors/test/compat.ts deleted file mode 100644 index 489629e067..0000000000 --- a/packages/detox/src/executors/test/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import detoxTestExecutor from './test.impl'; - -export default convertNxExecutor(detoxTestExecutor); diff --git a/packages/detox/src/generators/application/application.ts b/packages/detox/src/generators/application/application.ts index 65138b439d..a8af1cdbe2 100644 --- a/packages/detox/src/generators/application/application.ts +++ b/packages/detox/src/generators/application/application.ts @@ -1,9 +1,4 @@ -import { - convertNxGenerator, - formatFiles, - runTasksInSerial, - Tree, -} from '@nx/devkit'; +import { formatFiles, runTasksInSerial, Tree } from '@nx/devkit'; import detoxInitGenerator from '../init/init'; import { addGitIgnoreEntry } from './lib/add-git-ignore-entry'; @@ -44,6 +39,3 @@ export async function detoxApplicationGeneratorInternal( } export default detoxApplicationGenerator; -export const detoxApplicationSchematic = convertNxGenerator( - detoxApplicationGenerator -); diff --git a/packages/detox/src/generators/init/init.ts b/packages/detox/src/generators/init/init.ts index a7dc66ad6e..479844ab88 100644 --- a/packages/detox/src/generators/init/init.ts +++ b/packages/detox/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, GeneratorCallback, removeDependenciesFromPackageJson, @@ -54,4 +53,3 @@ function moveDependency(host: Tree) { } export default detoxInitGenerator; -export const detoxInitSchematic = convertNxGenerator(detoxInitGenerator); diff --git a/packages/devkit/ngcli-adapter.ts b/packages/devkit/ngcli-adapter.ts index 197c62d08a..925677d264 100644 --- a/packages/devkit/ngcli-adapter.ts +++ b/packages/devkit/ngcli-adapter.ts @@ -4,7 +4,6 @@ // eslint-disable-next-line @typescript-eslint/no-restricted-imports export { wrapAngularDevkitSchematic, - overrideCollectionResolutionForTesting, mockSchematicsForTesting, NxScopedHost, } from 'nx/src/adapter/ngcli-adapter'; diff --git a/packages/esbuild/executors.json b/packages/esbuild/executors.json index dbba2d5027..f4ebe04316 100644 --- a/packages/esbuild/executors.json +++ b/packages/esbuild/executors.json @@ -1,11 +1,4 @@ { - "builders": { - "esbuild": { - "implementation": "./src/executors/esbuild/compat", - "schema": "./src/executors/esbuild/schema.json", - "description": "Bundle a package using EsBuild." - } - }, "executors": { "esbuild": { "implementation": "./src/executors/esbuild/esbuild.impl", diff --git a/packages/esbuild/generators.json b/packages/esbuild/generators.json index 7588f29021..1a28d4bfc7 100644 --- a/packages/esbuild/generators.json +++ b/packages/esbuild/generators.json @@ -1,20 +1,6 @@ { "name": "Nx esbuild", "version": "0.1", - "schematics": { - "init": { - "factory": "./src/generators/init/init#esbuildInitSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize the `@nrwl/esbuild` plugin.", - "hidden": true - }, - "configuration": { - "aliases": ["esbuild-project"], - "factory": "./src/generators/configuration/configuration#compat", - "schema": "./src/generators/configuration/schema.json", - "description": "Add esbuild configuration to a project." - } - }, "generators": { "init": { "factory": "./src/generators/init/init#esbuildInitGenerator", diff --git a/packages/esbuild/package.json b/packages/esbuild/package.json index 3c65d65091..d8e9fefb75 100644 --- a/packages/esbuild/package.json +++ b/packages/esbuild/package.json @@ -22,8 +22,8 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", - "builders": "./executors.json", + "generators": "./generators.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/esbuild/src/executors/esbuild/compat.ts b/packages/esbuild/src/executors/esbuild/compat.ts deleted file mode 100644 index 4b0539b6e2..0000000000 --- a/packages/esbuild/src/executors/esbuild/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import esbuildExecutor from './esbuild.impl'; - -export default convertNxExecutor(esbuildExecutor); diff --git a/packages/esbuild/src/generators/configuration/configuration.ts b/packages/esbuild/src/generators/configuration/configuration.ts index 9233c6bc8b..0c179a0705 100644 --- a/packages/esbuild/src/generators/configuration/configuration.ts +++ b/packages/esbuild/src/generators/configuration/configuration.ts @@ -1,6 +1,5 @@ import type { Tree } from '@nx/devkit'; import { - convertNxGenerator, formatFiles, joinPathFragments, readProjectConfiguration, @@ -131,6 +130,4 @@ function getTsConfigFile(tree: Tree, options: EsBuildProjectSchema) { return options.tsConfig; } -export const compat = convertNxGenerator(configurationGenerator); - export default configurationGenerator; diff --git a/packages/esbuild/src/generators/init/init.ts b/packages/esbuild/src/generators/init/init.ts index c05b72aa1a..25a6df9c74 100644 --- a/packages/esbuild/src/generators/init/init.ts +++ b/packages/esbuild/src/generators/init/init.ts @@ -1,9 +1,4 @@ -import { - addDependenciesToPackageJson, - convertNxGenerator, - formatFiles, - Tree, -} from '@nx/devkit'; +import { addDependenciesToPackageJson, formatFiles, Tree } from '@nx/devkit'; import { Schema } from './schema'; import { esbuildVersion } from '@nx/js/src/utils/versions'; import { nxVersion } from '../../utils/versions'; @@ -26,5 +21,3 @@ export async function esbuildInitGenerator(tree: Tree, schema: Schema) { } export default esbuildInitGenerator; - -export const esbuildInitSchematic = convertNxGenerator(esbuildInitGenerator); diff --git a/packages/expo/executors.json b/packages/expo/executors.json index c34726aa8c..698998e09a 100644 --- a/packages/expo/executors.json +++ b/packages/expo/executors.json @@ -55,62 +55,5 @@ "schema": "./src/executors/submit/schema.json", "description": "Submit app binary to App Store and/or Play Store" } - }, - "builders": { - "update": { - "implementation": "./src/executors/update/compat", - "schema": "./src/executors/update/schema.json", - "description": "Start an EAS update for your expo project" - }, - "build": { - "implementation": "./src/executors/build/compat", - "schema": "./src/executors/build/schema.json", - "description": "Start an EAS build for your expo project" - }, - "build-list": { - "implementation": "./src/executors/build-list/compat", - "schema": "./src/executors/build-list/schema.json", - "description": "List all EAS builds for your Expo project" - }, - "run": { - "implementation": "./src/executors/run/compat", - "schema": "./src/executors/run/schema.json", - "description": "Run the Android app binary locally or run the iOS app binary locally" - }, - "start": { - "implementation": "./src/executors/start/compat", - "schema": "./src/executors/start/schema.json", - "description": "Start a local dev server for the app or start a Webpack dev server for the web app" - }, - "sync-deps": { - "implementation": "./src/executors/sync-deps/compat", - "schema": "./src/executors/sync-deps/schema.json", - "description": "Syncs dependencies to package.json (required for autolinking)." - }, - "ensure-symlink": { - "implementation": "./src/executors/ensure-symlink/compat", - "schema": "./src/executors/ensure-symlink/schema.json", - "description": "Ensure workspace node_modules is symlink under app's node_modules folder." - }, - "prebuild": { - "implementation": "./src/executors/prebuild/compat", - "schema": "./src/executors/prebuild/schema.json", - "description": "Create native iOS and Android project files for building natively." - }, - "install": { - "implementation": "./src/executors/install/compat", - "schema": "./src/executors/install/schema.json", - "description": "Install a module or other package to a project." - }, - "export": { - "implementation": "./src/executors/export/compat", - "schema": "./src/executors/export/schema.json", - "description": "Export the JavaScript and assets for your app using Metro/webpack bundler" - }, - "submit": { - "implementation": "./src/executors/submit/compat", - "schema": "./src/executors/submit/schema.json", - "description": "Submit app binary to App Store and/or Play Store" - } } } diff --git a/packages/expo/generators.json b/packages/expo/generators.json index e683057b95..63ea539816 100644 --- a/packages/expo/generators.json +++ b/packages/expo/generators.json @@ -2,34 +2,6 @@ "name": "Nx Expo", "version": "0.1", "extends": ["@nx/workspace"], - "schematics": { - "init": { - "factory": "./src/generators/init/init#expoInitSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize the @nrwl/expo plugin", - "hidden": true - }, - "application": { - "factory": "./src/generators/application/application#expoApplicationSchematic", - "schema": "./src/generators/application/schema.json", - "aliases": ["app"], - "x-type": "application", - "description": "Create an application" - }, - "library": { - "factory": "./src/generators/library/library#expoLibrarySchematic", - "schema": "./src/generators/library/schema.json", - "aliases": ["lib"], - "x-type": "library", - "description": "Create a library" - }, - "component": { - "factory": "./src/generators/component/component#expoComponentSchematic", - "schema": "./src/generators/component/schema.json", - "description": "Create a component", - "aliases": ["c"] - } - }, "generators": { "init": { "factory": "./src/generators/init/init#expoInitGenerator", diff --git a/packages/expo/package.json b/packages/expo/package.json index fa946f18b9..dca29c2fa0 100644 --- a/packages/expo/package.json +++ b/packages/expo/package.json @@ -47,12 +47,12 @@ "@expo/cli": ">= 0.10.0", "eas-cli": ">= 3.15.0" }, - "builders": "./executors.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" }, - "schematics": "./generators.json", + "generators": "./generators.json", "publishConfig": { "access": "public" } diff --git a/packages/expo/src/executors/build-list/compat.ts b/packages/expo/src/executors/build-list/compat.ts deleted file mode 100644 index 764bd063fa..0000000000 --- a/packages/expo/src/executors/build-list/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import buildListExecutor from './build-list.impl'; - -export default convertNxExecutor(buildListExecutor); diff --git a/packages/expo/src/executors/build/compat.ts b/packages/expo/src/executors/build/compat.ts deleted file mode 100644 index fc7908d200..0000000000 --- a/packages/expo/src/executors/build/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import buildExecutor from './build.impl'; - -export default convertNxExecutor(buildExecutor); diff --git a/packages/expo/src/executors/ensure-symlink/compat.ts b/packages/expo/src/executors/ensure-symlink/compat.ts deleted file mode 100644 index 2b1fbac159..0000000000 --- a/packages/expo/src/executors/ensure-symlink/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import ensureSymlinkExecutor from './ensure-symlink.impl'; - -export default convertNxExecutor(ensureSymlinkExecutor); diff --git a/packages/expo/src/executors/export/compat.ts b/packages/expo/src/executors/export/compat.ts deleted file mode 100644 index b3d3c12d21..0000000000 --- a/packages/expo/src/executors/export/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import exportExecutor from './export.impl'; - -export default convertNxExecutor(exportExecutor); diff --git a/packages/expo/src/executors/install/compat.ts b/packages/expo/src/executors/install/compat.ts deleted file mode 100644 index 73aaed1b34..0000000000 --- a/packages/expo/src/executors/install/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import installExecutor from './install.impl'; - -export default convertNxExecutor(installExecutor); diff --git a/packages/expo/src/executors/prebuild/compat.ts b/packages/expo/src/executors/prebuild/compat.ts deleted file mode 100644 index a8ede28bfc..0000000000 --- a/packages/expo/src/executors/prebuild/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import prebuildExecutor from './prebuild.impl'; - -export default convertNxExecutor(prebuildExecutor); diff --git a/packages/expo/src/executors/run/compat.ts b/packages/expo/src/executors/run/compat.ts deleted file mode 100644 index 8bda243d65..0000000000 --- a/packages/expo/src/executors/run/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import runExecutor from './run.impl'; - -export default convertNxExecutor(runExecutor); diff --git a/packages/expo/src/executors/start/compat.ts b/packages/expo/src/executors/start/compat.ts deleted file mode 100644 index d0a895af81..0000000000 --- a/packages/expo/src/executors/start/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import startExecutor from './start.impl'; - -export default convertNxExecutor(startExecutor); diff --git a/packages/expo/src/executors/submit/compat.ts b/packages/expo/src/executors/submit/compat.ts deleted file mode 100644 index 8a20bd7c54..0000000000 --- a/packages/expo/src/executors/submit/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import submitExecutor from './submit.impl'; - -export default convertNxExecutor(submitExecutor); diff --git a/packages/expo/src/executors/sync-deps/compat.ts b/packages/expo/src/executors/sync-deps/compat.ts deleted file mode 100644 index a0a363f75c..0000000000 --- a/packages/expo/src/executors/sync-deps/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import syncDepsExecutor from './sync-deps.impl'; - -export default convertNxExecutor(syncDepsExecutor); diff --git a/packages/expo/src/executors/update/compat.ts b/packages/expo/src/executors/update/compat.ts deleted file mode 100644 index d898a595f8..0000000000 --- a/packages/expo/src/executors/update/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import buildExecutor from './update.impl'; - -export default convertNxExecutor(buildExecutor); diff --git a/packages/expo/src/generators/application/application.ts b/packages/expo/src/generators/application/application.ts index 72c1f49ac6..f68a1313a3 100644 --- a/packages/expo/src/generators/application/application.ts +++ b/packages/expo/src/generators/application/application.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, formatFiles, GeneratorCallback, joinPathFragments, @@ -67,6 +66,3 @@ export async function expoApplicationGeneratorInternal( } export default expoApplicationGenerator; -export const expoApplicationSchematic = convertNxGenerator( - expoApplicationGenerator -); diff --git a/packages/expo/src/generators/component/component.ts b/packages/expo/src/generators/component/component.ts index e14228022e..b4ee7fa7cb 100644 --- a/packages/expo/src/generators/component/component.ts +++ b/packages/expo/src/generators/component/component.ts @@ -2,7 +2,6 @@ import * as ts from 'typescript'; import { Schema } from './schema'; import { applyChangesToString, - convertNxGenerator, formatFiles, generateFiles, getProjects, @@ -83,6 +82,3 @@ function addExportsToBarrel(host: Tree, options: NormalizedSchema) { } export default expoComponentGenerator; -export const expoComponentSchematic = convertNxGenerator( - expoComponentGenerator -); diff --git a/packages/expo/src/generators/init/init.ts b/packages/expo/src/generators/init/init.ts index 455eab099c..fe2e07c2e3 100644 --- a/packages/expo/src/generators/init/init.ts +++ b/packages/expo/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, GeneratorCallback, removeDependenciesFromPackageJson, @@ -112,4 +111,3 @@ function moveDependency(host: Tree) { } export default expoInitGenerator; -export const expoInitSchematic = convertNxGenerator(expoInitGenerator); diff --git a/packages/expo/src/generators/library/library.ts b/packages/expo/src/generators/library/library.ts index 96cafbacae..c167214a48 100644 --- a/packages/expo/src/generators/library/library.ts +++ b/packages/expo/src/generators/library/library.ts @@ -1,6 +1,5 @@ import { addProjectConfiguration, - convertNxGenerator, ensurePackage, formatFiles, generateFiles, @@ -220,4 +219,3 @@ function maybeJs(options: NormalizedSchema, path: string): string { } export default expoLibraryGenerator; -export const expoLibrarySchematic = convertNxGenerator(expoLibraryGenerator); diff --git a/packages/express/generators.json b/packages/express/generators.json index bc6ea16491..a0098d2e4f 100644 --- a/packages/express/generators.json +++ b/packages/express/generators.json @@ -10,7 +10,6 @@ "aliases": ["ng-add"], "hidden": true }, - "application": { "factory": "./src/generators/application/application#applicationGeneratorInternal", "schema": "./src/generators/application/schema.json", @@ -18,22 +17,5 @@ "x-type": "application", "description": "Create an Express application." } - }, - "schematics": { - "init": { - "factory": "./src/generators/init/init#initSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize the `@nrwl/express` plugin.", - "aliases": ["ng-add"], - "hidden": true - }, - - "application": { - "factory": "./src/generators/application/application#applicationSchematic", - "schema": "./src/generators/application/schema.json", - "aliases": ["app"], - "x-type": "application", - "description": "Create an Express application." - } } } diff --git a/packages/express/package.json b/packages/express/package.json index 0d7e951b8b..6554d94e75 100644 --- a/packages/express/package.json +++ b/packages/express/package.json @@ -24,7 +24,7 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", + "generators": "./generators.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/express/src/generators/application/application.ts b/packages/express/src/generators/application/application.ts index adf4ae7adb..d7c5a7b3cf 100644 --- a/packages/express/src/generators/application/application.ts +++ b/packages/express/src/generators/application/application.ts @@ -1,5 +1,5 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator, formatFiles, toJS, updateJson } from '@nx/devkit'; +import { formatFiles, toJS, updateJson } from '@nx/devkit'; import { determineProjectNameAndRootOptions } from '@nx/devkit/src/generators/project-name-and-root-utils'; import { applicationGenerator as nodeApplicationGenerator } from '@nx/node'; import { join } from 'path'; @@ -83,7 +83,6 @@ export async function applicationGeneratorInternal(tree: Tree, schema: Schema) { } export default applicationGenerator; -export const applicationSchematic = convertNxGenerator(applicationGenerator); async function normalizeOptions( host: Tree, diff --git a/packages/express/src/generators/init/init.ts b/packages/express/src/generators/init/init.ts index 5a4d9a50ef..e3eee52308 100644 --- a/packages/express/src/generators/init/init.ts +++ b/packages/express/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, removeDependenciesFromPackageJson, Tree, @@ -47,4 +46,3 @@ export async function initGenerator(tree: Tree, schema: Schema) { } export default initGenerator; -export const initSchematic = convertNxGenerator(initGenerator); diff --git a/packages/jest/executors.json b/packages/jest/executors.json index 6a9afc165b..136c230019 100644 --- a/packages/jest/executors.json +++ b/packages/jest/executors.json @@ -1,11 +1,4 @@ { - "builders": { - "jest": { - "implementation": "./src/executors/jest/compat", - "schema": "./src/executors/jest/schema.json", - "description": "Run Jest unit tests." - } - }, "executors": { "jest": { "implementation": "./src/executors/jest/jest.impl", diff --git a/packages/jest/generators.json b/packages/jest/generators.json index 62fe83c0cc..ba0c899726 100644 --- a/packages/jest/generators.json +++ b/packages/jest/generators.json @@ -1,21 +1,6 @@ { "name": "Nx Jest", "version": "0.1", - "schematics": { - "init": { - "factory": "./src/generators/init/init#jestInitSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize the `@nrwl/jest` plugin.", - "aliases": ["ng-add"], - "hidden": true - }, - "configuration": { - "factory": "./src/generators/configuration/configuration#compat", - "schema": "./src/generators/configuration/schema.json", - "description": "Add Jest configuration to a project.", - "hidden": true - } - }, "generators": { "init": { "factory": "./src/generators/init/init#jestInitGenerator", diff --git a/packages/jest/package.json b/packages/jest/package.json index b626d67894..25c461a51f 100644 --- a/packages/jest/package.json +++ b/packages/jest/package.json @@ -27,8 +27,8 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", - "builders": "./executors.json", + "generators": "./generators.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/jest/src/executors/jest/compat.ts b/packages/jest/src/executors/jest/compat.ts deleted file mode 100644 index 5211fd6b87..0000000000 --- a/packages/jest/src/executors/jest/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import { default as jestExecutor } from './jest.impl'; - -export default convertNxExecutor(jestExecutor); diff --git a/packages/jest/src/generators/configuration/configuration.ts b/packages/jest/src/generators/configuration/configuration.ts index 048c237a9c..4f062facd3 100644 --- a/packages/jest/src/generators/configuration/configuration.ts +++ b/packages/jest/src/generators/configuration/configuration.ts @@ -7,7 +7,6 @@ import { JestProjectSchema, NormalizedJestProjectSchema } from './schema'; import { formatFiles, Tree, - convertNxGenerator, GeneratorCallback, readProjectConfiguration, } from '@nx/devkit'; @@ -75,5 +74,3 @@ export async function configurationGenerator( } export default configurationGenerator; - -export const compat = convertNxGenerator(configurationGenerator); diff --git a/packages/jest/src/generators/init/init.ts b/packages/jest/src/generators/init/init.ts index a4ffd0a61b..6ad8d03a66 100644 --- a/packages/jest/src/generators/init/init.ts +++ b/packages/jest/src/generators/init/init.ts @@ -1,10 +1,8 @@ import { addDependenciesToPackageJson, - convertNxGenerator, GeneratorCallback, getProjects, readNxJson, - readProjectConfiguration, removeDependenciesFromPackageJson, runTasksInSerial, stripIndents, @@ -233,5 +231,3 @@ function normalizeOptions(options: JestInitSchema) { } export default jestInitGenerator; - -export const jestInitSchematic = convertNxGenerator(jestInitGenerator); diff --git a/packages/js/executors.json b/packages/js/executors.json index ff7d851b68..884efedeac 100644 --- a/packages/js/executors.json +++ b/packages/js/executors.json @@ -28,27 +28,5 @@ "schema": "./src/executors/verdaccio/schema.json", "description": "Start local registry with verdaccio" } - }, - "builders": { - "tsc": { - "implementation": "./src/executors/tsc/compat", - "schema": "./src/executors/tsc/schema.json", - "description": "Build a project using TypeScript." - }, - "swc": { - "implementation": "./src/executors/swc/compat", - "schema": "./src/executors/swc/schema.json", - "description": "Build a project using SWC." - }, - "node": { - "implementation": "./src/executors/node/compat", - "schema": "./src/executors/node/schema.json", - "description": "Execute a Node application." - }, - "verdaccio": { - "implementation": "./src/executors/verdaccio/compat", - "schema": "./src/executors/verdaccio/schema.json", - "description": "Start local registry with verdaccio" - } } } diff --git a/packages/js/generators.json b/packages/js/generators.json index 91a7eed1c5..c43c2e1349 100644 --- a/packages/js/generators.json +++ b/packages/js/generators.json @@ -1,41 +1,6 @@ { "name": "nx/js", "version": "0.1", - "schematics": { - "library": { - "factory": "./src/generators/library/library#librarySchematic", - "schema": "./src/generators/library/schema.json", - "aliases": ["lib"], - "x-type": "library", - "description": "Create a library." - }, - "init": { - "factory": "./src/generators/init/init#initSchematic", - "schema": "./src/generators/init/schema.json", - "x-type": "init", - "description": "Initialize a TS/JS workspace.", - "hidden": true - }, - "convert-to-swc": { - "factory": "./src/generators/convert-to-swc/convert-to-swc#convertToSwcSchematic", - "schema": "./src/generators/convert-to-swc/schema.json", - "aliases": ["swc"], - "x-type": "library", - "description": "Convert a TypeScript library to compile with SWC." - }, - "setup-verdaccio": { - "factory": "./src/generators/setup-verdaccio/generator#setupVerdaccioSchematic", - "schema": "./src/generators/setup-verdaccio/schema.json", - "alias": ["verdaccio"], - "description": "Setup Verdaccio for local package management." - }, - "setup-build": { - "factory": "./src/generators/setup-build/generator#setupBuildSchematic", - "schema": "./src/generators/setup-build/schema.json", - "alias": ["build"], - "description": "setup-build generator" - } - }, "generators": { "library": { "factory": "./src/generators/library/library#libraryGeneratorInternal", diff --git a/packages/js/package.json b/packages/js/package.json index 48163735a4..5baac1d301 100644 --- a/packages/js/package.json +++ b/packages/js/package.json @@ -28,9 +28,7 @@ "migrations": "./migrations.json" }, "generators": "./generators.json", - "schematics": "./generators.json", "executors": "./executors.json", - "builders": "./executors.json", "dependencies": { "@babel/core": "^7.22.9", "@babel/plugin-proposal-class-properties": "^7.18.6", diff --git a/packages/js/src/executors/node/compat.ts b/packages/js/src/executors/node/compat.ts deleted file mode 100644 index 03735e668e..0000000000 --- a/packages/js/src/executors/node/compat.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; -import nodeExecutor from './node.impl'; - -export default convertNxExecutor(nodeExecutor); diff --git a/packages/js/src/executors/swc/compat.ts b/packages/js/src/executors/swc/compat.ts deleted file mode 100644 index 156bea015e..0000000000 --- a/packages/js/src/executors/swc/compat.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; -import { swcExecutor } from './swc.impl'; - -export default convertNxExecutor(swcExecutor); diff --git a/packages/js/src/executors/tsc/compat.ts b/packages/js/src/executors/tsc/compat.ts deleted file mode 100644 index ab5004ebde..0000000000 --- a/packages/js/src/executors/tsc/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import { tscExecutor } from './tsc.impl'; - -export default convertNxExecutor(tscExecutor); diff --git a/packages/js/src/executors/verdaccio/compat.ts b/packages/js/src/executors/verdaccio/compat.ts deleted file mode 100644 index 59c9b9ce7d..0000000000 --- a/packages/js/src/executors/verdaccio/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import { verdaccioExecutor } from './verdaccio.impl'; - -export default convertNxExecutor(verdaccioExecutor); diff --git a/packages/js/src/generators/convert-to-swc/convert-to-swc.ts b/packages/js/src/generators/convert-to-swc/convert-to-swc.ts index fb55f63966..ee1c5aa5f2 100644 --- a/packages/js/src/generators/convert-to-swc/convert-to-swc.ts +++ b/packages/js/src/generators/convert-to-swc/convert-to-swc.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, installPackagesTask, ProjectConfiguration, readJson, @@ -109,4 +108,3 @@ function checkSwcDependencies( } export default convertToSwcGenerator; -export const convertToSwcSchematic = convertNxGenerator(convertToSwcGenerator); diff --git a/packages/js/src/generators/init/init.ts b/packages/js/src/generators/init/init.ts index 94b1c80dca..ed52e27735 100644 --- a/packages/js/src/generators/init/init.ts +++ b/packages/js/src/generators/init/init.ts @@ -1,11 +1,9 @@ import { addDependenciesToPackageJson, - convertNxGenerator, ensurePackage, formatFiles, generateFiles, GeneratorCallback, - joinPathFragments, readJson, stripIndents, Tree, @@ -154,5 +152,3 @@ export async function initGenerator( } export default initGenerator; - -export const initSchematic = convertNxGenerator(initGenerator); diff --git a/packages/js/src/generators/library/library.ts b/packages/js/src/generators/library/library.ts index ef3451ede0..b9488428ca 100644 --- a/packages/js/src/generators/library/library.ts +++ b/packages/js/src/generators/library/library.ts @@ -1,7 +1,6 @@ import { addDependenciesToPackageJson, addProjectConfiguration, - convertNxGenerator, ensurePackage, formatFiles, generateFiles, @@ -239,6 +238,7 @@ export type AddLintOptions = Pick< | 'rootProject' | 'bundler' >; + export async function addLint( tree: Tree, options: AddLintOptions @@ -813,4 +813,3 @@ function determineEntryFields( } export default libraryGenerator; -export const librarySchematic = convertNxGenerator(libraryGenerator); diff --git a/packages/js/src/generators/setup-build/generator.ts b/packages/js/src/generators/setup-build/generator.ts index f84c8e7e03..a0ea3fad98 100644 --- a/packages/js/src/generators/setup-build/generator.ts +++ b/packages/js/src/generators/setup-build/generator.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, ensurePackage, formatFiles, type GeneratorCallback, @@ -161,4 +160,3 @@ export async function setupBuildGenerator( } export default setupBuildGenerator; -export const setupBuildSchematic = convertNxGenerator(setupBuildGenerator); diff --git a/packages/js/src/generators/setup-verdaccio/generator.ts b/packages/js/src/generators/setup-verdaccio/generator.ts index 380d468495..735c556fd7 100644 --- a/packages/js/src/generators/setup-verdaccio/generator.ts +++ b/packages/js/src/generators/setup-verdaccio/generator.ts @@ -1,7 +1,6 @@ import { addDependenciesToPackageJson, addProjectConfiguration, - convertNxGenerator, formatFiles, generateFiles, ProjectConfiguration, @@ -75,4 +74,3 @@ export async function setupVerdaccio( } export default setupVerdaccio; -export const setupVerdaccioSchematic = convertNxGenerator(setupVerdaccio); diff --git a/packages/linter/executors.json b/packages/linter/executors.json index 684f49d0da..ef774305db 100644 --- a/packages/linter/executors.json +++ b/packages/linter/executors.json @@ -1,11 +1,4 @@ { - "builders": { - "eslint": { - "implementation": "./src/executors/eslint/compat", - "schema": "./src/executors/eslint/schema.json", - "description": "Run ESLint on a project." - } - }, "executors": { "eslint": { "implementation": "./src/executors/eslint/lint.impl", diff --git a/packages/linter/generators.json b/packages/linter/generators.json index 7cfdf3c9f8..dde511249d 100644 --- a/packages/linter/generators.json +++ b/packages/linter/generators.json @@ -1,19 +1,6 @@ { "name": "nx/linter", "version": "0.1", - "schematics": { - "workspace-rules-project": { - "factory": "./src/generators/workspace-rules-project/workspace-rules-project#lintWorkspaceRulesProjectSchematic", - "schema": "./src/generators/workspace-rules-project/schema.json", - "description": "Create the Workspace Lint Rules Project.", - "hidden": true - }, - "workspace-rule": { - "factory": "./src/generators/workspace-rule/workspace-rule#lintWorkspaceRuleSchematic", - "schema": "./src/generators/workspace-rule/schema.json", - "description": "Create a new Workspace ESLint rule." - } - }, "generators": { "workspace-rules-project": { "factory": "./src/generators/workspace-rules-project/workspace-rules-project#lintWorkspaceRulesProjectGenerator", diff --git a/packages/linter/package.json b/packages/linter/package.json index 93341f1e58..962a62047e 100644 --- a/packages/linter/package.json +++ b/packages/linter/package.json @@ -27,8 +27,8 @@ "requirements": {}, "migrations": "./migrations.json" }, - "builders": "./executors.json", - "schematics": "./generators.json", + "executors": "./executors.json", + "generators": "./generators.json", "peerDependencies": { "eslint": "^8.0.0" }, diff --git a/packages/linter/src/executors/eslint/compat.ts b/packages/linter/src/executors/eslint/compat.ts deleted file mode 100644 index 1d005fafb0..0000000000 --- a/packages/linter/src/executors/eslint/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import lintExecutor from './lint.impl'; - -export default convertNxExecutor(lintExecutor); diff --git a/packages/linter/src/generators/workspace-rule/workspace-rule.ts b/packages/linter/src/generators/workspace-rule/workspace-rule.ts index ee9a7ea8ff..6c1ab98cf9 100644 --- a/packages/linter/src/generators/workspace-rule/workspace-rule.ts +++ b/packages/linter/src/generators/workspace-rule/workspace-rule.ts @@ -1,7 +1,6 @@ import { applyChangesToString, ChangeType, - convertNxGenerator, formatFiles, generateFiles, joinPathFragments, @@ -115,7 +114,3 @@ export async function lintWorkspaceRuleGenerator( return projectGeneratorCallback; } - -export const lintWorkspaceRuleSchematic = convertNxGenerator( - lintWorkspaceRuleGenerator -); diff --git a/packages/linter/src/generators/workspace-rules-project/workspace-rules-project.ts b/packages/linter/src/generators/workspace-rules-project/workspace-rules-project.ts index 19f66980e7..bcb39dbaea 100644 --- a/packages/linter/src/generators/workspace-rules-project/workspace-rules-project.ts +++ b/packages/linter/src/generators/workspace-rules-project/workspace-rules-project.ts @@ -1,6 +1,5 @@ import { addProjectConfiguration, - convertNxGenerator, ensurePackage, formatFiles, generateFiles, @@ -121,7 +120,3 @@ export async function lintWorkspaceRulesProjectGenerator( return installTask; } - -export const lintWorkspaceRulesProjectSchematic = convertNxGenerator( - lintWorkspaceRulesProjectGenerator -); diff --git a/packages/nest/generators.json b/packages/nest/generators.json index 86d60bc7bc..f7a242d051 100644 --- a/packages/nest/generators.json +++ b/packages/nest/generators.json @@ -2,104 +2,6 @@ "name": "nx/nest", "version": "0.1", "extends": ["@nx/workspace"], - "schematics": { - "application": { - "factory": "./src/generators/application/application#applicationSchematic", - "schema": "./src/generators/application/schema.json", - "aliases": ["app"], - "x-type": "application", - "description": "Create a NestJS application." - }, - "init": { - "factory": "./src/generators/init/init#initSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize the `@nrwl/nest` plugin.", - "aliases": ["ng-add"], - "hidden": true - }, - "library": { - "factory": "./src/generators/library/library#librarySchematic", - "schema": "./src/generators/library/schema.json", - "aliases": ["lib"], - "x-type": "library", - "description": "Create a new NestJS library." - }, - "class": { - "factory": "./src/generators/class/class#classSchematic", - "schema": "./src/generators/class/schema.json", - "description": "Run the `class` NestJS generator with Nx project support." - }, - "controller": { - "factory": "./src/generators/controller/controller#controllerSchematic", - "schema": "./src/generators/controller/schema.json", - "description": "Run the `controller` NestJS generator with Nx project support." - }, - "decorator": { - "factory": "./src/generators/decorator/decorator#decoratorSchematic", - "schema": "./src/generators/decorator/schema.json", - "description": "Run the `decorator` NestJS generator with Nx project support." - }, - "filter": { - "factory": "./src/generators/filter/filter#filterSchematic", - "schema": "./src/generators/filter/schema.json", - "description": "Run the `filter` NestJS generator with Nx project support." - }, - "gateway": { - "factory": "./src/generators/gateway/gateway#gatewaySchematic", - "schema": "./src/generators/gateway/schema.json", - "description": "Run the `gateway` NestJS generator with Nx project support." - }, - "guard": { - "factory": "./src/generators/guard/guard#guardSchematic", - "schema": "./src/generators/guard/schema.json", - "description": "Run the `guard` NestJS generator with Nx project support." - }, - "interceptor": { - "factory": "./src/generators/interceptor/interceptor#interceptorSchematic", - "schema": "./src/generators/interceptor/schema.json", - "description": "Run the `interceptor` NestJS generator with Nx project support." - }, - "interface": { - "factory": "./src/generators/interface/interface#interfaceSchematic", - "schema": "./src/generators/interface/schema.json", - "description": "Run the `interface` NestJS generator with Nx project support." - }, - "middleware": { - "factory": "./src/generators/middleware/middleware#middlewareSchematic", - "schema": "./src/generators/middleware/schema.json", - "description": "Run the `middleware` NestJS generator with Nx project support." - }, - "module": { - "factory": "./src/generators/module/module#moduleSchematic", - "schema": "./src/generators/module/schema.json", - "description": "Run the `module` NestJS generator with Nx project support." - }, - "pipe": { - "factory": "./src/generators/pipe/pipe#pipeSchematic", - "schema": "./src/generators/pipe/schema.json", - "description": "Run the `pipe` NestJS generator with Nx project support." - }, - "provider": { - "factory": "./src/generators/provider/provider#providerSchematic", - "schema": "./src/generators/provider/schema.json", - "description": "Run the `provider` NestJS generator with Nx project support." - }, - "resolver": { - "factory": "./src/generators/resolver/resolver#resolverSchematic", - "schema": "./src/generators/resolver/schema.json", - "description": "Run the `resolver` NestJS generator with Nx project support." - }, - "resource": { - "factory": "./src/generators/resource/resource#resourceSchematic", - "schema": "./src/generators/resource/schema.json", - "description": "Run the `resource` NestJS generator with Nx project support." - }, - "service": { - "factory": "./src/generators/service/service#serviceSchematic", - "schema": "./src/generators/service/schema.json", - "description": "Run the `service` NestJS generator with Nx project support." - } - }, "generators": { "application": { "factory": "./src/generators/application/application#applicationGeneratorInternal", diff --git a/packages/nest/package.json b/packages/nest/package.json index dc6b924ab4..5f2fe8b66d 100644 --- a/packages/nest/package.json +++ b/packages/nest/package.json @@ -24,7 +24,7 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", + "generators": "./generators.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/nest/src/generators/application/application.ts b/packages/nest/src/generators/application/application.ts index caf90e1b65..33426341f1 100644 --- a/packages/nest/src/generators/application/application.ts +++ b/packages/nest/src/generators/application/application.ts @@ -1,5 +1,5 @@ import type { GeneratorCallback, Tree } from '@nx/devkit'; -import { convertNxGenerator, formatFiles, runTasksInSerial } from '@nx/devkit'; +import { formatFiles, runTasksInSerial } from '@nx/devkit'; import { applicationGenerator as nodeApplicationGenerator } from '@nx/node'; import { initGenerator } from '../init/init'; @@ -46,5 +46,3 @@ export async function applicationGeneratorInternal( } export default applicationGenerator; - -export const applicationSchematic = convertNxGenerator(applicationGenerator); diff --git a/packages/nest/src/generators/class/class.ts b/packages/nest/src/generators/class/class.ts index b24c799617..c8f16c0a68 100644 --- a/packages/nest/src/generators/class/class.ts +++ b/packages/nest/src/generators/class/class.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption, @@ -25,8 +24,6 @@ export function classGenerator( export default classGenerator; -export const classSchematic = convertNxGenerator(classGenerator); - function normalizeClassOptions( tree: Tree, options: ClassGeneratorOptions diff --git a/packages/nest/src/generators/controller/controller.ts b/packages/nest/src/generators/controller/controller.ts index 554ed0c32b..d8e9487a85 100644 --- a/packages/nest/src/generators/controller/controller.ts +++ b/packages/nest/src/generators/controller/controller.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption, @@ -28,8 +27,6 @@ export function controllerGenerator( export default controllerGenerator; -export const controllerSchematic = convertNxGenerator(controllerGenerator); - function normalizeControllerOptions( tree: Tree, options: ControllerGeneratorOptions diff --git a/packages/nest/src/generators/decorator/decorator.ts b/packages/nest/src/generators/decorator/decorator.ts index 1092db987d..1879890ff8 100644 --- a/packages/nest/src/generators/decorator/decorator.ts +++ b/packages/nest/src/generators/decorator/decorator.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NormalizedOptions, @@ -19,8 +18,6 @@ export function decoratorGenerator( export default decoratorGenerator; -export const decoratorSchematic = convertNxGenerator(decoratorGenerator); - function normalizeDecoratorOptions( tree: Tree, options: DecoratorGeneratorOptions diff --git a/packages/nest/src/generators/filter/filter.ts b/packages/nest/src/generators/filter/filter.ts index 2b83a9ad40..4ff229beb6 100644 --- a/packages/nest/src/generators/filter/filter.ts +++ b/packages/nest/src/generators/filter/filter.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption, @@ -25,8 +24,6 @@ export function filterGenerator( export default filterGenerator; -export const filterSchematic = convertNxGenerator(filterGenerator); - function normalizeFilterOptions( tree: Tree, options: FilterGeneratorOptions diff --git a/packages/nest/src/generators/gateway/gateway.ts b/packages/nest/src/generators/gateway/gateway.ts index 0e816863e5..cc10b0b88b 100644 --- a/packages/nest/src/generators/gateway/gateway.ts +++ b/packages/nest/src/generators/gateway/gateway.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption, @@ -25,8 +24,6 @@ export function gatewayGenerator( export default gatewayGenerator; -export const gatewaySchematic = convertNxGenerator(gatewayGenerator); - function normalizeGatewayOptions( tree: Tree, options: GatewayGeneratorOptions diff --git a/packages/nest/src/generators/guard/guard.ts b/packages/nest/src/generators/guard/guard.ts index 20d1187ada..80b36cb0f8 100644 --- a/packages/nest/src/generators/guard/guard.ts +++ b/packages/nest/src/generators/guard/guard.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption, @@ -25,8 +24,6 @@ export function guardGenerator( export default guardGenerator; -export const guardSchematic = convertNxGenerator(guardGenerator); - function normalizeGuardOptions( tree: Tree, options: GuardGeneratorOptions diff --git a/packages/nest/src/generators/init/init.ts b/packages/nest/src/generators/init/init.ts index cb72841ff5..cfbe4e1b07 100644 --- a/packages/nest/src/generators/init/init.ts +++ b/packages/nest/src/generators/init/init.ts @@ -1,5 +1,5 @@ import type { GeneratorCallback, Tree } from '@nx/devkit'; -import { convertNxGenerator, formatFiles, runTasksInSerial } from '@nx/devkit'; +import { formatFiles, runTasksInSerial } from '@nx/devkit'; import { initGenerator as nodeInitGenerator } from '@nx/node'; import { addDependencies, normalizeOptions } from './lib'; @@ -31,5 +31,3 @@ export async function initGenerator( } export default initGenerator; - -export const initSchematic = convertNxGenerator(initGenerator); diff --git a/packages/nest/src/generators/interceptor/interceptor.ts b/packages/nest/src/generators/interceptor/interceptor.ts index 8a1fa22763..a1387f3445 100644 --- a/packages/nest/src/generators/interceptor/interceptor.ts +++ b/packages/nest/src/generators/interceptor/interceptor.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption, @@ -25,8 +24,6 @@ export function interceptorGenerator( export default interceptorGenerator; -export const interceptorSchematic = convertNxGenerator(interceptorGenerator); - function normalizeInterceptorOptions( tree: Tree, options: InterceptorGeneratorOptions diff --git a/packages/nest/src/generators/interface/interface.ts b/packages/nest/src/generators/interface/interface.ts index c82310273a..b3ec2f50a5 100644 --- a/packages/nest/src/generators/interface/interface.ts +++ b/packages/nest/src/generators/interface/interface.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorOptions } from '../utils'; import { normalizeOptions, runNestSchematic } from '../utils'; @@ -15,5 +14,3 @@ export function interfaceGenerator( } export default interfaceGenerator; - -export const interfaceSchematic = convertNxGenerator(interfaceGenerator); diff --git a/packages/nest/src/generators/library/library.ts b/packages/nest/src/generators/library/library.ts index 09e93fa455..70b4680663 100644 --- a/packages/nest/src/generators/library/library.ts +++ b/packages/nest/src/generators/library/library.ts @@ -1,5 +1,5 @@ import type { GeneratorCallback, Tree } from '@nx/devkit'; -import { convertNxGenerator, formatFiles } from '@nx/devkit'; +import { formatFiles } from '@nx/devkit'; import { libraryGenerator as jsLibraryGenerator } from '@nx/js'; import { addDependencies } from '../init/lib'; import { @@ -44,5 +44,3 @@ export async function libraryGeneratorInternal( } export default libraryGenerator; - -export const librarySchematic = convertNxGenerator(libraryGenerator); diff --git a/packages/nest/src/generators/middleware/middleware.ts b/packages/nest/src/generators/middleware/middleware.ts index 3690226acf..3b42bbfa6b 100644 --- a/packages/nest/src/generators/middleware/middleware.ts +++ b/packages/nest/src/generators/middleware/middleware.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption, @@ -25,8 +24,6 @@ export function middlewareGenerator( export default middlewareGenerator; -export const middlewareSchematic = convertNxGenerator(middlewareGenerator); - function normalizeMiddlewareOptions( tree: Tree, options: MiddlewareGeneratorOptions diff --git a/packages/nest/src/generators/module/module.ts b/packages/nest/src/generators/module/module.ts index 5faa8c6408..c29a9a41a4 100644 --- a/packages/nest/src/generators/module/module.ts +++ b/packages/nest/src/generators/module/module.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NormalizedOptions, @@ -22,8 +21,6 @@ export function moduleGenerator( export default moduleGenerator; -export const moduleSchematic = convertNxGenerator(moduleGenerator); - function normalizeModuleOptions( tree: Tree, options: ModuleGeneratorOptions diff --git a/packages/nest/src/generators/pipe/pipe.ts b/packages/nest/src/generators/pipe/pipe.ts index 5463bbfa24..28ea67d3ef 100644 --- a/packages/nest/src/generators/pipe/pipe.ts +++ b/packages/nest/src/generators/pipe/pipe.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption, @@ -25,8 +24,6 @@ export function pipeGenerator( export default pipeGenerator; -export const pipeSchematic = convertNxGenerator(pipeGenerator); - function normalizePipeOptions( tree: Tree, options: PipeGeneratorOptions diff --git a/packages/nest/src/generators/provider/provider.ts b/packages/nest/src/generators/provider/provider.ts index 95e88475b9..c708dea83b 100644 --- a/packages/nest/src/generators/provider/provider.ts +++ b/packages/nest/src/generators/provider/provider.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption, @@ -25,8 +24,6 @@ export function providerGenerator( export default providerGenerator; -export const providerSchematic = convertNxGenerator(providerGenerator); - function normalizeProviderOptions( tree: Tree, options: ProviderGeneratorOptions diff --git a/packages/nest/src/generators/resolver/resolver.ts b/packages/nest/src/generators/resolver/resolver.ts index e60f5e6ddd..06e86c708f 100644 --- a/packages/nest/src/generators/resolver/resolver.ts +++ b/packages/nest/src/generators/resolver/resolver.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption, @@ -25,8 +24,6 @@ export function resolverGenerator( export default resolverGenerator; -export const resolverSchematic = convertNxGenerator(resolverGenerator); - function normalizeResolverOptions( tree: Tree, options: ResolverGeneratorOptions diff --git a/packages/nest/src/generators/resource/resource.ts b/packages/nest/src/generators/resource/resource.ts index a49cf7740f..f5aa0faf9c 100644 --- a/packages/nest/src/generators/resource/resource.ts +++ b/packages/nest/src/generators/resource/resource.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NestGeneratorWithResourceOption, @@ -27,8 +26,6 @@ export function resourceGenerator( export default resourceGenerator; -export const resourceSchematic = convertNxGenerator(resourceGenerator); - function normalizeResourceOptions( tree: Tree, options: ResourceGeneratorOptions diff --git a/packages/nest/src/generators/service/service.ts b/packages/nest/src/generators/service/service.ts index 7c5db71bd3..6a7011cfe0 100644 --- a/packages/nest/src/generators/service/service.ts +++ b/packages/nest/src/generators/service/service.ts @@ -1,5 +1,4 @@ import type { Tree } from '@nx/devkit'; -import { convertNxGenerator } from '@nx/devkit'; import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption, @@ -25,8 +24,6 @@ export function serviceGenerator( export default serviceGenerator; -export const serviceSchematic = convertNxGenerator(serviceGenerator); - function normalizeServiceOptions( tree: Tree, options: ServiceGeneratorOptions diff --git a/packages/next/executors.json b/packages/next/executors.json index 75ceca37a6..02cee6578f 100644 --- a/packages/next/executors.json +++ b/packages/next/executors.json @@ -16,23 +16,5 @@ "description": "Export a Next.js application. The exported application is located at `dist/$outputPath/exported`.", "x-deprecated": "Use static exports in next.config.js instead. See: https://nextjs.org/docs/pages/building-your-application/deploying/static-exports." } - }, - "builders": { - "build": { - "implementation": "./src/executors/build/compat", - "schema": "./src/executors/build/schema.json", - "description": "Build a Next.js application." - }, - "server": { - "implementation": "./src/executors/server/compat", - "schema": "./src/executors/server/schema.json", - "description": "Serve a Next.js application." - }, - "export": { - "implementation": "./src/executors/export/compat", - "schema": "./src/executors/export/schema.json", - "description": "Export a Next.js application. The exported application is located at `dist/$outputPath/exported`.", - "x-deprecated": "Use static exports in next.config.js instead. See: https://nextjs.org/docs/pages/building-your-application/deploying/static-exports." - } } } diff --git a/packages/next/generators.json b/packages/next/generators.json index 8ad7a43caa..da4a3d1bf5 100644 --- a/packages/next/generators.json +++ b/packages/next/generators.json @@ -2,36 +2,6 @@ "name": "nx/next", "version": "0.1", "extends": ["@nx/react"], - "schematics": { - "init": { - "factory": "./src/generators/init/init#nextInitSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize the `@nrwl/next` plugin.", - "hidden": true - }, - "application": { - "factory": "./src/generators/application/application#applicationSchematic", - "schema": "./src/generators/application/schema.json", - "aliases": ["app"], - "x-type": "application", - "description": "Create a Next.js application." - }, - "page": { - "factory": "./src/generators/page/page#pageSchematic", - "schema": "./src/generators/page/schema.json", - "description": "Create a Next.js page component." - }, - "component": { - "factory": "./src/generators/component/component#componentSchematic", - "schema": "./src/generators/component/schema.json", - "description": "Create a React component." - }, - "custom-server": { - "factory": "./src/generators/custom-server/custom-server#customServerSchematic", - "schema": "./src/generators/custom-server/schema.json", - "description": "Set up a custom server." - } - }, "generators": { "init": { "factory": "./src/generators/init/init#nextInitGenerator", diff --git a/packages/next/package.json b/packages/next/package.json index c050f39561..c4af16631c 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -24,8 +24,8 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", - "builders": "./executors.json", + "generators": "./generators.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/next/src/executors/build/compat.ts b/packages/next/src/executors/build/compat.ts deleted file mode 100644 index fc7908d200..0000000000 --- a/packages/next/src/executors/build/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import buildExecutor from './build.impl'; - -export default convertNxExecutor(buildExecutor); diff --git a/packages/next/src/executors/export/compat.ts b/packages/next/src/executors/export/compat.ts deleted file mode 100644 index b3d3c12d21..0000000000 --- a/packages/next/src/executors/export/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import exportExecutor from './export.impl'; - -export default convertNxExecutor(exportExecutor); diff --git a/packages/next/src/executors/server/compat.ts b/packages/next/src/executors/server/compat.ts deleted file mode 100644 index 62dff828d2..0000000000 --- a/packages/next/src/executors/server/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import serverExecutor from './server.impl'; - -export default convertNxExecutor(serverExecutor); diff --git a/packages/next/src/generators/application/application.ts b/packages/next/src/generators/application/application.ts index 8b67f6d27f..854b3daca3 100644 --- a/packages/next/src/generators/application/application.ts +++ b/packages/next/src/generators/application/application.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, formatFiles, GeneratorCallback, joinPathFragments, @@ -76,5 +75,3 @@ export async function applicationGeneratorInternal(host: Tree, schema: Schema) { return runTasksInSerial(...tasks); } - -export const applicationSchematic = convertNxGenerator(applicationGenerator); diff --git a/packages/next/src/generators/component/component.ts b/packages/next/src/generators/component/component.ts index fed2cf03f7..1e357d943f 100644 --- a/packages/next/src/generators/component/component.ts +++ b/packages/next/src/generators/component/component.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, formatFiles, getProjects, joinPathFragments, @@ -61,4 +60,3 @@ export async function componentGenerator(host: Tree, options: Schema) { } export default componentGenerator; -export const componentSchematic = convertNxGenerator(componentGenerator); diff --git a/packages/next/src/generators/custom-server/custom-server.ts b/packages/next/src/generators/custom-server/custom-server.ts index ddc87338c5..5d10feff10 100644 --- a/packages/next/src/generators/custom-server/custom-server.ts +++ b/packages/next/src/generators/custom-server/custom-server.ts @@ -1,7 +1,6 @@ import type { Tree } from '@nx/devkit'; import { updateJson, - convertNxGenerator, generateFiles, logger, offsetFromRoot, @@ -115,5 +114,3 @@ export async function customServerGenerator( return json; }); } - -export const customServerSchematic = convertNxGenerator(customServerGenerator); diff --git a/packages/next/src/generators/init/init.ts b/packages/next/src/generators/init/init.ts index ed69a3ffc4..39f4afa0a4 100644 --- a/packages/next/src/generators/init/init.ts +++ b/packages/next/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, ensurePackage, GeneratorCallback, runTasksInSerial, @@ -91,4 +90,3 @@ export async function nextInitGenerator(host: Tree, schema: InitSchema) { } export default nextInitGenerator; -export const nextInitSchematic = convertNxGenerator(nextInitGenerator); diff --git a/packages/next/src/generators/library/library.ts b/packages/next/src/generators/library/library.ts index da3e94a81b..767c41cc98 100644 --- a/packages/next/src/generators/library/library.ts +++ b/packages/next/src/generators/library/library.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, formatFiles, GeneratorCallback, joinPathFragments, @@ -119,4 +118,3 @@ export async function libraryGeneratorInternal(host: Tree, rawOptions: Schema) { } export default libraryGenerator; -export const librarySchematic = convertNxGenerator(libraryGenerator); diff --git a/packages/next/src/generators/page/page.ts b/packages/next/src/generators/page/page.ts index b392e2492f..2683dad0d2 100644 --- a/packages/next/src/generators/page/page.ts +++ b/packages/next/src/generators/page/page.ts @@ -1,6 +1,5 @@ import { componentGenerator as reactComponentGenerator } from '@nx/react'; import { - convertNxGenerator, formatFiles, joinPathFragments, readProjectConfiguration, @@ -56,4 +55,3 @@ function normalizeOptions(host: Tree, options: Schema) { } export default pageGenerator; -export const pageSchematic = convertNxGenerator(pageGenerator); diff --git a/packages/node/generators.json b/packages/node/generators.json index 4da769bc74..17d96c7bf1 100644 --- a/packages/node/generators.json +++ b/packages/node/generators.json @@ -30,33 +30,5 @@ "description": "Set up Docker configuration for a project.", "hidden": false } - }, - "schematics": { - "init": { - "factory": "./src/generators/init/init#initSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize the `@nrwl/node` plugin.", - "aliases": ["ng-add"], - "hidden": true - }, - "application": { - "factory": "./src/generators/application/application#applicationSchematic", - "schema": "./src/generators/application/schema.json", - "aliases": ["app"], - "x-type": "application", - "description": "Create a node application." - }, - "library": { - "factory": "./src/generators/library/library#librarySchematic", - "schema": "./src/generators/library/schema.json", - "aliases": ["lib"], - "x-type": "library", - "description": "Create a node library." - }, - "setup-docker": { - "factory": "./src/generators/setup-docker/setup-docker#setupDockerGenerator", - "schema": "./src/generators/setup-docker/schema.json", - "description": "Set up Docker configuration for a project." - } } } diff --git a/packages/node/package.json b/packages/node/package.json index 46385595ac..fb042aca55 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -24,7 +24,7 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", + "generators": "./generators.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/node/src/generators/application/application.ts b/packages/node/src/generators/application/application.ts index a7349b4c05..195fa6230e 100644 --- a/packages/node/src/generators/application/application.ts +++ b/packages/node/src/generators/application/application.ts @@ -1,7 +1,6 @@ import { addDependenciesToPackageJson, addProjectConfiguration, - convertNxGenerator, ensurePackage, formatFiles, generateFiles, @@ -494,4 +493,3 @@ async function normalizeOptions( } export default applicationGenerator; -export const applicationSchematic = convertNxGenerator(applicationGenerator); diff --git a/packages/node/src/generators/e2e-project/e2e-project.ts b/packages/node/src/generators/e2e-project/e2e-project.ts index 6d977f1f81..3acac02165 100644 --- a/packages/node/src/generators/e2e-project/e2e-project.ts +++ b/packages/node/src/generators/e2e-project/e2e-project.ts @@ -1,7 +1,6 @@ import { addDependenciesToPackageJson, addProjectConfiguration, - convertNxGenerator, formatFiles, generateFiles, GeneratorCallback, @@ -167,4 +166,3 @@ async function normalizeOptions( } export default e2eProjectGenerator; -export const e2eProjectSchematic = convertNxGenerator(e2eProjectGenerator); diff --git a/packages/node/src/generators/init/init.ts b/packages/node/src/generators/init/init.ts index dded03c54e..9b573f1d65 100644 --- a/packages/node/src/generators/init/init.ts +++ b/packages/node/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, GeneratorCallback, removeDependenciesFromPackageJson, @@ -63,4 +62,3 @@ export async function initGenerator(tree: Tree, schema: Schema) { } export default initGenerator; -export const initSchematic = convertNxGenerator(initGenerator); diff --git a/packages/node/src/generators/library/library.ts b/packages/node/src/generators/library/library.ts index 4a56a55202..3d8e5a9a12 100644 --- a/packages/node/src/generators/library/library.ts +++ b/packages/node/src/generators/library/library.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, formatFiles, generateFiles, GeneratorCallback, @@ -76,7 +75,6 @@ export async function libraryGeneratorInternal(tree: Tree, schema: Schema) { } export default libraryGenerator; -export const librarySchematic = convertNxGenerator(libraryGenerator); async function normalizeOptions( tree: Tree, diff --git a/packages/node/src/generators/setup-docker/setup-docker.ts b/packages/node/src/generators/setup-docker/setup-docker.ts index d15d355437..5176b71fe9 100644 --- a/packages/node/src/generators/setup-docker/setup-docker.ts +++ b/packages/node/src/generators/setup-docker/setup-docker.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, formatFiles, generateFiles, GeneratorCallback, @@ -81,4 +80,3 @@ export async function setupDockerGenerator( } export default setupDockerGenerator; -export const setupDockerSchematic = convertNxGenerator(setupDockerGenerator); diff --git a/packages/nuxt/src/generators/init/init.ts b/packages/nuxt/src/generators/init/init.ts index 194efdb399..081500907e 100644 --- a/packages/nuxt/src/generators/init/init.ts +++ b/packages/nuxt/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, GeneratorCallback, runTasksInSerial, Tree, @@ -63,4 +62,3 @@ export async function nuxtInitGenerator(host: Tree, schema: InitSchema) { } export default nuxtInitGenerator; -export const nuxtInitSchematic = convertNxGenerator(nuxtInitGenerator); diff --git a/packages/nx/executors.json b/packages/nx/executors.json index 859cde0871..c69d5eb941 100644 --- a/packages/nx/executors.json +++ b/packages/nx/executors.json @@ -1,16 +1,4 @@ { - "builders": { - "run-commands": { - "implementation": "./src/executors/run-commands/compat", - "schema": "./src/executors/run-commands/schema.json", - "description": "Run any custom commands with Nx." - }, - "run-script": { - "implementation": "./src/executors/run-script/compat", - "schema": "./src/executors/run-script/schema.json", - "description": "Run an NPM script using Nx." - } - }, "executors": { "noop": { "implementation": "./src/executors/noop/noop.impl", diff --git a/packages/nx/src/adapter/ngcli-adapter.ts b/packages/nx/src/adapter/ngcli-adapter.ts index d88c92b88c..a9f5c469ec 100644 --- a/packages/nx/src/adapter/ngcli-adapter.ts +++ b/packages/nx/src/adapter/ngcli-adapter.ts @@ -792,30 +792,6 @@ function resolveMigrationsCollection(name: string): string { let collectionResolutionOverrides = null; let mockedSchematics = null; -/** - * By default, Angular Devkit schematic collections will be resolved using the Node resolution. - * This doesn't work if you are testing schematics that refer to other schematics in the - * same repo. - * - * This function can can be used to override the resolution behaviour. - * - * Example: - * - * ```typescript - * overrideCollectionResolutionForTesting({ - * '@nx/workspace': path.join(__dirname, '../../../../workspace/generators.json'), - * '@nx/angular': path.join(__dirname, '../../../../angular/generators.json'), - * '@nx/linter': path.join(__dirname, '../../../../linter/generators.json') - * }); - * - * ``` - */ -export function overrideCollectionResolutionForTesting(collections: { - [name: string]: string; -}) { - collectionResolutionOverrides = collections; -} - /** * If you have an Nx Devkit generator invoking the wrapped Angular Devkit schematic, * and you don't want the Angular Devkit schematic to run, you can mock it up using this function. @@ -1035,6 +1011,7 @@ async function getWrappedWorkspaceNodeModulesArchitectHost( constructor(private workspace, private root) { super(workspace, root); } + async resolveBuilder(builderStr: string): Promise { const [packageName, builderName] = builderStr.split(':'); diff --git a/packages/nx/src/command-line/init/implementation/angular/integrated-workspace.ts b/packages/nx/src/command-line/init/implementation/angular/integrated-workspace.ts index 00bf332cc7..0ca59a6bcc 100644 --- a/packages/nx/src/command-line/init/implementation/angular/integrated-workspace.ts +++ b/packages/nx/src/command-line/init/implementation/angular/integrated-workspace.ts @@ -3,5 +3,5 @@ import { getPackageManagerCommand } from '../../../../utils/package-manager'; export function setupIntegratedWorkspace(): void { const pmc = getPackageManagerCommand(); - execSync(`${pmc.exec} ng g @nx/angular:ng-add`, { stdio: [0, 1, 2] }); + execSync(`${pmc.exec} nx g @nx/angular:ng-add`, { stdio: [0, 1, 2] }); } diff --git a/packages/nx/src/executors/run-commands/compat.ts b/packages/nx/src/executors/run-commands/compat.ts deleted file mode 100644 index fc6201313b..0000000000 --- a/packages/nx/src/executors/run-commands/compat.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { convertNxExecutor } from '../utils/convert-nx-executor'; -import { default as runCommandsExecutor } from './run-commands.impl'; - -export default convertNxExecutor(runCommandsExecutor); diff --git a/packages/nx/src/executors/run-script/compat.ts b/packages/nx/src/executors/run-script/compat.ts deleted file mode 100644 index 08ac4ce599..0000000000 --- a/packages/nx/src/executors/run-script/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '../utils/convert-nx-executor'; - -import { default as runScriptExecutor } from './run-script.impl'; - -export default convertNxExecutor(runScriptExecutor); diff --git a/packages/playwright/executors.json b/packages/playwright/executors.json index 5cf4695be5..dcb3239e10 100644 --- a/packages/playwright/executors.json +++ b/packages/playwright/executors.json @@ -1,11 +1,4 @@ { - "builders": { - "playwright": { - "implementation": "./src/executors/playwright/compat", - "schema": "./src/executors/playwright/schema.json", - "description": "Run Playwright tests." - } - }, "executors": { "playwright": { "implementation": "./src/executors/playwright/playwright", diff --git a/packages/playwright/generators.json b/packages/playwright/generators.json index c8d82df7d6..3584b88667 100644 --- a/packages/playwright/generators.json +++ b/packages/playwright/generators.json @@ -1,18 +1,6 @@ { "name": "Nx Playwright", "version": "0.1", - "schematics": { - "configuration": { - "factory": "./src/generators/configuration/configuration#configurationSchematic", - "schema": "./src/generators/configuration/schema.json", - "description": "Add Nx Playwright configuration to your project" - }, - "init": { - "factory": "./src/generators/init/init#initSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initializes a Playwright project in the current workspace" - } - }, "generators": { "configuration": { "factory": "./src/generators/configuration/configuration", diff --git a/packages/playwright/src/executors/playwright/compat.ts b/packages/playwright/src/executors/playwright/compat.ts deleted file mode 100644 index ca72a5cebe..0000000000 --- a/packages/playwright/src/executors/playwright/compat.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; -import { playwrightExecutor } from './playwright'; - -export default convertNxExecutor(playwrightExecutor); diff --git a/packages/playwright/src/generators/configuration/configuration.ts b/packages/playwright/src/generators/configuration/configuration.ts index caa1820476..40278071c3 100644 --- a/packages/playwright/src/generators/configuration/configuration.ts +++ b/packages/playwright/src/generators/configuration/configuration.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, formatFiles, generateFiles, GeneratorCallback, @@ -101,6 +100,3 @@ Rename or remove the existing e2e target.`); } export default configurationGenerator; -export const configurationSchematic = convertNxGenerator( - configurationGenerator -); diff --git a/packages/playwright/src/generators/init/init.ts b/packages/playwright/src/generators/init/init.ts index 21fc7bd2a6..2768b79d2b 100644 --- a/packages/playwright/src/generators/init/init.ts +++ b/packages/playwright/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, GeneratorCallback, getPackageManagerCommand, @@ -72,4 +71,3 @@ export async function initGenerator(tree: Tree, options: InitGeneratorSchema) { } export default initGenerator; -export const initSchematic = convertNxGenerator(initGenerator); diff --git a/packages/plugin/executors.json b/packages/plugin/executors.json index 8a5bcb9852..91bdd162fe 100644 --- a/packages/plugin/executors.json +++ b/packages/plugin/executors.json @@ -1,12 +1,4 @@ { - "builders": { - "e2e": { - "implementation": "./src/executors/e2e/compat", - "schema": "./src/executors/e2e/schema.json", - "description": "Creates and runs the E2E tests for an Nx Plugin.", - "x-deprecated": "@nx/plugin:e2e is deprecated and will be removed in Nx 18. Use @nx/jest:jest instead." - } - }, "executors": { "e2e": { "implementation": "./src/executors/e2e/e2e.impl", diff --git a/packages/plugin/generators.json b/packages/plugin/generators.json index 91502f26bc..8b86e8349b 100644 --- a/packages/plugin/generators.json +++ b/packages/plugin/generators.json @@ -45,37 +45,5 @@ "hidden": true, "x-use-standalone-layout": true } - }, - "schematics": { - "plugin": { - "factory": "./src/generators/plugin/plugin#pluginSchematic", - "schema": "./src/generators/plugin/schema.json", - "description": "Create a Nx Plugin." - }, - "create-package": { - "factory": "./src/generators/create-package/create-package#createPackageSchematic", - "schema": "./src/generators/create-package/schema.json", - "description": "Create a package which can be used by npx to create a new workspace" - }, - "e2e-project": { - "factory": "./src/generators/e2e-project/e2e#e2eProjectSchematic", - "schema": "./src/generators/e2e-project/schema.json", - "description": "Create a E2E application for a Nx Plugin." - }, - "migration": { - "factory": "./src/generators/migration/migration#migrationSchematic", - "schema": "./src/generators/migration/schema.json", - "description": "Create a migration for an Nx Plugin." - }, - "generator": { - "factory": "./src/generators/generator/generator#generatorSchematic", - "schema": "./src/generators/generator/schema.json", - "description": "Create a generator for an Nx Plugin." - }, - "executor": { - "factory": "./src/generators/executor/executor#executorSchematic", - "schema": "./src/generators/executor/schema.json", - "description": "Create an executor for an Nx Plugin." - } } } diff --git a/packages/plugin/package.json b/packages/plugin/package.json index b52aca1e9e..c4270f0d1a 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -21,8 +21,8 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", - "builders": "./executors.json", + "generators": "./generators.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/plugin/src/executors/e2e/compat.ts b/packages/plugin/src/executors/e2e/compat.ts deleted file mode 100644 index 1b9fcf07a7..0000000000 --- a/packages/plugin/src/executors/e2e/compat.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; -import { nxPluginE2EExecutor } from './e2e.impl'; - -export const nxPluginE2EBuilder = convertNxExecutor(nxPluginE2EExecutor); diff --git a/packages/plugin/src/generators/create-package/create-package.ts b/packages/plugin/src/generators/create-package/create-package.ts index 55d2487035..2b76571226 100644 --- a/packages/plugin/src/generators/create-package/create-package.ts +++ b/packages/plugin/src/generators/create-package/create-package.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, generateFiles, GeneratorCallback, @@ -187,6 +186,3 @@ function addE2eProject(host: Tree, options: NormalizedSchema) { } export default createPackageGenerator; -export const createPackageSchematic = convertNxGenerator( - createPackageGenerator -); diff --git a/packages/plugin/src/generators/e2e-project/e2e.ts b/packages/plugin/src/generators/e2e-project/e2e.ts index ca28e54602..1181129695 100644 --- a/packages/plugin/src/generators/e2e-project/e2e.ts +++ b/packages/plugin/src/generators/e2e-project/e2e.ts @@ -1,7 +1,6 @@ import type { Tree } from '@nx/devkit'; import { addProjectConfiguration, - convertNxGenerator, extractLayoutDirectory, formatFiles, generateFiles, @@ -215,4 +214,3 @@ export async function e2eProjectGeneratorInternal(host: Tree, schema: Schema) { } export default e2eProjectGenerator; -export const e2eProjectSchematic = convertNxGenerator(e2eProjectGenerator); diff --git a/packages/plugin/src/generators/executor/executor.ts b/packages/plugin/src/generators/executor/executor.ts index e3705f412f..5c8ffda941 100644 --- a/packages/plugin/src/generators/executor/executor.ts +++ b/packages/plugin/src/generators/executor/executor.ts @@ -1,7 +1,6 @@ import { readProjectConfiguration, names, - convertNxGenerator, generateFiles, updateJson, getWorkspaceLayout, @@ -197,4 +196,3 @@ export async function executorGenerator(host: Tree, schema: Schema) { } export default executorGenerator; -export const executorSchematic = convertNxGenerator(executorGenerator); diff --git a/packages/plugin/src/generators/generator/generator.ts b/packages/plugin/src/generators/generator/generator.ts index c228b2dca7..e36a8e1106 100644 --- a/packages/plugin/src/generators/generator/generator.ts +++ b/packages/plugin/src/generators/generator/generator.ts @@ -4,7 +4,6 @@ import { joinPathFragments, Tree, writeJson, - convertNxGenerator, generateFiles, getWorkspaceLayout, names, @@ -187,4 +186,3 @@ export async function generatorGenerator(host: Tree, schema: Schema) { } export default generatorGenerator; -export const generatorSchematic = convertNxGenerator(generatorGenerator); diff --git a/packages/plugin/src/generators/migration/migration.ts b/packages/plugin/src/generators/migration/migration.ts index 29fac57de9..32a4383d49 100644 --- a/packages/plugin/src/generators/migration/migration.ts +++ b/packages/plugin/src/generators/migration/migration.ts @@ -1,7 +1,6 @@ import { readProjectConfiguration, names, - convertNxGenerator, generateFiles, updateProjectConfiguration, updateJson, @@ -16,6 +15,7 @@ import * as path from 'path'; import { addMigrationJsonChecks } from '../lint-checks/generator'; import { PackageJson, readNxMigrateConfig } from 'nx/src/utils/package-json'; import { nxVersion } from '../../utils/versions'; + interface NormalizedSchema extends Schema { projectRoot: string; projectSourceRoot: string; @@ -166,4 +166,3 @@ export async function migrationGenerator(host: Tree, schema: Schema) { } export default migrationGenerator; -export const migrationSchematic = convertNxGenerator(migrationGenerator); diff --git a/packages/plugin/src/generators/plugin/plugin.ts b/packages/plugin/src/generators/plugin/plugin.ts index 96f195e445..bab8142284 100644 --- a/packages/plugin/src/generators/plugin/plugin.ts +++ b/packages/plugin/src/generators/plugin/plugin.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, generateFiles, GeneratorCallback, @@ -151,4 +150,3 @@ export async function pluginGeneratorInternal(host: Tree, schema: Schema) { } export default pluginGenerator; -export const pluginSchematic = convertNxGenerator(pluginGenerator); diff --git a/packages/react-native/executors.json b/packages/react-native/executors.json index f8dd98f444..08be40c7d4 100644 --- a/packages/react-native/executors.json +++ b/packages/react-native/executors.json @@ -50,57 +50,5 @@ "schema": "./src/executors/pod-install/schema.json", "description": "Run `pod install` in the `ios` directory." } - }, - "builders": { - "run-android": { - "implementation": "./src/executors/run-android/compat", - "schema": "./src/executors/run-android/schema.json", - "description": "Runs Android application." - }, - "run-ios": { - "implementation": "./src/executors/run-ios/compat", - "schema": "./src/executors/run-ios/schema.json", - "description": "Runs iOS application." - }, - "bundle": { - "implementation": "./src/executors/bundle/compat", - "schema": "./src/executors/bundle/schema.json", - "description": "Builds the JavaScript bundle for offline use." - }, - "build-android": { - "implementation": "./src/executors/build-android/compat", - "schema": "./src/executors/build-android/schema.json", - "description": "Release Build for Android." - }, - "build-ios": { - "implementation": "./src/executors/build-ios/compat", - "schema": "./src/executors/build-ios/schema.json", - "description": "Build iOS app" - }, - "start": { - "implementation": "./src/executors/start/compat", - "schema": "./src/executors/start/schema.json", - "description": "Starts the Javascript server that communicates with connected devices." - }, - "sync-deps": { - "implementation": "./src/executors/sync-deps/compat", - "schema": "./src/executors/sync-deps/schema.json", - "description": "Syncs dependencies to `package.json` (required for autolinking)." - }, - "ensure-symlink": { - "implementation": "./src/executors/ensure-symlink/compat", - "schema": "./src/executors/ensure-symlink//schema.json", - "description": "Ensure workspace `node_modules` is symlink under app's `node_modules` folder." - }, - "storybook": { - "implementation": "./src/executors/storybook/compat", - "schema": "./src/executors/storybook/schema.json", - "description": "Serve React Native Storybook." - }, - "pod-install": { - "implementation": "./src/executors/pod-install/compat", - "schema": "./src/executors/pod-install/schema.json", - "description": "Run `pod install` in the `ios` directory." - } } } diff --git a/packages/react-native/generators.json b/packages/react-native/generators.json index aec2a322ff..975087282b 100644 --- a/packages/react-native/generators.json +++ b/packages/react-native/generators.json @@ -2,58 +2,6 @@ "name": "Nx React Native", "version": "0.1", "extends": ["@nx/workspace"], - "schematics": { - "init": { - "factory": "./src/generators/init/init#reactNativeInitSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize the `@nrwl/react-native` plugin.", - "hidden": true - }, - "application": { - "factory": "./src/generators/application/application#reactNativeApplicationSchematic", - "schema": "./src/generators/application/schema.json", - "aliases": ["app"], - "x-type": "application", - "description": "Create a React Native application." - }, - "library": { - "factory": "./src/generators/library/library#reactNativeLibrarySchematic", - "schema": "./src/generators/library/schema.json", - "aliases": ["lib"], - "x-type": "library", - "description": "Create a React Native library." - }, - "component": { - "factory": "./src/generators/component/component#reactNativeComponentSchematic", - "schema": "./src/generators/component/schema.json", - "description": "Create a React Native component.", - "aliases": ["c"] - }, - "storybook-configuration": { - "factory": "./src/generators/storybook-configuration/configuration#storybookConfigurationSchematic", - "schema": "./src/generators/storybook-configuration/schema.json", - "description": "Set up Storybook for a React-native application or library.", - "hidden": false - }, - "component-story": { - "factory": "./src/generators/component-story/component-story#componentStorySchematic", - "schema": "./src/generators/component-story/schema.json", - "description": "Generate Storybook story for a React-native component.", - "hidden": false - }, - "stories": { - "factory": "./src/generators/stories/stories#storiesSchematic", - "schema": "./src/generators/stories/schema.json", - "description": "Create stories for all components declared in an application or library.", - "hidden": false - }, - "upgrade-native": { - "factory": "./src/generators/upgrade-native/upgrade-native#reactNativeUpgradeNativeSchematic", - "schema": "./src/generators/upgrade-native/schema.json", - "description": "Destructive command to upgrade native iOS and Android code to latest.", - "hidden": false - } - }, "generators": { "init": { "factory": "./src/generators/init/init#reactNativeInitGenerator", diff --git a/packages/react-native/package.json b/packages/react-native/package.json index a50cab6ab7..a2053e828e 100644 --- a/packages/react-native/package.json +++ b/packages/react-native/package.json @@ -47,12 +47,12 @@ "peerDependencies": { "react-native": ">= 0.72.0 < 0.73.0" }, - "builders": "./executors.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" }, - "schematics": "./generators.json", + "generators": "./generators.json", "publishConfig": { "access": "public" } diff --git a/packages/react-native/src/executors/build-android/compat.ts b/packages/react-native/src/executors/build-android/compat.ts deleted file mode 100644 index bc72a9a5a6..0000000000 --- a/packages/react-native/src/executors/build-android/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import buildAndroidExecutor from './build-android.impl'; - -export default convertNxExecutor(buildAndroidExecutor); diff --git a/packages/react-native/src/executors/build-ios/compat.ts b/packages/react-native/src/executors/build-ios/compat.ts deleted file mode 100644 index 9e5d0e5510..0000000000 --- a/packages/react-native/src/executors/build-ios/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import buildIosExecutor from './build-ios.impl'; - -export default convertNxExecutor(buildIosExecutor); diff --git a/packages/react-native/src/executors/bundle/compat.ts b/packages/react-native/src/executors/bundle/compat.ts deleted file mode 100644 index 18728208bd..0000000000 --- a/packages/react-native/src/executors/bundle/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import bundleExecutor from './bundle.impl'; - -export default convertNxExecutor(bundleExecutor); diff --git a/packages/react-native/src/executors/ensure-symlink/compat.ts b/packages/react-native/src/executors/ensure-symlink/compat.ts deleted file mode 100644 index 2b1fbac159..0000000000 --- a/packages/react-native/src/executors/ensure-symlink/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import ensureSymlinkExecutor from './ensure-symlink.impl'; - -export default convertNxExecutor(ensureSymlinkExecutor); diff --git a/packages/react-native/src/executors/pod-install/compat.ts b/packages/react-native/src/executors/pod-install/compat.ts deleted file mode 100644 index d3b90a4005..0000000000 --- a/packages/react-native/src/executors/pod-install/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import podInstall from './pod-install.impl'; - -export default convertNxExecutor(podInstall); diff --git a/packages/react-native/src/executors/run-android/compat.ts b/packages/react-native/src/executors/run-android/compat.ts deleted file mode 100644 index 3cc09a92e5..0000000000 --- a/packages/react-native/src/executors/run-android/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import runAndroidExecutor from './run-android.impl'; - -export default convertNxExecutor(runAndroidExecutor); diff --git a/packages/react-native/src/executors/run-ios/compat.ts b/packages/react-native/src/executors/run-ios/compat.ts deleted file mode 100644 index beedbf9d60..0000000000 --- a/packages/react-native/src/executors/run-ios/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import runIosExecutor from './run-ios.impl'; - -export default convertNxExecutor(runIosExecutor); diff --git a/packages/react-native/src/executors/start/compat.ts b/packages/react-native/src/executors/start/compat.ts deleted file mode 100644 index d0a895af81..0000000000 --- a/packages/react-native/src/executors/start/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import startExecutor from './start.impl'; - -export default convertNxExecutor(startExecutor); diff --git a/packages/react-native/src/executors/storybook/compat.ts b/packages/react-native/src/executors/storybook/compat.ts deleted file mode 100644 index 9ed1507ccc..0000000000 --- a/packages/react-native/src/executors/storybook/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import storybookExecutor from './storybook.impl'; - -export default convertNxExecutor(storybookExecutor); diff --git a/packages/react-native/src/executors/sync-deps/compat.ts b/packages/react-native/src/executors/sync-deps/compat.ts deleted file mode 100644 index a0a363f75c..0000000000 --- a/packages/react-native/src/executors/sync-deps/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import syncDepsExecutor from './sync-deps.impl'; - -export default convertNxExecutor(syncDepsExecutor); diff --git a/packages/react-native/src/generators/application/application.ts b/packages/react-native/src/generators/application/application.ts index 089a1ea597..94df014947 100644 --- a/packages/react-native/src/generators/application/application.ts +++ b/packages/react-native/src/generators/application/application.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, formatFiles, GeneratorCallback, joinPathFragments, @@ -76,6 +75,3 @@ export async function reactNativeApplicationGeneratorInternal( } export default reactNativeApplicationGenerator; -export const reactNativeApplicationSchematic = convertNxGenerator( - reactNativeApplicationGenerator -); diff --git a/packages/react-native/src/generators/component-story/component-story.ts b/packages/react-native/src/generators/component-story/component-story.ts index 8f3354fab6..93c0ac8312 100644 --- a/packages/react-native/src/generators/component-story/component-story.ts +++ b/packages/react-native/src/generators/component-story/component-story.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, formatFiles, generateFiles, getProjects, @@ -150,6 +149,3 @@ export async function componentStoryGenerator( } export default componentStoryGenerator; -export const componentStorySchematic = convertNxGenerator( - componentStoryGenerator -); diff --git a/packages/react-native/src/generators/component/component.ts b/packages/react-native/src/generators/component/component.ts index 0ca810744f..8bdedbe89f 100644 --- a/packages/react-native/src/generators/component/component.ts +++ b/packages/react-native/src/generators/component/component.ts @@ -1,7 +1,6 @@ import { Schema } from './schema'; import { applyChangesToString, - convertNxGenerator, formatFiles, generateFiles, getProjects, @@ -55,6 +54,7 @@ function createComponentFiles(host: Tree, options: NormalizedSchema) { } let tsModule: typeof import('typescript'); + function addExportsToBarrel(host: Tree, options: NormalizedSchema) { if (!tsModule) { tsModule = ensureTypescript(); @@ -88,6 +88,3 @@ function addExportsToBarrel(host: Tree, options: NormalizedSchema) { } export default reactNativeComponentGenerator; -export const reactNativeComponentSchematic = convertNxGenerator( - reactNativeComponentGenerator -); diff --git a/packages/react-native/src/generators/init/init.ts b/packages/react-native/src/generators/init/init.ts index e26532da53..7dec268124 100644 --- a/packages/react-native/src/generators/init/init.ts +++ b/packages/react-native/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, detectPackageManager, formatFiles, GeneratorCallback, @@ -125,6 +124,3 @@ function moveDependency(host: Tree) { } export default reactNativeInitGenerator; -export const reactNativeInitSchematic = convertNxGenerator( - reactNativeInitGenerator -); diff --git a/packages/react-native/src/generators/library/library.ts b/packages/react-native/src/generators/library/library.ts index f0b7a09f94..0f4287e5f2 100644 --- a/packages/react-native/src/generators/library/library.ts +++ b/packages/react-native/src/generators/library/library.ts @@ -1,6 +1,5 @@ import { addProjectConfiguration, - convertNxGenerator, ensurePackage, formatFiles, generateFiles, @@ -219,6 +218,3 @@ function maybeJs(options: NormalizedSchema, path: string): string { } export default reactNativeLibraryGenerator; -export const reactNativeLibrarySchematic = convertNxGenerator( - reactNativeLibraryGenerator -); diff --git a/packages/react-native/src/generators/stories/stories.ts b/packages/react-native/src/generators/stories/stories.ts index 8ddc53eca3..06874ef57e 100644 --- a/packages/react-native/src/generators/stories/stories.ts +++ b/packages/react-native/src/generators/stories/stories.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, ensurePackage, formatFiles, getProjects, @@ -82,4 +81,3 @@ export async function storiesGenerator( } export default storiesGenerator; -export const storiesSchematic = convertNxGenerator(storiesGenerator); diff --git a/packages/react-native/src/generators/storybook-configuration/configuration.ts b/packages/react-native/src/generators/storybook-configuration/configuration.ts index 3503690ab4..f848dd0dad 100644 --- a/packages/react-native/src/generators/storybook-configuration/configuration.ts +++ b/packages/react-native/src/generators/storybook-configuration/configuration.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, ensurePackage, formatFiles, GeneratorCallback, @@ -87,6 +86,3 @@ function addStorybookTask(host: Tree, projectName: string) { } export default storybookConfigurationGenerator; -export const storybookConfigurationSchematic = convertNxGenerator( - storybookConfigurationGenerator -); diff --git a/packages/react-native/src/generators/upgrade-native/upgrade-native.ts b/packages/react-native/src/generators/upgrade-native/upgrade-native.ts index 4e5d5620d4..f1c027a1f0 100644 --- a/packages/react-native/src/generators/upgrade-native/upgrade-native.ts +++ b/packages/react-native/src/generators/upgrade-native/upgrade-native.ts @@ -4,7 +4,6 @@ */ import { - convertNxGenerator, GeneratorCallback, joinPathFragments, readProjectConfiguration, @@ -51,6 +50,3 @@ export async function reactNativeUpgradeNativeGenerator( } export default reactNativeUpgradeNativeGenerator; -export const reactNativeUpgradeNativeSchematic = convertNxGenerator( - reactNativeUpgradeNativeGenerator -); diff --git a/packages/react/executors.json b/packages/react/executors.json index 91a086fe2c..a82dd5af31 100644 --- a/packages/react/executors.json +++ b/packages/react/executors.json @@ -1,16 +1,4 @@ { - "builders": { - "module-federation-dev-server": { - "implementation": "./src/executors/module-federation-dev-server/compat", - "schema": "./src/executors/module-federation-dev-server/schema.json", - "description": "Serve a host or remote application." - }, - "module-federation-ssr-dev-server": { - "implementation": "./src/executors/module-federation-ssr-dev-server/compat", - "schema": "./src/executors/module-federation-ssr-dev-server/schema.json", - "description": "Serve a host application along with it's known remotes." - } - }, "executors": { "module-federation-dev-server": { "implementation": "./src/executors/module-federation-dev-server/module-federation-dev-server.impl", diff --git a/packages/react/generators.json b/packages/react/generators.json index c19b87080d..a1db78e9c8 100644 --- a/packages/react/generators.json +++ b/packages/react/generators.json @@ -2,115 +2,6 @@ "name": "Nx React", "version": "0.1", "extends": ["@nx/workspace"], - "schematics": { - "init": { - "factory": "./src/generators/init/init#reactInitSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize the `@nrwl/react` plugin.", - "aliases": ["ng-add"], - "hidden": true - }, - - "application": { - "factory": "./src/generators/application/application#applicationSchematic", - "schema": "./src/generators/application/schema.json", - "aliases": ["app"], - "x-type": "application", - "description": "Create a React application." - }, - - "library": { - "factory": "./src/generators/library/library#librarySchematic", - "schema": "./src/generators/library/schema.json", - "aliases": ["lib"], - "x-type": "library", - "description": "Create a React library." - }, - - "component": { - "factory": "./src/generators/component/component#componentSchematic", - "schema": "./src/generators/component/schema.json", - "description": "Create a React component.", - "aliases": ["c"] - }, - - "redux": { - "factory": "./src/generators/redux/redux#reduxSchematic", - "schema": "./src/generators/redux/schema.json", - "description": "Create a Redux slice for a project.", - "aliases": ["slice"] - }, - - "storybook-configuration": { - "factory": "./src/generators/storybook-configuration/configuration#storybookConfigurationSchematic", - "schema": "./src/generators/storybook-configuration/schema.json", - "description": "Set up storybook for a React app or library.", - "hidden": false - }, - - "component-story": { - "factory": "./src/generators/component-story/component-story#componentStorySchematic", - "schema": "./src/generators/component-story/schema.json", - "description": "Generate storybook story for a React component.", - "hidden": false - }, - - "stories": { - "factory": "./src/generators/stories/stories#storiesSchematic", - "schema": "./src/generators/stories/schema.json", - "description": "Create stories/specs for all components declared in an app or library.", - "hidden": false - }, - - "component-cypress-spec": { - "factory": "./src/generators/component-cypress-spec/component-cypress-spec#componentCypressSchematic", - "schema": "./src/generators/component-cypress-spec/schema.json", - "description": "Create a Cypress spec for a UI component that has a story.", - "hidden": false - }, - - "hook": { - "factory": "./src/generators/hook/hook#hookSchematic", - "schema": "./src/generators/hook/schema.json", - "description": "Create a hook.", - "aliases": ["h"] - }, - - "cypress-component-configuration": { - "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration#cypressComponentConfigGenerator", - "schema": "./src/generators/cypress-component-configuration/schema.json", - "description": "Setup Cypress component testing for a React project.", - "hidden": false - }, - - "component-test": { - "factory": "./src/generators/component-test/component-test#componentTestGenerator", - "schema": "./src/generators/component-test/schema.json", - "description": "Generate a Cypress component test for a React component.", - "hidden": false - }, - - "setup-tailwind": { - "factory": "./src/generators/setup-tailwind/setup-tailwind#setupTailwindSchematic", - "schema": "./src/generators/setup-tailwind/schema.json", - "description": "Set up Tailwind configuration for a project.", - "hidden": false - }, - - "setup-ssr": { - "factory": "./src/generators/setup-ssr/setup-ssr#setupSsrSchematic", - "schema": "./src/generators/setup-ssr/schema.json", - "description": "Set up SSR configuration for a project.", - "hidden": false - }, - - "federate-module": { - "factory": "./src/generators/federate-module/federate-module#federateModuleSchematic", - "schema": "./src/generators/federate-module/schema.json", - "description": "Federate a module.", - "hidden": false - } - }, "generators": { "init": { "factory": "./src/generators/init/init#reactInitGenerator", @@ -119,7 +10,6 @@ "aliases": ["ng-add"], "hidden": true }, - "application": { "factory": "./src/generators/application/application#applicationGeneratorInternal", "schema": "./src/generators/application/schema.json", @@ -127,7 +17,6 @@ "x-type": "application", "description": "Create a React application." }, - "library": { "factory": "./src/generators/library/library#libraryGeneratorInternal", "schema": "./src/generators/library/schema.json", @@ -135,98 +24,84 @@ "x-type": "library", "description": "Create a React library." }, - "component": { "factory": "./src/generators/component/component#componentGenerator", "schema": "./src/generators/component/schema.json", "description": "Create a React component.", "aliases": ["c"] }, - "redux": { "factory": "./src/generators/redux/redux#reduxGenerator", "schema": "./src/generators/redux/schema.json", "description": "Create a Redux slice for a project.", "aliases": ["slice"] }, - "storybook-configuration": { "factory": "./src/generators/storybook-configuration/configuration#storybookConfigurationGenerator", "schema": "./src/generators/storybook-configuration/schema.json", "description": "Set up storybook for a React app or library.", "hidden": false }, - "component-story": { "factory": "./src/generators/component-story/component-story#componentStoryGenerator", "schema": "./src/generators/component-story/schema.json", "description": "Generate storybook story for a React component", "hidden": false }, - "stories": { "factory": "./src/generators/stories/stories#storiesGenerator", "schema": "./src/generators/stories/schema.json", "description": "Create stories/specs for all components declared in an app or library.", "hidden": false }, - "component-cypress-spec": { "factory": "./src/generators/component-cypress-spec/component-cypress-spec#componentCypressGenerator", "schema": "./src/generators/component-cypress-spec/schema.json", "description": "Create a Cypress spec for a UI component that has a story.", "hidden": false }, - "hook": { "factory": "./src/generators/hook/hook#hookGenerator", "schema": "./src/generators/hook/schema.json", "description": "Create a hook.", "aliases": ["c"] }, - "host": { "factory": "./src/generators/host/host#hostGeneratorInternal", "schema": "./src/generators/host/schema.json", "x-type": "application", "description": "Generate a host react application" }, - "remote": { "factory": "./src/generators/remote/remote#remoteGeneratorInternal", "schema": "./src/generators/remote/schema.json", "x-type": "application", "description": "Generate a remote react application" }, - "cypress-component-configuration": { "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration#cypressComponentConfigGenerator", "schema": "./src/generators/cypress-component-configuration/schema.json", "description": "Setup Cypress component testing for a React project", "hidden": false }, - "component-test": { "factory": "./src/generators/component-test/component-test#componentTestGenerator", "schema": "./src/generators/component-test/schema.json", "description": "Generate a Cypress component test for a React component", "hidden": false }, - "setup-tailwind": { "factory": "./src/generators/setup-tailwind/setup-tailwind#setupTailwindGenerator", "schema": "./src/generators/setup-tailwind/schema.json", "description": "Set up Tailwind configuration for a project.", "hidden": false }, - "setup-ssr": { "factory": "./src/generators/setup-ssr/setup-ssr#setupSsrGenerator", "schema": "./src/generators/setup-ssr/schema.json", "description": "Set up SSR configuration for a project.", "hidden": false }, - "federate-module": { "factory": "./src/generators/federate-module/federate-module#federateModuleGenerator", "schema": "./src/generators/federate-module/schema.json", diff --git a/packages/react/package.json b/packages/react/package.json index 2bc7c4d2e9..21b6a5b45c 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -24,8 +24,8 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "builders": "./executors.json", - "schematics": "./generators.json", + "executors": "./executors.json", + "generators": "./generators.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/react/src/executors/module-federation-dev-server/compat.ts b/packages/react/src/executors/module-federation-dev-server/compat.ts deleted file mode 100644 index ed735f0637..0000000000 --- a/packages/react/src/executors/module-federation-dev-server/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import devServer from './module-federation-dev-server.impl'; - -export default convertNxExecutor(devServer); diff --git a/packages/react/src/executors/module-federation-ssr-dev-server/compat.ts b/packages/react/src/executors/module-federation-ssr-dev-server/compat.ts deleted file mode 100644 index 2b8297f689..0000000000 --- a/packages/react/src/executors/module-federation-ssr-dev-server/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import ssrDevServer from './module-federation-ssr-dev-server.impl'; - -export default convertNxExecutor(ssrDevServer); diff --git a/packages/react/src/generators/application/application.ts b/packages/react/src/generators/application/application.ts index de7aa3e540..4fc587c915 100644 --- a/packages/react/src/generators/application/application.ts +++ b/packages/react/src/generators/application/application.ts @@ -10,7 +10,6 @@ import { setDefaults } from './lib/set-defaults'; import { addStyledModuleDependencies } from '../../rules/add-styled-dependencies'; import { addDependenciesToPackageJson, - convertNxGenerator, ensurePackage, formatFiles, GeneratorCallback, @@ -305,4 +304,3 @@ export async function applicationGeneratorInternal( } export default applicationGenerator; -export const applicationSchematic = convertNxGenerator(applicationGenerator); diff --git a/packages/react/src/generators/component-cypress-spec/component-cypress-spec.ts b/packages/react/src/generators/component-cypress-spec/component-cypress-spec.ts index 5c5b9434e2..ffc9119fa6 100644 --- a/packages/react/src/generators/component-cypress-spec/component-cypress-spec.ts +++ b/packages/react/src/generators/component-cypress-spec/component-cypress-spec.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, formatFiles, generateFiles, getProjects, @@ -177,6 +176,3 @@ function findPropsAndGenerateFileForCypress( } export default componentCypressGenerator; -export const componentCypressSchematic = convertNxGenerator( - componentCypressGenerator -); diff --git a/packages/react/src/generators/component-story/component-story.ts b/packages/react/src/generators/component-story/component-story.ts index 2507e10811..29bc3ed0a0 100644 --- a/packages/react/src/generators/component-story/component-story.ts +++ b/packages/react/src/generators/component-story/component-story.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, formatFiles, generateFiles, getProjects, @@ -148,6 +147,3 @@ export async function componentStoryGenerator( } export default componentStoryGenerator; -export const componentStorySchematic = convertNxGenerator( - componentStoryGenerator -); diff --git a/packages/react/src/generators/component/component.ts b/packages/react/src/generators/component/component.ts index e42161f951..8c4e55ef99 100644 --- a/packages/react/src/generators/component/component.ts +++ b/packages/react/src/generators/component/component.ts @@ -1,7 +1,6 @@ import { addDependenciesToPackageJson, applyChangesToString, - convertNxGenerator, formatFiles, generateFiles, GeneratorCallback, @@ -224,5 +223,3 @@ function assertValidOptions(options: Schema) { } export default componentGenerator; - -export const componentSchematic = convertNxGenerator(componentGenerator); diff --git a/packages/react/src/generators/federate-module/federate-module.ts b/packages/react/src/generators/federate-module/federate-module.ts index 9afb567282..627a004727 100644 --- a/packages/react/src/generators/federate-module/federate-module.ts +++ b/packages/react/src/generators/federate-module/federate-module.ts @@ -1,7 +1,6 @@ import { GeneratorCallback, Tree, - convertNxGenerator, formatFiles, logger, readJson, @@ -73,7 +72,3 @@ export async function federateModuleGenerator(tree: Tree, schema: Schema) { } export default federateModuleGenerator; - -export const federateModuleSchematic = convertNxGenerator( - federateModuleGenerator -); diff --git a/packages/react/src/generators/hook/hook.ts b/packages/react/src/generators/hook/hook.ts index dff84d2fbe..5ffad03848 100644 --- a/packages/react/src/generators/hook/hook.ts +++ b/packages/react/src/generators/hook/hook.ts @@ -1,7 +1,6 @@ // TODO(jack): Remove inline renderHook function when RTL releases with its own version import { applyChangesToString, - convertNxGenerator, formatFiles, generateFiles, getProjects, @@ -62,6 +61,7 @@ function createFiles(host: Tree, options: NormalizedSchema) { } let tsModule: typeof import('typescript'); + function addExportsToBarrel(host: Tree, options: NormalizedSchema) { if (!tsModule) { tsModule = ensureTypescript(); @@ -178,5 +178,3 @@ function assertValidOptions(options: Schema) { } export default hookGenerator; - -export const hookSchematic = convertNxGenerator(hookGenerator); diff --git a/packages/react/src/generators/init/init.ts b/packages/react/src/generators/init/init.ts index 426dbb6ebf..0d749a532a 100755 --- a/packages/react/src/generators/init/init.ts +++ b/packages/react/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, ensurePackage, GeneratorCallback, readNxJson, @@ -94,5 +93,3 @@ export async function reactInitGenerator(host: Tree, schema: InitSchema) { } export default reactInitGenerator; - -export const reactInitSchematic = convertNxGenerator(reactInitGenerator); diff --git a/packages/react/src/generators/library/library.ts b/packages/react/src/generators/library/library.ts index 969cc4b8d0..4912bd9861 100644 --- a/packages/react/src/generators/library/library.ts +++ b/packages/react/src/generators/library/library.ts @@ -1,6 +1,5 @@ import { addProjectConfiguration, - convertNxGenerator, ensurePackage, formatFiles, GeneratorCallback, @@ -229,4 +228,3 @@ export async function libraryGeneratorInternal(host: Tree, schema: Schema) { } export default libraryGenerator; -export const librarySchematic = convertNxGenerator(libraryGenerator); diff --git a/packages/react/src/generators/redux/redux.ts b/packages/react/src/generators/redux/redux.ts index 0784b51629..9328bf384d 100644 --- a/packages/react/src/generators/redux/redux.ts +++ b/packages/react/src/generators/redux/redux.ts @@ -9,7 +9,6 @@ import { NormalizedSchema, Schema } from './schema'; import { addDependenciesToPackageJson, applyChangesToString, - convertNxGenerator, formatFiles, generateFiles, getProjects, @@ -204,4 +203,3 @@ function normalizeOptions(host: Tree, options: Schema): NormalizedSchema { } export default reduxGenerator; -export const reduxSchematic = convertNxGenerator(reduxGenerator); diff --git a/packages/react/src/generators/setup-ssr/setup-ssr.ts b/packages/react/src/generators/setup-ssr/setup-ssr.ts index 6f3975bccf..2fe028079b 100644 --- a/packages/react/src/generators/setup-ssr/setup-ssr.ts +++ b/packages/react/src/generators/setup-ssr/setup-ssr.ts @@ -2,7 +2,6 @@ import type * as ts from 'typescript'; import { addDependenciesToPackageJson, applyChangesToString, - convertNxGenerator, formatFiles, generateFiles, joinPathFragments, @@ -241,5 +240,3 @@ export async function setupSsrGenerator(tree: Tree, options: Schema) { } export default setupSsrGenerator; - -export const setupSsrSchematic = convertNxGenerator(setupSsrGenerator); diff --git a/packages/react/src/generators/setup-tailwind/setup-tailwind.ts b/packages/react/src/generators/setup-tailwind/setup-tailwind.ts index d7ee99fa75..cbb8e93b55 100644 --- a/packages/react/src/generators/setup-tailwind/setup-tailwind.ts +++ b/packages/react/src/generators/setup-tailwind/setup-tailwind.ts @@ -1,7 +1,6 @@ import type { GeneratorCallback, Tree } from '@nx/devkit'; import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, generateFiles, joinPathFragments, @@ -67,7 +66,3 @@ export async function setupTailwindGenerator( } export default setupTailwindGenerator; - -export const setupTailwindSchematic = convertNxGenerator( - setupTailwindGenerator -); diff --git a/packages/react/src/generators/stories/stories.ts b/packages/react/src/generators/stories/stories.ts index 64b7a06a3f..ca31cfd18b 100644 --- a/packages/react/src/generators/stories/stories.ts +++ b/packages/react/src/generators/stories/stories.ts @@ -6,7 +6,6 @@ import { } from '../../utils/ast-utils'; import { addDependenciesToPackageJson, - convertNxGenerator, ensurePackage, formatFiles, GeneratorCallback, @@ -203,4 +202,3 @@ export async function storiesGenerator( } export default storiesGenerator; -export const storiesSchematic = convertNxGenerator(storiesGenerator); diff --git a/packages/react/src/generators/storybook-configuration/configuration.ts b/packages/react/src/generators/storybook-configuration/configuration.ts index 4d27122974..6561dde48b 100644 --- a/packages/react/src/generators/storybook-configuration/configuration.ts +++ b/packages/react/src/generators/storybook-configuration/configuration.ts @@ -1,7 +1,6 @@ import { StorybookConfigureSchema } from './schema'; import storiesGenerator from '../stories/stories'; import { - convertNxGenerator, ensurePackage, formatFiles, readProjectConfiguration, @@ -76,6 +75,3 @@ export async function storybookConfigurationGenerator( } export default storybookConfigurationGenerator; -export const storybookConfigurationSchematic = convertNxGenerator( - storybookConfigurationGenerator -); diff --git a/packages/rollup/executors.json b/packages/rollup/executors.json index c40811cf29..2e87d990bf 100644 --- a/packages/rollup/executors.json +++ b/packages/rollup/executors.json @@ -1,11 +1,4 @@ { - "builders": { - "rollup": { - "implementation": "./src/executors/rollup/compat", - "schema": "./src/executors/rollup/schema.json", - "description": "Bundle a package using Rollup." - } - }, "executors": { "rollup": { "implementation": "./src/executors/rollup/rollup.impl", diff --git a/packages/rollup/generators.json b/packages/rollup/generators.json index 28fe87e7ad..9dc2fe8c75 100644 --- a/packages/rollup/generators.json +++ b/packages/rollup/generators.json @@ -1,20 +1,6 @@ { "name": "Nx rollup", "version": "0.1", - "schematics": { - "init": { - "factory": "./src/generators/init/init#rollupInitSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize the `@nrwl/rollup` plugin.", - "hidden": true - }, - "configuration": { - "aliases": ["rollup-project"], - "factory": "./src/generators/configuration/configuration#compat", - "schema": "./src/generators/configuration/schema.json", - "description": "Add rollup configuration to a project." - } - }, "generators": { "init": { "factory": "./src/generators/init/init#rollupInitGenerator", diff --git a/packages/rollup/package.json b/packages/rollup/package.json index 24e1c2f18a..2c92b54193 100644 --- a/packages/rollup/package.json +++ b/packages/rollup/package.json @@ -22,8 +22,8 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", - "builders": "./executors.json", + "generators": "./generators.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/rollup/src/executors/rollup/compat.ts b/packages/rollup/src/executors/rollup/compat.ts deleted file mode 100644 index 4681ebee42..0000000000 --- a/packages/rollup/src/executors/rollup/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import rollupExecutor from './rollup.impl'; - -export default convertNxExecutor(rollupExecutor); diff --git a/packages/rollup/src/generators/configuration/configuration.ts b/packages/rollup/src/generators/configuration/configuration.ts index 863d789633..fa18877803 100644 --- a/packages/rollup/src/generators/configuration/configuration.ts +++ b/packages/rollup/src/generators/configuration/configuration.ts @@ -1,6 +1,5 @@ import type { Tree } from '@nx/devkit'; import { - convertNxGenerator, formatFiles, joinPathFragments, readProjectConfiguration, @@ -114,5 +113,3 @@ function addBuildTarget(tree: Tree, options: RollupProjectSchema) { } export default configurationGenerator; - -export const compat = convertNxGenerator(configurationGenerator); diff --git a/packages/rollup/src/generators/init/init.ts b/packages/rollup/src/generators/init/init.ts index 761bb50ee3..698e5863e0 100644 --- a/packages/rollup/src/generators/init/init.ts +++ b/packages/rollup/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, GeneratorCallback, Tree, @@ -12,7 +11,6 @@ import { swcLoaderVersion, tsLibVersion, } from '../../utils/versions'; -import { addBabelInputs } from '@nx/js/src/utils/add-babel-inputs'; export async function rollupInitGenerator(tree: Tree, schema: Schema) { let task: GeneratorCallback; @@ -47,5 +45,3 @@ export async function rollupInitGenerator(tree: Tree, schema: Schema) { } export default rollupInitGenerator; - -export const rollupInitSchematic = convertNxGenerator(rollupInitGenerator); diff --git a/packages/storybook/executors.json b/packages/storybook/executors.json index 99af402117..b70a57e399 100644 --- a/packages/storybook/executors.json +++ b/packages/storybook/executors.json @@ -1,16 +1,4 @@ { - "builders": { - "storybook": { - "implementation": "./src/executors/storybook/compat", - "schema": "./src/executors/storybook/schema.json", - "description": "Serve Storybook." - }, - "build": { - "implementation": "./src/executors/build-storybook/compat", - "schema": "./src/executors/build-storybook/schema.json", - "description": "Build Storybook." - } - }, "executors": { "storybook": { "implementation": "./src/executors/storybook/storybook.impl", diff --git a/packages/storybook/generators.json b/packages/storybook/generators.json index 20161857ed..1eb483e4bd 100644 --- a/packages/storybook/generators.json +++ b/packages/storybook/generators.json @@ -1,33 +1,6 @@ { "name": "Nx Storybook", "version": "0.1", - "schematics": { - "init": { - "factory": "./src/generators/init/init#initSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Add Storybook configuration to the workspace.", - "aliases": ["ng-add"], - "hidden": true - }, - "configuration": { - "factory": "./src/generators/configuration/configuration#configurationSchematic", - "schema": "./src/generators/configuration/schema.json", - "description": "Add Storybook configuration to a UI library or an application.", - "hidden": false - }, - "cypress-project": { - "factory": "./src/generators/cypress-project/cypress-project#cypressProjectSchematic", - "schema": "./src/generators/cypress-project/schema.json", - "description": "Add cypress e2e app to test a UI library that is set up for Storybook.", - "hidden": false - }, - "migrate-7": { - "factory": "./src/generators/migrate-7/migrate-7#migrate7Schematic", - "schema": "./src/generators/migrate-7/schema.json", - "description": "Migrate to Storybook version 7.", - "hidden": false - } - }, "generators": { "init": { "factory": "./src/generators/init/init", diff --git a/packages/storybook/package.json b/packages/storybook/package.json index bcf6a7f76a..6893fdfa4c 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -23,8 +23,8 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", - "builders": "./executors.json", + "generators": "./generators.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/storybook/src/executors/build-storybook/compat.ts b/packages/storybook/src/executors/build-storybook/compat.ts deleted file mode 100644 index 3edcd4e583..0000000000 --- a/packages/storybook/src/executors/build-storybook/compat.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; -import buildStorybookExecutor from './build-storybook.impl'; - -export default convertNxExecutor(buildStorybookExecutor); diff --git a/packages/storybook/src/executors/storybook/compat.ts b/packages/storybook/src/executors/storybook/compat.ts deleted file mode 100644 index 0297cd7618..0000000000 --- a/packages/storybook/src/executors/storybook/compat.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; -import storybookExecutor from './storybook.impl'; - -export default convertNxExecutor(storybookExecutor); diff --git a/packages/storybook/src/generators/configuration/configuration.ts b/packages/storybook/src/generators/configuration/configuration.ts index 9d926ea931..606c1e297b 100644 --- a/packages/storybook/src/generators/configuration/configuration.ts +++ b/packages/storybook/src/generators/configuration/configuration.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, GeneratorCallback, logger, @@ -229,6 +228,3 @@ function normalizeSchema( } export default configurationGenerator; -export const configurationSchematic = convertNxGenerator( - configurationGenerator -); diff --git a/packages/storybook/src/generators/cypress-project/cypress-project.ts b/packages/storybook/src/generators/cypress-project/cypress-project.ts index 40b2bacc57..f43b85f802 100644 --- a/packages/storybook/src/generators/cypress-project/cypress-project.ts +++ b/packages/storybook/src/generators/cypress-project/cypress-project.ts @@ -7,11 +7,9 @@ import { getUnscopedLibName, } from '@nx/cypress/src/utils/project-name'; import { - convertNxGenerator, formatFiles, generateFiles, GeneratorCallback, - joinPathFragments, readJson, readProjectConfiguration, runTasksInSerial, @@ -154,6 +152,3 @@ function projectAlreadyHasCypress(tree: Tree): boolean { } export default cypressProjectGenerator; -export const cypressProjectSchematic = convertNxGenerator( - cypressProjectGenerator -); diff --git a/packages/storybook/src/generators/init/init.ts b/packages/storybook/src/generators/init/init.ts index 287612c273..6d70d36deb 100644 --- a/packages/storybook/src/generators/init/init.ts +++ b/packages/storybook/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, detectPackageManager, GeneratorCallback, readJson, @@ -209,4 +208,3 @@ export async function initGenerator(tree: Tree, schema: Schema) { } export default initGenerator; -export const initSchematic = convertNxGenerator(initGenerator); diff --git a/packages/storybook/src/generators/migrate-7/migrate-7.ts b/packages/storybook/src/generators/migrate-7/migrate-7.ts index 1daeee2eed..553a1e6878 100644 --- a/packages/storybook/src/generators/migrate-7/migrate-7.ts +++ b/packages/storybook/src/generators/migrate-7/migrate-7.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, GeneratorCallback, readJson, @@ -107,4 +106,3 @@ export async function migrate7Generator(tree: Tree, schema: Schema) { } export default migrate7Generator; -export const migrate7Schematic = convertNxGenerator(migrate7Generator); diff --git a/packages/vite/generators.json b/packages/vite/generators.json index e268573ad5..ecc8f42a0c 100644 --- a/packages/vite/generators.json +++ b/packages/vite/generators.json @@ -1,27 +1,6 @@ { "name": "Nx Vite", "version": "0.1", - "schematics": { - "init": { - "factory": "./src/generators/init/init#initSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize Vite in the workspace.", - "aliases": ["ng-add"], - "hidden": true - }, - "configuration": { - "factory": "./src/generators/configuration/configuration#configurationSchematic", - "schema": "./src/generators/configuration/schema.json", - "description": "Configure a project to use Vite.js.", - "aliases": ["config"], - "hidden": false - }, - "vitest": { - "factory": "./src/generators/vitest/vitest-generator#vitestSchematic", - "schema": "./src/generators/vitest/schema.json", - "description": "Generate a vitest configuration" - } - }, "generators": { "init": { "factory": "./src/generators/init/init", diff --git a/packages/vite/package.json b/packages/vite/package.json index ed9f35ffc8..0af4bccffc 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -22,8 +22,8 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", - "builders": "./executors.json", + "generators": "./generators.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/vite/src/generators/configuration/configuration.ts b/packages/vite/src/generators/configuration/configuration.ts index f433f5f9df..6d13ed00b0 100644 --- a/packages/vite/src/generators/configuration/configuration.ts +++ b/packages/vite/src/generators/configuration/configuration.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, formatFiles, GeneratorCallback, joinPathFragments, @@ -246,6 +245,3 @@ export async function viteConfigurationGenerator( } export default viteConfigurationGenerator; -export const configurationSchematic = convertNxGenerator( - viteConfigurationGenerator -); diff --git a/packages/vite/src/generators/init/init.ts b/packages/vite/src/generators/init/init.ts index 9a52754d89..38af46007a 100644 --- a/packages/vite/src/generators/init/init.ts +++ b/packages/vite/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, logger, readJson, readNxJson, @@ -120,4 +119,3 @@ export async function initGenerator(tree: Tree, schema: InitGeneratorSchema) { } export default initGenerator; -export const initSchematic = convertNxGenerator(initGenerator); diff --git a/packages/vite/src/generators/vitest/vitest-generator.ts b/packages/vite/src/generators/vitest/vitest-generator.ts index 9cfab4d019..95921b4a57 100644 --- a/packages/vite/src/generators/vitest/vitest-generator.ts +++ b/packages/vite/src/generators/vitest/vitest-generator.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, generateFiles, GeneratorCallback, @@ -220,4 +219,3 @@ function getCoverageProviderDependency( } export default vitestGenerator; -export const vitestSchematic = convertNxGenerator(vitestGenerator); diff --git a/packages/vue/src/generators/stories/stories.ts b/packages/vue/src/generators/stories/stories.ts index 89e66a10fc..c9bb3149c8 100644 --- a/packages/vue/src/generators/stories/stories.ts +++ b/packages/vue/src/generators/stories/stories.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, ensurePackage, formatFiles, GeneratorCallback, @@ -109,4 +108,3 @@ export async function storiesGenerator( } export default storiesGenerator; -export const storiesSchematic = convertNxGenerator(storiesGenerator); diff --git a/packages/vue/src/generators/storybook-configuration/configuration.ts b/packages/vue/src/generators/storybook-configuration/configuration.ts index 6a1d806ed5..4cfc3ba858 100644 --- a/packages/vue/src/generators/storybook-configuration/configuration.ts +++ b/packages/vue/src/generators/storybook-configuration/configuration.ts @@ -1,11 +1,6 @@ import { StorybookConfigureSchema } from './schema'; import storiesGenerator from '../stories/stories'; -import { - convertNxGenerator, - ensurePackage, - formatFiles, - Tree, -} from '@nx/devkit'; +import { ensurePackage, formatFiles, Tree } from '@nx/devkit'; import { nxVersion } from '../../utils/versions'; async function generateStories(host: Tree, schema: StorybookConfigureSchema) { @@ -47,6 +42,3 @@ export async function storybookConfigurationGenerator( } export default storybookConfigurationGenerator; -export const storybookConfigurationSchematic = convertNxGenerator( - storybookConfigurationGenerator -); diff --git a/packages/web/generators.json b/packages/web/generators.json index d647f86dec..10156d1e1a 100644 --- a/packages/web/generators.json +++ b/packages/web/generators.json @@ -21,25 +21,5 @@ "schema": "./src/generators/static-serve/schema.json", "description": "Add a new static-serve target to a project." } - }, - "schematics": { - "init": { - "factory": "./src/generators/init/init#webInitSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Add `@nrwl/web` to a project.", - "hidden": true - }, - "application": { - "factory": "./src/generators/application/application#applicationSchematic", - "schema": "./src/generators/application/schema.json", - "aliases": ["app"], - "x-type": "application", - "description": "Create an web application." - }, - "static-config": { - "factory": "./src/generators/static-serve/static-serve-configuration#compat", - "schema": "./src/generators/static-serve/schema.json", - "description": "Add a new static-serve target to a project." - } } } diff --git a/packages/web/package.json b/packages/web/package.json index 301b47700e..bf5dca7662 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -23,8 +23,8 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", - "builders": "./executors.json", + "generators": "./generators.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/web/src/executors/file-server/compat.ts b/packages/web/src/executors/file-server/compat.ts index d1efb97276..be847322ae 100644 --- a/packages/web/src/executors/file-server/compat.ts +++ b/packages/web/src/executors/file-server/compat.ts @@ -1,5 +1,4 @@ import { convertNxExecutor } from '@nx/devkit'; +import fileServer from './file-server.impl'; -import fileServerExecutor from './file-server.impl'; - -export default convertNxExecutor(fileServerExecutor); +export default convertNxExecutor(fileServer); diff --git a/packages/web/src/generators/application/application.ts b/packages/web/src/generators/application/application.ts index 994069655d..16021d5b73 100644 --- a/packages/web/src/generators/application/application.ts +++ b/packages/web/src/generators/application/application.ts @@ -1,7 +1,6 @@ import { addDependenciesToPackageJson, addProjectConfiguration, - convertNxGenerator, ensurePackage, formatFiles, generateFiles, @@ -398,4 +397,3 @@ async function normalizeOptions( } export default applicationGenerator; -export const applicationSchematic = convertNxGenerator(applicationGenerator); diff --git a/packages/web/src/generators/init/init.ts b/packages/web/src/generators/init/init.ts index c980dd592e..60b00a3228 100644 --- a/packages/web/src/generators/init/init.ts +++ b/packages/web/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, ensurePackage, formatFiles, GeneratorCallback, @@ -80,4 +79,3 @@ export async function webInitGenerator(tree: Tree, schema: Schema) { } export default webInitGenerator; -export const webInitSchematic = convertNxGenerator(webInitGenerator); diff --git a/packages/web/src/generators/static-serve/static-serve-configuration.ts b/packages/web/src/generators/static-serve/static-serve-configuration.ts index 33fa76d264..4d2e89efb4 100644 --- a/packages/web/src/generators/static-serve/static-serve-configuration.ts +++ b/packages/web/src/generators/static-serve/static-serve-configuration.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, logger, parseTargetString, readProjectConfiguration, @@ -9,6 +8,7 @@ import { updateProjectConfiguration, } from '@nx/devkit'; import { Schema as FileServerExecutorSchema } from '../../executors/file-server/schema.d'; + interface WebStaticServeSchema { buildTarget: string; outputPath?: string; @@ -108,5 +108,4 @@ function addStaticConfig(tree: Tree, opts: NormalizedWebStaticServeSchema) { updateProjectConfiguration(tree, opts.projectName, projectConfig); } -export const compat = convertNxGenerator(webStaticServeGenerator); export default webStaticServeGenerator; diff --git a/packages/webpack/executors.json b/packages/webpack/executors.json index 41fc3cf300..9d4a1d6135 100644 --- a/packages/webpack/executors.json +++ b/packages/webpack/executors.json @@ -1,21 +1,4 @@ { - "builders": { - "webpack": { - "implementation": "./src/executors/webpack/compat", - "schema": "./src/executors/webpack/schema.json", - "description": "Run webpack build." - }, - "dev-server": { - "implementation": "./src/executors/dev-server/compat", - "schema": "./src/executors/dev-server/schema.json", - "description": "Serve a web application." - }, - "ssr-dev-server": { - "implementation": "./src/executors/ssr-dev-server/compat", - "schema": "./src/executors/ssr-dev-server/schema.json", - "description": "Serve a SSR application." - } - }, "executors": { "webpack": { "implementation": "./src/executors/webpack/webpack.impl", diff --git a/packages/webpack/generators.json b/packages/webpack/generators.json index 9179cd979a..4490102f61 100644 --- a/packages/webpack/generators.json +++ b/packages/webpack/generators.json @@ -1,21 +1,6 @@ { "name": "Nx Webpack", "version": "0.1", - "schematics": { - "init": { - "factory": "./src/generators/init/init#webpackInitSchematic", - "schema": "./src/generators/init/schema.json", - "description": "Initialize the `@nrwl/webpack` plugin.", - "hidden": true - }, - "configuration": { - "aliases": ["webpack-project"], - "factory": "./src/generators/configuration/configuration#compat", - "schema": "./src/generators/configuration/schema.json", - "description": "Add webpack configuration to a project.", - "hidden": true - } - }, "generators": { "init": { "factory": "./src/generators/init/init#webpackInitGenerator", diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 9a11fd70ab..aa3d8c56f9 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -22,8 +22,8 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", - "builders": "./executors.json", + "generators": "./generators.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json" diff --git a/packages/webpack/src/executors/dev-server/compat.ts b/packages/webpack/src/executors/dev-server/compat.ts deleted file mode 100644 index 34b277b04e..0000000000 --- a/packages/webpack/src/executors/dev-server/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import devServerExecutor from './dev-server.impl'; - -export default convertNxExecutor(devServerExecutor); diff --git a/packages/webpack/src/executors/ssr-dev-server/compat.ts b/packages/webpack/src/executors/ssr-dev-server/compat.ts deleted file mode 100644 index 1ce89e1e88..0000000000 --- a/packages/webpack/src/executors/ssr-dev-server/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import ssrDevServerExecutor from './ssr-dev-server.impl'; - -export default convertNxExecutor(ssrDevServerExecutor); diff --git a/packages/webpack/src/executors/webpack/compat.ts b/packages/webpack/src/executors/webpack/compat.ts deleted file mode 100644 index e04afb8239..0000000000 --- a/packages/webpack/src/executors/webpack/compat.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { convertNxExecutor } from '@nx/devkit'; - -import { webpackExecutor } from './webpack.impl'; - -export default convertNxExecutor(webpackExecutor); diff --git a/packages/webpack/src/generators/configuration/configuration.ts b/packages/webpack/src/generators/configuration/configuration.ts index 8778f1504a..4d2a953f95 100644 --- a/packages/webpack/src/generators/configuration/configuration.ts +++ b/packages/webpack/src/generators/configuration/configuration.ts @@ -1,6 +1,5 @@ import type { Tree } from '@nx/devkit'; import { - convertNxGenerator, formatFiles, joinPathFragments, readProjectConfiguration, @@ -154,5 +153,3 @@ function addServeTarget(tree: Tree, options: ConfigurationGeneratorSchema) { } export default configurationGenerator; - -export const compat = convertNxGenerator(configurationGenerator); diff --git a/packages/webpack/src/generators/init/init.ts b/packages/webpack/src/generators/init/init.ts index 81ab64d5b8..ea94976c02 100644 --- a/packages/webpack/src/generators/init/init.ts +++ b/packages/webpack/src/generators/init/init.ts @@ -1,6 +1,5 @@ import { addDependenciesToPackageJson, - convertNxGenerator, formatFiles, GeneratorCallback, runTasksInSerial, @@ -59,5 +58,3 @@ export async function webpackInitGenerator(tree: Tree, schema: Schema) { } export default webpackInitGenerator; - -export const webpackInitSchematic = convertNxGenerator(webpackInitGenerator); diff --git a/packages/workspace/generators.json b/packages/workspace/generators.json index ee73b5fcd7..aadabfccde 100644 --- a/packages/workspace/generators.json +++ b/packages/workspace/generators.json @@ -1,37 +1,6 @@ { "name": "nx/workspace", "version": "0.1", - "schematics": { - "move": { - "factory": "./src/generators/move/move#moveSchematic", - "schema": "./src/generators/move/schema.json", - "aliases": ["mv"], - "description": "Move an application or library to another folder." - }, - "remove": { - "factory": "./src/generators/remove/remove#removeSchematic", - "schema": "./src/generators/remove/schema.json", - "aliases": ["rm"], - "description": "Remove an application or library." - }, - "convert-to-monorepo": { - "factory": "./src/generators/convert-to-monorepo/convert-to-monorepo#monorepoSchematic", - "schema": "./src/generators/convert-to-monorepo/schema.json", - "description": "Convert a Nx project to a monorepo." - }, - "run-commands": { - "factory": "./src/generators/run-commands/run-commands#runCommandsSchematic", - "schema": "./src/generators/run-commands/schema.json", - "aliases": ["run-command", "target"], - "description": "Generates a target to run any command in the terminal." - }, - "npm-package": { - "factory": "./src/generators/npm-package/npm-package#npmPackageSchematic", - "schema": "./src/generators/npm-package/schema.json", - "description": "Create a minimal NPM package.", - "x-type": "library" - } - }, "generators": { "preset": { "factory": "./src/generators/preset/preset#presetGenerator", diff --git a/packages/workspace/index.ts b/packages/workspace/index.ts index dd278a00fd..3741c8c50e 100644 --- a/packages/workspace/index.ts +++ b/packages/workspace/index.ts @@ -43,9 +43,6 @@ export { checkAndCleanWithSemver } from './src/utils/version-utils'; export { moveGenerator } from './src/generators/move/move'; export { removeGenerator } from './src/generators/remove/remove'; export { runCommandsGenerator } from './src/generators/run-commands/run-commands'; -export { - convertToNxProjectGenerator, - convertToNxProjectSchematic, -} from './src/generators/convert-to-nx-project/convert-to-nx-project'; +export { convertToNxProjectGenerator } from './src/generators/convert-to-nx-project/convert-to-nx-project'; export const stringUtils = strings; diff --git a/packages/workspace/package.json b/packages/workspace/package.json index 5ccbe64da8..18f0efa20a 100644 --- a/packages/workspace/package.json +++ b/packages/workspace/package.json @@ -27,8 +27,8 @@ "url": "https://github.com/nrwl/nx/issues" }, "homepage": "https://nx.dev", - "schematics": "./generators.json", - "builders": "./executors.json", + "generators": "./generators.json", + "executors": "./executors.json", "ng-update": { "requirements": {}, "migrations": "./migrations.json", diff --git a/packages/workspace/src/generators/ci-workflow/ci-workflow.ts b/packages/workspace/src/generators/ci-workflow/ci-workflow.ts index dda72391d6..a2a9e59f50 100644 --- a/packages/workspace/src/generators/ci-workflow/ci-workflow.ts +++ b/packages/workspace/src/generators/ci-workflow/ci-workflow.ts @@ -2,7 +2,6 @@ import { Tree, names, generateFiles, - joinPathFragments, getPackageManagerCommand, readJson, NxJsonConfiguration, diff --git a/packages/workspace/src/generators/convert-to-monorepo/convert-to-monorepo.ts b/packages/workspace/src/generators/convert-to-monorepo/convert-to-monorepo.ts index f3dead4470..fdea588dd0 100644 --- a/packages/workspace/src/generators/convert-to-monorepo/convert-to-monorepo.ts +++ b/packages/workspace/src/generators/convert-to-monorepo/convert-to-monorepo.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, getProjects, joinPathFragments, ProjectConfiguration, @@ -52,5 +51,3 @@ export async function monorepoGenerator(tree: Tree, options: {}) { } export default monorepoGenerator; - -export const monorepoSchematic = convertNxGenerator(monorepoGenerator); diff --git a/packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts b/packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts index effc2ecb8a..9b8c663735 100644 --- a/packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts +++ b/packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts @@ -1,6 +1,5 @@ import { addProjectConfiguration, - convertNxGenerator, formatFiles, readJson, Tree, @@ -101,7 +100,3 @@ export async function convertToNxProjectGenerator(host: Tree, schema: Schema) { } export default convertToNxProjectGenerator; - -export const convertToNxProjectSchematic = convertNxGenerator( - convertToNxProjectGenerator -); diff --git a/packages/workspace/src/generators/move/move.ts b/packages/workspace/src/generators/move/move.ts index 07ff3bd763..15f1037038 100644 --- a/packages/workspace/src/generators/move/move.ts +++ b/packages/workspace/src/generators/move/move.ts @@ -1,5 +1,4 @@ import { - convertNxGenerator, formatFiles, readProjectConfiguration, removeProjectConfiguration, @@ -71,5 +70,3 @@ export async function moveGeneratorInternal(tree: Tree, rawSchema: Schema) { } export default moveGenerator; - -export const moveSchematic = convertNxGenerator(moveGenerator); diff --git a/packages/workspace/src/generators/npm-package/npm-package.ts b/packages/workspace/src/generators/npm-package/npm-package.ts index 8c192f9ef1..de54925a26 100644 --- a/packages/workspace/src/generators/npm-package/npm-package.ts +++ b/packages/workspace/src/generators/npm-package/npm-package.ts @@ -1,6 +1,5 @@ import { addProjectConfiguration, - convertNxGenerator, formatFiles, generateFiles, Tree, @@ -18,6 +17,7 @@ export interface ProjectOptions { directory?: string; projectNameAndRootFormat?: ProjectNameAndRootFormat; } + interface NormalizedProjectOptions extends ProjectOptions { projectRoot: string; } @@ -86,5 +86,3 @@ export async function npmPackageGeneratorInternal( await formatFiles(tree); } - -export const npmPackageSchematic = convertNxGenerator(npmPackageGenerator); diff --git a/packages/workspace/src/generators/remove/remove.ts b/packages/workspace/src/generators/remove/remove.ts index c86575b38c..6fe42b651a 100644 --- a/packages/workspace/src/generators/remove/remove.ts +++ b/packages/workspace/src/generators/remove/remove.ts @@ -1,9 +1,4 @@ -import { - convertNxGenerator, - formatFiles, - readProjectConfiguration, - Tree, -} from '@nx/devkit'; +import { formatFiles, readProjectConfiguration, Tree } from '@nx/devkit'; import { checkProjectIsSafeToRemove } from './lib/check-project-is-safe-to-remove'; import { checkDependencies } from './lib/check-dependencies'; @@ -29,5 +24,3 @@ export async function removeGenerator(tree: Tree, schema: Schema) { } export default removeGenerator; - -export const removeSchematic = convertNxGenerator(removeGenerator); diff --git a/packages/workspace/src/generators/run-commands/run-commands.ts b/packages/workspace/src/generators/run-commands/run-commands.ts index a121aa4484..e4f8825ff1 100644 --- a/packages/workspace/src/generators/run-commands/run-commands.ts +++ b/packages/workspace/src/generators/run-commands/run-commands.ts @@ -1,6 +1,5 @@ import { Schema } from './schema'; import { - convertNxGenerator, formatFiles, joinPathFragments, readProjectConfiguration, @@ -30,5 +29,3 @@ export async function runCommandsGenerator(host: Tree, schema: Schema) { } export default runCommandsGenerator; - -export const runCommandsSchematic = convertNxGenerator(runCommandsGenerator);