maint: modernize devDependencies (#287)

wolfy1339 · web-flow · commit 7752bbeabc49 · 2025-01-01T09:44:56.000-05:00
* maint: modernize devDependencies * Switch to vitest * Switch to fetch-mock@11 from custom fork * Remove semantic-release from devDeps * maint: remove vitest ui * style: prettier * test: update inline snapshots * Revert "test: update inline snapshots" This reverts commit b819a31. * fix merge
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "lint": "prettier --check '{src,test,scripts}/**/*' README.md package.json",
     "lint:fix": "prettier --write '{src,test,scripts}/**/*' README.md package.json",
     "pretest": "npm run -s lint",
-    "test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest --coverage"
+    "test": "vitest run --coverage"
   },
   "repository": "https://github.com/octokit/oauth-methods.js",
   "keywords": [
@@ -28,53 +28,17 @@
   },
   "devDependencies": {
     "@octokit/tsconfig": "^3.0.0",
-    "@types/jest": "^29.0.0",
     "@types/node": "^22.0.0",
+    "@vitest/coverage-v8": "^2.0.0",
     "esbuild": "^0.24.0",
-    "fetch-mock": "npm:@gr2m/fetch-mock@9.11.0-pull-request-644.1",
+    "fetch-mock": "^11.0.0",
     "glob": "^11.0.0",
-    "jest": "^29.0.0",
     "prettier": "3.4.2",
-    "semantic-release": "^24.0.0",
     "semantic-release-plugin-update-version-in-files": "^1.1.0",
-    "ts-jest": "^29.0.0",
-    "typescript": "^5.0.0"
-  },
-  "jest": {
-    "extensionsToTreatAsEsm": [
-      ".ts"
-    ],
-    "transform": {
-      "^.+\\.(ts|tsx)$": [
-        "ts-jest",
-        {
-          "tsconfig": "test/tsconfig.test.json",
-          "useESM": true
-        }
-      ]
-    },
-    "coverageThreshold": {
-      "global": {
-        "statements": 100,
-        "branches": 100,
-        "functions": 100,
-        "lines": 100
-      }
-    },
-    "moduleNameMapper": {
-      "^(.+)\\.jsx?$": "$1"
-    }
+    "typescript": "^5.0.0",
+    "vitest": "^2.0.0"
   },
   "release": {
-    "branches": [
-      "+([0-9]).x",
-      "main",
-      "next",
-      {
-        "name": "beta",
-        "prerelease": true
-      }
-    ],
     "plugins": [
       "@semantic-release/commit-analyzer",
       "@semantic-release/release-notes-generator",
diff --git a/src/check-token.ts b/src/check-token.ts
@@ -43,10 +43,9 @@ export async function checkToken(
 export async function checkToken(
   options: CheckTokenOAuthAppOptions | CheckTokenGitHubAppOptions,
 ): Promise<any> {
-  const request =
-    options.request ||
-    /* istanbul ignore next: we always pass a custom request in tests */
-    defaultRequest;
+  /* v8 ignore start: we always pass a custom request in tests */
+  const request = options.request || defaultRequest;
+  /* v8 ignore stop */
 
   const response = await request("POST /applications/{client_id}/token", {
     headers: {
diff --git a/src/create-device-code.ts b/src/create-device-code.ts
@@ -26,10 +26,9 @@ export type CreateDeviceCodeDeviceTokenResponse = OctokitResponse<{
 export async function createDeviceCode(
   options: CreateDeviceCodeOAuthAppOptions | CreateDeviceCodeGitHubAppOptions,
 ): Promise<CreateDeviceCodeDeviceTokenResponse> {
-  const request =
-    options.request ||
-    /* istanbul ignore next: we always pass a custom request in tests */
-    defaultRequest;
+  /* v8 ignore start: we always pass a custom request in tests */
+  const request = options.request || defaultRequest;
+  /* v8 ignore stop */
 
   const parameters: Record<string, unknown> = {
     client_id: options.clientId,
diff --git a/src/delete-authorization.ts b/src/delete-authorization.ts
@@ -30,10 +30,9 @@ export async function deleteAuthorization(
     | DeleteAuthorizationOAuthAppOptions
     | DeleteAuthorizationGitHubAppOptions,
 ): Promise<any> {
-  const request =
-    options.request ||
-    /* istanbul ignore next: we always pass a custom request in tests */
-    defaultRequest;
+  /* v8 ignore start: we always pass a custom request in tests */
+  const request = options.request || defaultRequest;
+  /* v8 ignore stop */
 
   const auth = btoa(`${options.clientId}:${options.clientSecret}`);
   return request(
diff --git a/src/delete-token.ts b/src/delete-token.ts
@@ -29,10 +29,9 @@ export async function deleteToken(
 export async function deleteToken(
   options: DeleteTokenOAuthAppOptions | DeleteTokenGitHubAppOptions,
 ): Promise<any> {
-  const request =
-    options.request ||
-    /* istanbul ignore next: we always pass a custom request in tests */
-    defaultRequest;
+  /* v8 ignore start: we always pass a custom request in tests */
+  const request = options.request || defaultRequest;
+  /* v8 ignore stop */
 
   const auth = btoa(`${options.clientId}:${options.clientSecret}`);
   return request(
diff --git a/src/exchange-device-code.ts b/src/exchange-device-code.ts
@@ -118,10 +118,9 @@ export async function exchangeDeviceCode(
     | ExchangeDeviceCodeOAuthAppOptionsWithoutClientSecret
     | ExchangeDeviceCodeGitHubAppOptionsWithoutClientSecret,
 ): Promise<any> {
-  const request =
-    options.request ||
-    /* istanbul ignore next: we always pass a custom request in tests */
-    defaultRequest;
+  /* v8 ignore start: we always pass a custom request in tests */
+  const request = options.request || defaultRequest;
+  /* v8 ignore stop */
 
   const response = await oauthRequest(
     request,
diff --git a/src/exchange-web-flow-code.ts b/src/exchange-web-flow-code.ts
@@ -62,10 +62,9 @@ export async function exchangeWebFlowCode(
     | ExchangeWebFlowCodeOAuthAppOptions
     | ExchangeWebFlowCodeGitHubAppOptions,
 ): Promise<any> {
-  const request =
-    options.request ||
-    /* istanbul ignore next: we always pass a custom request in tests */
-    defaultRequest;
+  /* v8 ignore start: we always pass a custom request in tests */
+  const request = options.request || defaultRequest;
+  /* v8 ignore stop */
 
   const response = await oauthRequest(
     request,
diff --git a/src/refresh-token.ts b/src/refresh-token.ts
@@ -23,10 +23,9 @@ export type RefreshTokenResponse =
 export async function refreshToken(
   options: RefreshTokenOptions,
 ): Promise<RefreshTokenResponse> {
-  const request =
-    options.request ||
-    /* istanbul ignore next: we always pass a custom request in tests */
-    defaultRequest;
+  /* v8 ignore start: we always pass a custom request in tests */
+  const request = options.request || defaultRequest;
+  /* v8 ignore stop */
 
   const response = await oauthRequest(
     request,
diff --git a/src/reset-token.ts b/src/reset-token.ts
@@ -43,10 +43,9 @@ export async function resetToken(
 export async function resetToken(
   options: ResetTokenOAuthAppOptions | ResetTokenGitHubAppOptions,
 ): Promise<any> {
-  const request =
-    options.request ||
-    /* istanbul ignore next: we always pass a custom request in tests */
-    defaultRequest;
+  /* v8 ignore start: we always pass a custom request in tests */
+  const request = options.request || defaultRequest;
+  /* v8 ignore stop */
 
   const auth = btoa(`${options.clientId}:${options.clientSecret}`);
   const response = await request(
diff --git a/src/scope-token.ts b/src/scope-token.ts
@@ -54,10 +54,9 @@ export async function scopeToken(
     ...requestOptions
   } = options;
 
-  const request =
-    optionsRequest ||
-    /* istanbul ignore next: we always pass a custom request in tests */
-    defaultRequest;
+  /* v8 ignore start: we always pass a custom request in tests */
+  const request = options.request || defaultRequest;
+  /* v8 ignore stop */
 
   const response = await request(
     "POST /applications/{client_id}/token/scoped",
diff --git a/test/check-token.test.ts b/test/check-token.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from "vitest";
 import fetchMock from "fetch-mock";
 import { request } from "@octokit/request";
 import { checkToken } from "../src/index.js";
diff --git a/test/create-device-code.test.ts b/test/create-device-code.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from "vitest";
 import fetchMock from "fetch-mock";
 import { request } from "@octokit/request";
 import { createDeviceCode } from "../src/index.js";
diff --git a/test/delete-authorization.test.ts b/test/delete-authorization.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from "vitest";
 import fetchMock from "fetch-mock";
 import { request } from "@octokit/request";
 import { deleteAuthorization } from "../src/index.js";
diff --git a/test/delete-token.test.ts b/test/delete-token.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from "vitest";
 import fetchMock from "fetch-mock";
 import { request } from "@octokit/request";
 import { deleteToken } from "../src/index.js";
diff --git a/test/exchange-device-code.test.ts b/test/exchange-device-code.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from "vitest";
 import fetchMock from "fetch-mock";
 import { request } from "@octokit/request";
 import { exchangeDeviceCode } from "../src/index.js";
@@ -135,7 +136,7 @@ describe("exchangeDeviceCode()", () => {
       },
     );
 
-    expect(
+    await expect(
       async () =>
         await exchangeDeviceCode({
           clientType: "oauth-app",
diff --git a/test/exchange-web-flow-code.test.ts b/test/exchange-web-flow-code.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from "vitest";
 import fetchMock from "fetch-mock";
 import { request } from "@octokit/request";
 import { exchangeWebFlowCode } from "../src/index.js";
diff --git a/test/get-web-flow-authorization-url.test.ts b/test/get-web-flow-authorization-url.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from "vitest";
 import { request } from "@octokit/request";
 import { getWebFlowAuthorizationUrl } from "../src/index.js";
 
diff --git a/test/refresh-token.test.ts b/test/refresh-token.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from "vitest";
 import fetchMock from "fetch-mock";
 import { request } from "@octokit/request";
 import { refreshToken } from "../src/index.js";
diff --git a/test/reset-token.test.ts b/test/reset-token.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from "vitest";
 import fetchMock from "fetch-mock";
 import { request } from "@octokit/request";
 import { resetToken } from "../src/index.js";
diff --git a/test/scope-token.test.ts b/test/scope-token.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from "vitest";
 import fetchMock from "fetch-mock";
 import { request } from "@octokit/request";
 import { scopeToken } from "../src/index.js";
diff --git a/test/smoke.test.ts b/test/smoke.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from "vitest";
 import {
   getWebFlowAuthorizationUrl,
   exchangeWebFlowCode,
diff --git a/vite.config.js b/vite.config.js
@@ -0,0 +1,13 @@
+import { defineConfig } from "vite";
+
+export default defineConfig({
+  test: {
+    coverage: {
+      include: ["src/**/*.ts"],
+      reporter: ["html"],
+      thresholds: {
+        100: true,
+      },
+    },
+  },
+});
