chore: move extension manifest to src/, add build script

.gitignore

@@ -1,3 +1,6 @@
+# builds
+dist/
+
 # dependencies
 node_modules/
 

dep/.github/workflows/update-parents.yml

@@ -1,29 +0,0 @@
-name: 'update parent repositories'
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  sync:
-    name: update parent
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        repo: ['notion-enhancer/extension', 'notion-enhancer/desktop']
-    steps:
-      - name: checkout repo
-        uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.CI_TOKEN }}
-          submodules: true
-          repository: ${{ matrix.repo }}
-      - name: pull updates
-        run: |
-          git pull --recurse-submodules
-          git submodule update --remote --recursive
-      - name: commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: '[${{ github.event.repository.name }}] ${{ github.event.head_commit.message }}'

package.json

@@ -10,6 +10,9 @@
   "license": "MIT",
   "bin": "bin.mjs",
   "type": "module",
+  "scripts": {
+    "build-ext": "./scripts/build-browser-extension.sh"
+  },
   "engines": {
     "node": ">=16.x.x"
   },

scripts/build-browser-extension.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+version=$(node -p "require('./package.json').version")
+
+cd src
+mkdir -p ../dist
+rm -f "../dist/notion-enhancer-$version.zip"
+zip -r9 "../dist/notion-enhancer-$version.zip" . -x electron/\*

scripts/enhance-desktop-app.mjs

@@ -115,13 +115,14 @@ const unpackApp = () => {
       insertPath = getResourcePath("app/node_modules/notion-enhancer");
     if (existsSync(insertPath)) await fsp.rm(insertPath, { recursive: true });
     // insert the notion-enhancer/src folder into notion's node_modules folder
+    const excludedDests = [
+      getResourcePath("app/node_modules/notion-enhancer/browser"),
+      getResourcePath("app/node_modules/notion-enhancer/manifest.json"),
+    ];
     await fsp.cp(srcPath, insertPath, {
       recursive: true,
-      filter: (_, dest) => {
+      // exclude browser-specific files
-        // exclude browser-specific files
+      filter: (_, dest) => !excludedDests.includes(dest),
-        const browserDest = getResourcePath("app/node_modules/notion-enhancer/browser");
-        return dest !== browserDest;
-      },
     });
     // call patch-desktop-app.mjs on each file
     const notionScripts = (await readdirDeep(appPath)).filter((file) => file.endsWith(".js")),
@@ -135,7 +136,7 @@ const unpackApp = () => {
     }
     // create package.json
     const manifestPath = getResourcePath("app/node_modules/notion-enhancer/package.json"),
-      insertManifest = { ...manifest, main: "desktop/init.cjs" };
+      insertManifest = { ...manifest, main: "electron/init.cjs" };
     // remove cli-specific fields
     delete insertManifest.bin;
     delete insertManifest.type;

src/manifest.json

@@ -16,14 +16,14 @@
   "browser_action": {},
   "background": { "scripts": ["worker.js"] },
   "options_ui": {
-    "page": "repo/menu/menu.html",
+    "page": "mods/menu/menu.html",
     "open_in_tab": true
   },
-  "web_accessible_resources": ["env/*", "api/*", "dep/*", "media/*", "repo/*"],
+  "web_accessible_resources": ["browser/*", "common/*", "dep/*", "media/*", "mods/*"],
   "content_scripts": [
     {
       "matches": ["https://*.notion.so/*", "https://*.notion.site/*"],
-      "js": ["init.js"]
+      "js": ["browser/init.js"]
     }
   ],
   "permissions": ["tabs", "storage", "clipboardRead", "clipboardWrite", "unlimitedStorage"]