Skip to content

Commit a6e9186

Browse files
committed
refactor: use full relative paths
This should help bring ESM compatibility in the future
1 parent 6ead0b7 commit a6e9186

15 files changed

+30
-27
lines changed

src/event-handler/index.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { createLogger } from "../createLogger";
1+
import { createLogger } from "../createLogger.js";
22
import type {
33
EmitterWebhookEvent,
44
EmitterWebhookEventName,
@@ -11,9 +11,9 @@ import {
1111
receiverOn as on,
1212
receiverOnAny as onAny,
1313
receiverOnError as onError,
14-
} from "./on";
15-
import { receiverHandle as receive } from "./receive";
16-
import { removeListener } from "./remove-listener";
14+
} from "./on.js";
15+
import { receiverHandle as receive } from "./receive.js";
16+
import { removeListener } from "./remove-listener.js";
1717

1818
interface EventHandler<TTransformed> {
1919
on<E extends EmitterWebhookEventName>(

src/event-handler/on.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { emitterEventNames } from "../generated/webhook-names";
1+
import { emitterEventNames } from "../generated/webhook-names.js";
22
import type {
33
EmitterWebhookEvent,
44
EmitterWebhookEventName,

src/index.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { createLogger } from "./createLogger";
2-
import { createEventHandler } from "./event-handler/index";
1+
import { createLogger } from "./createLogger.js";
2+
import { createEventHandler } from "./event-handler/index.js";
33
import { sign, verify } from "@octokit/webhooks-methods";
4-
import { verifyAndReceive } from "./verify-and-receive";
4+
import { verifyAndReceive } from "./verify-and-receive.js";
55
import type {
66
EmitterWebhookEvent,
77
EmitterWebhookEventName,
@@ -12,10 +12,10 @@ import type {
1212
WebhookError,
1313
WebhookEventHandlerError,
1414
EmitterWebhookEventWithStringPayloadAndSignature,
15-
} from "./types";
15+
} from "./types.ts";
1616

17-
export { createNodeMiddleware } from "./middleware/node/index";
18-
export { emitterEventNames } from "./generated/webhook-names";
17+
export { createNodeMiddleware } from "./middleware/node/index.js";
18+
export { emitterEventNames } from "./generated/webhook-names.js";
1919

2020
// U holds the return value of `transform` function in Options
2121
class Webhooks<TTransformed = unknown> {

src/middleware/node/index.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { createLogger } from "../../createLogger";
2-
import type { Webhooks } from "../../index";
3-
import { middleware } from "./middleware";
4-
import type { MiddlewareOptions } from "./types";
1+
import { createLogger } from "../../createLogger.js";
2+
import type { Webhooks } from "../../index.js";
3+
import { middleware } from "./middleware.js";
4+
import type { MiddlewareOptions } from "./types.ts";
55

66
export function createNodeMiddleware(
77
webhooks: Webhooks,

src/middleware/node/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { Logger } from "../../createLogger";
1+
import type { Logger } from "../../createLogger.js";
22

33
export type MiddlewareOptions = {
44
path?: string;

test/integration/event-handler-test.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
import { createEventHandler } from "../../src/event-handler";
1+
import { createEventHandler } from "../../src/event-handler/index.js";
22
import { EmitterWebhookEvent, WebhookEventHandlerError } from "../../src/types";
3-
import { installationCreatedPayload, pushEventPayload } from "../fixtures";
3+
import {
4+
installationCreatedPayload,
5+
pushEventPayload,
6+
} from "../fixtures/index.js";
47

58
test("events", async () => {
69
const eventHandler = createEventHandler({});

test/integration/node-middleware.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { sign } from "@octokit/webhooks-methods";
66
// import without types
77
const express = require("express");
88

9-
import { createNodeMiddleware, Webhooks } from "../../src";
9+
import { createNodeMiddleware, Webhooks } from "../../src/index.ts";
1010

1111
const pushEventPayload = readFileSync(
1212
"test/fixtures/push-payload.json",

test/integration/smoke-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Webhooks, createEventHandler, emitterEventNames } from "../../src";
1+
import { Webhooks, createEventHandler, emitterEventNames } from "../../src/index.ts";
22

33
test("@octokit/webhooks", () => {
44
const emitWarningSpy = jest.spyOn(process, "emitWarning");

test/integration/webhooks.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { readFileSync } from "fs";
22

33
import { sign } from "@octokit/webhooks-methods";
44

5-
import { Webhooks } from "../../src";
5+
import { Webhooks } from "../../src/index.ts";
66

77
const pushEventPayloadString = readFileSync(
88
"test/fixtures/push-payload.json",

test/typescript-validate.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
EmitterWebhookEvent,
55
WebhookError,
66
createNodeMiddleware,
7-
} from "../src/index";
7+
} from "../src/index.js";
88
import { createServer } from "http";
99
import {
1010
HandlerFunction,

test/unit/createLogger-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { createLogger } from "../../src/createLogger";
1+
import { createLogger } from "../../src/createLogger.js";
22

33
const noop = () => {};
44

test/unit/event-handler-on-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { receiverOn } from "../../src/event-handler/on";
1+
import { receiverOn } from "../../src/event-handler/on.js";
22
import { State } from "../../src/types";
33

44
function noop() {}

test/unit/event-handler-receive-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { receiverHandle as receive } from "../../src/event-handler/receive";
1+
import { receiverHandle as receive } from "../../src/event-handler/receive.js";
22
import { State } from "../../src/types";
33

44
const state: State = {

test/unit/event-handler-remove-listener-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { removeListener } from "../../src/event-handler/remove-listener";
1+
import { removeListener } from "../../src/event-handler/remove-listener.js";
22
import { State } from "../../src/types";
33

44
test("remove-listener: single listener", () => {

test/unit/event-handler-wrap-error-handler-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { wrapErrorHandler } from "../../src/event-handler/wrap-error-handler";
1+
import { wrapErrorHandler } from "../../src/event-handler/wrap-error-handler.js";
22

33
const noop = () => {};
44

0 commit comments

Comments
 (0)