Merge pull request #9 from JacobLinCool/fix-8

fix: update the regexp to match location

Author: JacobLinCool

.github/workflows/test.yml

@@ -4,7 +4,7 @@ on:
     push:
         branches:
             - main
-    pull_request_target:
+    pull_request:
         branches:
             - main
     workflow_dispatch:
@@ -36,5 +36,10 @@ jobs:
             - name: Build
               run: pnpm i && pnpm build
 
-            - name: Test
+            - name: Test (w/ service)
+              run: sudo -E $PNPM_HOME/pnpm test
+              if: matrix.os != 'windows-latest'
+
+            - name: Test (w/o service)
               run: pnpm test
+              if: matrix.os == 'windows-latest'

jest.config.cjs

@@ -6,7 +6,7 @@
     "types": "./lib/lib.d.ts",
     "bin": "./lib/cloudflared.js",
     "scripts": {
-        "test": "jest --coverage",
+        "test": "vitest",
         "dev": "tsup --watch",
         "build": "tsup",
         "docs": "typedoc ./src/lib.ts",
@@ -30,19 +30,17 @@
         "scripts"
     ],
     "devDependencies": {
-        "@types/jest": "^28.1.6",
         "@types/node": "^18.0.6",
         "@typescript-eslint/eslint-plugin": "^5.30.7",
         "@typescript-eslint/parser": "^5.30.7",
         "cloudflared": "workspace:*",
         "eslint": "^8.20.0",
         "eslint-config-prettier": "^8.5.0",
-        "jest": "^28.1.3",
         "prettier": "^2.7.1",
-        "ts-jest": "^28.0.7",
         "tsup": "^6.1.3",
         "typedoc": "^0.23.8",
-        "typescript": "^4.7.4"
+        "typescript": "^4.7.4",
+        "vitest": "^0.34.4"
     },
     "homepage": "https://github.com/JacobLinCool/node-cloudflared#readme",
     "repository": {