🚧 Support match arguments

package.json

@@ -55,9 +55,9 @@
     "prettier-plugin-organize-imports": "^3.2.3",
     "prettier-plugin-svelte": "^3.0.3",
     "style-loader": "^3.3.3",
-    "svelte": "^4.2.1",
+    "svelte": "^4.2.8",
     "svelte-loader": "^3.1.9",
-    "svelte-preprocess": "^5.0.4",
+    "svelte-preprocess": "^5.1.2",
     "svelte-sequential-preprocessor": "^2.0.1",
     "ts-loader": "^9.5.0",
     "typescript": "^5.2.2",
@@ -78,7 +78,7 @@
   },
   "pnpm": {
     "patchedDependencies": {
-      "[email protected].1": "patches/[email protected]",
+      "[email protected].8": "patches/[email protected]",
       "[email protected]": "patches/[email protected]",
       "@melt-ui/[email protected]": "patches/@[email protected]"
     }

scripts/setup.ts

@@ -21,7 +21,7 @@ import {
   getSrcFile,
 } from './lib/constants.js'
 import { setupFiles } from './lib/files.js'
-import { linkFolder, linkStaticFolder, linkTscFolder } from './lib/linker.js'
+import { linkStaticFolder, linkTscFolder } from './lib/linker.js'
 import { failure, info } from './lib/logging.js'
 import { downloadReleaseAsset, getLatestRelease } from './lib/releases.js'
 

src/content/browser/Browser.svelte

@@ -8,10 +8,10 @@
   import CustomizableUi from './components/customizableUI/CustomizableUI.svelte'
   import { BrowserContextMenu, HamburgerMenu } from './components/menus'
   import Keybindings from './components/keybindings/Keybindings.svelte'
-  import { tabs, selectedTab } from './lib/window/tabs'
+  import { tabs, selectedTabId } from './lib/window/tabs'
 
   let component = customizableUIDynamicPref('browser.uiCustomization.state')
-  $: currentTab = $tabs.find((tab) => tab.getId() == $selectedTab)
+  $: currentTab = $tabs.find((tab) => tab.getId() == $selectedTabId)
 </script>
 
 {#if currentTab}

src/content/browser/components/customizableUI/BrowserView.svelte

@@ -10,7 +10,7 @@
   } from '@shared/customizableUI'
   import UiItemBase from './UIItemBase.svelte'
   import Browser from '../Browser.svelte'
-  import { selectedTab, tabs } from '@browser/lib/window/tabs'
+  import { selectedTabId, tabs } from '@browser/lib/window/tabs'
 
   export let component: ComponentId & BrowserComponent
   export let root: Component
@@ -24,6 +24,6 @@
 
 <UiItemBase {component} {root}>
   {#each sortedBrowers as tab (tab.getId())}
-    <Browser {tab} selectedTab={$selectedTab} />
+    <Browser {tab} selectedTab={$selectedTabId} />
   {/each}
 </UiItemBase>

src/content/browser/components/customizableUI/Tabs.svelte

@@ -11,15 +11,15 @@
   import Tab from '@browser/components/tabs/Tab.svelte'
 
   import UiItemBase from './UIItemBase.svelte'
-  import { selectedTab, tabs } from '@browser/lib/window/tabs'
+  import { selectedTabId, tabs } from '@browser/lib/window/tabs'
 
   export let component: ComponentId & TabsComponent
   export let root: Component
 </script>
 
 <UiItemBase {component} {root} class="tabs" on:drop={(e) => e.preventDefault()}>
   {#each $tabs as tab (tab.getId())}
-    <Tab {tab} bind:selectedTab={$selectedTab} />
+    <Tab {tab} bind:selectedTab={$selectedTabId} />
   {/each}
 </UiItemBase>
 

src/content/browser/components/omnibox/Omnibox.svelte

@@ -90,7 +90,9 @@
       />
 
       {#each $pageActions as [_extId, pageAction]}
-        <PageAction {pageAction} />
+        {#if pageAction.shouldShow($uri.asciiSpec)}
+          <PageAction {pageAction} />
+        {/if}
       {/each}
 
       <Bookmarks {tab} />

src/content/browser/components/omnibox/PageAction.svelte

@@ -1,3 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <script lang="ts">
   import type { PageAction } from 'resource://app/modules/EPageActions.sys.mjs'
   import ToolbarButton from '@shared/components/ToolbarButton.svelte'

src/content/browser/lib/modules/EPageActionsBindings.ts

@@ -1,3 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 import { readable } from 'svelte/store'
 
 import { resource } from '../resources'
@@ -6,9 +9,9 @@ import { resource } from '../resources'
  * @todo lazy loading store
  */
 export const pageActions = readable(
-  resource.EPageActions.pageActions.entries(),
+  [...resource.EPageActions.pageActions.entries()],
   (set) => {
-    const update = () => set(resource.EPageActions.pageActions.entries())
+    const update = () => set([...resource.EPageActions.pageActions.entries()])
     resource.EPageActions.events.on('*', update)
     return () => resource.EPageActions.events.off('*', update)
   },

src/content/browser/lib/window/tabs.ts

@@ -9,8 +9,8 @@ import { resource } from '../resources'
 import { Tab } from './tab'
 
 let internalSelectedTab = -1
-export const selectedTab = writable(-1)
-selectedTab.subscribe((v) => (internalSelectedTab = v))
+export const selectedTabId = writable(-1)
+selectedTabId.subscribe((v) => (internalSelectedTab = v))
 
 const uriPref = (pref: string) => (): nsIURIType =>
   resource.NetUtil.newURI(Services.prefs.getStringPref(pref, 'about:blank'))
@@ -22,7 +22,7 @@ export const tabs = viewableWritable<Tab[]>([])
 export function openTab(uri: nsIURIType = newTabUri()) {
   const newTab = new Tab(uri)
   tabs.update((tabs) => {
-    selectedTab.set(newTab.getId())
+    selectedTabId.set(newTab.getId())
     return [...tabs, newTab]
   })
   return newTab
@@ -39,9 +39,9 @@ export function closeTab(tab: Tab) {
     }
 
     if (filtered[tabIndex]) {
-      selectedTab.set(filtered[tabIndex].getId())
+      selectedTabId.set(filtered[tabIndex].getId())
     } else {
-      selectedTab.set(filtered[tabIndex - 1].getId())
+      selectedTabId.set(filtered[tabIndex - 1].getId())
     }
 
     tab.destroy()
@@ -78,7 +78,7 @@ export function setCurrentTabIndex(index: number) {
   if (index < 0) index = allTabs.length - 1
   if (index >= allTabs.length) index = 0
 
-  selectedTab.set(allTabs[index].getId())
+  selectedTabId.set(allTabs[index].getId())
 }
 
 export function moveTabBefore(toMoveId: number, targetId: number) {