From e55811bbf94899e283fc608a0b2093be184efbe9 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Thu, 1 Jan 2026 13:15:44 -0500 Subject: [PATCH] [mv3] Need to setup scriptlet details only once --- platform/mv3/make-rulesets.js | 2 -- platform/mv3/make-scriptlets.js | 42 +++++++++++++++++---------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/platform/mv3/make-rulesets.js b/platform/mv3/make-rulesets.js index d17aa5218..6bf08224c 100644 --- a/platform/mv3/make-rulesets.js +++ b/platform/mv3/make-rulesets.js @@ -925,8 +925,6 @@ async function processScriptletFilters(assetDetails, mapin) { if ( mapin === undefined ) { return 0; } if ( mapin.size === 0 ) { return 0; } - makeScriptlet.init(); - for ( const details of mapin.values() ) { makeScriptlet.compile(assetDetails, details); } diff --git a/platform/mv3/make-scriptlets.js b/platform/mv3/make-scriptlets.js index 8a6b2d347..9dd53b36d 100644 --- a/platform/mv3/make-scriptlets.js +++ b/platform/mv3/make-scriptlets.js @@ -64,26 +64,6 @@ function createScriptletCoreCode(worldDetails, resourceEntry) { /******************************************************************************/ -export function init() { - for ( const scriptlet of builtinScriptlets ) { - const { name, aliases, fn } = scriptlet; - const entry = { - name: fn.name, - code: fn.toString(), - world: scriptlet.world || 'MAIN', - dependencies: scriptlet.dependencies, - requiresTrust: scriptlet.requiresTrust === true, - }; - resourceDetails.set(name, entry); - if ( Array.isArray(aliases) === false ) { continue; } - for ( const alias of aliases ) { - resourceAliases.set(alias, name); - } - } -} - -/******************************************************************************/ - export function reset() { worlds.ISOLATED = structuredClone(worldTemplate); worlds.MAIN = structuredClone(worldTemplate); @@ -239,3 +219,25 @@ export async function commit(rulesetId, path, writeFn) { } /******************************************************************************/ + +function init() { + for ( const scriptlet of builtinScriptlets ) { + const { name, aliases, fn } = scriptlet; + const entry = { + name: fn.name, + code: fn.toString(), + world: scriptlet.world || 'MAIN', + dependencies: scriptlet.dependencies, + requiresTrust: scriptlet.requiresTrust === true, + }; + resourceDetails.set(name, entry); + if ( Array.isArray(aliases) === false ) { continue; } + for ( const alias of aliases ) { + resourceAliases.set(alias, name); + } + } +} + +init(); + +/******************************************************************************/