update build script

biome.json

@@ -11,6 +11,7 @@
     "include": [
       "src/**/*.ts",
       "src/**/*.tsx",
+      "scripts/**/*.ts",
       "vite.config.ts",
       "tailwind.config.ts"
     ],

package.json

@@ -42,8 +42,7 @@
     "webextension-polyfill": "^0.12.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "latest",
-    "@types/bun": "latest",
+    "@biomejs/biome": "latest", 
     "@types/node": "^22.7.3",
     "@types/react": "^18.3.9",
     "@types/react-dom": "^18.3.0",

scripts/build.ts

@@ -1,60 +1,39 @@
-import fs from "fs";
-import Bun from "bun";
+import { cp, rmdir, writeFile } from "node:fs/promises";
 import { build } from "vite";
+// @ts-expect-error
+import webExt from "web-ext";
 import { manifest } from "./manifest";
-import { minifyJs } from "./minify";
-import { webExtBuild } from "./web-ext";
-
-const browsers: browsers = ["chrome", "firefox"];
 
+const browsers = ["chrome", "firefox"] as const;
 process.env.NODE_ENV = "production";
 
-function make_proc(cmd: string[]) {
-  return new Promise<void>((resolve) => {
-    const proc = Bun.spawn(cmd, {
-      stdout: "inherit",
-      onExit: async () => {
-        console.log(await new Response(proc.stdout).text());
-        resolve();
-      },
-    });
+try {
+  await rmdir("dist", { recursive: true });
+
+  await build({
+    build: {
+      outDir: `../dist/${"chrome"}`,
+    },
   });
-}
 
-const tsc = make_proc(["bunx", "--bun", "tsc"]);
-const fmt = make_proc(["bun", "run", "format"]);
-const lint = make_proc(["bun", "run", "lint"]);
+  await cp("dist/chrome", "dist/firefox", { recursive: true });
 
-await Promise.all([fs.rmdirSync("dist", { recursive: true }), tsc, fmt, lint]).then(
-  () =>
-    build({
-      mode: "chrome",
-      build: {
-        outDir: `../dist/${"chrome"}`,
-      },
-    })
-      .then(async () => {
-        await minifyJs("chrome").then(async () => {
-          await make_proc(["cp", "-r", "dist/chrome", "dist/firefox"]);
-        });
-        browsers.map((browser) => {
-          Promise.all([
-            manifest(browser).then((manifest) => {
-              Bun.write(
-                Bun.file(`dist/${browser}/manifest.json`),
-                JSON.stringify(manifest)
-              );
-            }),
-            Bun.write(
-              Bun.file(`dist/${browser}/meta.json`),
-              JSON.stringify({
-                updated: new Date().toISOString(),
-              })
-            ),
-          ]);
-        });
-      })
-      .then(() => {
-        browsers.map((browser) => webExtBuild(browser));
-      })
-);
+  for (const browser of browsers) {
+    const m = await manifest(browser);
+    const dist = `dist/${browser}`;
+
+    await writeFile(`${dist}/manifest.json`, JSON.stringify(m));
+    await cp("LICENSE.txt", `${dist}/LICENSE.txt`, { force: true });
+    webExt.cmd.build({
+      sourceDir: dist,
+      artifactsDir: "dist",
+      asNeeded: false,
+      overwriteDest: true,
+      ignoreFiles: [],
+      filename: `${browser}.zip`,
+    });
+  }
+} catch (error) {
+  console.error(error);
+  process.exit(1);
+}

scripts/manifest.ts

@@ -1,8 +1,6 @@
-import Bun from "bun";
+import fs from "node:fs";
 
-const pkg = await Bun.file("package.json")
-  .text()
-  .then((text) => JSON.parse(text));
+const pkg = JSON.parse(fs.readFileSync("package.json", "utf-8"));
 
 const base = {
   name: pkg.displayName,
@@ -21,27 +19,20 @@ const base = {
   options_ui: {
     page: "options/options.html",
   },
-  background: {},
   content_scripts: [
     {
       js: ["d_comments.js"],
       matches: ["*://animestore.docomo.ne.jp/*"],
       run_at: "document_start",
     },
   ],
-  web_accessible_resources: [],
-  permissions: ["cookies", "storage", "tabs"],
+  permissions: ["storage", "tabs"],
 };
 
-/**
- * manifest.json を chrome, firefox 用にそれぞれ生成する
- */
-export async function manifest(browser: browsers[number]) {
-  let manifest = {};
-
+export async function manifest(browser: "chrome" | "firefox") {
   switch (browser) {
     case "chrome": {
-      manifest = {
+      return {
         ...base,
         manifest_version: 3,
         background: {
@@ -56,22 +47,17 @@ export async function manifest(browser: browsers[number]) {
         web_accessible_resources: [
           {
             matches: ["*://animestore.docomo.ne.jp/*"],
-            resources: ["js/*.js", "assets/css/*.css", "assets/*.js"],
+            resources: ["*.js", "*.css"],
           },
         ],
         host_permissions: [
           "*://*.nicovideo.jp/*",
           "*://animestore.docomo.ne.jp/*",
-          "*://nvcomment.nicovideo.jp/*",
-          "*://nvapi.nicovideo.jp/v1/users/*",
-          "*://public.api.nicovideo.jp/v1/channel/channelapp/channels/*",
-          "*://api.search.nicovideo.jp/*",
         ],
       };
-      break;
     }
     case "firefox": {
-      manifest = {
+      return {
         ...base,
         manifest_version: 2,
         background: {
@@ -92,19 +78,12 @@ export async function manifest(browser: browsers[number]) {
           ...base.permissions,
           "https://*.nicovideo.jp/*",
           "https://animestore.docomo.ne.jp/*",
-          "https://nvcomment.nicovideo.jp/*",
-          "https://nvapi.nicovideo.jp/v1/users/*",
-          "https://public.api.nicovideo.jp/v1/channel/channelapp/channels/*",
-          "https://api.search.nicovideo.jp/*",
         ],
         developer: {
           name: pkg.author,
           url: pkg.repository.url,
         },
       };
-      break;
     }
   }
-
-  return manifest;
 }

src/options/components/footer.tsx

@@ -15,22 +15,11 @@
     along with d-comments.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { useEffect, useRef } from "react";
 import browser from "webextension-polyfill";
 
 function Footer() {
   const manifest = browser.runtime.getManifest();
 
-  const year = useRef(2022);
-
-  useEffect(() => {
-    fetch(browser.runtime.getURL("meta.json"))
-      .then((response) => response.json())
-      .then((data) => {
-        year.current = data.year;
-      });
-  }, []);
-
   return (
     <footer className="flex flex-row w-full h-16 p-2 text-sm text-center border-spacing-1 border-t border-gray-200">
       <a
@@ -40,7 +29,9 @@ function Footer() {
         className="flex flex-row items-center justify-center w-full h-full"
       >
         <span className="mx-3">{manifest.name}</span>
-        <span className="mx-1">2022 - {year.current}</span>
+        <span className="mx-1">
+          2022 - {new Date(manifest.version).getFullYear()}
+        </span>
         <span className="mx-1">{browser.runtime.getManifest().author}</span>
         <span className="mx-3">Version {manifest.version}</span>
       </a>