Bump Extension.js (canary)

Author: cezaraugusto

package.json

@@ -92,7 +92,7 @@
     "@types/chrome": "^0.0.287",
     "@types/node": "^22.10.1",
     "eslint": "^9.16.0",
-    "extension": "3.15.0-canary.local-30d4e851e6",
+    "extension": "3.15.1-canary.local-fda8403864",
     "globals": "^15.13.0",
     "knip": "^5.33.0",
     "lint-staged": "16.1.0",

pnpm-lock.yaml

@@ -11,12 +11,19 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import {spawn} from 'node:child_process'
-import {fileURLToPath} from 'node:url'
+import {fileURLToPath, pathToFileURL} from 'node:url'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 const repoRoot = path.resolve(__dirname, '..')
-const probePath = path.join(__dirname, 'probe-extension-develop-resolve.cjs')
+const probePathCjs = path.join(__dirname, 'probe-extension-develop-resolve.cjs')
+const probePathEsm = path.join(
+  __dirname,
+  'probe-extension-develop-resolve-esm.mjs'
+)
+// `--import` requires a URL form for absolute paths so the loader thread can
+// resolve the registration module the same way on POSIX and Windows.
+const probeEsmImportArg = pathToFileURL(probePathEsm).href
 
 const installedExtensionBin = path.join(
   repoRoot,
@@ -65,7 +72,7 @@ const result = await new Promise((resolve) => {
       env: {
         ...process.env,
         NODE_OPTIONS:
-          `${process.env.NODE_OPTIONS ?? ''} --require ${probePath}`.trim(),
+          `${process.env.NODE_OPTIONS ?? ''} --require ${probePathCjs} --import ${probeEsmImportArg}`.trim(),
         // Strip any stale env override that could mask resolver behavior.
         EXTENSION_DEVELOP_ROOT: ''
       },
@@ -75,20 +82,36 @@ const result = await new Promise((resolve) => {
 
   let stdout = ''
   let stderr = ''
+  let killedOnMarker = false
   child.stdout.on('data', (d) => (stdout += d.toString()))
-  child.stderr.on('data', (d) => (stderr += d.toString()))
+  child.stderr.on('data', (d) => {
+    stderr += d.toString()
+    // The ESM resolve hook lives in the loader worker thread and cannot
+    // exit the main process directly, so kill from the parent as soon as
+    // the marker line shows up. Avoids waiting for `extension dev` to
+    // crash on the fake project (no package.json).
+    if (!killedOnMarker && /__EXT_DEV_RESOLVED__::/.test(stderr)) {
+      killedOnMarker = true
+      child.kill('SIGKILL')
+    }
+  })
 
   const killTimer = setTimeout(() => {
     child.kill('SIGKILL')
   }, 60_000)
 
   child.on('close', (code) => {
     clearTimeout(killTimer)
-    resolve({code: code ?? 1, stdout, stderr})
+    resolve({code: code ?? 1, stdout, stderr, killedOnMarker})
   })
   child.on('error', (err) => {
     clearTimeout(killTimer)
-    resolve({code: 1, stdout, stderr: String(err?.message || err)})
+    resolve({
+      code: 1,
+      stdout,
+      stderr: String(err?.message || err),
+      killedOnMarker
+    })
   })
 })
 
@@ -121,16 +144,21 @@ if (!match) {
   process.exit(1)
 }
 
-const resolved = match[1].trim()
+const resolvedRaw = match[1].trim()
+// CJS hook emits a filesystem path; ESM hook emits a `file://` URL. Normalize
+// both to a filesystem path before checking the local-install prefix.
+const resolvedPath = resolvedRaw.startsWith('file://')
+  ? fileURLToPath(resolvedRaw)
+  : resolvedRaw
 const expectedPrefix = installedExtensionDevelopRoot + path.sep
 
-if (!resolved.startsWith(expectedPrefix)) {
+if (!resolvedPath.startsWith(expectedPrefix)) {
   console.error(
     '✖ extension-develop resolved outside the local install:\n' +
       `  expected prefix: ${expectedPrefix}\n` +
-      `  resolved:        ${resolved}`
+      `  resolved:        ${resolvedPath}`
   )
   process.exit(1)
 }
 
-console.log(`✔ extension-develop resolved to ${resolved}`)
+console.log(`✔ extension-develop resolved to ${resolvedPath}`)

scripts/assert-canary-runtime-installed.mjs

@@ -0,0 +1,33 @@
+// ESM resolve hook (runs in Node's loader worker thread). Mirrors the CJS
+// probe-extension-develop-resolve.cjs: observes the first resolution that
+// matches the installed-runtime or workspace-runtime entry, prints a marker
+// line on stderr, and exits the *worker* thread cleanly. The main thread
+// then sees the marker land in stderr and the resolver returns normally.
+
+import {writeSync} from 'node:fs'
+
+const PATTERN =
+  /(?:[\\/]extension-develop[\\/]|[\\/]programs[\\/]develop[\\/])dist[\\/]module\.[cm]?js$/
+
+let observed = false
+
+export async function resolve(specifier, context, nextResolve) {
+  const result = await nextResolve(specifier, context)
+
+  if (
+    !observed &&
+    typeof result?.url === 'string' &&
+    PATTERN.test(result.url)
+  ) {
+    observed = true
+    // writeSync to fd 2 because process.stderr in the loader thread is not
+    // always wired the same way as on the main thread.
+    writeSync(2, `__EXT_DEV_RESOLVED__::${result.url}\n`)
+    // Signal main thread by triggering an unrecoverable error path is too
+    // aggressive; instead we let the load proceed and rely on stderr capture.
+    // The assert script's downstream dev() failure (no real package.json) is
+    // expected and harmless once the marker has been observed.
+  }
+
+  return result
+}

scripts/probe-extension-develop-resolve-esm-hook.mjs

@@ -0,0 +1,10 @@
+// Loaded via `node --import` to register an ESM resolve hook that observes
+// which `extension-develop/dist/module.*` URL the canary CLI imports. Used
+// alongside the CJS probe (probe-extension-develop-resolve.cjs) so both
+// `Module._load` (CJS require) and `await import()` (ESM) paths are covered.
+
+import {register} from 'node:module'
+
+// `import.meta.url` is already a `file://` URL string; do NOT wrap it in
+// pathToFileURL (that would treat the URL as a file path and double-encode).
+register('./probe-extension-develop-resolve-esm-hook.mjs', import.meta.url)