chore: run migrations

Author: Bielik20

.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,15 +35,15 @@
     },
     {
       "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
       }
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     },
     {

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,

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"

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', () => {

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"

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}`);

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', () => {

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"

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', () => {

jest.config.ts

@@ -1,4 +1,4 @@
-const { getJestProjects } = require('@nrwl/jest');
+const { getJestProjects } = require('@nx/jest');
 
 export default {
   projects: getJestProjects(),

jest.preset.js

@@ -1,3 +1,3 @@
-const nxPreset = require('@nrwl/jest/preset').default;
+const nxPreset = require('@nx/jest/preset').default;
 
 module.exports = { ...nxPreset };

migrations.json

@@ -5,7 +5,7 @@
   },
   "tasksRunnerOptions": {
     "default": {
-      "runner": "@nrwl/nx-cloud",
+      "runner": "nx-cloud",
       "options": {
         "cacheableOperations": ["build", "lint", "test", "e2e"],
         "accessToken": "YzQ0ZjZiNmItNDVjMi00OTVkLWI0YTMtZTJjYjBhZDE0YWEwfHJlYWQtd3JpdGU=",

nx.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": {

package.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"
       }
     }
   ]

packages/nx-core/.eslintrc.json

@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "packages/nx-core/**/*.ts",
@@ -17,15 +17,15 @@
       "outputs": ["{options.outputFile}"]
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "packages/nx-core/jest.config.ts",
         "passWithNoTests": true
       }
     },
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nx/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/packages/nx-core",

packages/nx-core/project.json

@@ -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';

packages/nx-core/src/testing-utils/ensure-complex-nx-project.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 || ''
     }`,
     {

packages/nx-core/src/testing-utils/run-nx-new-command.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];

packages/nx-core/src/utils/get-project-configuration.ts

@@ -1,4 +1,4 @@
-import { getWorkspaceLayout, names, Tree } from '@nrwl/devkit';
+import { getWorkspaceLayout, names, Tree } from '@nx/devkit';
 
 export interface NormalizedOptions {
   projectName: string;