Merge pull request #33 from koliveira15/feature/nx-16

Nx 16 Migration

.eslintignore

@@ -0,0 +1 @@
+node_modules

.eslintrc.json

@@ -1,12 +1,12 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -23,12 +23,12 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript"],
+      "extends": ["plugin:@nx/typescript"],
       "rules": {}
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     },
     {

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
           node-version: 18.14.0
           cache: 'npm'
       - run: npm ci
-      - run: npx nx affected --target=lint --parallel=3
-      - run: npx nx affected --target=test --parallel=3 --ci
-      - run: npx nx affected --target=build --parallel=3
+      - run: npx nx affected --target=lint
+      - run: npx nx affected --target=test --ci
+      - run: npx nx affected --target=build
       - run: npx nx affected --target=e2e --parallel=1

e2e/nx-sonarqube-e2e/jest.config.ts

@@ -2,14 +2,15 @@
 export default {
   displayName: 'nx-sonarqube-e2e',
   preset: '../../jest.preset.js',
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-    },
-  },
+  globals: {},
   transform: {
-    '^.+\\.[tj]s$': 'ts-jest',
+    '^.+\\.[tj]s$': [
+      'ts-jest',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+      },
+    ],
   },
-  moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/e2e/nx-sonarqube-e2e',
+  moduleFileExtensions: ['ts', 'js', 'html'],
 };

e2e/nx-sonarqube-e2e/project.json

@@ -1,14 +1,16 @@
 {
+  "name": "nx-sonarqube-e2e",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "e2e/nx-sonarqube-e2e/src",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/nx-plugin:e2e",
+      "executor": "@nx/jest:jest",
       "options": {
-        "target": "nx-sonarqube:build",
-        "jestConfig": "e2e/nx-sonarqube-e2e/jest.config.ts"
-      }
+        "jestConfig": "e2e/nx-sonarqube-e2e/jest.config.ts",
+        "runInBand": true
+      },
+      "dependsOn": ["nx-sonarqube:build"]
     }
   },
   "tags": [],

e2e/nx-sonarqube-e2e/tests/nx-sonarqube.spec.ts

@@ -6,13 +6,13 @@ import {
   runCommand,
   runNxCommandAsync,
   uniq,
-} from '@nrwl/nx-plugin/testing';
+} from '@nx/plugin/testing';
 import { copyFileSync, readFileSync, writeFileSync, rmSync } from 'fs';
 import {
   checkFilesExist,
   updateFile,
-} from '@nrwl/nx-plugin/src/utils/testing-utils/utils';
-import { names } from '@nrwl/devkit';
+} from '@nx/plugin/src/utils/testing-utils/utils';
+import { names } from '@nx/devkit';
 
 const TIMEOUT = 120000;
 const projectName = 'nx-sonarqube';
@@ -29,15 +29,15 @@ describe('nx-sonarqube e2e', () => {
 
   beforeAll(async () => {
     ensureNxProject('@koliveira15/nx-sonarqube', 'dist/packages/nx-sonarqube');
-    copyNodeModules(['@nrwl/jest', '@nrwl/js']);
+    copyNodeModules(['@nx/jest', '@nx/js']);
     await createLibs(projects);
     await createDependency(project, project2);
     setupGlobalJest();
-    runCommand(`git init`); // workaround for initiating nx & projectGraph
+    runCommand(`git init`, {}); // workaround for initiating nx & projectGraph
   }, TIMEOUT);
 
-  afterAll(() => {
-    runNxCommandAsync('reset');
+  afterAll(async () => {
+    await runNxCommandAsync('reset');
   });
 
   it(
@@ -177,7 +177,7 @@ async function createDependency(project: string, project2: string) {
 async function createLibs(projects: string[]) {
   for (let i = 0; i < projects.length; i++) {
     await runNxCommandAsync(
-      `generate @nrwl/js:lib --name ${projects[i]} --unitTestRunner=jest`
+      `generate @nx/js:lib --name ${projects[i]} --unitTestRunner=jest`
     );
 
     const projectPath = `libs/${projects[i]}/project.json`;

jest.config.ts

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

jest.preset.js

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

nx.json

@@ -4,30 +4,41 @@
   "affected": {
     "defaultBase": "origin/main"
   },
-  "implicitDependencies": {
-    "package.json": {
-      "dependencies": "*",
-      "devDependencies": "*"
-    },
-    ".eslintrc.json": "*",
-    ".github/workflows/ci.yml": "*"
-  },
   "tasksRunnerOptions": {
     "default": {
-      "runner": "@nrwl/nx-cloud",
+      "runner": "nx-cloud",
       "options": {
         "cacheableOperations": ["build", "lint", "test", "e2e"],
-        "accessToken": "MWM4ZWZiNDgtOGYwMi00ZDI3LTllMDUtYTNkYTExMmU3MDY2fHJlYWQ="
+        "accessToken": "MWM4ZWZiNDgtOGYwMi00ZDI3LTllMDUtYTNkYTExMmU3MDY2fHJlYWQ=",
+        "parallel": 3
       }
     }
   },
   "targetDefaults": {
     "build": {
-      "dependsOn": ["^build"]
+      "dependsOn": ["^build"],
+      "inputs": ["production", "^production"]
+    },
+    "lint": {
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
+    },
+    "test": {
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
     }
   },
   "workspaceLayout": {
     "appsDir": "e2e",
     "libsDir": "packages"
+  },
+  "namedInputs": {
+    "default": ["{projectRoot}/**/*", "sharedGlobals"],
+    "sharedGlobals": ["{workspaceRoot}/.github/workflows/ci.yml"],
+    "production": [
+      "default",
+      "!{projectRoot}/.eslintrc.json",
+      "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
+      "!{projectRoot}/tsconfig.spec.json",
+      "!{projectRoot}/jest.config.[jt]s"
+    ]
   }
 }