Skip to content

Commit 05198aa

Browse files
committed
Move from CommonJS to standard JS modules
1 parent 509ae0a commit 05198aa

29 files changed

+134
-161
lines changed

__tests__/compose-tweet.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const mockCommits = [
7777
}
7878
];
7979

80-
import composeTweet from "../lib/compose-tweet.js";
80+
import composeTweet from "../lib/compose-tweet.mjs";
8181

8282
for (const mockCommit of mockCommits) {
8383
test(mockCommit.name, t => {

__tests__/get-user-status.mjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ let mockOrgMemberships = new Map(); // GitHub user ID -> array of GitHub orgs
55

66
let getUserStatus;
77
before(async () => {
8-
mock.module("../lib/helpers/json-github-database.js", {
9-
defaultExport: {
8+
mock.module("../lib/helpers/json-github-database.mjs", {
9+
namedExports: {
1010
get(type) {
1111
return {
1212
sha: "doesn't matter",
@@ -16,8 +16,8 @@ before(async () => {
1616
}
1717
});
1818

19-
mock.module("../lib/helpers/github.js", {
20-
defaultExport: {
19+
mock.module("../lib/helpers/github.mjs", {
20+
namedExports: {
2121
api: {
2222
orgs: {
2323
checkPublicMembershipForUser({ org, username }) {
@@ -32,7 +32,7 @@ before(async () => {
3232
}
3333
});
3434

35-
getUserStatus = (await import("../lib/get-user-status.js")).default;
35+
getUserStatus = (await import("../lib/get-user-status.mjs")).default;
3636
});
3737

3838
function individualData(workstreams, verified, { id = "johndoetw" } = {}) {

__tests__/helpers/workstreams.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ before(async () => {
3030
}
3131
});
3232

33-
workstreams = await import("../../lib/helpers/workstreams.js");
33+
workstreams = await import("../../lib/helpers/workstreams.mjs");
3434
});
3535

3636
test("repos", t => {

__tests__/integration.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ before(async () => {
88
defaultExport: (await import("../private-config.sample.json", { with: { type: "json" } })).default
99
});
1010

11-
server = (await import("../lib/app.js")).default;
11+
server = (await import("../lib/app.mjs")).default;
1212
});
1313

1414
after(() => {

__tests__/pr-webhook.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import fromMain from "./__fixtures__/pr-from-main-hook-payload.json" with { type
66

77
let mockCreateStatus, mockPRGet, prWebhook;
88
before(async () => {
9-
mock.module("../lib/get-user-status.js", {
9+
mock.module("../lib/get-user-status.mjs", {
1010
defaultExport: () => {
1111
return {
1212
statusField1: "status value 1",
@@ -15,8 +15,8 @@ before(async () => {
1515
}
1616
});
1717

18-
mock.module("../lib/helpers/github.js", {
19-
defaultExport: {
18+
mock.module("../lib/helpers/github.mjs", {
19+
namedExports: {
2020
api: {
2121
repos: {
2222
get createCommitStatus() {
@@ -32,7 +32,7 @@ before(async () => {
3232
}
3333
});
3434

35-
prWebhook = (await import("../lib/pr-webhook.js")).default;
35+
prWebhook = (await import("../lib/pr-webhook.mjs")).default;
3636
});
3737

3838
beforeEach(() => {

__tests__/process-agreement.mjs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,14 @@ const { BadRequest } = httpErrors;
55
let submitAgreement;
66
before(async () => {
77
// Fake the UUID generator so it is deterministic for snapshot testing.
8-
mock.module("crypto", {
9-
namedExports: {
10-
randomUUID() {
11-
return "1d8ab899-4d91-48b8-acfa-bf9cde5ad909";
12-
}
13-
}
8+
mock.method(crypto, "randomUUID", () => {
9+
return "1d8ab899-4d91-48b8-acfa-bf9cde5ad909";
1410
});
1511

1612
// Mock Date.now() to return 0 for deterministic testing
1713
mock.timers.enable({ apis: ["Date"], now: 0 });
1814

19-
submitAgreement = (await import("../lib/process-agreement.js")).default;
15+
submitAgreement = (await import("../lib/process-agreement.mjs")).default;
2016
});
2117

2218
// General

__tests__/server-infra/validate-github-webhook.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ before(async () => {
66
defaultExport: { webhook: { secret: "hunter2" } }
77
});
88

9-
validateGitHubWebhook = (await import("../../lib/server-infra/validate-github-webhook.js")).default;
9+
validateGitHubWebhook = (await import("../../lib/server-infra/validate-github-webhook.mjs")).default;
1010
});
1111

1212
[

__tests__/tweet-webhook.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ before(async () => {
3636
}
3737
});
3838

39-
tweetWebhook = (await import("../lib/tweet-webhook.js")).default;
39+
tweetWebhook = (await import("../lib/tweet-webhook.mjs")).default;
4040
});
4141

4242
beforeEach(() => {

__tests__/update-pr.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import merged from "./__fixtures__/merged-pr.json" with { type: "json" };
88

99
let mockCreateStatus, mockGet, updatePR;
1010
before(async () => {
11-
mock.module("../lib/get-user-status.js", {
11+
mock.module("../lib/get-user-status.mjs", {
1212
defaultExport: () => {
1313
return {
1414
statusField1: "status value 1",
@@ -17,8 +17,8 @@ before(async () => {
1717
}
1818
});
1919

20-
mock.module("../lib/helpers/github.js", {
21-
defaultExport: {
20+
mock.module("../lib/helpers/github.mjs", {
21+
namedExports: {
2222
api: {
2323
pulls: {
2424
get get() {
@@ -34,7 +34,7 @@ before(async () => {
3434
}
3535
});
3636

37-
updatePR = (await import("../lib/update-pr.js")).default;
37+
updatePR = (await import("../lib/update-pr.mjs")).default;
3838
});
3939

4040
beforeEach(() => {

eslint.config.mjs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ export default [
55
{
66
ignores: ["coverage/**/*"]
77
},
8-
{
9-
files: ["**/*.js"],
10-
languageOptions: {
11-
sourceType: "commonjs",
12-
globals: globals.node
13-
}
14-
},
158
{
169
files: ["**/*.mjs"],
1710
languageOptions: {

0 commit comments

Comments
 (0)