Simplify polyfill setup + prepare for temporal release

.vscode/settings.json

@@ -7,8 +7,7 @@
         "*.ts": "$(capture).test.ts,$(capture).d.ts"
     },
     "oxc.typeAware": true,
-    "js/ts.experimental.useTsgo": false,
-    "js/ts.tsdk.path": "node_modules/typescript/lib",
+    "js/ts.experimental.useTsgo": true,
 
     "cSpell.language": "de,en",
     "editor.formatOnSaveMode": "modificationsIfAvailable",

Dockerfile

@@ -40,4 +40,4 @@ FROM node:alpine
     RUN echo "RELEASE_IDENTIFIER=${RELEASE_IDENTIFIER:-debug}" >> /app/.env && \
         echo "BUILD_NUMBER=${BUILD_NUMBER:-0}" >> /app/.env
 
-    ENTRYPOINT ["node", "--env-file", "/app/.env", "src/app.ts"]
+    ENTRYPOINT ["node", "--env-file", "/app/.env", "--require", "./src/polyfills.ts", "src/app.ts"]

package.json

@@ -61,8 +61,7 @@
     "lefthook": "^2.1.3",
     "oxfmt": "^0.36.0",
     "oxlint": "^1.51.0",
-    "oxlint-tsgolint": "^0.16.0",
-    "typescript": "^6.0.1-rc"
+    "oxlint-tsgolint": "^0.16.0"
   },
   "engines": {
     "node": ">=25.6.1"

src/app.ts

@@ -4,9 +4,6 @@ import * as sentry from "@sentry/node";
 import { readConfig, databasePath, args } from "#/service/config.ts";
 import log from "#log";
 
-import { Temporal } from "@js-temporal/polyfill";
-import "#/polyfills.ts";
-
 import * as kysely from "#/storage/db/db.ts";
 
 import type { ReactionHandler } from "#/handler/ReactionHandler.ts";
@@ -58,16 +55,6 @@ log.info(`Bot starting up...${release ? ` (release: ${release})` : ""}`);
 
 const config = await readConfig();
 
-// This polyfill requires that Temporal is already available in the runtime
-// We cannot add it in the polyfills.ts because that file is also used as --require argument for ts-node
-// TODO: Remove this once temporal is available in Node.js, see: https://github.com/nodejs/node/issues/57127
-if (typeof Date.prototype.toTemporalInstant !== "function") {
-    // biome-ignore lint/suspicious/noExplicitAny: hack
-    (Date.prototype as any).toTemporalInstant = function () {
-        return Temporal.Instant.fromEpochMilliseconds(this.getTime());
-    };
-}
-
 if (config.sentry?.dsn) {
     sentry.init({
         dsn: config.sentry.dsn,

src/commands/lauscher.ts

@@ -16,7 +16,6 @@ import type { ApplicationCommand } from "#/commands/command.ts";
 import type { BotContext } from "#/context.ts";
 import assertNever from "#/utils/assertNever.ts";
 import { getPlaybackStats, setUserRegistration, type TrackStat } from "#/service/lauscher.ts";
-import { Temporal } from "@js-temporal/polyfill";
 import { truncateToLength } from "#/utils/stringUtils.ts";
 import { chunkArray } from "#/utils/arrayUtils.ts";
 import { Vec2 } from "#/utils/math.ts";

src/commands/vote.ts

@@ -1,7 +1,6 @@
 import { parseArgs, type ParseArgsConfig } from "node:util";
 
 import { cleanContent } from "discord.js";
-import { Temporal } from "@js-temporal/polyfill";
 
 import type { MessageCommand } from "#/commands/command.ts";
 import type { BotContext } from "#/context.ts";

src/commands/woisvote.ts

@@ -1,5 +1,3 @@
-import { Temporal } from "@js-temporal/polyfill"; // TODO: Remove once Node.js ships temporal
-
 import {
     type CommandInteraction,
     type Message,

src/context.ts

@@ -15,7 +15,6 @@ import type {
 } from "discord.js";
 import { ChannelType } from "discord.js";
 import { SpotifyApi } from "@spotify/web-api-ts-sdk";
-import { Temporal } from "@js-temporal/polyfill";
 
 import type { UserMapEntry } from "#/commands/aoc.ts";
 import { readConfig } from "#/service/config.ts";

src/handler/reaction/quoteHandler.ts

@@ -9,7 +9,6 @@ import {
     type GuildTextBasedChannel,
     hyperlink,
 } from "discord.js";
-import { Temporal } from "@js-temporal/polyfill";
 
 import type { BotContext, QuoteConfig } from "#/context.ts";
 import type { ReactionHandler } from "../ReactionHandler.ts";

src/polyfills.ts

@@ -1,4 +1,4 @@
-import type { Temporal } from "@js-temporal/polyfill";
+import { Temporal as PolyfillTemporal } from "@js-temporal/polyfill";
 
 declare global {
     // type polyfill for Math.sumPrecise (currently in stage 2):
@@ -13,10 +13,15 @@ declare global {
         getOrInsert(key: K, defaultValue: V): V;
         getOrInsertComputed<TK extends K>(key: TK, callbackFunction: (key: TK) => V): V;
     }
+}
 
-    interface Date {
-        toTemporalInstant(): Temporal.Instant;
-    }
+globalThis.Temporal = PolyfillTemporal as typeof Temporal;
+
+// TODO: Remove this once temporal is available in Node.js, see: https://github.com/nodejs/node/issues/57127
+if (typeof Date.prototype.toTemporalInstant !== "function") {
+    Date.prototype.toTemporalInstant = function () {
+        return Temporal.Instant.fromEpochMilliseconds(this.getTime());
+    };
 }
 
 if (typeof Math.sumPrecise !== "function") {

src/service/ban.ts

@@ -1,6 +1,5 @@
 import { time, type GuildMember, type User, TimestampStyles } from "discord.js";
 import * as sentry from "@sentry/node";
-import { Temporal } from "@js-temporal/polyfill";
 
 import type { BotContext } from "#/context.ts";
 import * as ban from "#/storage/ban.ts";

src/service/fadingMessage.ts

@@ -1,6 +1,5 @@
 import type { TextChannel } from "discord.js";
 import * as sentry from "@sentry/node";
-import { Temporal } from "@js-temporal/polyfill";
 
 import type { BotContext } from "#/context.ts";
 

src/service/lauscher.ts

@@ -1,4 +1,3 @@
-import type { Temporal } from "@js-temporal/polyfill";
 import type { Activity, User } from "discord.js";
 
 import type { BotContext } from "#/context.ts";

src/service/loot.ts

@@ -1,5 +1,4 @@
 import type { User, Snowflake, Message } from "discord.js";
-import { Temporal } from "@js-temporal/polyfill";
 
 import type { LootId, LootInsertable, LootOrigin } from "#/storage/db/model.ts";
 import type { LootAttributeKindId, LootKindId } from "./lootData.ts";

src/service/lootDrop.ts

@@ -17,7 +17,6 @@ import {
     type MessageComponentInteraction,
     type BaseMessageOptions,
 } from "discord.js";
-import { Temporal } from "@js-temporal/polyfill";
 import * as sentry from "@sentry/node";
 
 import type { BotContext } from "#/context.ts";

src/service/poll.ts

@@ -1,5 +1,4 @@
 import type { GuildMember, Message, MessageReaction, TextBasedChannel, User } from "discord.js";
-import { Temporal } from "@js-temporal/polyfill";
 
 import * as legacyDelayedPoll from "#/service/delayedPollLegacy.ts";
 import type { Poll, PollId } from "#/storage/db/model.ts";

src/service/pollEmbed.ts

@@ -8,7 +8,6 @@ import {
     TimestampStyles,
     type User,
 } from "discord.js";
-import { Temporal } from "@js-temporal/polyfill";
 
 export const LETTERS = [
     ":regional_indicator_a:",

src/service/roll.ts

@@ -1,5 +1,4 @@
 import { cleanContent, type APIEmbed, type TextChannel, type User } from "discord.js";
-import { Temporal } from "@js-temporal/polyfill";
 
 export async function rollInChannel(
     author: User,

src/service/voiceState.ts

@@ -1,5 +1,4 @@
 import type { VoiceState } from "discord.js";
-import { Temporal } from "@js-temporal/polyfill";
 
 import type { BotContext } from "#/context.ts";
 import log from "#log";

src/storage/ban.ts

@@ -1,5 +1,4 @@
 import type { GuildMember, Snowflake, User } from "discord.js";
-import type { Temporal } from "@js-temporal/polyfill";
 
 import type { Ban } from "./db/model.ts";
 import db from "#db";

src/storage/db/date-plugin.ts

@@ -6,7 +6,6 @@ import type {
     RootOperationNode,
     UnknownRow,
 } from "kysely";
-import { Temporal } from "@js-temporal/polyfill";
 
 import log from "#log";
 

src/storage/emote.ts

@@ -1,5 +1,4 @@
 import { sql } from "kysely";
-import { Temporal } from "@js-temporal/polyfill";
 import type { Message, Snowflake } from "discord.js";
 
 import type { Emote } from "./db/model.ts";

src/storage/fadingMessage.ts

@@ -1,5 +1,4 @@
 import type { Message } from "discord.js";
-import { Temporal } from "@js-temporal/polyfill";
 
 import type { FadingMessage } from "./db/model.ts";
 import db from "#db";

src/storage/lauscher.ts

@@ -1,4 +1,3 @@
-import { Temporal } from "@js-temporal/polyfill"; // TODO: Remove once Node.js ships temporal
 import type { User } from "discord.js";
 
 import type { LauscherRegistration, LauscherSpotifyLogEntry } from "#/storage/db/model.ts";

src/storage/loot.ts

@@ -8,7 +8,6 @@ import type {
     User,
 } from "discord.js";
 import { type ExpressionBuilder, sql } from "kysely";
-import type { Temporal } from "@js-temporal/polyfill";
 
 import type { BotContext } from "#/context.ts";
 import type {

src/storage/poll.ts

@@ -1,5 +1,4 @@
 import type { Snowflake } from "discord.js";
-import type { Temporal } from "@js-temporal/polyfill";
 
 import db from "#db";
 import type { Poll, PollAnswer, PollId, PollOption, PollOptionId } from "./db/model.ts";

src/storage/reminders.ts

@@ -1,5 +1,4 @@
 import type { Snowflake, User } from "discord.js";
-import { Temporal } from "@js-temporal/polyfill";
 
 import type { Reminder } from "./db/model.ts";
 

src/storage/woisAction.ts

@@ -1,5 +1,4 @@
 import type { Message, PartialMessage, Snowflake, User } from "discord.js";
-import type { Temporal } from "@js-temporal/polyfill";
 
 import type { WoisAction } from "./db/model.ts";
 import db from "#db";

src/utils/dateUtils.ts

@@ -1,5 +1,3 @@
-import { Temporal } from "@js-temporal/polyfill"; // TODO: Remove once Node.js ships temporal
-
 const timeFormatter = new Intl.DateTimeFormat("de-DE", {
     hour: "2-digit",
     minute: "2-digit",