From 41cd3de779e837d544e1c619d3f8a2c92d838e09 Mon Sep 17 00:00:00 2001
From: Damian Bielecki <bielik20@gmail.com>
Date: Wed, 3 May 2023 08:41:40 +0200
Subject: [PATCH] chore: run migrations

---
 .eslintrc.json                                |   8 +-
 e2e/nx-core-e2e/project.json                  |   2 +-
 e2e/nx-jest-playwright-e2e/project.json       |   2 +-
 .../tests/nx-jest-playwright.spec.ts          |   2 +-
 e2e/nx-npm-e2e/project.json                   |   2 +-
 e2e/nx-npm-e2e/tests/nx-npm.spec.ts           |   6 +-
 .../tests/nx-playwright.spec.ts               |  16 +-
 e2e/nx-serverless-e2e/project.json            |   2 +-
 .../tests/serverless.spec.ts                  |   2 +-
 jest.config.ts                                |   2 +-
 jest.preset.js                                |   2 +-
 migrations.json                               | 116 ---------
 nx.json                                       |   2 +-
 package.json                                  |  24 +-
 packages/nx-core/.eslintrc.json               |   2 +-
 packages/nx-core/project.json                 |   6 +-
 .../ensure-complex-nx-project.ts              |   4 +-
 .../src/testing-utils/run-nx-new-command.ts   |   4 +-
 .../src/utils/get-project-configuration.ts    |   2 +-
 .../nx-core/src/utils/normalize-options.ts    |   2 +-
 .../nx-core/src/utils/start-dev-server.ts     |   2 +-
 packages/nx-core/src/utils/stringify-args.ts  |   2 +-
 packages/nx-jest-playwright/.eslintrc.json    |   2 +-
 packages/nx-jest-playwright/README.md         |  10 +-
 packages/nx-jest-playwright/project.json      |   6 +-
 .../src/executors/jest-playwright/executor.ts |   4 +-
 .../src/executors/jest-playwright/schema.d.ts |   2 +-
 .../src/executors/jest-playwright/schema.json |   1 -
 .../src/generators/init/generator.ts          |   6 +-
 .../src/generators/init/schema.json           |   1 -
 .../project/files/jest.config.ts__tmpl__      |   2 +-
 .../src/generators/project/generator.ts       |   6 +-
 .../src/generators/project/lib/add-linting.ts |   6 +-
 .../src/generators/project/schema.d.ts        |   2 +-
 .../src/generators/project/schema.json        |   1 -
 packages/nx-npm/.eslintrc.json                |   2 +-
 packages/nx-npm/project.json                  |   6 +-
 .../nx-npm/src/executors/publish/executor.ts  |   2 +-
 .../publish/lib/normalize-options.ts          |   2 +-
 .../nx-npm/src/executors/publish/schema.json  |   1 -
 .../nx-npm/src/executors/version/executor.ts  |   2 +-
 .../nx-npm/src/executors/version/schema.json  |   1 -
 .../nx-npm/src/generators/npm/generator.ts    |   2 +-
 .../npm/lib/check-for-npm-config.ts           |   2 +-
 .../npm/lib/get-repository-field.ts           |   2 +-
 .../generators/npm/lib/update-package-json.ts |   2 +-
 .../generators/npm/lib/update-workspace.ts    |   2 +-
 .../nx-npm/src/generators/npm/schema.json     |   1 -
 packages/nx-playwright/.eslintrc.json         |   2 +-
 packages/nx-playwright/project.json           |   6 +-
 .../src/executors/playwright/executor.spec.ts |   2 +-
 .../src/executors/playwright/executor.ts      |   2 +-
 .../src/executors/playwright/schema.json      |   1 -
 .../src/generators/init/generator.ts          |   2 +-
 .../src/generators/init/schema.json           |   1 -
 .../src/generators/project/generator.spec.ts  |   4 +-
 .../src/generators/project/generator.ts       |  10 +-
 .../src/generators/project/schema.d.ts        |   2 +-
 .../src/generators/project/schema.json        |   1 -
 packages/nx-serverless/.eslintrc.json         |   2 +-
 packages/nx-serverless/README.md              |   4 +-
 .../nx-serverless/plugin/nrwl/nx-facade.ts    |   2 +-
 .../plugin/nrwl/nx-serverless-config.ts       |   2 +-
 packages/nx-serverless/project.json           |   6 +-
 .../src/executors/sls/executor.ts             |   2 +-
 .../src/executors/sls/schema.json             |   1 -
 .../generators/application/generator.spec.ts  |  16 +-
 .../src/generators/application/generator.ts   |   6 +-
 .../generators/application/lib/add-jest.ts    |   4 +-
 .../generators/application/lib/add-linting.ts |   6 +-
 .../application/lib/get-build-base-config.ts  |   4 +-
 .../application/lib/get-project-config.ts     |   2 +-
 .../src/generators/application/schema.d.ts    |   2 +-
 .../src/generators/application/schema.json    |   1 -
 .../src/generators/init/generator.ts          |   8 +-
 .../src/generators/init/schema.json           |   1 -
 .../src/utils/get-sls-command.ts              |   2 +-
 .../nx-serverless/src/utils/test-context.ts   |   2 +-
 tools/workspace-plugin/.eslintrc.json         |  25 ++
 tools/workspace-plugin/generators.json        |   9 +
 tools/workspace-plugin/jest.config.ts         |  10 +
 tools/workspace-plugin/package.json           |   6 +
 tools/workspace-plugin/project.json           |  65 +++++
 .../src}/generators/plugin/index.ts           |   6 +-
 .../src}/generators/plugin/schema.json        |   0
 .../src}/generators/plugin/schema.ts          |   2 +-
 .../src/index.ts}                             |   0
 tools/workspace-plugin/tsconfig.json          |  16 ++
 tools/workspace-plugin/tsconfig.lib.json      |  10 +
 tools/workspace-plugin/tsconfig.spec.json     |   9 +
 tsconfig.base.json                            |   3 +-
 yarn.lock                                     | 238 +++++-------------
 92 files changed, 357 insertions(+), 436 deletions(-)
 delete mode 100644 migrations.json
 create mode 100644 tools/workspace-plugin/.eslintrc.json
 create mode 100644 tools/workspace-plugin/generators.json
 create mode 100644 tools/workspace-plugin/jest.config.ts
 create mode 100644 tools/workspace-plugin/package.json
 create mode 100644 tools/workspace-plugin/project.json
 rename tools/{ => workspace-plugin/src}/generators/plugin/index.ts (92%)
 rename tools/{ => workspace-plugin/src}/generators/plugin/schema.json (100%)
 rename tools/{ => workspace-plugin/src}/generators/plugin/schema.ts (56%)
 rename tools/{generators/.gitkeep => workspace-plugin/src/index.ts} (100%)
 create mode 100644 tools/workspace-plugin/tsconfig.json
 create mode 100644 tools/workspace-plugin/tsconfig.lib.json
 create mode 100644 tools/workspace-plugin/tsconfig.spec.json

diff --git a/.eslintrc.json b/.eslintrc.json
index 37008c09..3f7ef81a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,12 +1,12 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx", "unused-imports", "simple-import-sort", "import", "prettier"],
+  "plugins": ["@nx", "unused-imports", "simple-import-sort", "import", "prettier"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -35,7 +35,7 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript"],
+      "extends": ["plugin:@nx/typescript"],
       "rules": {
         "@typescript-eslint/ban-ts-comment": 0,
         "@typescript-eslint/no-var-requires": 0
@@ -43,7 +43,7 @@
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     },
     {
diff --git a/e2e/nx-core-e2e/project.json b/e2e/nx-core-e2e/project.json
index eaeb0e7c..cdec3a16 100644
--- a/e2e/nx-core-e2e/project.json
+++ b/e2e/nx-core-e2e/project.json
@@ -5,7 +5,7 @@
   "sourceRoot": "e2e/nx-core-e2e/src",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/nx-plugin:e2e",
+      "executor": "@nx/plugin:e2e",
       "options": {
         "target": "nx-core-e2e:prepare",
         "passWithNoTests": true,
diff --git a/e2e/nx-jest-playwright-e2e/project.json b/e2e/nx-jest-playwright-e2e/project.json
index 737fb558..aa09ca80 100644
--- a/e2e/nx-jest-playwright-e2e/project.json
+++ b/e2e/nx-jest-playwright-e2e/project.json
@@ -5,7 +5,7 @@
   "sourceRoot": "e2e/nx-jest-playwright-e2e/src",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/nx-plugin:e2e",
+      "executor": "@nx/plugin:e2e",
       "options": {
         "target": "nx-jest-playwright-e2e:prepare",
         "jestConfig": "e2e/nx-jest-playwright-e2e/jest.config.ts"
diff --git a/e2e/nx-jest-playwright-e2e/tests/nx-jest-playwright.spec.ts b/e2e/nx-jest-playwright-e2e/tests/nx-jest-playwright.spec.ts
index 85a99905..aeea078f 100644
--- a/e2e/nx-jest-playwright-e2e/tests/nx-jest-playwright.spec.ts
+++ b/e2e/nx-jest-playwright-e2e/tests/nx-jest-playwright.spec.ts
@@ -1,4 +1,4 @@
-import { checkFilesExist, readJson, runNxCommandAsync, uniq } from '@nrwl/nx-plugin/testing';
+import { checkFilesExist, readJson, runNxCommandAsync, uniq } from '@nx/plugin/testing';
 import { ensureComplexNxProject } from '@ns3/nx-core/src/testing-utils/ensure-complex-nx-project';
 
 describe('nx-jest-playwright e2e', () => {
diff --git a/e2e/nx-npm-e2e/project.json b/e2e/nx-npm-e2e/project.json
index 881905f6..9c1daebe 100644
--- a/e2e/nx-npm-e2e/project.json
+++ b/e2e/nx-npm-e2e/project.json
@@ -5,7 +5,7 @@
   "sourceRoot": "e2e/nx-npm-e2e/src",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/nx-plugin:e2e",
+      "executor": "@nx/plugin:e2e",
       "options": {
         "target": "nx-npm-e2e:prepare",
         "jestConfig": "e2e/nx-npm-e2e/jest.config.ts"
diff --git a/e2e/nx-npm-e2e/tests/nx-npm.spec.ts b/e2e/nx-npm-e2e/tests/nx-npm.spec.ts
index cda76883..d18083a3 100644
--- a/e2e/nx-npm-e2e/tests/nx-npm.spec.ts
+++ b/e2e/nx-npm-e2e/tests/nx-npm.spec.ts
@@ -1,4 +1,4 @@
-import { runCommandAsync, runNxCommandAsync, tmpProjPath, uniq } from '@nrwl/nx-plugin/testing';
+import { runCommandAsync, runNxCommandAsync, tmpProjPath, uniq } from '@nx/plugin/testing';
 import { getPackageManagerCommand } from '@nrwl/tao/src/shared/package-manager';
 import { ensureComplexNxProject } from '@ns3/nx-core/src/testing-utils/ensure-complex-nx-project';
 import { readFileSync, writeFileSync } from 'fs';
@@ -10,7 +10,7 @@ describe('nx-npm e2e', () => {
       ['@ns3/nx-core', 'dist/packages/nx-core'],
     );
     const pmc = getPackageManagerCommand();
-    await runCommandAsync(`${pmc.addDev} @nrwl/js`);
+    await runCommandAsync(`${pmc.addDev} @nx/js`);
     const p = JSON.parse(readFileSync(tmpProjPath('package.json')).toString());
     p['repository'] = {
       type: 'git',
@@ -22,7 +22,7 @@ describe('nx-npm e2e', () => {
   it('should create nx-npm', async () => {
     const plugin = uniq('nx-npm');
 
-    await runNxCommandAsync(`generate @nrwl/js:lib ${plugin} --importPath ${plugin} --bundler tsc`);
+    await runNxCommandAsync(`generate @nx/js:lib ${plugin} --importPath ${plugin} --bundler tsc`);
     await runNxCommandAsync(`generate @ns3/nx-npm:npm --project ${plugin}`);
 
     const buildResult = await runNxCommandAsync(`build ${plugin}`);
diff --git a/e2e/nx-playwright-e2e/tests/nx-playwright.spec.ts b/e2e/nx-playwright-e2e/tests/nx-playwright.spec.ts
index ea573d15..be462dcf 100644
--- a/e2e/nx-playwright-e2e/tests/nx-playwright.spec.ts
+++ b/e2e/nx-playwright-e2e/tests/nx-playwright.spec.ts
@@ -4,7 +4,7 @@ import {
   runCommandAsync,
   runNxCommandAsync,
   uniq,
-} from '@nrwl/nx-plugin/testing';
+} from '@nx/plugin/testing';
 import { ensureComplexNxProject } from '@ns3/nx-core/src/testing-utils/ensure-complex-nx-project';
 import * as assert from 'node:assert/strict';
 import { after, before, describe, it } from 'node:test';
@@ -35,9 +35,17 @@ describe('nx-playwright e2e', () => {
     assert.match(sanitised, /Successfully ran target e2e for project/);
 
     const helpResult = await runNxCommandAsync(`e2e ${project} --help_`, { silenceError: true });
-    const hResult = await runNxCommandAsync(`e2e ${project} app.spec.ts -h_`, { silenceError: true });
-    assert.match(helpResult.stdout, /yarn playwright test --config=.*\/playwright.config.ts --help/);
-    assert.match(hResult.stdout, /yarn playwright test app.spec.ts --config=.*\/playwright.config.ts -h/);
+    const hResult = await runNxCommandAsync(`e2e ${project} app.spec.ts -h_`, {
+      silenceError: true,
+    });
+    assert.match(
+      helpResult.stdout,
+      /yarn playwright test --config=.*\/playwright.config.ts --help/,
+    );
+    assert.match(
+      hResult.stdout,
+      /yarn playwright test app.spec.ts --config=.*\/playwright.config.ts -h/,
+    );
   });
 
   describe('--directory', () => {
diff --git a/e2e/nx-serverless-e2e/project.json b/e2e/nx-serverless-e2e/project.json
index e68c3d0a..df2de08c 100644
--- a/e2e/nx-serverless-e2e/project.json
+++ b/e2e/nx-serverless-e2e/project.json
@@ -5,7 +5,7 @@
   "sourceRoot": "e2e/nx-serverless-e2e/src",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/nx-plugin:e2e",
+      "executor": "@nx/plugin:e2e",
       "options": {
         "target": "nx-serverless-e2e:prepare",
         "jestConfig": "e2e/nx-serverless-e2e/jest.config.ts"
diff --git a/e2e/nx-serverless-e2e/tests/serverless.spec.ts b/e2e/nx-serverless-e2e/tests/serverless.spec.ts
index 13031342..4b86d80d 100644
--- a/e2e/nx-serverless-e2e/tests/serverless.spec.ts
+++ b/e2e/nx-serverless-e2e/tests/serverless.spec.ts
@@ -1,4 +1,4 @@
-import { checkFilesExist, readJson, runNxCommandAsync, uniq } from '@nrwl/nx-plugin/testing';
+import { checkFilesExist, readJson, runNxCommandAsync, uniq } from '@nx/plugin/testing';
 import { ensureComplexNxProject } from '@ns3/nx-core/src/testing-utils/ensure-complex-nx-project';
 
 describe('serverless e2e', () => {
diff --git a/jest.config.ts b/jest.config.ts
index dafe1653..0830aab5 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -1,4 +1,4 @@
-const { getJestProjects } = require('@nrwl/jest');
+const { getJestProjects } = require('@nx/jest');
 
 export default {
   projects: getJestProjects(),
diff --git a/jest.preset.js b/jest.preset.js
index e6c8ebea..f078ddce 100644
--- a/jest.preset.js
+++ b/jest.preset.js
@@ -1,3 +1,3 @@
-const nxPreset = require('@nrwl/jest/preset').default;
+const nxPreset = require('@nx/jest/preset').default;
 
 module.exports = { ...nxPreset };
diff --git a/migrations.json b/migrations.json
deleted file mode 100644
index 672710c4..00000000
--- a/migrations.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "migrations": [
-    {
-      "cli": "nx",
-      "version": "16.0.0-beta.0",
-      "description": "Remove @nrwl/cli.",
-      "implementation": "./src/migrations/update-16-0-0/remove-nrwl-cli",
-      "package": "nx",
-      "name": "16.0.0-remove-nrwl-cli"
-    },
-    {
-      "cli": "nx",
-      "version": "16.0.0-beta.9",
-      "description": "Replace `dependsOn.projects` and `inputs` definitions with new configuration format.",
-      "implementation": "./src/migrations/update-16-0-0/update-depends-on-to-tokens",
-      "package": "nx",
-      "name": "16.0.0-tokens-for-depends-on"
-    },
-    {
-      "cli": "nx",
-      "version": "16.0.0-beta.0",
-      "description": "Replace @nrwl/nx-cloud with nx-cloud",
-      "implementation": "./src/migrations/update-16-0-0/update-nx-cloud-runner",
-      "package": "nx",
-      "name": "16.0.0-update-nx-cloud-runner"
-    },
-    {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/workspace with @nx/workspace",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages",
-      "package": "@nrwl/workspace",
-      "name": "update-16-0-0-add-nx-packages"
-    },
-    {
-      "version": "16.0.0-beta.4",
-      "description": "Generates a plugin called 'workspace-plugin' containing your workspace generators.",
-      "cli": "nx",
-      "implementation": "./src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin",
-      "package": "@nrwl/workspace",
-      "name": "16-0-0-move-workspace-generators-into-local-plugin"
-    },
-    {
-      "version": "16.0.0-beta.9",
-      "description": "Fix .babelrc presets if it contains an invalid entry for @nx/web/babel.",
-      "cli": "nx",
-      "implementation": "./src/migrations/update-16-0-0/fix-invalid-babelrc",
-      "package": "@nrwl/workspace",
-      "name": "16-0-0-fix-invalid-babelrc"
-    },
-    {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/devkit with @nx/devkit",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages",
-      "package": "@nrwl/devkit",
-      "name": "update-16-0-0-add-nx-packages"
-    },
-    {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/linter with @nx/linter",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages",
-      "package": "@nrwl/linter",
-      "name": "update-16-0-0-add-nx-packages"
-    },
-    {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/js with @nx/js",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages",
-      "package": "@nrwl/js",
-      "name": "update-16-0-0-add-nx-packages"
-    },
-    {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/jest with @nx/jest",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages",
-      "package": "@nrwl/jest",
-      "name": "update-16-0-0-add-nx-packages"
-    },
-    {
-      "version": "16.0.0-beta.1",
-      "cli": "nx",
-      "description": "Removes CLI property within schema.json files and moves generators and schematics to the proper root node in migrations.json",
-      "factory": "./src/migrations/update-16-0-0/cli-in-schema-json",
-      "package": "@nrwl/nx-plugin",
-      "name": "update-remove-cli-prop"
-    },
-    {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/nx-plugin with @nx/plugin",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages",
-      "package": "@nrwl/nx-plugin",
-      "name": "update-16-0-0-add-nx-packages"
-    },
-    {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/eslint-plugin-nx with @nx/eslint-plugin",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages",
-      "package": "@nrwl/eslint-plugin-nx",
-      "name": "update-16-0-0-add-nx-packages"
-    },
-    {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/webpack with @nx/webpack",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages",
-      "package": "@nrwl/webpack",
-      "name": "update-16-0-0-add-nx-packages"
-    }
-  ]
-}
diff --git a/nx.json b/nx.json
index c422d6c4..38778483 100644
--- a/nx.json
+++ b/nx.json
@@ -5,7 +5,7 @@
   },
   "tasksRunnerOptions": {
     "default": {
-      "runner": "@nrwl/nx-cloud",
+      "runner": "nx-cloud",
       "options": {
         "cacheableOperations": ["build", "lint", "test", "e2e"],
         "accessToken": "YzQ0ZjZiNmItNDVjMi00OTVkLWI0YTMtZTJjYjBhZDE0YWEwfHJlYWQtd3JpdGU=",
diff --git a/package.json b/package.json
index cc62f60b..a9f6fdef 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
   },
   "private": true,
   "dependencies": {
+    "@nx/devkit": "16.0.3",
     "@swc/helpers": "0.5.1",
     "bestzip": "^2.2.1",
     "execa": "^5.0.0",
@@ -49,19 +50,13 @@
     "@actions/core": "^1.10.0",
     "@commitlint/cli": "^17.5.1",
     "@commitlint/config-conventional": "^17.4.4",
-    "@nrwl/cli": "15.9.1",
-    "@nrwl/devkit": "16.0.3",
-    "@nrwl/eslint-plugin-nx": "16.0.3",
-    "@nrwl/jest": "16.0.3",
-    "@nrwl/js": "16.0.3",
-    "@nrwl/linter": "16.0.3",
-    "@nrwl/nx-cloud": "16.0.5",
-    "@nrwl/nx-plugin": "16.0.3",
-    "@nrwl/webpack": "16.0.3",
-    "@nrwl/workspace": "16.0.3",
+    "@nx/jest": "16.0.3",
+    "@nx/js": "16.0.3",
+    "@nx/plugin": "16.0.3",
+    "@nx/workspace": "16.0.3",
     "@swc-node/register": "^1.4.2",
     "@swc/cli": "0.1.62",
-    "@swc/core": "^1.2.173",
+    "@swc/core": "~1.3.51",
     "@types/flat": "^5.0.2",
     "@types/fs-extra": "^11.0.1",
     "@types/jest": "29.4.0",
@@ -84,13 +79,18 @@
     "jsonc-eslint-parser": "^2.1.0",
     "lint-staged": "^13.2.0",
     "nx": "16.0.3",
+    "nx-cloud": "16.0.5",
     "prettier": "2.8.7",
     "semantic-release": "^21.0.0",
     "semver": "^7.3.8",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
     "tslib": "^2.4.0",
-    "typescript": "4.9.5"
+    "typescript": "4.9.5",
+    "@nx/devkit": "16.0.3",
+    "@nx/linter": "16.0.3",
+    "@nx/eslint-plugin": "16.0.3",
+    "@nx/webpack": "16.0.3"
   },
   "config": {
     "commitizen": {
diff --git a/packages/nx-core/.eslintrc.json b/packages/nx-core/.eslintrc.json
index 1afbd008..3ae84db4 100644
--- a/packages/nx-core/.eslintrc.json
+++ b/packages/nx-core/.eslintrc.json
@@ -19,7 +19,7 @@
       "files": ["./package.json", "./generators.json", "./executors.json"],
       "parser": "jsonc-eslint-parser",
       "rules": {
-        "@nrwl/nx/nx-plugin-checks": "error"
+        "@nx/nx-plugin-checks": "error"
       }
     }
   ]
diff --git a/packages/nx-core/project.json b/packages/nx-core/project.json
index 8ab33558..44957a5d 100644
--- a/packages/nx-core/project.json
+++ b/packages/nx-core/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "packages/nx-core/**/*.ts",
@@ -17,7 +17,7 @@
       "outputs": ["{options.outputFile}"]
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "packages/nx-core/jest.config.ts",
@@ -25,7 +25,7 @@
       }
     },
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nx/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/packages/nx-core",
diff --git a/packages/nx-core/src/testing-utils/ensure-complex-nx-project.ts b/packages/nx-core/src/testing-utils/ensure-complex-nx-project.ts
index 7c040eca..8fa17862 100644
--- a/packages/nx-core/src/testing-utils/ensure-complex-nx-project.ts
+++ b/packages/nx-core/src/testing-utils/ensure-complex-nx-project.ts
@@ -1,5 +1,5 @@
-import { workspaceRoot } from '@nrwl/devkit';
-import { cleanup, runPackageManagerInstall, tmpProjPath } from '@nrwl/nx-plugin/testing';
+import { workspaceRoot } from '@nx/devkit';
+import { cleanup, runPackageManagerInstall, tmpProjPath } from '@nx/plugin/testing';
 import { readFileSync, writeFileSync } from 'fs';
 import { ensureDirSync } from 'fs-extra';
 import { runNxNewCommand } from './run-nx-new-command';
diff --git a/packages/nx-core/src/testing-utils/run-nx-new-command.ts b/packages/nx-core/src/testing-utils/run-nx-new-command.ts
index c96322fc..b5cc0f4f 100644
--- a/packages/nx-core/src/testing-utils/run-nx-new-command.ts
+++ b/packages/nx-core/src/testing-utils/run-nx-new-command.ts
@@ -1,4 +1,4 @@
-import { tmpProjPath } from '@nrwl/nx-plugin/testing';
+import { tmpProjPath } from '@nx/plugin/testing';
 import { execSync } from 'child_process';
 import { dirname } from 'path';
 
@@ -7,7 +7,7 @@ export function runNxNewCommand(args?: string, silent?: boolean) {
   return execSync(
     `node ${require.resolve(
       '@nrwl/tao',
-    )} new proj --nx-workspace-root=${localTmpDir} --no-interactive --skip-install --collection=@nrwl/workspace --npmScope=proj --preset=empty ${
+    )} new proj --nx-workspace-root=${localTmpDir} --no-interactive --skip-install --collection=@nx/workspace --npmScope=proj --preset=empty ${
       args || ''
     }`,
     {
diff --git a/packages/nx-core/src/utils/get-project-configuration.ts b/packages/nx-core/src/utils/get-project-configuration.ts
index 91ba4078..2a71fdef 100644
--- a/packages/nx-core/src/utils/get-project-configuration.ts
+++ b/packages/nx-core/src/utils/get-project-configuration.ts
@@ -1,4 +1,4 @@
-import { ExecutorContext, ProjectConfiguration } from '@nrwl/devkit';
+import { ExecutorContext, ProjectConfiguration } from '@nx/devkit';
 
 export function getProjectConfiguration(context: ExecutorContext): ProjectConfiguration {
   return context.workspace.projects[context.projectName];
diff --git a/packages/nx-core/src/utils/normalize-options.ts b/packages/nx-core/src/utils/normalize-options.ts
index 647a0962..e90f4229 100644
--- a/packages/nx-core/src/utils/normalize-options.ts
+++ b/packages/nx-core/src/utils/normalize-options.ts
@@ -1,4 +1,4 @@
-import { getWorkspaceLayout, names, Tree } from '@nrwl/devkit';
+import { getWorkspaceLayout, names, Tree } from '@nx/devkit';
 
 export interface NormalizedOptions {
   projectName: string;
diff --git a/packages/nx-core/src/utils/start-dev-server.ts b/packages/nx-core/src/utils/start-dev-server.ts
index 60ea20c7..9ed17a61 100644
--- a/packages/nx-core/src/utils/start-dev-server.ts
+++ b/packages/nx-core/src/utils/start-dev-server.ts
@@ -1,4 +1,4 @@
-import { ExecutorContext, parseTargetString, readTargetOptions, runExecutor } from '@nrwl/devkit';
+import { ExecutorContext, parseTargetString, readTargetOptions, runExecutor } from '@nx/devkit';
 
 export interface StartDevServerOptions {
   devServerTarget?: string;
diff --git a/packages/nx-core/src/utils/stringify-args.ts b/packages/nx-core/src/utils/stringify-args.ts
index 46eb6291..97dbb9dd 100644
--- a/packages/nx-core/src/utils/stringify-args.ts
+++ b/packages/nx-core/src/utils/stringify-args.ts
@@ -1,4 +1,4 @@
-import { names } from '@nrwl/devkit';
+import { names } from '@nx/devkit';
 import { flatten } from 'flat';
 
 interface Options {
diff --git a/packages/nx-jest-playwright/.eslintrc.json b/packages/nx-jest-playwright/.eslintrc.json
index 1afbd008..3ae84db4 100644
--- a/packages/nx-jest-playwright/.eslintrc.json
+++ b/packages/nx-jest-playwright/.eslintrc.json
@@ -19,7 +19,7 @@
       "files": ["./package.json", "./generators.json", "./executors.json"],
       "parser": "jsonc-eslint-parser",
       "rules": {
-        "@nrwl/nx/nx-plugin-checks": "error"
+        "@nx/nx-plugin-checks": "error"
       }
     }
   ]
diff --git a/packages/nx-jest-playwright/README.md b/packages/nx-jest-playwright/README.md
index dd8ee6c8..fd77fea5 100644
--- a/packages/nx-jest-playwright/README.md
+++ b/packages/nx-jest-playwright/README.md
@@ -7,7 +7,7 @@ It works similarly to cypress runner in a sense that you can pass either `devSer
 
 Just like `jest-playwright-preset` we recommend the official [Playwright test-runner (@playwright/test)](https://playwright.dev/docs/test-intro) via **[@ns3/nx-playwright](https://www.npmjs.com/package/@ns3/nx-playwright)**.
 
-We will continue to support this package as long as it remains compatible with `@nrwl/jest` package and `jest-playwright-preset` is supported.
+We will continue to support this package as long as it remains compatible with `@nx/jest` package and `jest-playwright-preset` is supported.
 
 ## Install
 
@@ -30,8 +30,8 @@ nx run my-desktop-e2e:e2e
 ```
 
 You may use flag specified for that runner. Most notable:
-* `--watch`
-* `--slowMo 1000` - so that you can see what is happening.
-* `--headless false` - will start browser.
-* `--devtools` - just like headless but will also open devtools (works only in chrome).
 
+- `--watch`
+- `--slowMo 1000` - so that you can see what is happening.
+- `--headless false` - will start browser.
+- `--devtools` - just like headless but will also open devtools (works only in chrome).
diff --git a/packages/nx-jest-playwright/project.json b/packages/nx-jest-playwright/project.json
index 529721da..6f0beeb0 100644
--- a/packages/nx-jest-playwright/project.json
+++ b/packages/nx-jest-playwright/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "packages/nx-jest-playwright/**/*.ts",
@@ -17,7 +17,7 @@
       "outputs": ["{options.outputFile}"]
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "packages/nx-jest-playwright/jest.config.ts",
@@ -25,7 +25,7 @@
       }
     },
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nx/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/packages/nx-jest-playwright",
diff --git a/packages/nx-jest-playwright/src/executors/jest-playwright/executor.ts b/packages/nx-jest-playwright/src/executors/jest-playwright/executor.ts
index 82c4fae1..e3914d14 100644
--- a/packages/nx-jest-playwright/src/executors/jest-playwright/executor.ts
+++ b/packages/nx-jest-playwright/src/executors/jest-playwright/executor.ts
@@ -1,7 +1,7 @@
 import { Config } from '@jest/types';
-import { ExecutorContext, logger } from '@nrwl/devkit';
-import { jestConfigParser } from '@nrwl/jest/src/executors/jest/jest.impl';
 import { startDevServer } from '@ns3/nx-core';
+import { ExecutorContext, logger } from '@nx/devkit';
+import { jestConfigParser } from '@nx/jest/src/executors/jest/jest.impl';
 import { runCLI } from 'jest';
 import { JestPlaywrightExecutorSchema } from './schema';
 
diff --git a/packages/nx-jest-playwright/src/executors/jest-playwright/schema.d.ts b/packages/nx-jest-playwright/src/executors/jest-playwright/schema.d.ts
index fc60895e..ff1db81c 100644
--- a/packages/nx-jest-playwright/src/executors/jest-playwright/schema.d.ts
+++ b/packages/nx-jest-playwright/src/executors/jest-playwright/schema.d.ts
@@ -1,4 +1,4 @@
-import { JestExecutorOptions } from '@nrwl/jest/src/executors/jest/schema';
+import { JestExecutorOptions } from '@nx/jest/src/executors/jest/schema';
 
 export interface JestPlaywrightExecutorSchema extends JestExecutorOptions {
   devServerTarget: string;
diff --git a/packages/nx-jest-playwright/src/executors/jest-playwright/schema.json b/packages/nx-jest-playwright/src/executors/jest-playwright/schema.json
index fa403d8a..d4180bd0 100644
--- a/packages/nx-jest-playwright/src/executors/jest-playwright/schema.json
+++ b/packages/nx-jest-playwright/src/executors/jest-playwright/schema.json
@@ -2,7 +2,6 @@
   "version": 2,
   "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "title": "Jest Playwright Builder",
   "description": "Jest Playwright target options for Build Facade",
   "type": "object",
diff --git a/packages/nx-jest-playwright/src/generators/init/generator.ts b/packages/nx-jest-playwright/src/generators/init/generator.ts
index 2802ef44..afab0d13 100644
--- a/packages/nx-jest-playwright/src/generators/init/generator.ts
+++ b/packages/nx-jest-playwright/src/generators/init/generator.ts
@@ -1,6 +1,6 @@
-import { addDependenciesToPackageJson, formatFiles, Tree, updateJson } from '@nrwl/devkit';
-import { jestInitGenerator } from '@nrwl/jest';
-import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
+import { addDependenciesToPackageJson, formatFiles, Tree, updateJson } from '@nx/devkit';
+import { jestInitGenerator } from '@nx/jest';
+import { runTasksInSerial } from '@nx/workspace/src/utilities/run-tasks-in-serial';
 import { jestPlaywrightPresetVersion, playwrightVersion } from '../../utils/versions';
 import { InitGeneratorSchema } from './schema';
 
diff --git a/packages/nx-jest-playwright/src/generators/init/schema.json b/packages/nx-jest-playwright/src/generators/init/schema.json
index 8ca03182..0ffdfcad 100644
--- a/packages/nx-jest-playwright/src/generators/init/schema.json
+++ b/packages/nx-jest-playwright/src/generators/init/schema.json
@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "id": "NxJestPlaywrightInit",
   "title": "Initialize the @ns3/nx-jest-playwright plugin",
   "type": "object",
diff --git a/packages/nx-jest-playwright/src/generators/project/files/jest.config.ts__tmpl__ b/packages/nx-jest-playwright/src/generators/project/files/jest.config.ts__tmpl__
index 401ebe79..582a9306 100644
--- a/packages/nx-jest-playwright/src/generators/project/files/jest.config.ts__tmpl__
+++ b/packages/nx-jest-playwright/src/generators/project/files/jest.config.ts__tmpl__
@@ -1,4 +1,4 @@
-import nxPreset from '@nrwl/jest/preset';
+import nxPreset from '@nx/jest/preset';
 
 const { testEnvironment, ...rest } = nxPreset;
 
diff --git a/packages/nx-jest-playwright/src/generators/project/generator.ts b/packages/nx-jest-playwright/src/generators/project/generator.ts
index cdb8941f..990d3131 100644
--- a/packages/nx-jest-playwright/src/generators/project/generator.ts
+++ b/packages/nx-jest-playwright/src/generators/project/generator.ts
@@ -1,3 +1,4 @@
+import { normalizeOptions } from '@ns3/nx-core';
 import {
   addProjectConfiguration,
   formatFiles,
@@ -5,9 +6,8 @@ import {
   names,
   offsetFromRoot,
   Tree,
-} from '@nrwl/devkit';
-import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
-import { normalizeOptions } from '@ns3/nx-core';
+} from '@nx/devkit';
+import { runTasksInSerial } from '@nx/workspace/src/utilities/run-tasks-in-serial';
 import * as path from 'path';
 import jestPlaywrightInitGenerator from '../init/generator';
 import { addLinting } from './lib/add-linting';
diff --git a/packages/nx-jest-playwright/src/generators/project/lib/add-linting.ts b/packages/nx-jest-playwright/src/generators/project/lib/add-linting.ts
index c8f861c2..80aa6336 100644
--- a/packages/nx-jest-playwright/src/generators/project/lib/add-linting.ts
+++ b/packages/nx-jest-playwright/src/generators/project/lib/add-linting.ts
@@ -1,6 +1,6 @@
-import { GeneratorCallback, joinPathFragments, Tree, updateJson } from '@nrwl/devkit';
-import { Linter, lintProjectGenerator } from '@nrwl/linter';
-import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
+import { GeneratorCallback, joinPathFragments, Tree, updateJson } from '@nx/devkit';
+import { Linter, lintProjectGenerator } from '@nx/linter';
+import { runTasksInSerial } from '@nx/workspace/src/utilities/run-tasks-in-serial';
 import { NxJestPlaywrightGeneratorNormalizedSchema } from './normalize-options';
 
 export async function addLinting(
diff --git a/packages/nx-jest-playwright/src/generators/project/schema.d.ts b/packages/nx-jest-playwright/src/generators/project/schema.d.ts
index 9451534b..45d4154e 100644
--- a/packages/nx-jest-playwright/src/generators/project/schema.d.ts
+++ b/packages/nx-jest-playwright/src/generators/project/schema.d.ts
@@ -1,4 +1,4 @@
-import { Linter } from '@nrwl/linter';
+import { Linter } from '@nx/linter';
 
 export interface NxJestPlaywrightGeneratorSchema {
   project?: string;
diff --git a/packages/nx-jest-playwright/src/generators/project/schema.json b/packages/nx-jest-playwright/src/generators/project/schema.json
index c325efa2..5dde738b 100644
--- a/packages/nx-jest-playwright/src/generators/project/schema.json
+++ b/packages/nx-jest-playwright/src/generators/project/schema.json
@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "id": "NxJestPlaywrightProject",
   "title": "Add a Jest Playwright Project",
   "type": "object",
diff --git a/packages/nx-npm/.eslintrc.json b/packages/nx-npm/.eslintrc.json
index 1afbd008..3ae84db4 100644
--- a/packages/nx-npm/.eslintrc.json
+++ b/packages/nx-npm/.eslintrc.json
@@ -19,7 +19,7 @@
       "files": ["./package.json", "./generators.json", "./executors.json"],
       "parser": "jsonc-eslint-parser",
       "rules": {
-        "@nrwl/nx/nx-plugin-checks": "error"
+        "@nx/nx-plugin-checks": "error"
       }
     }
   ]
diff --git a/packages/nx-npm/project.json b/packages/nx-npm/project.json
index 82a2fe5b..99f7589c 100644
--- a/packages/nx-npm/project.json
+++ b/packages/nx-npm/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "packages/nx-npm/**/*.ts",
@@ -17,7 +17,7 @@
       "outputs": ["{options.outputFile}"]
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "packages/nx-npm/jest.config.ts",
@@ -25,7 +25,7 @@
       }
     },
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nx/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/packages/nx-npm",
diff --git a/packages/nx-npm/src/executors/publish/executor.ts b/packages/nx-npm/src/executors/publish/executor.ts
index 73e334a1..5382335b 100644
--- a/packages/nx-npm/src/executors/publish/executor.ts
+++ b/packages/nx-npm/src/executors/publish/executor.ts
@@ -1,4 +1,4 @@
-import { ExecutorContext, joinPathFragments } from '@nrwl/devkit';
+import { ExecutorContext, joinPathFragments } from '@nx/devkit';
 import { execSync } from 'child_process';
 import { readJson, writeJson } from 'fs-extra';
 import { normalizeOptions } from './lib/normalize-options';
diff --git a/packages/nx-npm/src/executors/publish/lib/normalize-options.ts b/packages/nx-npm/src/executors/publish/lib/normalize-options.ts
index 5d744f1f..c444c489 100644
--- a/packages/nx-npm/src/executors/publish/lib/normalize-options.ts
+++ b/packages/nx-npm/src/executors/publish/lib/normalize-options.ts
@@ -1,5 +1,5 @@
-import { ExecutorContext } from '@nrwl/devkit';
 import { getProjectConfiguration } from '@ns3/nx-core';
+import { ExecutorContext } from '@nx/devkit';
 import { PublishExecutorNormalizedSchema, PublishExecutorSchema } from '../schema';
 
 export function normalizeOptions(
diff --git a/packages/nx-npm/src/executors/publish/schema.json b/packages/nx-npm/src/executors/publish/schema.json
index bb64d47c..7ec6e15d 100644
--- a/packages/nx-npm/src/executors/publish/schema.json
+++ b/packages/nx-npm/src/executors/publish/schema.json
@@ -2,7 +2,6 @@
   "version": 2,
   "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "title": "Publish npm package",
   "description": "",
   "type": "object",
diff --git a/packages/nx-npm/src/executors/version/executor.ts b/packages/nx-npm/src/executors/version/executor.ts
index 23d64804..0cf2a538 100644
--- a/packages/nx-npm/src/executors/version/executor.ts
+++ b/packages/nx-npm/src/executors/version/executor.ts
@@ -1,5 +1,5 @@
-import { ExecutorContext } from '@nrwl/devkit';
 import { getProjectConfiguration } from '@ns3/nx-core';
+import { ExecutorContext } from '@nx/devkit';
 import { execSync } from 'child_process';
 import { VersionExecutorSchema } from './schema';
 
diff --git a/packages/nx-npm/src/executors/version/schema.json b/packages/nx-npm/src/executors/version/schema.json
index 72e2abb9..f700f2b2 100644
--- a/packages/nx-npm/src/executors/version/schema.json
+++ b/packages/nx-npm/src/executors/version/schema.json
@@ -2,7 +2,6 @@
   "version": 2,
   "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "title": "Update version in package.json",
   "description": "",
   "type": "object",
diff --git a/packages/nx-npm/src/generators/npm/generator.ts b/packages/nx-npm/src/generators/npm/generator.ts
index a4f0da85..68fa549f 100644
--- a/packages/nx-npm/src/generators/npm/generator.ts
+++ b/packages/nx-npm/src/generators/npm/generator.ts
@@ -1,4 +1,4 @@
-import { formatFiles, Tree } from '@nrwl/devkit';
+import { formatFiles, Tree } from '@nx/devkit';
 import { checkForNpmConfig } from './lib/check-for-npm-config';
 import { updatePackageJson } from './lib/update-package-json';
 import { updateWorkspace } from './lib/update-workspace';
diff --git a/packages/nx-npm/src/generators/npm/lib/check-for-npm-config.ts b/packages/nx-npm/src/generators/npm/lib/check-for-npm-config.ts
index d41e6fc4..af9e01c2 100644
--- a/packages/nx-npm/src/generators/npm/lib/check-for-npm-config.ts
+++ b/packages/nx-npm/src/generators/npm/lib/check-for-npm-config.ts
@@ -1,4 +1,4 @@
-import { joinPathFragments, readJson, readProjectConfiguration, Tree } from '@nrwl/devkit';
+import { joinPathFragments, readJson, readProjectConfiguration, Tree } from '@nx/devkit';
 import { NxNpmGeneratorSchema } from '../schema';
 
 export function checkForNpmConfig(tree: Tree, options: NxNpmGeneratorSchema) {
diff --git a/packages/nx-npm/src/generators/npm/lib/get-repository-field.ts b/packages/nx-npm/src/generators/npm/lib/get-repository-field.ts
index 22368796..6f638a58 100644
--- a/packages/nx-npm/src/generators/npm/lib/get-repository-field.ts
+++ b/packages/nx-npm/src/generators/npm/lib/get-repository-field.ts
@@ -1,4 +1,4 @@
-import { readJson, Tree } from '@nrwl/devkit';
+import { readJson, Tree } from '@nx/devkit';
 
 export function getRepositoryField(tree: Tree) {
   const packageJson = readJson(tree, 'package.json');
diff --git a/packages/nx-npm/src/generators/npm/lib/update-package-json.ts b/packages/nx-npm/src/generators/npm/lib/update-package-json.ts
index b2106c70..1834d12d 100644
--- a/packages/nx-npm/src/generators/npm/lib/update-package-json.ts
+++ b/packages/nx-npm/src/generators/npm/lib/update-package-json.ts
@@ -1,4 +1,4 @@
-import { joinPathFragments, readProjectConfiguration, Tree, updateJson } from '@nrwl/devkit';
+import { joinPathFragments, readProjectConfiguration, Tree, updateJson } from '@nx/devkit';
 import { NxNpmGeneratorSchema } from '../schema';
 import { getRepositoryField } from './get-repository-field';
 
diff --git a/packages/nx-npm/src/generators/npm/lib/update-workspace.ts b/packages/nx-npm/src/generators/npm/lib/update-workspace.ts
index 2c948602..2ba9990d 100644
--- a/packages/nx-npm/src/generators/npm/lib/update-workspace.ts
+++ b/packages/nx-npm/src/generators/npm/lib/update-workspace.ts
@@ -1,4 +1,4 @@
-import { readProjectConfiguration, Tree, updateProjectConfiguration } from '@nrwl/devkit';
+import { readProjectConfiguration, Tree, updateProjectConfiguration } from '@nx/devkit';
 import { NxNpmGeneratorSchema } from '../schema';
 
 export function updateWorkspace(tree: Tree, options: NxNpmGeneratorSchema) {
diff --git a/packages/nx-npm/src/generators/npm/schema.json b/packages/nx-npm/src/generators/npm/schema.json
index abb0e390..3b07518e 100644
--- a/packages/nx-npm/src/generators/npm/schema.json
+++ b/packages/nx-npm/src/generators/npm/schema.json
@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "id": "NxNpm",
   "title": "Add npm version and publish capabilities",
   "type": "object",
diff --git a/packages/nx-playwright/.eslintrc.json b/packages/nx-playwright/.eslintrc.json
index 556554a7..4cf7f347 100644
--- a/packages/nx-playwright/.eslintrc.json
+++ b/packages/nx-playwright/.eslintrc.json
@@ -18,7 +18,7 @@
       "files": ["./package.json", "./generators.json", "./executors.json"],
       "parser": "jsonc-eslint-parser",
       "rules": {
-        "@nrwl/nx/nx-plugin-checks": "error"
+        "@nx/nx-plugin-checks": "error"
       }
     }
   ]
diff --git a/packages/nx-playwright/project.json b/packages/nx-playwright/project.json
index 419d9eeb..835d3bb9 100644
--- a/packages/nx-playwright/project.json
+++ b/packages/nx-playwright/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nx/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/packages/nx-playwright",
@@ -39,7 +39,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
@@ -51,7 +51,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "packages/nx-playwright/jest.config.ts",
diff --git a/packages/nx-playwright/src/executors/playwright/executor.spec.ts b/packages/nx-playwright/src/executors/playwright/executor.spec.ts
index 056d9764..f06291f5 100644
--- a/packages/nx-playwright/src/executors/playwright/executor.spec.ts
+++ b/packages/nx-playwright/src/executors/playwright/executor.spec.ts
@@ -1,4 +1,4 @@
-import { ExecutorContext } from '@nrwl/devkit';
+import { ExecutorContext } from '@nx/devkit';
 import { PlaywrightExecutorSchema } from './schema';
 
 const options: PlaywrightExecutorSchema = {
diff --git a/packages/nx-playwright/src/executors/playwright/executor.ts b/packages/nx-playwright/src/executors/playwright/executor.ts
index aff4e280..bed47235 100644
--- a/packages/nx-playwright/src/executors/playwright/executor.ts
+++ b/packages/nx-playwright/src/executors/playwright/executor.ts
@@ -1,6 +1,6 @@
 import 'dotenv/config';
-import { ExecutorContext, getPackageManagerCommand, logger } from '@nrwl/devkit';
 import { printCommand, startDevServer, stringifyArgs } from '@ns3/nx-core';
+import { ExecutorContext, getPackageManagerCommand, logger } from '@nx/devkit';
 import * as execa from 'execa';
 import { PlaywrightExecutorSchema } from './schema';
 
diff --git a/packages/nx-playwright/src/executors/playwright/schema.json b/packages/nx-playwright/src/executors/playwright/schema.json
index b263f427..a47a5dde 100644
--- a/packages/nx-playwright/src/executors/playwright/schema.json
+++ b/packages/nx-playwright/src/executors/playwright/schema.json
@@ -1,7 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
   "version": 2,
-  "cli": "nx",
   "title": "Playwright executor",
   "description": "",
   "type": "object",
diff --git a/packages/nx-playwright/src/generators/init/generator.ts b/packages/nx-playwright/src/generators/init/generator.ts
index 090bd15e..cbc87c8e 100644
--- a/packages/nx-playwright/src/generators/init/generator.ts
+++ b/packages/nx-playwright/src/generators/init/generator.ts
@@ -4,7 +4,7 @@ import {
   removeDependenciesFromPackageJson,
   Tree,
   updateNxJson,
-} from '@nrwl/devkit';
+} from '@nx/devkit';
 import { playwrightRunnerVersion } from '../../utils/versions';
 import { InitGeneratorSchema } from './schema';
 
diff --git a/packages/nx-playwright/src/generators/init/schema.json b/packages/nx-playwright/src/generators/init/schema.json
index 736e7fe5..2657dcdd 100644
--- a/packages/nx-playwright/src/generators/init/schema.json
+++ b/packages/nx-playwright/src/generators/init/schema.json
@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "id": "NxPlaywrightInit",
   "title": "Initialize the @ns3/nx-playwright plugin",
   "type": "object",
diff --git a/packages/nx-playwright/src/generators/project/generator.spec.ts b/packages/nx-playwright/src/generators/project/generator.spec.ts
index cd9ed5ab..b1123ee3 100644
--- a/packages/nx-playwright/src/generators/project/generator.spec.ts
+++ b/packages/nx-playwright/src/generators/project/generator.spec.ts
@@ -1,5 +1,5 @@
-import { readProjectConfiguration, Tree } from '@nrwl/devkit';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { readProjectConfiguration, Tree } from '@nx/devkit';
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import generator from './generator';
 import { PlaywrightGeneratorSchema } from './schema';
 
diff --git a/packages/nx-playwright/src/generators/project/generator.ts b/packages/nx-playwright/src/generators/project/generator.ts
index cf84f907..fe91daa5 100644
--- a/packages/nx-playwright/src/generators/project/generator.ts
+++ b/packages/nx-playwright/src/generators/project/generator.ts
@@ -1,3 +1,4 @@
+import { getPackageMajorVersion, normalizeOptions } from '@ns3/nx-core';
 import {
   addProjectConfiguration,
   formatFiles,
@@ -7,11 +8,10 @@ import {
   names,
   offsetFromRoot,
   Tree,
-} from '@nrwl/devkit';
-import { Linter, lintProjectGenerator } from '@nrwl/linter';
-import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
-import { getRelativePathToRootTsConfig } from '@nrwl/workspace/src/utilities/typescript';
-import { getPackageMajorVersion, normalizeOptions } from '@ns3/nx-core';
+} from '@nx/devkit';
+import { Linter, lintProjectGenerator } from '@nx/linter';
+import { runTasksInSerial } from '@nx/workspace/src/utilities/run-tasks-in-serial';
+import { getRelativePathToRootTsConfig } from '@nx/workspace/src/utilities/typescript';
 import * as path from 'path';
 import playwrightInitGenerator from '../init/generator';
 import { PlaywrightGeneratorNormalizedSchema, PlaywrightGeneratorSchema } from './schema';
diff --git a/packages/nx-playwright/src/generators/project/schema.d.ts b/packages/nx-playwright/src/generators/project/schema.d.ts
index 7cf64980..599883c3 100644
--- a/packages/nx-playwright/src/generators/project/schema.d.ts
+++ b/packages/nx-playwright/src/generators/project/schema.d.ts
@@ -1,5 +1,5 @@
-import { Linter } from '@nrwl/linter';
 import { NormalizedOptions } from '@ns3/nx-core';
+import { Linter } from '@nx/linter';
 
 export interface PlaywrightGeneratorSchema {
   name: string;
diff --git a/packages/nx-playwright/src/generators/project/schema.json b/packages/nx-playwright/src/generators/project/schema.json
index a65d8a88..006ae9af 100644
--- a/packages/nx-playwright/src/generators/project/schema.json
+++ b/packages/nx-playwright/src/generators/project/schema.json
@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "$id": "NxPlaywrightProject",
   "title": "Add a Playwright Project",
   "type": "object",
diff --git a/packages/nx-serverless/.eslintrc.json b/packages/nx-serverless/.eslintrc.json
index 1afbd008..3ae84db4 100644
--- a/packages/nx-serverless/.eslintrc.json
+++ b/packages/nx-serverless/.eslintrc.json
@@ -19,7 +19,7 @@
       "files": ["./package.json", "./generators.json", "./executors.json"],
       "parser": "jsonc-eslint-parser",
       "rules": {
-        "@nrwl/nx/nx-plugin-checks": "error"
+        "@nx/nx-plugin-checks": "error"
       }
     }
   ]
diff --git a/packages/nx-serverless/README.md b/packages/nx-serverless/README.md
index 4bf94433..fa29aa54 100644
--- a/packages/nx-serverless/README.md
+++ b/packages/nx-serverless/README.md
@@ -25,7 +25,7 @@ nx generate @ns3/nx-serverless:app my-app-name
 
 You can opt in to use experimental `@ns3/nx-serverless/plugin`.
 It supports only `aws` as a provider, but works both with nx cache and incremental build.
-It uses `@nrwl/webpack:webpack` executor to compile the code.
+It uses `@nx/webpack:webpack` executor to compile the code.
 It also means that it will respect `target` you set in `tsconfig.json`.
 You can use `externalDependencies` option of `build` target to exclude certain dependencies from the bundle (like aws sdk).
 
@@ -74,7 +74,7 @@ nx run my-app-name:sls --command logs
 nx run my-app-name:sls --command 'invoke local'
 ```
 
-All arguments are forwarded. 
+All arguments are forwarded.
 If there is an argument that conflicts with Nx or this executor simply suffix it with `_`.
 For example:
 
diff --git a/packages/nx-serverless/plugin/nrwl/nx-facade.ts b/packages/nx-serverless/plugin/nrwl/nx-facade.ts
index 2054c8c4..cabee21d 100644
--- a/packages/nx-serverless/plugin/nrwl/nx-facade.ts
+++ b/packages/nx-serverless/plugin/nrwl/nx-facade.ts
@@ -1,4 +1,4 @@
-import { ExecutorContext, runExecutor } from '@nrwl/devkit';
+import { ExecutorContext, runExecutor } from '@nx/devkit';
 import { join } from 'path';
 import { FunctionDecorator } from '../functions/function-decorator';
 import { getNxServerlessConfig } from './nx-serverless-config';
diff --git a/packages/nx-serverless/plugin/nrwl/nx-serverless-config.ts b/packages/nx-serverless/plugin/nrwl/nx-serverless-config.ts
index bc671f45..f6fbd0e6 100644
--- a/packages/nx-serverless/plugin/nrwl/nx-serverless-config.ts
+++ b/packages/nx-serverless/plugin/nrwl/nx-serverless-config.ts
@@ -1,5 +1,5 @@
-import { ExecutorContext } from '@nrwl/devkit';
 import { getProjectConfiguration } from '@ns3/nx-core';
+import { ExecutorContext } from '@nx/devkit';
 import { ensureDir, readJSONSync, writeJSON } from 'fs-extra';
 import { join } from 'path';
 
diff --git a/packages/nx-serverless/project.json b/packages/nx-serverless/project.json
index 9bbc8160..080d89e3 100644
--- a/packages/nx-serverless/project.json
+++ b/packages/nx-serverless/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "packages/nx-serverless/**/*.ts",
@@ -17,7 +17,7 @@
       "outputs": ["{options.outputFile}"]
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "packages/nx-serverless/jest.config.ts",
@@ -25,7 +25,7 @@
       }
     },
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nx/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/packages/nx-serverless",
diff --git a/packages/nx-serverless/src/executors/sls/executor.ts b/packages/nx-serverless/src/executors/sls/executor.ts
index 6493cdd4..6bbd2939 100644
--- a/packages/nx-serverless/src/executors/sls/executor.ts
+++ b/packages/nx-serverless/src/executors/sls/executor.ts
@@ -1,6 +1,6 @@
 import 'dotenv/config';
-import { ExecutorContext } from '@nrwl/devkit';
 import { getProjectConfiguration, printCommand, stringifyArgs } from '@ns3/nx-core';
+import { ExecutorContext } from '@nx/devkit';
 import * as execa from 'execa';
 import {
   NX_SERVERLESS_CONFIG_PATH_KEY,
diff --git a/packages/nx-serverless/src/executors/sls/schema.json b/packages/nx-serverless/src/executors/sls/schema.json
index 3db2319a..05dca6b1 100644
--- a/packages/nx-serverless/src/executors/sls/schema.json
+++ b/packages/nx-serverless/src/executors/sls/schema.json
@@ -2,7 +2,6 @@
   "version": 2,
   "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "title": "Serverless executor",
   "description": "",
   "type": "object",
diff --git a/packages/nx-serverless/src/generators/application/generator.spec.ts b/packages/nx-serverless/src/generators/application/generator.spec.ts
index 8408248a..665f0fad 100644
--- a/packages/nx-serverless/src/generators/application/generator.spec.ts
+++ b/packages/nx-serverless/src/generators/application/generator.spec.ts
@@ -1,6 +1,6 @@
-import { readProjectConfiguration, Tree } from '@nrwl/devkit';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
-import { Linter } from '@nrwl/linter';
+import { readProjectConfiguration, Tree } from '@nx/devkit';
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
+import { Linter } from '@nx/linter';
 import generator from './generator';
 import { ServerlessGeneratorSchema } from './schema';
 
@@ -70,7 +70,7 @@ describe('serverless generator', () => {
                 codeCoverage: true,
               },
             },
-            executor: '@nrwl/jest:jest',
+            executor: '@nx/jest:jest',
             outputs: ['{workspaceRoot}/coverage/{projectRoot}'],
             options: {
               jestConfig: 'apps/sample/jest.config.ts',
@@ -78,7 +78,7 @@ describe('serverless generator', () => {
             },
           },
           lint: {
-            executor: '@nrwl/linter:eslint',
+            executor: '@nx/linter:eslint',
             outputs: ['{options.outputFile}'],
             options: {
               lintFilePatterns: ['apps/sample/src/**/*.{ts,tsx,js,jsx}'],
@@ -111,7 +111,7 @@ describe('serverless generator', () => {
         sourceRoot: 'apps/sample/src',
         targets: {
           build: {
-            executor: '@nrwl/webpack:webpack',
+            executor: '@nx/webpack:webpack',
             outputs: ['{options.outputPath}'],
             options: {
               outputPath: 'dist/apps/sample',
@@ -172,7 +172,7 @@ describe('serverless generator', () => {
                 codeCoverage: true,
               },
             },
-            executor: '@nrwl/jest:jest',
+            executor: '@nx/jest:jest',
             outputs: ['{workspaceRoot}/coverage/{projectRoot}'],
             options: {
               jestConfig: 'apps/sample/jest.config.ts',
@@ -180,7 +180,7 @@ describe('serverless generator', () => {
             },
           },
           lint: {
-            executor: '@nrwl/linter:eslint',
+            executor: '@nx/linter:eslint',
             outputs: ['{options.outputFile}'],
             options: {
               lintFilePatterns: ['apps/sample/src/**/*.{ts,tsx,js,jsx}'],
diff --git a/packages/nx-serverless/src/generators/application/generator.ts b/packages/nx-serverless/src/generators/application/generator.ts
index 1fb79e83..1ac42fb1 100644
--- a/packages/nx-serverless/src/generators/application/generator.ts
+++ b/packages/nx-serverless/src/generators/application/generator.ts
@@ -1,3 +1,4 @@
+import { normalizeOptions } from '@ns3/nx-core';
 import {
   addProjectConfiguration,
   formatFiles,
@@ -6,9 +7,8 @@ import {
   offsetFromRoot,
   Tree,
   updateJson,
-} from '@nrwl/devkit';
-import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
-import { normalizeOptions } from '@ns3/nx-core';
+} from '@nx/devkit';
+import { runTasksInSerial } from '@nx/workspace/src/utilities/run-tasks-in-serial';
 import { join } from 'path';
 import serverlessInitGenerator from '../init/generator';
 import { addJest } from './lib/add-jest';
diff --git a/packages/nx-serverless/src/generators/application/lib/add-jest.ts b/packages/nx-serverless/src/generators/application/lib/add-jest.ts
index 3504a0e0..2fabd059 100644
--- a/packages/nx-serverless/src/generators/application/lib/add-jest.ts
+++ b/packages/nx-serverless/src/generators/application/lib/add-jest.ts
@@ -1,5 +1,5 @@
-import { Tree } from '@nrwl/devkit';
-import { jestProjectGenerator } from '@nrwl/jest';
+import { Tree } from '@nx/devkit';
+import { jestProjectGenerator } from '@nx/jest';
 import { ServerlessGeneratorNormalizedSchema } from './normalized-options';
 
 export async function addJest(host: Tree, options: ServerlessGeneratorNormalizedSchema) {
diff --git a/packages/nx-serverless/src/generators/application/lib/add-linting.ts b/packages/nx-serverless/src/generators/application/lib/add-linting.ts
index 58fa1e2e..b06c5032 100644
--- a/packages/nx-serverless/src/generators/application/lib/add-linting.ts
+++ b/packages/nx-serverless/src/generators/application/lib/add-linting.ts
@@ -1,6 +1,6 @@
-import { GeneratorCallback, joinPathFragments, Tree, updateJson } from '@nrwl/devkit';
-import { Linter, lintProjectGenerator } from '@nrwl/linter';
-import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
+import { GeneratorCallback, joinPathFragments, Tree, updateJson } from '@nx/devkit';
+import { Linter, lintProjectGenerator } from '@nx/linter';
+import { runTasksInSerial } from '@nx/workspace/src/utilities/run-tasks-in-serial';
 import { ServerlessGeneratorNormalizedSchema } from './normalized-options';
 
 export async function addLinting(
diff --git a/packages/nx-serverless/src/generators/application/lib/get-build-base-config.ts b/packages/nx-serverless/src/generators/application/lib/get-build-base-config.ts
index 7075f006..78a36b67 100644
--- a/packages/nx-serverless/src/generators/application/lib/get-build-base-config.ts
+++ b/packages/nx-serverless/src/generators/application/lib/get-build-base-config.ts
@@ -1,9 +1,9 @@
-import { joinPathFragments, TargetConfiguration } from '@nrwl/devkit';
 import { NormalizedOptions } from '@ns3/nx-core';
+import { joinPathFragments, TargetConfiguration } from '@nx/devkit';
 
 export function getBuildBaseConfig(options: NormalizedOptions): TargetConfiguration {
   return {
-    executor: '@nrwl/webpack:webpack',
+    executor: '@nx/webpack:webpack',
     outputs: ['{options.outputPath}'],
     options: {
       outputPath: joinPathFragments('dist', options.projectRoot),
diff --git a/packages/nx-serverless/src/generators/application/lib/get-project-config.ts b/packages/nx-serverless/src/generators/application/lib/get-project-config.ts
index f40015e1..1738f2c3 100644
--- a/packages/nx-serverless/src/generators/application/lib/get-project-config.ts
+++ b/packages/nx-serverless/src/generators/application/lib/get-project-config.ts
@@ -1,4 +1,4 @@
-import { joinPathFragments, ProjectConfiguration } from '@nrwl/devkit';
+import { joinPathFragments, ProjectConfiguration } from '@nx/devkit';
 import { getBuildBaseConfig } from './get-build-base-config';
 import { getOutputPath } from './get-output-path';
 import { ServerlessGeneratorNormalizedSchema } from './normalized-options';
diff --git a/packages/nx-serverless/src/generators/application/schema.d.ts b/packages/nx-serverless/src/generators/application/schema.d.ts
index e6aaaf77..22edd4de 100644
--- a/packages/nx-serverless/src/generators/application/schema.d.ts
+++ b/packages/nx-serverless/src/generators/application/schema.d.ts
@@ -1,4 +1,4 @@
-import { Linter } from '@nrwl/linter';
+import { Linter } from '@nx/linter';
 
 export interface ServerlessGeneratorSchema {
   plugin: 'serverless-bundle' | '@ns3/nx-serverless/plugin';
diff --git a/packages/nx-serverless/src/generators/application/schema.json b/packages/nx-serverless/src/generators/application/schema.json
index 5ea83277..bc9d878d 100644
--- a/packages/nx-serverless/src/generators/application/schema.json
+++ b/packages/nx-serverless/src/generators/application/schema.json
@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "id": "NxServerlessApplication",
   "title": "Nx Serverless Application Options Schema",
   "type": "object",
diff --git a/packages/nx-serverless/src/generators/init/generator.ts b/packages/nx-serverless/src/generators/init/generator.ts
index 6f55b552..27aec417 100644
--- a/packages/nx-serverless/src/generators/init/generator.ts
+++ b/packages/nx-serverless/src/generators/init/generator.ts
@@ -5,9 +5,9 @@ import {
   readNxJson,
   Tree,
   updateNxJson,
-} from '@nrwl/devkit';
-import { jestInitGenerator } from '@nrwl/jest';
-import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
+} from '@nx/devkit';
+import { jestInitGenerator } from '@nx/jest';
+import { runTasksInSerial } from '@nx/workspace/src/utilities/run-tasks-in-serial';
 import {
   serverlessBundleVersion,
   serverlessOfflineVersion,
@@ -47,7 +47,7 @@ function updateDependencies(host: Tree, options: InitGeneratorSchema) {
       'serverless-offline': serverlessOfflineVersion,
       ...(options.plugin === 'serverless-bundle'
         ? { 'serverless-bundle': serverlessBundleVersion }
-        : { '@nrwl/webpack': '*' }),
+        : { '@nx/webpack': '*' }),
     },
   );
 }
diff --git a/packages/nx-serverless/src/generators/init/schema.json b/packages/nx-serverless/src/generators/init/schema.json
index de91a119..440e5b22 100644
--- a/packages/nx-serverless/src/generators/init/schema.json
+++ b/packages/nx-serverless/src/generators/init/schema.json
@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "id": "NxServerlessInit",
   "title": "Init Nx Serverless Plugin",
   "type": "object",
diff --git a/packages/nx-serverless/src/utils/get-sls-command.ts b/packages/nx-serverless/src/utils/get-sls-command.ts
index becaccdf..f0c87123 100644
--- a/packages/nx-serverless/src/utils/get-sls-command.ts
+++ b/packages/nx-serverless/src/utils/get-sls-command.ts
@@ -1,4 +1,4 @@
-import { detectPackageManager } from '@nrwl/devkit';
+import { detectPackageManager } from '@nx/devkit';
 
 export function getSlsCommand() {
   const packageManager = detectPackageManager();
diff --git a/packages/nx-serverless/src/utils/test-context.ts b/packages/nx-serverless/src/utils/test-context.ts
index 74842721..28ae2f89 100644
--- a/packages/nx-serverless/src/utils/test-context.ts
+++ b/packages/nx-serverless/src/utils/test-context.ts
@@ -1,4 +1,4 @@
-import { ExecutorContext } from '@nrwl/devkit';
+import { ExecutorContext } from '@nx/devkit';
 
 export const testContext: ExecutorContext = {
   root: '/base/ns3/tmp/nx-e2e/proj',
diff --git a/tools/workspace-plugin/.eslintrc.json b/tools/workspace-plugin/.eslintrc.json
new file mode 100644
index 00000000..99664e58
--- /dev/null
+++ b/tools/workspace-plugin/.eslintrc.json
@@ -0,0 +1,25 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["./package.json", "./generators.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/nx-plugin-checks": "error"
+      }
+    }
+  ]
+}
diff --git a/tools/workspace-plugin/generators.json b/tools/workspace-plugin/generators.json
new file mode 100644
index 00000000..c6cf18cd
--- /dev/null
+++ b/tools/workspace-plugin/generators.json
@@ -0,0 +1,9 @@
+{
+  "generators": {
+    "plugin": {
+      "implementation": "./src/generators/plugin",
+      "schema": "./src/generators/plugin/schema.json",
+      "description": "Generator plugin"
+    }
+  }
+}
diff --git a/tools/workspace-plugin/jest.config.ts b/tools/workspace-plugin/jest.config.ts
new file mode 100644
index 00000000..946685cf
--- /dev/null
+++ b/tools/workspace-plugin/jest.config.ts
@@ -0,0 +1,10 @@
+/* eslint-disable */
+export default {
+  displayName: 'workspace-plugin',
+  preset: '../../jest.preset.js',
+  transform: {
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../coverage/tools/workspace-plugin',
+};
diff --git a/tools/workspace-plugin/package.json b/tools/workspace-plugin/package.json
new file mode 100644
index 00000000..df225b98
--- /dev/null
+++ b/tools/workspace-plugin/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "@ns3/workspace-plugin",
+  "version": "0.0.1",
+  "type": "commonjs",
+  "generators": "./generators.json"
+}
diff --git a/tools/workspace-plugin/project.json b/tools/workspace-plugin/project.json
new file mode 100644
index 00000000..e0ed579b
--- /dev/null
+++ b/tools/workspace-plugin/project.json
@@ -0,0 +1,65 @@
+{
+  "name": "workspace-plugin",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "tools/workspace-plugin/src",
+  "projectType": "library",
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/tools/workspace-plugin",
+        "main": "tools/workspace-plugin/src/index.ts",
+        "tsConfig": "tools/workspace-plugin/tsconfig.lib.json",
+        "assets": [
+          {
+            "input": "./tools/workspace-plugin/src",
+            "glob": "**/!(*.ts)",
+            "output": "./src"
+          },
+          {
+            "input": "./tools/workspace-plugin/src",
+            "glob": "**/*.d.ts",
+            "output": "./src"
+          },
+          {
+            "input": "./tools/workspace-plugin",
+            "glob": "generators.json",
+            "output": "."
+          },
+          {
+            "input": "./tools/workspace-plugin",
+            "glob": "executors.json",
+            "output": "."
+          }
+        ]
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": [
+          "tools/workspace-plugin/**/*.ts",
+          "tools/workspace-plugin/package.json",
+          "tools/workspace-plugin/generators.json"
+        ]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "tools/workspace-plugin/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/tools/generators/plugin/index.ts b/tools/workspace-plugin/src/generators/plugin/index.ts
similarity index 92%
rename from tools/generators/plugin/index.ts
rename to tools/workspace-plugin/src/generators/plugin/index.ts
index 2c2b5f67..be6919e5 100644
--- a/tools/generators/plugin/index.ts
+++ b/tools/workspace-plugin/src/generators/plugin/index.ts
@@ -5,9 +5,9 @@ import {
   Tree,
   updateJson,
   updateProjectConfiguration,
-} from '@nrwl/devkit';
-import { Linter } from '@nrwl/linter';
-import pluginGenerator from '@nrwl/nx-plugin/src/generators/plugin/plugin';
+} from '@nx/devkit';
+import { Linter } from '@nx/linter';
+import pluginGenerator from '@nx/plugin/src/generators/plugin/plugin';
 import { commandSync } from 'execa';
 import { join } from 'path';
 import { Schema } from './schema';
diff --git a/tools/generators/plugin/schema.json b/tools/workspace-plugin/src/generators/plugin/schema.json
similarity index 100%
rename from tools/generators/plugin/schema.json
rename to tools/workspace-plugin/src/generators/plugin/schema.json
diff --git a/tools/generators/plugin/schema.ts b/tools/workspace-plugin/src/generators/plugin/schema.ts
similarity index 56%
rename from tools/generators/plugin/schema.ts
rename to tools/workspace-plugin/src/generators/plugin/schema.ts
index d1442814..010a2015 100644
--- a/tools/generators/plugin/schema.ts
+++ b/tools/workspace-plugin/src/generators/plugin/schema.ts
@@ -1,4 +1,4 @@
-export interface Schema  {
+export interface Schema {
   name: string;
   tags?: string;
 }
diff --git a/tools/generators/.gitkeep b/tools/workspace-plugin/src/index.ts
similarity index 100%
rename from tools/generators/.gitkeep
rename to tools/workspace-plugin/src/index.ts
diff --git a/tools/workspace-plugin/tsconfig.json b/tools/workspace-plugin/tsconfig.json
new file mode 100644
index 00000000..19b9eece
--- /dev/null
+++ b/tools/workspace-plugin/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs"
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/tools/workspace-plugin/tsconfig.lib.json b/tools/workspace-plugin/tsconfig.lib.json
new file mode 100644
index 00000000..33eca2c2
--- /dev/null
+++ b/tools/workspace-plugin/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
+}
diff --git a/tools/workspace-plugin/tsconfig.spec.json b/tools/workspace-plugin/tsconfig.spec.json
new file mode 100644
index 00000000..f6d8ffcc
--- /dev/null
+++ b/tools/workspace-plugin/tsconfig.spec.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+}
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 8ff96750..deae72c1 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -20,7 +20,8 @@
       "@ns3/nx-jest-playwright": ["packages/nx-jest-playwright"],
       "@ns3/nx-npm": ["packages/nx-npm"],
       "@ns3/nx-playwright": ["packages/nx-playwright"],
-      "@ns3/nx-serverless": ["packages/nx-serverless"]
+      "@ns3/nx-serverless": ["packages/nx-serverless"],
+      "@ns3/workspace-plugin": ["tools/workspace-plugin/src/index.ts"]
     }
   },
   "exclude": ["node_modules", "tmp"]
diff --git a/yarn.lock b/yarn.lock
index 78cd7a0c..92d89482 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1905,13 +1905,6 @@
     read-package-json-fast "^3.0.0"
     which "^3.0.0"
 
-"@nrwl/cli@15.9.1":
-  version "15.9.1"
-  resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-15.9.1.tgz#4724f83c2286486fd416b169a1af73055af6aa65"
-  integrity sha512-zyMDiMxPhOGKmq9ivY6mV29pOsRCERKjBRfEYbFuqslxP1RNe9uiMxPUf9Gqm5VwxqKleKkwz92BMvO2Qbk+fA==
-  dependencies:
-    nx "15.9.1"
-
 "@nrwl/devkit@16.0.3":
   version "16.0.3"
   resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-16.0.3.tgz#ee9141e49d28196aa7250c001f3e3e267e920da5"
@@ -1954,41 +1947,6 @@
   dependencies:
     nx-cloud "16.0.5"
 
-"@nrwl/nx-darwin-arm64@15.9.1":
-  version "15.9.1"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.9.1.tgz#ea27ec667e9237689b7f778d3116fcaa51a743f2"
-  integrity sha512-rwVQ+uxP12Bhltkawc2B7bKxh6RZR5S5Y8kKkxSx57wFniOslEqLr/s3XpTTceJUoKk5ZynGY/98HCG3FUqGyg==
-
-"@nrwl/nx-darwin-x64@15.9.1":
-  version "15.9.1"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.9.1.tgz#90f0f7881c46abd03c211bb10787d2a914685651"
-  integrity sha512-F1Pmj14xNcYlsJhDv0DOnBhGAgXTSOg6ayeCqnH3nR1IHB8ygcyBWKzaHWOJA/wyP16w+dEqCGkMVQUt2gNE3A==
-
-"@nrwl/nx-linux-arm-gnueabihf@15.9.1":
-  version "15.9.1"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.9.1.tgz#845eb0b91ee72d8b552340efdf5a55eb89a00a89"
-  integrity sha512-RSt2siC4k1W0eLU658rVyGsMP1OxlkHmklapA3zfb7gASrKhZBy7HiAJjrpalqxj3D1n4c8cnpnn8NjjiLgyOg==
-
-"@nrwl/nx-linux-arm64-gnu@15.9.1":
-  version "15.9.1"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.9.1.tgz#e34379243b61b4f46c0633277b4d2c7c6b6b057d"
-  integrity sha512-6T2uPk4teDLnkXhWfjmXmei3b3dC7g2OreGTwTl6jpIkhduQrQ3ipPGLkCAywjyckZtouv1mlOO0mBd7Hjst4w==
-
-"@nrwl/nx-linux-arm64-musl@15.9.1":
-  version "15.9.1"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.9.1.tgz#d5c9eb46993d4920dbf631d6da9068f0bf87635d"
-  integrity sha512-K8wvm7rAsw6fgbixC5PEaY/go3uqtX4regoNpnck9zZnybQP66a9DxHzfekCLOfXnlgoVxtHmV1iVZETZNmKGg==
-
-"@nrwl/nx-linux-x64-gnu@15.9.1":
-  version "15.9.1"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.9.1.tgz#aca6e40e48ab6ea1434b67ad0e1f5d6f9b5c0131"
-  integrity sha512-7kD9J86KhmYkHIrF2YuJWM1ltdiettOQ8ej9gAnqxQRKnVPazDSg56jFBosjow1mdilvTYONbFPSDEh0IrIE3g==
-
-"@nrwl/nx-linux-x64-musl@15.9.1":
-  version "15.9.1"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.9.1.tgz#beebac0f0b40fce0ef3bdcf7ca4c31d47e0ab655"
-  integrity sha512-WopD1Jf1CGHg/uCYfo40TEd/yawglMFCoNPc/WNFXNx9P2LMfp8cKyApdvfP32Ptaql3fJvJCHXUqcPxYy6cSg==
-
 "@nrwl/nx-plugin@16.0.3":
   version "16.0.3"
   resolved "https://registry.yarnpkg.com/@nrwl/nx-plugin/-/nx-plugin-16.0.3.tgz#d7bd864ad151ba2d091928598332e64cd0bf5e91"
@@ -1996,23 +1954,6 @@
   dependencies:
     "@nx/plugin" "16.0.3"
 
-"@nrwl/nx-win32-arm64-msvc@15.9.1":
-  version "15.9.1"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.9.1.tgz#e48deea3d88df205ef3b6588019c10cd42f60064"
-  integrity sha512-ZU/QuUU1WPaIFdKqCWAm5TI+/zYAXbEyZKd/OhY67Gxaca98O4YXS6GmfF7WNHvQzsYoeuuLyRzZowSp22Rung==
-
-"@nrwl/nx-win32-x64-msvc@15.9.1":
-  version "15.9.1"
-  resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.9.1.tgz#bb68010c852ccf644a6ca281b58f5097ac1d463c"
-  integrity sha512-te43yJPni7VIIM5DpZnGuWwEjZNMERdBAhHeKWobwvSQ4ogdpmDbOhsdHqU3mFLaiKP1pzRo17R5tNJ5Gmw5tA==
-
-"@nrwl/tao@15.9.1":
-  version "15.9.1"
-  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-15.9.1.tgz#b276eb57fb40263659dc211302ee3b24601341fc"
-  integrity sha512-gb21eJ3VrZdUpg4MQ4rmOfLy+omHiXCEvWWFGYvFSxXGVeNaLzlvQ/+OOK0B/d0KTCuXKCgvVKJ3jobd+4s02A==
-  dependencies:
-    nx "15.9.1"
-
 "@nrwl/tao@16.0.3":
   version "16.0.3"
   resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-16.0.3.tgz#f0a34f20118484f3ffc1e8c4acb5cb520d012935"
@@ -2531,71 +2472,71 @@
     slash "3.0.0"
     source-map "^0.7.3"
 
-"@swc/core-darwin-arm64@1.3.37":
-  version "1.3.37"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.37.tgz#a92e075ae35f18a64aaf3823ea175f03564f8da1"
-  integrity sha512-iIyVqqioUpVeT/hbBVfkrsjfCyL4idNH+LVKGmoTAWaTTSB0+UNhNuA7Wh2CqIHWh1Mv7IlumitWPcqsVDdoEw==
-
-"@swc/core-darwin-x64@1.3.37":
-  version "1.3.37"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.37.tgz#a3cc06c87140a2ca0b8e7ef1f3d5cc34dd080429"
-  integrity sha512-dao5nXPWKxtaxqak4ZkRyBoApNIelW/glantQhPhj0FjMjuIQc+v03ldJ8XDByWOG+6xuVUTheANCtEccxoQBw==
-
-"@swc/core-linux-arm-gnueabihf@1.3.37":
-  version "1.3.37"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.37.tgz#f7d8f8523830c6be653f608839d4bd5598457f1f"
-  integrity sha512-/mVrc8H/f062CUkqKGmBiil2VIYu4mKawHxERfeP1y38X5K/OwjG5s9MgO9TVxy+Ly6vejwj70kRhSa3hVp1Bw==
-
-"@swc/core-linux-arm64-gnu@1.3.37":
-  version "1.3.37"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.37.tgz#b162febd9de14fb08000c722b063be2bb5aefa6b"
-  integrity sha512-eRQ3KaZI0j5LidTfOIi/kUVOOMuVmw1HCdt/Z1TAUKoHMLVxY8xcJ3pEE3/+ednI60EmHpwpJRs6LelXyL6uzQ==
-
-"@swc/core-linux-arm64-musl@1.3.37":
-  version "1.3.37"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.37.tgz#3b1a628e880fbb1a5e2a7a46d42e8aa878c6bfdd"
-  integrity sha512-w2BRLODyxNQY2rfHZMZ5ir6QrrnGBPlnIslTrgKmVbn1OjZoxUCtuqhrYnCmybaAc4DOkeH02TqynEFXrm+EMw==
-
-"@swc/core-linux-x64-gnu@1.3.37":
-  version "1.3.37"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.37.tgz#ed443ad77dc90e415267d02a38e4113047b2d3d8"
-  integrity sha512-CfoH8EsZJZ9kunjMUjBNYD5fFuO86zw+K/o4wEw72Yg6ZEiqPmeIlCKU8tpTv4sK+CbhUXrmVzMB5tqsb2jALQ==
-
-"@swc/core-linux-x64-musl@1.3.37":
-  version "1.3.37"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.37.tgz#de607a4985458bd6e8b0e40f0d62d0e26bd8df1e"
-  integrity sha512-9YPrHYNdoG7PK11gV51GfL45biI2dic+YTqHUDKyykemsD7Ot1zUFX7Ty//pdvpKcKSff6SrHbfFACD5ziNirA==
-
-"@swc/core-win32-arm64-msvc@1.3.37":
-  version "1.3.37"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.37.tgz#d5851a47d7df183929b9746d56f76c282f940e6a"
-  integrity sha512-h17Ek8/wCDje6BrXOvCXBM80oBRmTSMMdLyt87whTl5xqYlWYYs9oQIzZndNRTlNpTgjGO8Ns2eo4kwVxIkBIA==
-
-"@swc/core-win32-ia32-msvc@1.3.37":
-  version "1.3.37"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.37.tgz#06ad7016f61b56aec4abf60eab3a91b786f9e294"
-  integrity sha512-1BR175E1olGy/zdt94cgdb6ps/lBNissAOaxyBk8taFpcjy3zpdP30yAoH0GIsC6isnZ5JfArbOJNRXXO5tE0Q==
-
-"@swc/core-win32-x64-msvc@1.3.37":
-  version "1.3.37"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.37.tgz#60139a7089003a7447a4efef9704ae8fde21995e"
-  integrity sha512-1siDQ7dccQ1pesJmgAL3BUBbRPtfbNInOWnZOkiie/DfFqGQ117QKnCVyjUvwFKfTQx1+3UUTDmMSlRd00SlXg==
-
-"@swc/core@^1.2.173":
-  version "1.3.37"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.37.tgz#644653fa7deb20c7c342e7fd019c7abc44ecf1bf"
-  integrity sha512-VOFlEQ1pReOM73N9A7R8rt561GU8Rxsq833jiimWDUB2sXEN3V6n6wFTgYmZuMz2T4/R0cQA1nV48KkaT4gkFw==
+"@swc/core-darwin-arm64@1.3.56":
+  version "1.3.56"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.56.tgz#a846f7fdbc274aa7d299568031dde025d44a3b4c"
+  integrity sha512-DZcu7BzDaLEdWHabz9DRTP0yEBLqkrWmskFcD5BX0lGAvoIvE4duMnAqi5F2B3X7630QioHRCYFoRw2WkeE3Cw==
+
+"@swc/core-darwin-x64@1.3.56":
+  version "1.3.56"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.56.tgz#793865f14f07f5eff6a6e6764aa6c766983fa007"
+  integrity sha512-VH5saqYFasdRXJy6RAT+MXm0+IjkMZvOkohJwUei+oA65cKJofQwrJ1jZro8yOJFYvUSI3jgNRGsdBkmo/4hMw==
+
+"@swc/core-linux-arm-gnueabihf@1.3.56":
+  version "1.3.56"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.56.tgz#6942e9a4f6086da66d995c46c2ab2b0f7fa86a1d"
+  integrity sha512-LWwPo6NnJkH01+ukqvkoNIOpMdw+Zundm4vBeicwyVrkP+mC3kwVfi03TUFpQUz3kRKdw/QEnxGTj+MouCPbtw==
+
+"@swc/core-linux-arm64-gnu@1.3.56":
+  version "1.3.56"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.56.tgz#21c3f8083c2d0a8028a07bf42cdd2a345e5108e9"
+  integrity sha512-GzsUy/4egJ4cMlxbM+Ub7AMi5CKAc+pxBxrh8MUPQbyStW8jGgnQsJouTnGy0LHawtdEnsCOl6PcO6OgvktXuQ==
+
+"@swc/core-linux-arm64-musl@1.3.56":
+  version "1.3.56"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.56.tgz#87c9781f0814bca65074f357e5cfdcdd7fb09845"
+  integrity sha512-9gxL09BIiAv8zY0DjfnFf19bo8+P4T9tdhzPwcm+1yPJcY5yr1+YFWLNFzz01agtOj6VlZ2/wUJTaOfdjjtc+A==
+
+"@swc/core-linux-x64-gnu@1.3.56":
+  version "1.3.56"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.56.tgz#55edae77d1c6a2b6230abbc79bccd175cb7c2208"
+  integrity sha512-n0ORNknl50vMRkll3BDO1E4WOqY6iISlPV1ZQCRLWQ6YQ2q8/WAryBxc2OAybcGHBUFkxyACpJukeU1QZ/9tNw==
+
+"@swc/core-linux-x64-musl@1.3.56":
+  version "1.3.56"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.56.tgz#45bf5a6611350bcbe3bdd1eac6f5fcfe69502137"
+  integrity sha512-r+D34WLAOAlJtfw1gaVWpHRwCncU9nzW9i7w9kSw4HpWYnHJOz54jLGSEmNsrhdTCz1VK2ar+V2ktFUsrlGlDA==
+
+"@swc/core-win32-arm64-msvc@1.3.56":
+  version "1.3.56"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.56.tgz#28853170b9e4f57a793d617aab75ef4b9c4b8a7f"
+  integrity sha512-29Yt75Is6X24z3x8h/xZC1HnDPkPpyLH9mDQiM6Cuc0I9mVr1XSriPEUB2N/awf5IE4SA8c+3IVq1DtKWbkJIw==
+
+"@swc/core-win32-ia32-msvc@1.3.56":
+  version "1.3.56"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.56.tgz#dfa120fece0741c6ccc24885d4c155c9593a956e"
+  integrity sha512-mplp0zbYDrcHtfvkniXlXdB04e2qIjz2Gq/XHKr4Rnc6xVORJjjXF91IemXKpavx2oZYJws+LNJL7UFQ8jyCdQ==
+
+"@swc/core-win32-x64-msvc@1.3.56":
+  version "1.3.56"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.56.tgz#23b601b9afcdc435e2e4d66767ac5fa6bb50d640"
+  integrity sha512-zp8MBnrw/bjdLenO/ifYzHrImSjKunqL0C2IF4LXYNRfcbYFh2NwobsVQMZ20IT0474lKRdlP8Oxdt+bHuXrzA==
+
+"@swc/core@~1.3.51":
+  version "1.3.56"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.56.tgz#b12e98bc9ef39dc6092e71ea922f8073f7bec50f"
+  integrity sha512-yz/EeXT+PMZucUNrYceRUaTfuNS4IIu5EDZSOlvCEvm4jAmZi7CYH1B/kvzEzoAOzr7zkQiDPNJftcQXLkjbjA==
   optionalDependencies:
-    "@swc/core-darwin-arm64" "1.3.37"
-    "@swc/core-darwin-x64" "1.3.37"
-    "@swc/core-linux-arm-gnueabihf" "1.3.37"
-    "@swc/core-linux-arm64-gnu" "1.3.37"
-    "@swc/core-linux-arm64-musl" "1.3.37"
-    "@swc/core-linux-x64-gnu" "1.3.37"
-    "@swc/core-linux-x64-musl" "1.3.37"
-    "@swc/core-win32-arm64-msvc" "1.3.37"
-    "@swc/core-win32-ia32-msvc" "1.3.37"
-    "@swc/core-win32-x64-msvc" "1.3.37"
+    "@swc/core-darwin-arm64" "1.3.56"
+    "@swc/core-darwin-x64" "1.3.56"
+    "@swc/core-linux-arm-gnueabihf" "1.3.56"
+    "@swc/core-linux-arm64-gnu" "1.3.56"
+    "@swc/core-linux-arm64-musl" "1.3.56"
+    "@swc/core-linux-x64-gnu" "1.3.56"
+    "@swc/core-linux-x64-musl" "1.3.56"
+    "@swc/core-win32-arm64-msvc" "1.3.56"
+    "@swc/core-win32-ia32-msvc" "1.3.56"
+    "@swc/core-win32-x64-msvc" "1.3.56"
 
 "@swc/helpers@0.5.1":
   version "0.5.1"
@@ -9039,57 +8980,6 @@ nx-cloud@16.0.5:
     tar "6.1.11"
     yargs-parser ">=21.1.1"
 
-nx@15.9.1:
-  version "15.9.1"
-  resolved "https://registry.yarnpkg.com/nx/-/nx-15.9.1.tgz#c6a923cc29a869feeeab5768fc18a314fb696a84"
-  integrity sha512-4PXqQ45JPUBTYqVkVFmUg+mGj+qYkn89Cf+T1n+V1EC8p0pdavqPNaMaTxJTJDOP0TyF+yZ780Kujbarzae8bg==
-  dependencies:
-    "@nrwl/cli" "15.9.1"
-    "@nrwl/tao" "15.9.1"
-    "@parcel/watcher" "2.0.4"
-    "@yarnpkg/lockfile" "^1.1.0"
-    "@yarnpkg/parsers" "^3.0.0-rc.18"
-    "@zkochan/js-yaml" "0.0.6"
-    axios "^1.0.0"
-    chalk "^4.1.0"
-    cli-cursor "3.1.0"
-    cli-spinners "2.6.1"
-    cliui "^7.0.2"
-    dotenv "~10.0.0"
-    enquirer "~2.3.6"
-    fast-glob "3.2.7"
-    figures "3.2.0"
-    flat "^5.0.2"
-    fs-extra "^11.1.0"
-    glob "7.1.4"
-    ignore "^5.0.4"
-    js-yaml "4.1.0"
-    jsonc-parser "3.2.0"
-    lines-and-columns "~2.0.3"
-    minimatch "3.0.5"
-    npm-run-path "^4.0.1"
-    open "^8.4.0"
-    semver "7.3.4"
-    string-width "^4.2.3"
-    strong-log-transformer "^2.1.0"
-    tar-stream "~2.2.0"
-    tmp "~0.2.1"
-    tsconfig-paths "^4.1.2"
-    tslib "^2.3.0"
-    v8-compile-cache "2.3.0"
-    yargs "^17.6.2"
-    yargs-parser "21.1.1"
-  optionalDependencies:
-    "@nrwl/nx-darwin-arm64" "15.9.1"
-    "@nrwl/nx-darwin-x64" "15.9.1"
-    "@nrwl/nx-linux-arm-gnueabihf" "15.9.1"
-    "@nrwl/nx-linux-arm64-gnu" "15.9.1"
-    "@nrwl/nx-linux-arm64-musl" "15.9.1"
-    "@nrwl/nx-linux-x64-gnu" "15.9.1"
-    "@nrwl/nx-linux-x64-musl" "15.9.1"
-    "@nrwl/nx-win32-arm64-msvc" "15.9.1"
-    "@nrwl/nx-win32-x64-msvc" "15.9.1"
-
 nx@16.0.3:
   version "16.0.3"
   resolved "https://registry.yarnpkg.com/nx/-/nx-16.0.3.tgz#30085e06fa5c79abd3b65c553c3baf84f54999e3"