Merge branch 'main' into remove-sha1

Uzlopak · web-flow · commit 57cb8bf49a5f · 2023-11-29T13:46:48.000+01:00
diff --git a/.github/workflows/immediate-response.yml b/.github/workflows/immediate-response.yml
@@ -11,7 +11,7 @@ on:
       - opened
 jobs:
   respond-to-issue:
-    if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' }}
+    if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' && github.actor != 'githubactions[bot]' && github.actor != 'octokitbot' }}
     runs-on: ubuntu-latest
     steps:
       - name: Determine issue or PR number
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -60,7 +60,11 @@
     "testPathIgnorePatterns": [
       "<rootDir>/node_modules/",
       "<rootDir>/test/deno/"
-    ]
+    ],
+    "testEnvironment": "node",
+    "moduleNameMapper": {
+      "^(.+)\\.jsx?$": "$1"
+    }
   },
   "release": {
     "branches": [
diff --git a/scripts/build.mjs b/scripts/build.mjs
@@ -1,5 +1,5 @@
 import esbuild from "esbuild";
-import { copyFile, readFile, writeFile, rm } from "fs/promises";
+import { copyFile, readFile, writeFile, rm } from "node:fs/promises";
 import { glob } from "glob";
 
 const sharedOptions = {
diff --git a/src/index.ts b/src/index.ts
@@ -1,5 +1,5 @@
-export { sign } from "./node/sign";
-import { verify } from "./node/verify";
+export { sign } from "./node/sign.js";
+import { verify } from "./node/verify.js";
 export { verify };
 
 export function verifyWithFallback(
diff --git a/src/node/sign.ts b/src/node/sign.ts
@@ -1,5 +1,5 @@
 import { createHmac } from "crypto";
-import { VERSION } from "../version";
+import { VERSION } from "../version.js";
 
 export function sign(secret: string | Buffer, payload: string): string {
   if (!secret || !payload) {
diff --git a/src/node/verify.ts b/src/node/verify.ts
@@ -1,7 +1,7 @@
 import { createHmac, timingSafeEqual } from "crypto";
 import { Buffer } from "buffer";
 
-import { VERSION } from "../version";
+import { VERSION } from "../version.js";
 import { isValidSignaturePrefix } from "../utils";
 
 export function verify(
diff --git a/test/browser-test.js b/test/browser-test.js
@@ -1,6 +1,6 @@
-const { strictEqual } = require("assert");
+const { strictEqual } = require("node:assert");
 
-const { readFile } = require("fs").promises;
+const { readFile } = require("node:fs/promises");
 const puppeteer = require("puppeteer");
 
 runTests();
diff --git a/test/sign.test.ts b/test/sign.test.ts
@@ -1,4 +1,4 @@
-import { sign } from "../src";
+import { sign } from "../src/index.ts";
 
 const eventPayload = {
   foo: "bar",
diff --git a/test/tsconfig.test.json b/test/tsconfig.test.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "emitDeclarationOnly": false,
     "noEmit": true,
-    "verbatimModuleSyntax": false
+    "verbatimModuleSyntax": false,
+    "allowImportingTsExtensions": true
   },
   "include": ["src/**/*"]
 }
diff --git a/test/verify.test.ts b/test/verify.test.ts
@@ -1,4 +1,4 @@
-import { verify, verifyWithFallback } from "../src";
+import { verify, verifyWithFallback } from "../src/index.ts";
 
 function toNormalizedJsonString(payload: object) {
   // GitHub sends its JSON with an indentation of 2 spaces and a line break at the end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { sign } from "../src";`
	`1`	`+import { sign } from "../src/index.ts";`
`2`	`2`
`3`	`3`	`const eventPayload = {`
`4`	`4`	`foo: "bar",`