chore: upgrade to nx 17 1 and others (#29)

naxodev · Nov 19, 2023 · 2018689 · 2018689
1 parent 783726b
commit 2018689
Show file tree

Hide file tree

Showing 12 changed files with 727 additions and 522 deletions.
diff --git a/e2e/examples/cloudflare-next-app/project.json b/e2e/examples/cloudflare-next-app/project.json
@@ -46,14 +46,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "e2e/examples/cloudflare-next-app/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "e2e/examples/cloudflare-next-app/jest.config.ts"
       }
     },
     "lint": {

diff --git a/e2e/plugins-nx-cloudflare-e2e/project.json b/e2e/plugins-nx-cloudflare-e2e/project.json
@@ -9,15 +9,8 @@
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "e2e/plugins-nx-cloudflare-e2e/jest.config.ts",
-        "passWithNoTests": true,
         "runInBand": true
       },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
-      },
       "dependsOn": ["^build"]
     },
     "lint": {

diff --git a/nx.json b/nx.json
@@ -15,12 +15,18 @@
       ],
       "cache": true
     },
-    "test": {
+    "@nx/jest:jest": {
+      "cache": true,
       "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
-      "cache": true
-    },
-    "e2e": {
-      "cache": true
+      "options": {
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
     }
   },
   "namedInputs": {

diff --git a/package.json b/package.json
@@ -12,19 +12,19 @@
     "@commitlint/config-conventional": "^17.8.1",
     "@eslint/eslintrc": "^2.1.2",
     "@eslint/js": "^8.52.0",
-    "@jscutlery/semver": "^3.3.0",
-    "@nx/angular": "17.0.1",
-    "@nx/devkit": "17.0.1",
-    "@nx/eslint-plugin": "17.0.1",
-    "@nx/jest": "17.0.1",
-    "@nx/js": "17.0.1",
-    "@nx/next": "17.0.1",
-    "@nx/node": "17.0.1",
-    "@nx/plugin": "17.0.1",
-    "@nx/react": "17.0.1",
-    "@nx/vite": "17.0.1",
-    "@nx/web": "17.0.1",
-    "@nx/workspace": "17.0.1",
+    "@jscutlery/semver": "^3.4.1",
+    "@nx/angular": "17.1.2",
+    "@nx/devkit": "17.1.2",
+    "@nx/eslint-plugin": "17.1.2",
+    "@nx/jest": "17.1.2",
+    "@nx/js": "17.1.2",
+    "@nx/next": "17.1.2",
+    "@nx/node": "17.1.2",
+    "@nx/plugin": "17.1.2",
+    "@nx/react": "17.1.2",
+    "@nx/vite": "17.1.2",
+    "@nx/web": "17.1.2",
+    "@nx/workspace": "17.1.2",
     "@svgr/webpack": "^8.1.0",
     "@swc-node/register": "1.6.8",
     "@swc/cli": "~0.1.62",
@@ -34,14 +34,14 @@
     "@types/fs-extra": "^11.0.3",
     "@types/jest": "^29.5.6",
     "@types/node": "18.14.2",
-    "@types/react": "18.2.24",
-    "@types/react-dom": "18.2.14",
+    "@types/react": "18.2.37",
+    "@types/react-dom": "18.2.15",
     "@types/semver": "^7.5.4",
-    "@typescript-eslint/eslint-plugin": "5.62.0",
-    "@typescript-eslint/parser": "5.62.0",
+    "@typescript-eslint/eslint-plugin": "6.11.0",
+    "@typescript-eslint/parser": "6.11.0",
     "babel-jest": "^29.4.1",
     "chalk": "^4.1.2",
-    "cli-spinners": "^2.9.0",
+    "cli-spinners": "^2.9.1",
     "copy-webpack-plugin": "^11.0.0",
     "dotenv": "^16.3.1",
     "eslint": "8.46.0",
@@ -53,25 +53,25 @@
     "eslint-plugin-react-hooks": "4.6.0",
     "fs-extra": "^11.1.1",
     "globals": "^13.21.0",
-    "husky": "^8.0.0",
+    "husky": "^8.0.3",
     "jest": "^29.4.1",
     "jest-environment-jsdom": "^29.4.1",
     "kill-port": "^2.0.1",
-    "next": "^13.5.4",
-    "ngx-deploy-npm": "^7.0.1",
-    "nx": "17.0.1",
+    "next": "^13.5.6",
+    "ngx-deploy-npm": "^7.1.0",
+    "nx": "17.1.2",
     "prettier": "^2.6.2",
     "sass": "1.62.1",
     "tcp-port-used": "^1.0.2",
     "tree-kill": "^1.2.2",
     "ts-jest": "^29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "~5.1.3",
+    "typescript": "5.2.2",
     "url-loader": "^4.1.1",
     "verdaccio": "^5.27.0",
     "webpack": "^5.89.0",
-    "wrangler": "^3.14.0",
-    "@nx/eslint": "17.0.1"
+    "wrangler": "^3.16.0",
+    "@nx/eslint": "17.1.2"
   },
   "dependencies": {
     "react": "18.2.0",

diff --git a/packages/plugins/nx-cloudflare/package.json b/packages/plugins/nx-cloudflare/package.json
@@ -37,7 +37,7 @@
   "peerDependencies": {
     "next": "^13.4.19",
     "@nx/js": "^17.0.0",
-    "typescript": "~5.1.3",
+    "typescript": "5.2.2",
     "webpack": "^5.88.2",
     "nx": "^17.0.0",
     "@nx/workspace": "^17.0.0",

diff --git a/packages/plugins/nx-cloudflare/project.json b/packages/plugins/nx-cloudflare/project.json
@@ -52,14 +52,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "packages/plugins/nx-cloudflare/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "packages/plugins/nx-cloudflare/jest.config.ts"
       }
     },
     "version": {

diff --git a/...ges/plugins/nx-cloudflare/src/generators/application/files/fetch-handler/index.ts__tmpl__ b/...ges/plugins/nx-cloudflare/src/generators/application/files/fetch-handler/index.ts__tmpl__
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Welcome to Cloudflare Workers! This is your first worker.
  *

diff --git a/packages/plugins/nx-cloudflare/src/generators/application/files/hono/index.test.ts__tmpl__ b/packages/plugins/nx-cloudflare/src/generators/application/files/hono/index.test.ts__tmpl__
@@ -2,6 +2,8 @@ import app from '.'
 <%-vitestImports %>
 
 describe('Test the application', () => {
+  beforeAll(() => {});
+  afterAll(() => {});
   it('Should return 200 response', async () => {
     const res = await app.request('http://localhost/')
     expect(res.status).toBe(200)

diff --git a/...plugins/nx-cloudflare/src/generators/application/files/scheduled-handler/index.ts__tmpl__ b/...plugins/nx-cloudflare/src/generators/application/files/scheduled-handler/index.ts__tmpl__
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Welcome to Cloudflare Workers! This is your first scheduled worker.
  *

diff --git a/packages/plugins/nx-cloudflare/src/utils/versions.ts b/packages/plugins/nx-cloudflare/src/utils/versions.ts
@@ -1,6 +1,5 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
 export const nxCloudflareVersion = require('../../package.json').version;
 
-export const wranglerVersion = '^3.14.0';
+export const wranglerVersion = '^3.16.0';
 export const cloudflareWorkersTypeVersions = '^4.20231025.0';
-export const honoVersion = '^3.8.3';
+export const honoVersion = '^3.10.1';