Fix up Firefox build

Author: jonathanKingston

scripts/inject.js

@@ -1,5 +1,6 @@
 import { rollupScript } from './utils/build.js'
 import { parseArgs, write } from './script-utils.js'
+import { camelcase } from '../src/utils.js'
 
 const contentScopePath = 'src/content-scope-features.js'
 const contentScopeName = 'contentScopeFeatures'
@@ -41,7 +42,8 @@ const builds = {
 
 async function initOther (injectScriptPath, platformName) {
     const supportsMozProxies = platformName === 'firefox'
-    const injectScript = await rollupScript(injectScriptPath, `inject${platformName}`, supportsMozProxies)
+    const identName = `inject${camelcase(platformName)}`
+    const injectScript = await rollupScript(injectScriptPath, identName, supportsMozProxies)
     const outputScript = injectScript
     return outputScript
 }

scripts/utils/build.js

@@ -44,11 +44,9 @@ function runtimeInjections () {
 }
 
 export async function rollupScript (scriptPath, name, supportsMozProxies = false) {
-    let mozProxies = false
     // The code is using a global, that we define here which means once tree shaken we get a browser specific output.
-    if (supportsMozProxies) {
-        mozProxies = true
-    }
+    const mozProxies = supportsMozProxies
+
     const inputOptions = {
         input: scriptPath,
         plugins: [

unit-test/verify-artifacts.js

@@ -1,12 +1,12 @@
 import { join, relative } from 'node:path'
-import { statSync } from 'node:fs'
+import { readFileSync, statSync } from 'node:fs'
 import { cwd } from '../scripts/script-utils.js'
 
 // path helpers
 const ROOT = join(cwd(import.meta.url), '..')
 const BUILD = join(ROOT, 'build')
 const APPLE_BUILD = join(ROOT, 'Sources/ContentScopeScripts/dist')
-const CSS_OUTPUT_SIZE = 512000
+const CSS_OUTPUT_SIZE = 530000
 const CSS_OUTPUT_SIZE_CHROME = CSS_OUTPUT_SIZE * 1.45 // 45% larger for Chrome MV2 due to base64 encoding
 
 const checks = {
@@ -17,10 +17,12 @@ const checks = {
         { kind: 'maxFileSize', value: CSS_OUTPUT_SIZE_CHROME, path: join(BUILD, 'chrome/inject.js') }
     ],
     'chrome-mv3': [
-        { kind: 'maxFileSize', value: CSS_OUTPUT_SIZE, path: join(BUILD, 'chrome-mv3/inject.js') }
+        { kind: 'maxFileSize', value: CSS_OUTPUT_SIZE, path: join(BUILD, 'chrome-mv3/inject.js') },
+        { kind: 'containsString', text: 'cloneInto(', path: join(BUILD, 'chrome-mv3/inject.js'), includes: false }
     ],
     firefox: [
-        { kind: 'maxFileSize', value: CSS_OUTPUT_SIZE, path: join(BUILD, 'firefox/inject.js') }
+        { kind: 'maxFileSize', value: CSS_OUTPUT_SIZE, path: join(BUILD, 'firefox/inject.js') },
+        { kind: 'containsString', text: 'cloneInto(', path: join(BUILD, 'firefox/inject.js'), includes: true }
     ],
     integration: [
         { kind: 'maxFileSize', value: CSS_OUTPUT_SIZE, path: join(BUILD, 'integration/contentScope.js') }
@@ -36,13 +38,24 @@ const checks = {
 describe('checks', () => {
     for (const [platformName, platformChecks] of Object.entries(checks)) {
         for (const check of platformChecks) {
+            const localPath = relative(ROOT, check.path)
             if (check.kind === 'maxFileSize') {
-                const localPath = relative(ROOT, check.path)
                 it(`${platformName}: '${localPath}' is smaller than ${check.value}`, () => {
                     const stats = statSync(check.path)
                     expect(stats.size).toBeLessThan(check.value)
                 })
             }
+            if (check.kind === 'containsString') {
+                it(`${platformName}: '${localPath}' contains ${check.text}`, () => {
+                    const fileContents = readFileSync(localPath).toString()
+                    const includes = fileContents.includes(check.text)
+                    if (check.includes) {
+                        expect(includes).toBeTrue()
+                    } else {
+                        expect(includes).toBeFalse()
+                    }
+                })
+            }
         }
     }
 })