Merge pull request #3700 from github/koesie10/upgrade-octokit

Upgrade Octokit packages

Author: koesie10

extensions/ql-vscode/package-lock.json

@@ -1968,9 +1968,9 @@
   },
   "dependencies": {
     "@floating-ui/react": "^0.26.12",
-    "@octokit/plugin-retry": "^6.0.1",
-    "@octokit/plugin-throttling": "^8.0.0",
-    "@octokit/rest": "^20.0.2",
+    "@octokit/plugin-retry": "^7.1.1",
+    "@octokit/plugin-throttling": "^9.3.1",
+    "@octokit/rest": "^21.0.2",
     "@vscode/codicons": "^0.0.36",
     "@vscode/debugadapter": "^1.59.0",
     "@vscode/debugprotocol": "^1.65.0",

extensions/ql-vscode/package.json

@@ -1,4 +1,5 @@
 import type { Config } from "jest";
+import { transformIgnorePatterns } from "../../test/jest-config";
 
 /*
  * For a detailed explanation regarding each configuration property and type check, visit:
@@ -184,10 +185,7 @@ const config: Config = {
   },
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-  transformIgnorePatterns: [
-    // These use ES modules, so need to be transformed
-    "node_modules/(?!(?:@vscode/webview-ui-toolkit|@microsoft/.+|exenv-es6|d3|d3-(.*)|internmap|delaunator|robust-predicates)/.*)",
-  ],
+  transformIgnorePatterns,
 
   // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
   // unmockedModulePathPatterns: undefined,

extensions/ql-vscode/src/view/jest.config.ts

@@ -0,0 +1,26 @@
+// These are all the packages that DO need to be transformed. All other packages will be ignored.
+// These pacakges all use ES modules, so need to be transformed
+const transformScopes = ["@microsoft", "@octokit"];
+const transformPackages = [
+  "@vscode/webview-ui-toolkit",
+  "before-after-hook",
+  "d3",
+  "delaunator",
+  "exenv-es6",
+  "internmap",
+  "nanoid",
+  "p-queue",
+  "p-timeout",
+  "robust-predicates",
+  "universal-user-agent",
+];
+const transformWildcards = ["d3-(.*)"];
+const transformPatterns = [
+  ...transformScopes.map((scope) => `${scope}/.+`),
+  ...transformPackages,
+  ...transformWildcards,
+];
+
+export const transformIgnorePatterns = [
+  `node_modules/(?!(?:${transformPatterns.join("|")})/.*)`,
+];

extensions/ql-vscode/test/jest-config.ts

@@ -1,4 +1,5 @@
 import type { Config } from "jest";
+import { transformIgnorePatterns } from "../jest-config";
 
 /*
  * For a detailed explanation regarding each configuration property and type check, visit:
@@ -180,10 +181,7 @@ const config: Config = {
   },
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-  transformIgnorePatterns: [
-    // These use ES modules, so need to be transformed
-    "node_modules/(?!(?:@vscode/webview-ui-toolkit|@microsoft/.+|exenv-es6|nanoid|p-queue|p-timeout)/.*)",
-  ],
+  transformIgnorePatterns,
 
   // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
   // unmockedModulePathPatterns: undefined,

extensions/ql-vscode/test/unit-tests/jest.config.ts

@@ -32,9 +32,6 @@ describe("handleRequestError", () => {
 
   it("returns false when handling an error without response", () => {
     const e = new RequestError("Timeout", 500, {
-      headers: {
-        "Content-Type": "application/json",
-      },
       request: {
         method: "POST",
         url: faker.internet.url(),