feat: add support for nx 18.x

.env

@@ -0,0 +1,4 @@
+# Nx 18 enables using plugins to infer targets by default
+# This is disabled for existing workspaces to maintain compatibility
+# For more info, see: https://nx.dev/concepts/inferred-tasks
+NX_ADD_PLUGINS=false

.eslintrc.json

@@ -33,9 +33,6 @@
     },
     {
       "files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],
-      "env": {
-        "jest": true
-      },
       "rules": {}
     },
     {

.github/workflows/ci.yml

@@ -24,9 +24,7 @@ jobs:
       - run: npm ci
 
       - run: npx nx format:check
-      - run: npx nx affected --target=lint --parallel=3
-      - run: npx nx affected --target=test --parallel=3 --ci --code-coverage --silent
-      - run: npx nx affected --target=build --parallel=3
+      - run: npx nx affected -t lint test build
       - run: |
           echo "NO_COVERAGE_RUN=$(if [ -z "$(npx nx print-affected --select=projects)" ]; then echo "true"; else echo "false";fi)" >> $GITHUB_ENV
       - name: Merge coverage

.sonarcloud.properties

@@ -2,4 +2,4 @@
 sonar.exclusions=**/tests/**/*, **/test/**/*, **/*.spec.*
 
 # Exclude from SonarCloud duplication measure
-sonar.cpd.exclusions=**/jest.config.ts
+sonar.cpd.exclusions=**/vite.config.ts

e2e/data-migration-e2e/project.json

@@ -5,12 +5,8 @@
   "sourceRoot": "e2e/data-migration-e2e/src",
   "targets": {
     "e2e": {
-      "executor": "@nx/jest:jest",
-      "options": {
-        "jestConfig": "e2e/data-migration-e2e/jest.config.ts",
-        "runInBand": true,
-        "passWithNoTests": false
-      },
+      "executor": "@nx/vite:test",
+      "options": {},
       "dependsOn": ["data-migration:build"]
     },
     "lint": {

e2e/data-migration-e2e/tests/dynamodb-migration.spec.ts

@@ -14,10 +14,7 @@ describe('dynamodb-migration e2e', () => {
   // on a unique project in the workspace, such that they
   // are not dependant on one another.
   beforeAll(() => {
-    ensureNxProject(
-      '@nxlv/dynamodb-python',
-      'dist/packages/dynamodb-migration'
-    );
+    ensureNxProject('@nxlv/data-migration', 'dist/packages/dynamodb-migration');
   });
 
   afterAll(() => {
@@ -29,7 +26,7 @@ describe('dynamodb-migration e2e', () => {
   it('should create dynamodb-migration', async () => {
     const project = uniq('dynamodb-migration');
     await runNxCommandAsync(
-      `generate @nxlv/dynamodb-python:dynamodb-migration ${project}`
+      `generate @nxlv/data-migration:dynamodb-migration ${project}`,
     );
     const result = await runNxCommandAsync(`build ${project}`);
     expect(result.stdout).toContain('Executor ran');
@@ -39,10 +36,10 @@ describe('dynamodb-migration e2e', () => {
     it('should create src in the specified directory', async () => {
       const project = uniq('dynamodb-migration');
       await runNxCommandAsync(
-        `generate @nxlv/dynamodb-python:dynamodb-migration ${project} --directory subdir`
+        `generate @nxlv/data-migration:dynamodb-migration ${project} --directory subdir`,
       );
       expect(() =>
-        checkFilesExist(`libs/subdir/${project}/src/index.ts`)
+        checkFilesExist(`libs/subdir/${project}/src/index.ts`),
       ).not.toThrow();
     }, 120000);
   });
@@ -51,11 +48,11 @@ describe('dynamodb-migration e2e', () => {
     it('should add tags to the project', async () => {
       const projectName = uniq('dynamodb-migration');
       ensureNxProject(
-        '@nxlv/dynamodb-python',
-        'dist/packages/dynamodb-migration'
+        '@nxlv/data-migration',
+        'dist/packages/dynamodb-migration',
       );
       await runNxCommandAsync(
-        `generate @nxlv/dynamodb-python:dynamodb-migration ${projectName} --tags e2etag,e2ePackage`
+        `generate @nxlv/data-migration:dynamodb-migration ${projectName} --tags e2etag,e2ePackage`,
       );
       const project = readJson(`libs/${projectName}/project.json`);
       expect(project.tags).toEqual(['e2etag', 'e2ePackage']);

e2e/data-migration-e2e/tsconfig.spec.json

@@ -2,13 +2,25 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node"]
+    "types": [
+      "vitest/globals",
+      "vitest/importMeta",
+      "vite/client",
+      "node",
+      "vitest"
+    ]
   },
   "include": [
-    "jest.config.ts",
+    "vite.config.ts",
+    "vitest.config.ts",
     "src/**/*.test.ts",
     "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
     "src/**/*.d.ts"
   ]
 }

e2e/data-migration-e2e/vite.config.ts

@@ -0,0 +1,34 @@
+/// <reference types='vitest' />
+import { defineConfig } from 'vite';
+
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+
+export default defineConfig({
+  root: __dirname,
+  cacheDir: '../../node_modules/.vite/e2e/data-migration-e2e',
+
+  plugins: [nxViteTsPaths()],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [ nxViteTsPaths() ],
+  // },
+
+  test: {
+    name: 'data-migration-e2e',
+    minWorkers: 1,
+    maxWorkers: 1,
+    globals: true,
+    cache: {
+      dir: '../../node_modules/.vitest',
+    },
+    environment: 'node',
+    include: ['tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: '../../coverage/e2e/data-migration-e2e',
+      provider: 'v8',
+    },
+  },
+});

packages/testing/dynamoose-mock/.eslintrc.json → e2e/nx-python-e2e/.eslintrc.json

@@ -1,5 +1,5 @@
 {
-  "extends": ["../../../.eslintrc.json"],
+  "extends": ["../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {

e2e/nx-python-e2e/project.json

@@ -5,13 +5,13 @@
   "sourceRoot": "e2e/nx-python-e2e/src",
   "targets": {
     "e2e": {
-      "executor": "@nx/jest:jest",
-      "options": {
-        "jestConfig": "e2e/nx-python-e2e/jest.config.ts",
-        "runInBand": true,
-        "passWithNoTests": false
-      },
+      "executor": "@nx/vite:test",
+      "options": {},
       "dependsOn": ["nx-python:build"]
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": [],

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

@@ -1,4 +1,86 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`nx-python e2e > shared virtual environment > should create nx-python project with 3 levels with shared virtual environment 1`] = `
+"[tool.nx]
+autoActivate = true
+
+[tool.poetry]
+name = "@proj/source"
+version = "1.0.0"
+description = ""
+authors = [ ]
+license = "Proprietary"
+readme = "README.md"
+
+  [tool.poetry.dependencies]
+  python = ">=3.9,<3.11"
+
+    [tool.poetry.dependencies.app1]
+    path = "app1"
+    develop = true
+
+    [tool.poetry.dependencies.lib1]
+    path = "lib1"
+    develop = true
+
+    [tool.poetry.dependencies.lib2]
+    path = "lib2"
+    develop = true
+
+[tool.poetry.group.dev.dependencies]
+autopep8 = "2.0.2"
+flake8 = "6.0.0"
+pytest = "7.3.1"
+pytest-sugar = "0.9.7"
+pytest-cov = "4.1.0"
+pytest-html = "3.2.0"
+
+[build-system]
+requires = [ "poetry-core==1.1.0" ]
+build-backend = "poetry.core.masonry.api"
+"
+`;
+
+exports[`nx-python e2e > shared virtual environment > should create one nx-python project, migrate to shared venv and add 3 levels 1`] = `
+"[tool.nx]
+autoActivate = true
+
+[tool.poetry]
+name = "@proj/source"
+version = "1.0.0"
+description = ""
+authors = [ ]
+license = "Proprietary"
+readme = "README.md"
+
+  [tool.poetry.dependencies]
+  python = ">=3.9,<3.11"
+
+    [tool.poetry.dependencies.app1]
+    path = "app1"
+    develop = true
+
+    [tool.poetry.dependencies.lib1]
+    path = "lib1"
+    develop = true
+
+    [tool.poetry.dependencies.lib2]
+    path = "lib2"
+    develop = true
+
+[tool.poetry.group.dev.dependencies]
+autopep8 = "2.0.2"
+flake8 = "6.0.0"
+pytest = "7.3.1"
+pytest-sugar = "0.9.7"
+pytest-cov = "4.1.0"
+pytest-html = "3.2.0"
+
+[build-system]
+requires = [ "poetry-core==1.1.0" ]
+build-backend = "poetry.core.masonry.api"
+"
+`;
 
 exports[`nx-python e2e shared virtual environment should create nx-python project with 3 levels with shared virtual environment 1`] = `
 "[tool.nx]