fix: Fixes module building

javalent · Apr 22, 2024 · 5b6210f · 5b6210f
1 parent d7b42bc
commit 5b6210f
Show file tree

Hide file tree

Showing 9 changed files with 665 additions and 1,618 deletions.
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -104,16 +104,11 @@ jobs:
         runs-on: ubuntu-latest
         needs: upload-build
         steps:
-           - name: Webhook
-             uses: javalent/workflows/actions/discord-embed@main
-             env:
-                 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
-             with:
-                 name: Dice Roller
-                 repo: dice-roller
-                 webhook-urls: ${{ secrets.TTRPG_WEBHOOK }}
-    publish:
-        needs: release-please
-        if: ${{ needs.release-please.outputs.release_created }}
-        uses: javalent/workflows/.github/workflows/publish.yml@main
-        secrets: inherit
+            - name: Webhook
+              uses: javalent/workflows/actions/discord-embed@main
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  name: Dice Roller
+                  repo: dice-roller
+                  webhook-urls: ${{ secrets.TTRPG_WEBHOOK }}
diff --git a/esbuild.config.mjs b/esbuild.config.mjs
@@ -1,10 +1,11 @@
 import esbuild from "esbuild";
 import process from "process";
 import builtins from "builtin-modules";
+import sveltePlugin from "esbuild-svelte";
+import sveltePreprocess from "svelte-preprocess";
 import path from "path";
 import { copyFile } from "fs/promises";
 import { config } from "dotenv";
-import { build } from "tsup";
 
 config();
 
@@ -50,28 +51,31 @@ const parameters = {
         "@codemirror/tooltip",
         "@codemirror/view",
         "moment",
+        "@javalent/components/svelte",
         ...builtins
     ],
     format: "cjs",
     target: "es2022",
     logLevel: "info",
     sourcemap: prod ? false : "inline",
-    minify: prod,
+    minify: true,
     treeShaking: true,
     outdir: dir,
-
+    conditions: ["svelte"],
+    plugins: [
+        sveltePlugin({
+            compilerOptions: { css: "injected" },
+            preprocess: sveltePreprocess(),
+            filterWarnings: (warning) => {
+                if (warning.code.toLowerCase().startsWith("a11y-")) {
+                    return false;
+                }
+                return true;
+            }
+        })
+    ],
     logOverride: { "empty-import-meta": "silent" }
 };
-
-await esbuild.build(parameters).catch((x) => {
-    if (x.errors) {
-        console.error(x.errors);
-    } else {
-        console.error(x);
-    }
-    process.exit(1);
-});
-
 if (prod) {
     await esbuild.build(parameters).catch((x) => {
         if (x.errors) {
@@ -81,14 +85,9 @@ if (prod) {
         }
         process.exit(1);
     });
-    await build({
-        entry: ["./src/api/api.ts"],
-        dts: {
-            only: true
-        }
-    });
-    await build({
-        entry: ["./src/types/api.ts"]
+    await esbuild.build({
+        entryPoints: ["./src/types/api.ts"],
+        outdir: "./dist"
     });
 } else {
     let ctx = await esbuild.context(parameters);