Nx 15 Support

.eslintrc.json

@@ -30,6 +30,18 @@
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nrwl/nx/javascript"],
       "rules": {}
+    },
+    {
+      "files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],
+      "env": {
+        "jest": true
+      },
+      "rules": {}
+    },
+    {
+      "files": "*.json",
+      "parser": "jsonc-eslint-parser",
+      "rules": {}
     }
   ]
 }

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "eslint.validate": ["json"]
+}

e2e/nx-python-e2e/jest.config.js → e2e/nx-python-e2e/jest.config.ts

@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'nx-python-e2e',
   preset: '../../jest.preset.js',
   globals: {

e2e/nx-python-e2e/project.json

@@ -1,13 +1,14 @@
 {
-  "root": "e2e/nx-python-e2e",
+  "name": "nx-python-e2e",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "e2e/nx-python-e2e/src",
   "targets": {
     "e2e": {
       "executor": "@nrwl/nx-plugin:e2e",
       "options": {
         "target": "nx-python:build",
-        "jestConfig": "e2e/nx-python-e2e/jest.config.js"
+        "jestConfig": "e2e/nx-python-e2e/jest.config.ts"
       }
     }
   },

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

@@ -9,19 +9,19 @@ describe('nx-python e2e', () => {
   it('should create nx-python project', async () => {
     const app1 = 'app1';
     const lib1 = 'lib1';
-    ensureNxProject('@nxlv/nx-python', 'dist/packages/nx-python');
+    ensureNxProject('@nxlv/python', 'dist/packages/nx-python');
 
     const nxJson = readJson('nx.json');
-    nxJson.plugins = ['@nxlv/nx-python'];
+    nxJson.plugins = ['@nxlv/python'];
 
     updateFile('nx.json', JSON.stringify(nxJson, null, 4));
 
     await runNxCommandAsync(
-      `generate @nxlv/nx-python:project ${app1} --type "application" --packageName ${app1} --description ${app1}`
+      `generate @nxlv/python:project ${app1} --type "application" --packageName ${app1} --description ${app1}`
     );
 
     await runNxCommandAsync(
-      `generate @nxlv/nx-python:project ${lib1} --type "library"  --packageName ${lib1} --description ${lib1}`
+      `generate @nxlv/python:project ${lib1} --type "library"  --packageName ${lib1} --description ${lib1}`
     );
 
     await runNxCommandAsync(`run ${app1}:add --name ${lib1} --local`);
@@ -45,23 +45,23 @@ describe('nx-python e2e', () => {
     const lib1 = 'lib1';
     const lib2 = 'lib2';
 
-    ensureNxProject('@nxlv/nx-python', 'dist/packages/nx-python');
+    ensureNxProject('@nxlv/python', 'dist/packages/nx-python');
 
     const nxJson = readJson('nx.json');
-    nxJson.plugins = ['@nxlv/nx-python'];
+    nxJson.plugins = ['@nxlv/python'];
 
     updateFile('nx.json', JSON.stringify(nxJson, null, 4));
 
     await runNxCommandAsync(
-      `generate @nxlv/nx-python:project ${app1} --type "application" --packageName ${app1} --description ${app1}`
+      `generate @nxlv/python:project ${app1} --type "application" --packageName ${app1} --description ${app1}`
     );
 
     await runNxCommandAsync(
-      `generate @nxlv/nx-python:project ${lib1} --type "library"  --packageName ${lib1} --description ${lib1}`
+      `generate @nxlv/python:project ${lib1} --type "library"  --packageName ${lib1} --description ${lib1}`
     );
 
     await runNxCommandAsync(
-      `generate @nxlv/nx-python:project ${lib2} --type "library"  --packageName ${lib2} --description ${lib2}`
+      `generate @nxlv/python:project ${lib2} --type "library"  --packageName ${lib2} --description ${lib2}`
     );
 
     await runNxCommandAsync(`run ${lib1}:add --name ${lib2} --local`);

e2e/nx-python-e2e/tsconfig.json

@@ -3,9 +3,6 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./tsconfig.e2e.json"
-    },
     {
       "path": "./tsconfig.spec.json"
     }

e2e/nx-python-e2e/tsconfig.spec.json

@@ -5,5 +5,10 @@
     "module": "commonjs",
     "types": ["jest", "node"]
   },
-  "include": ["**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
+  ]
 }

jest.config.ts

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

jest.preset.js

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

nx.json

@@ -1,38 +1,24 @@
 {
-  "npmScope": "lucasvieira",
-  "affected": {
-    "defaultBase": "main"
-  },
-  "cli": {
-    "defaultCollection": "@nrwl/workspace"
-  },
-  "implicitDependencies": {
-    "package.json": {
-      "dependencies": "*",
-      "devDependencies": "*"
-    },
-    ".eslintrc.json": "*"
-  },
+  "$schema": "./node_modules/nx/schemas/nx-schema.json",
+  "npmScope": "@nxlv/nx-plugins",
   "tasksRunnerOptions": {
     "default": {
-      "runner": "@nrwl/workspace/tasks-runners/default",
+      "runner": "nx/tasks-runners/default",
       "options": {
-        "cacheableOperations": [
-          "build",
-          "lint",
-          "test",
-          "e2e"
-        ]
+        "cacheableOperations": ["build", "lint", "test", "e2e"]
       }
     }
   },
-  "targetDependencies": {
-    "build": [
-      {
-        "target": "build",
-        "projects": "dependencies"
-      }
-    ]
+  "targetDefaults": {
+    "build": {
+      "dependsOn": ["^build"]
+    },
+    "lint": {
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
+    },
+    "test": {
+      "inputs": ["default", "^default", "{workspaceRoot}/jest.preset.js"]
+    }
   },
   "workspaceLayout": {
     "appsDir": "e2e",