Skip to content

Commit

Permalink
fully switch to ESM
Browse files Browse the repository at this point in the history
top level await woooooo
  • Loading branch information
3vorp committed Mar 19, 2024
1 parent cd85e5b commit bed83d3
Show file tree
Hide file tree
Showing 20 changed files with 22 additions and 25 deletions.
7 changes: 4 additions & 3 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import { ValidateError } from "tsoa";
import responseTime from "response-time";
import cors from "cors";
import apiErrorHandler from "api-error-handler";
import { readFileSync, readdirSync } from "fs";
import { RegisterRoutes } from "../build/routes";
import { ApiError } from "./v2/tools/ApiError";
import { AddonChangeController } from "./v2/controller/addonChange.controller";
import formHandler from "./v2/tools/FormHandler";

// eslint-disable-next-line @typescript-eslint/no-unused-vars
const NO_CACHE = process.env.NO_CACHE === "true";
const PORT = process.env.PORT || 8000;

Expand Down Expand Up @@ -82,12 +82,13 @@ app.all("/v1/*", (req, res) => {
res.status(400).json({
message: "API v1 has been discontinued; please switch to API v2 for all new endpoints.",
});

});

RegisterRoutes(app);

let swaggerDoc = require("../public/swagger.json");
// for some reason TS reads this file as being in the root dir
//! DO NOT add an extra dot so the path is actually correct (no idea why)
let swaggerDoc = JSON.parse(readFileSync("./public/swagger.json", { encoding: "utf8" }));

// manual things
const adc = new AddonChangeController();
Expand Down
2 changes: 1 addition & 1 deletion src/v2/firestorm/addons/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import firestorm from "firestorm-db";
import { FirestormAddon, AddonAll, Files } from "~/v2/interfaces";
import { FirestormAddon, AddonAll, Files } from "../../interfaces";
import "../config";
import { files } from "../posts/files";

Expand Down
2 changes: 1 addition & 1 deletion src/v2/firestorm/modding/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import firestorm from "firestorm-db";
import { FirestormMod } from "~/v2/interfaces";
import { FirestormMod } from "../../interfaces";
import "../config";

export const mods = firestorm.collection<FirestormMod>("mods");
2 changes: 1 addition & 1 deletion src/v2/firestorm/modding/modpacks.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import firestorm from "firestorm-db";
import { FirestormModpack } from "~/v2/interfaces";
import { FirestormModpack } from "../../interfaces";
import "../config";

export const modpacks = firestorm.collection<FirestormModpack>("modpacks");
2 changes: 1 addition & 1 deletion src/v2/firestorm/packs/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import firestorm from "firestorm-db";
import { FirestormPack } from "~/v2/interfaces";
import { FirestormPack } from "../../interfaces";
import "../config";
import { submissions } from "./submissions";

Expand Down
2 changes: 1 addition & 1 deletion src/v2/firestorm/packs/submissions.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import firestorm from "firestorm-db";
import { FirestormSubmission } from "~/v2/interfaces";
import { FirestormSubmission } from "../../interfaces";
import "../config";

export const submissions = firestorm.collection<FirestormSubmission>("submissions");
2 changes: 1 addition & 1 deletion src/v2/firestorm/posts/files.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import firestorm from "firestorm-db";
import { FirestormFile } from "~/v2/interfaces";
import { FirestormFile } from "../../interfaces";
import "../config";

export const files = firestorm.collection<FirestormFile>("files");
2 changes: 1 addition & 1 deletion src/v2/firestorm/textures/contributions.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import firestorm from "firestorm-db";
import { FirestormContribution } from "~/v2/interfaces";
import { FirestormContribution } from "../../interfaces";
import "../config";

export const contributions = firestorm.collection<FirestormContribution>("contributions");
2 changes: 1 addition & 1 deletion src/v2/firestorm/textures/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
MCMETA,
PackGitHub,
Edition,
} from "~/v2/interfaces";
} from "../../interfaces";
import "../config";

import { uses } from "./uses";
Expand Down
2 changes: 1 addition & 1 deletion src/v2/firestorm/textures/paths.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import firestorm from "firestorm-db";
import { FirestormPath } from "~/v2/interfaces";
import { FirestormPath } from "../../interfaces";
import "../config";

export const paths = firestorm.collection<FirestormPath>("paths");
2 changes: 1 addition & 1 deletion src/v2/firestorm/textures/uses.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import firestorm from "firestorm-db";
import { Paths, FirestormUse } from "~/v2/interfaces";
import { Paths, FirestormUse } from "../../interfaces";
import "../config";
import { paths } from "./paths";

Expand Down
2 changes: 1 addition & 1 deletion src/v2/firestorm/users/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import firestorm from "firestorm-db";
import { Contributions, Addons, FirestormUser } from "~/v2/interfaces";
import { Contributions, Addons, FirestormUser } from "../../interfaces";
import { contributions } from "..";
import { addons } from "../addons";
import "../config";
Expand Down
2 changes: 1 addition & 1 deletion src/v2/repository/packs.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
PackID,
CreationPackAll,
PackSearch,
} from "~/v2/interfaces";
} from "../interfaces";
import { contributions, packs } from "../firestorm";
import SubmissionFirestormRepository from "./submissions.repository";

Expand Down
2 changes: 1 addition & 1 deletion src/v2/repository/path.repository.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { InputPath, Path, Paths, PathRepository } from "~/v2/interfaces";
import { ID_FIELD, WriteConfirmation } from "firestorm-db";
import { InputPath, Path, Paths, PathRepository } from "../interfaces";
import { paths } from "../firestorm/textures/paths";

export default class PathFirestormRepository implements PathRepository {
Expand Down
2 changes: 1 addition & 1 deletion src/v2/repository/submissions.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
CreationSubmission,
PackAll,
PackID,
} from "~/v2/interfaces";
} from "../interfaces";
import { submissions } from "../firestorm/packs/submissions";
import { packs } from "../firestorm/packs";

Expand Down
2 changes: 1 addition & 1 deletion src/v2/repository/texture.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
Textures,
TextureRepository,
PropertyToOutput,
} from "~/v2/interfaces";
} from "../interfaces";
import { NotFoundError } from "../tools/ApiError";
import { textures, paths, uses, contributions, settings } from "../firestorm";
import { MinecraftSorter } from "../tools/sorter";
Expand Down
2 changes: 1 addition & 1 deletion src/v2/repository/use.repository.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable arrow-body-style */
import { Use, UseRepository, Uses } from "~/v2/interfaces";
import { ID_FIELD, WriteConfirmation } from "firestorm-db";
import { Use, UseRepository, Uses } from "../interfaces";
import { paths, uses } from "../firestorm";

export default class UseFirestormRepository implements UseRepository {
Expand Down
2 changes: 1 addition & 1 deletion src/v2/service/modpacks.service.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Modpack } from "~/v2/interfaces";
import { Modpack } from "../interfaces";
import { modpacks } from "../firestorm";
import ModpacksFirestormRepository from "../repository/modpacks.repository";

Expand Down
2 changes: 1 addition & 1 deletion src/v2/service/mods.service.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Mod } from "~/v2/interfaces";
import { Mod } from "../interfaces";
import { mods } from "../firestorm";
import ModsFirestormRepository from "../repository/mods.repository";

Expand Down
4 changes: 0 additions & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
"allowJs": true,
"resolveJsonModule": true,
"baseUrl": "src",
"paths": {
"@/*": ["../*"],
"~/*": ["*"],
}
},
"exclude": [
"node_modules"
Expand Down

0 comments on commit bed83d3

Please sign in to comment.