Skip to content

Commit ef167d7

Browse files
dschodscho
authored
Merge pull request gitgitgadget#1671 from webstech/esm
ES Modules Support
2 parents 46d6340 + 31464c1 commit ef167d7

36 files changed

+238
-183
lines changed

‎.eslintrc.js renamed to ‎.eslintrc.cjs

File renamed without changes.

‎.github/workflows/build-and-test.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ jobs:
125125
with:
126126
github-token: ${{ env.GGG_TOKEN }}
127127
script: |
128-
const exports = require(`${process.env.GITHUB_WORKSPACE}/gitgitgadget/build/lib/delete-ci-test-branches.js`)
129-
await exports.deleteBranches(github, process.env.GITHUB_REPOSITORY_OWNER, process.env.GGG_REPOSITORY);
128+
const {pathToFileURL} = await import("node:url");
129+
const filePath = pathToFileURL(`${process.env.GITHUB_WORKSPACE}/gitgitgadget/build/lib/delete-ci-test-branches.js`);
130+
const {deleteBranches} = await import(filePath);
131+
await deleteBranches(github, process.env.GITHUB_REPOSITORY_OWNER, process.env.GGG_REPOSITORY);
130132
if: env.GGG_REPOSITORY

‎azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pool:
1313
steps:
1414
- task: NodeTool@0
1515
inputs:
16-
versionSpec: '16.x'
16+
versionSpec: '20.x'
1717
displayName: 'Install Node.js'
1818

1919
- script: |

‎lib/ci-helper.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import * as fs from "fs";
22
import * as util from "util";
3-
import addressparser from "nodemailer/lib/addressparser";
4-
import { ILintError, LintCommit } from "./commit-lint";
5-
import { commitExists, git, emptyTreeName } from "./git";
6-
import { GitNotes } from "./git-notes";
7-
import { GitGitGadget, IGitGitGadgetOptions } from "./gitgitgadget";
8-
import { GitHubGlue, IGitHubUser, IPRComment, IPRCommit, IPullRequestInfo, RequestError } from "./github-glue";
9-
import { toPrettyJSON } from "./json-util";
10-
import { MailArchiveGitHelper } from "./mail-archive-helper";
11-
import { MailCommitMapping } from "./mail-commit-mapping";
12-
import { IMailMetadata } from "./mail-metadata";
13-
import { IPatchSeriesMetadata } from "./patch-series-metadata";
14-
import { IConfig, getConfig } from "./project-config";
15-
import { getPullRequestKeyFromURL, pullRequestKey } from "./pullRequestKey";
3+
import addressparser from "nodemailer/lib/addressparser/index.js";
4+
import { ILintError, LintCommit } from "./commit-lint.js";
5+
import { commitExists, git, emptyTreeName } from "./git.js";
6+
import { GitNotes } from "./git-notes.js";
7+
import { GitGitGadget, IGitGitGadgetOptions } from "./gitgitgadget.js";
8+
import { GitHubGlue, IGitHubUser, IPRComment, IPRCommit, IPullRequestInfo, RequestError } from "./github-glue.js";
9+
import { toPrettyJSON } from "./json-util.js";
10+
import { MailArchiveGitHelper } from "./mail-archive-helper.js";
11+
import { MailCommitMapping } from "./mail-commit-mapping.js";
12+
import { IMailMetadata } from "./mail-metadata.js";
13+
import { IPatchSeriesMetadata } from "./patch-series-metadata.js";
14+
import { IConfig, getConfig } from "./project-config.js";
15+
import { getPullRequestKeyFromURL, pullRequestKey } from "./pullRequestKey.js";
1616

1717
const readFile = util.promisify(fs.readFile);
1818
type CommentFunction = (comment: string) => Promise<void>;

‎lib/commit-lint.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IPRCommit } from "./github-glue";
1+
import { IPRCommit } from "./github-glue.js";
22

33
export interface ILintError {
44
checkFailed: boolean; // true if check failed

‎lib/git-notes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { emptyBlobName, git, revParse } from "./git";
2-
import { fromJSON, toJSON } from "./json-util";
1+
import { emptyBlobName, git, revParse } from "./git.js";
2+
import { fromJSON, toJSON } from "./json-util.js";
33

44
export class GitNotes {
55
public static readonly defaultNotesRef = "refs/notes/gitgitgadget";

‎lib/gitgitgadget-config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IConfig, setConfig } from "./project-config";
1+
import { IConfig, setConfig } from "./project-config.js";
22

33
const defaultConfig: IConfig = {
44
repo: {

‎lib/gitgitgadget.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { isDirectory } from "./fs-util";
2-
import { git, gitConfig } from "./git";
3-
import { GitNotes } from "./git-notes";
4-
import { IGitHubUser, IPullRequestInfo } from "./github-glue";
5-
import { PatchSeries, SendFunction } from "./patch-series";
6-
import { IPatchSeriesMetadata } from "./patch-series-metadata";
7-
import { PatchSeriesOptions } from "./patch-series-options";
8-
import { IConfig, getConfig } from "./project-config";
9-
import { ISMTPOptions, parseHeadersAndSendMail, parseMBox, sendMail } from "./send-mail";
1+
import { isDirectory } from "./fs-util.js";
2+
import { git, gitConfig } from "./git.js";
3+
import { GitNotes } from "./git-notes.js";
4+
import { IGitHubUser, IPullRequestInfo } from "./github-glue.js";
5+
import { PatchSeries, SendFunction } from "./patch-series.js";
6+
import { IPatchSeriesMetadata } from "./patch-series-metadata.js";
7+
import { PatchSeriesOptions } from "./patch-series-options.js";
8+
import { IConfig, getConfig } from "./project-config.js";
9+
import { ISMTPOptions, parseHeadersAndSendMail, parseMBox, sendMail } from "./send-mail.js";
1010

1111
export interface IGitGitGadgetOptions {
1212
allowedUsers: string[];

‎lib/github-glue.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import addressparser from "nodemailer/lib/addressparser";
1+
import addressparser from "nodemailer/lib/addressparser/index.js";
22
import { Octokit } from "@octokit/rest";
3-
import { git, gitConfig } from "./git";
4-
import { getPullRequestKey, pullRequestKeyInfo, pullRequestKey } from "./pullRequestKey";
3+
import { git, gitConfig } from "./git.js";
4+
import { getPullRequestKey, pullRequestKeyInfo, pullRequestKey } from "./pullRequestKey.js";
55
export { RequestError } from "@octokit/request-error";
66

77
export interface IPullRequestInfo {

‎lib/mail-archive-helper.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { createHash } from "crypto";
2-
import { git, revParse } from "./git";
3-
import { GitNotes } from "./git-notes";
4-
import { IGitGitGadgetOptions } from "./gitgitgadget";
5-
import { GitHubGlue } from "./github-glue";
6-
import { IMailMetadata } from "./mail-metadata";
7-
import { IPatchSeriesMetadata } from "./patch-series-metadata";
8-
import { IConfig, getConfig } from "./project-config";
9-
import { getPullRequestKey } from "./pullRequestKey";
10-
import { IParsedMBox, parseMBox, parseMBoxMessageIDAndReferences } from "./send-mail";
11-
import { SousChef } from "./sous-chef";
2+
import { git, revParse } from "./git.js";
3+
import { GitNotes } from "./git-notes.js";
4+
import { IGitGitGadgetOptions } from "./gitgitgadget.js";
5+
import { GitHubGlue } from "./github-glue.js";
6+
import { IMailMetadata } from "./mail-metadata.js";
7+
import { IPatchSeriesMetadata } from "./patch-series-metadata.js";
8+
import { IConfig, getConfig } from "./project-config.js";
9+
import { getPullRequestKey } from "./pullRequestKey.js";
10+
import { IParsedMBox, parseMBox, parseMBoxMessageIDAndReferences } from "./send-mail.js";
11+
import { SousChef } from "./sous-chef.js";
1212

1313
export const stateKey = "[email protected] <-> GitGitGadget";
1414
const replyToThisURL = "https://github.com/gitgitgadget/gitgitgadget/wiki/ReplyToThis";

0 commit comments

Comments
 (0)