extension-develop 4.0.8 → 4.0.9-canary.1784113746.dc729329

package/dist/0~dev-server.mjs

@@ -491,6 +491,9 @@ class BridgeBroker {
             case 'result':
                 if ('producer' === this.roles.get(conn)) this.onResult(frame);
                 return;
+            case 'reload-ack':
+                if ('producer' === this.roles.get(conn) && this.pendingReload?.reloadType === frame.reloadType) this.pendingReload = void 0;
+                return;
             default:
                 return;
         }
@@ -516,7 +519,7 @@ class BridgeBroker {
             conn.send(frame);
             notified++;
         } catch  {}
-        this.pendingReload = 0 === notified ? frame : void 0;
+        this.pendingReload = 0 === notified || "content-scripts" === frame.reloadType ? frame : void 0;
         return notified;
     }
     pingProducers() {

package/dist/0~rspack-config.mjs

@@ -35,7 +35,8 @@ __webpack_require__.d(rspack_config_namespaceObject, {
     default: ()=>webpackConfig
 });
 function filterKeysForThisBrowser(manifest, browser) {
-    const isChromiumTarget = isChromiumBasedBrowser(String(browser)) || 'safari' === browser || 'webkit-based' === browser || String(browser).includes('webkit');
+    const isSafariTarget = 'safari' === browser || 'webkit-based' === browser || String(browser).includes('webkit');
+    const isChromiumTarget = isChromiumBasedBrowser(String(browser)) || isSafariTarget;
     const isGeckoTarget = constants_isGeckoBasedBrowser(String(browser));
     const chromiumPrefixes = new Set([
         'chromium',
@@ -46,12 +47,18 @@ function filterKeysForThisBrowser(manifest, browser) {
         'gecko',
         'firefox'
     ]);
-    const prefixMatchesTarget = (prefix)=>prefix === browser || isChromiumTarget && chromiumPrefixes.has(prefix) || isGeckoTarget && geckoPrefixes.has(prefix);
+    const webkitPrefixes = new Set([
+        'safari',
+        'webkit'
+    ]);
+    const isFamilyPrefix = (prefix)=>isChromiumTarget && chromiumPrefixes.has(prefix) || isGeckoTarget && geckoPrefixes.has(prefix);
+    const isSpecificPrefix = (prefix)=>prefix === browser || isSafariTarget && webkitPrefixes.has(prefix);
     const resolve = (node)=>{
         if (Array.isArray(node)) return node.map((item)=>resolve(item));
         if (node && 'object' == typeof node) {
             const result = {};
-            const prefixedMatches = {};
+            const familyMatches = {};
+            const specificMatches = {};
             for (const [key, value] of Object.entries(node)){
                 const indexOfColon = key.indexOf(':');
                 if (-1 === indexOfColon) {
@@ -59,9 +66,12 @@ function filterKeysForThisBrowser(manifest, browser) {
                     continue;
                 }
                 const prefix = key.substring(0, indexOfColon);
-                if (prefixMatchesTarget(prefix)) prefixedMatches[key.substring(indexOfColon + 1)] = resolve(value);
+                const strippedKey = key.substring(indexOfColon + 1);
+                if (isSpecificPrefix(prefix)) specificMatches[strippedKey] = resolve(value);
+                else if (isFamilyPrefix(prefix)) familyMatches[strippedKey] = resolve(value);
             }
-            for (const [strippedKey, value] of Object.entries(prefixedMatches))result[strippedKey] = value;
+            for (const [strippedKey, value] of Object.entries(familyMatches))result[strippedKey] = value;
+            for (const [strippedKey, value] of Object.entries(specificMatches))result[strippedKey] = value;
             return result;
         }
         return node;
@@ -2220,12 +2230,14 @@ async function buildCssRules(projectPath, mode, usage, opts) {
                 test: /\.(sass|scss)$/,
                 exclude: /\.module\.(sass|scss)$/,
                 type: nonModuleType,
-                loader: null
+                loader: null,
+                missingTool: 'sass'
             },
             {
                 test: /\.module\.(sass|scss)$/,
                 type: 'css/module',
-                loader: null
+                loader: null,
+                missingTool: 'sass'
             }
         ],
         ...useLess ? [
@@ -2245,16 +2257,18 @@ async function buildCssRules(projectPath, mode, usage, opts) {
                 test: /\.less$/,
                 exclude: /\.module\.less$/,
                 type: nonModuleType,
-                loader: null
+                loader: null,
+                missingTool: 'less'
             },
             {
                 test: /\.module\.less$/,
                 type: 'css/module',
-                loader: null
+                loader: null,
+                missingTool: 'less'
             }
         ]
     ];
-    return Promise.all(fileTypes.map(async ({ test, exclude, type, loader })=>{
+    return Promise.all(fileTypes.map(async ({ test, exclude, type, loader, missingTool })=>{
         const use = loader ? await commonStyleLoaders(projectPath, {
             mode: mode,
             loader,
@@ -2264,6 +2278,9 @@ async function buildCssRules(projectPath, mode, usage, opts) {
         }) : await commonStyleLoaders(projectPath, {
             mode: mode
         });
+        if (missingTool) use.push({
+            loader: resolveDevelopDistFile('preprocessor-passthrough-loader')
+        });
         return {
             test,
             exclude,
@@ -3605,6 +3622,22 @@ class EmitManifest {
 function sanitizeFatalManifestShapes(manifest, manifestDir) {
     const out = manifest;
     const fixes = [];
+    if ('string' != typeof out.name || '' === out.name) {
+        const from = out.name;
+        const isScalar = 'number' == typeof from || 'boolean' == typeof from;
+        out.name = isScalar ? String(from) : 'Unnamed Extension';
+        fixes.push({
+            field: 'name',
+            detail: `replaced ${JSON.stringify(from)} with "${out.name}" — Chrome requires a non-empty string name and refuses the whole extension otherwise`
+        });
+    }
+    if (null == out.version) {
+        out.version = '0.0.0';
+        fixes.push({
+            field: 'version',
+            detail: 'added "0.0.0" — the required version key was missing and Chrome refuses the whole extension without it'
+        });
+    }
     if (null != out.version && 'string' != typeof out.version) {
         const from = JSON.stringify(out.version);
         out.version = String(out.version);
@@ -3691,11 +3724,39 @@ function sanitizeFatalManifestShapes(manifest, manifestDir) {
             }
         }
     }
+    const csp = out.content_security_policy;
+    if (csp && 'object' == typeof csp && !Array.isArray(csp) && 'string' == typeof csp.extension_pages) {
+        const stripped = stripUnsafeInlineFromScriptSrc(csp.extension_pages);
+        if (stripped !== csp.extension_pages) {
+            csp.extension_pages = stripped;
+            fixes.push({
+                field: 'content_security_policy.extension_pages',
+                detail: "removed 'unsafe-inline' from script-src — Chrome refuses the whole extension over an insecure CSP value in extension pages"
+            });
+        }
+    }
     return {
         manifest: out,
         fixes
     };
 }
+function stripUnsafeInlineFromScriptSrc(policy) {
+    let changed = false;
+    const rebuilt = policy.split(';').map((segment)=>{
+        const tokens = segment.trim().split(/\s+/).filter(Boolean);
+        if (0 === tokens.length) return null;
+        if ("script-src" !== tokens[0].toLowerCase()) return tokens.join(' ');
+        const values = tokens.slice(1).filter((value)=>"'unsafe-inline'" !== value.toLowerCase());
+        if (values.length !== tokens.length - 1) changed = true;
+        return [
+            "script-src",
+            ...values.length ? values : [
+                "'self'"
+            ]
+        ].join(' ');
+    }).filter((segment)=>null !== segment);
+    return changed ? rebuilt.join('; ') : policy;
+}
 function isValidChromeVersion(version) {
     if (!version) return false;
     const parts = version.split('.');
@@ -8006,6 +8067,16 @@ const BRIDGE_PRODUCER_SOURCE = `;(function () {
         return;
       }
 
+      // Delivery ack for the broker: proves this SW's message pump actually
+      // processed the frame — a successful socket WRITE proves nothing when
+      // the worker is wedged-but-connected (bug 27). The broker latches a
+      // content-scripts reload until this ack and replays it to the next
+      // producer hello, so an edit that landed on a dead pump still converges.
+      // Sent on receipt (not after reinjection): the scripting-unavailable
+      // fallback restarts the whole extension, and an unacked latch would
+      // replay into the fresh SW and restart it a second time.
+      send({type: "reload-ack", reloadType: kind, label: label});
+
       announceReloadInTabs(announced);
       performDevReload(kind, function () {
         // Only the content-scripts path confirms from here (reinjection ran to
@@ -10792,6 +10863,7 @@ function webpackConfig(projectStructure, devOptions) {
             hints: false
         },
         optimization: {
+            emitOnErrors: false,
             minimize: 'production' === devOptions.mode,
             sideEffects: true,
             usedExports: 'global',

package/dist/101.mjs

@@ -416,6 +416,13 @@ function buildCommandFailed(error) {
     })();
     return `${getLoggingPrefix('error')} Build failed.\n${pintor.red(fmt.truncate(message, 1200))}`;
 }
+function devCommandFailed(error) {
+    const message = (()=>{
+        if (error instanceof Error && error.message) return error.message;
+        return String(error || 'Unknown error');
+    })();
+    return `${getLoggingPrefix('error')} Dev mode failed.\n${pintor.red(fmt.truncate(message, 1200))}`;
+}
 function managedDependencyConflict(duplicates, userPackageJsonPath) {
     const list = duplicates.map((d)=>`- ${pintor.yellow(d)}`).join('\n');
     return `${getLoggingPrefix('error')} Your project declares dependencies that are managed by ${pintor.blue('Extension.js')} and referenced in ${pintor.underline('extension.config.js')}\n${pintor.red('This can cause version conflicts and break the development/build process.')}\n\n${pintor.gray('Managed dependencies (remove these from your package.json):')}\n${list}\n\n${pintor.gray('PATH')} ${pintor.underline(userPackageJsonPath)}\nIf you need a different version, open an issue so we can consider bundling it safely.\nOperation aborted.`;
@@ -677,7 +684,7 @@ async function config_loader_isUsingExperimentalConfig(projectPath) {
     }
     return false;
 }
-var package_namespaceObject = /*#__PURE__*/ JSON.parse('{"rE":"4.0.8","El":{"@prefresh/core":"1.5.9","@prefresh/utils":"1.2.1","@rspack/core":"^2.1.1","@rspack/dev-server":"2.1.0","@rspack/plugin-preact-refresh":"2.0.1","@rspack/plugin-react-refresh":"2.0.2","@vue/compiler-sfc":"3.5.26","adm-zip":"^0.5.16","browser-extension-manifest-fields":"^2.2.9","case-sensitive-paths-webpack-plugin":"^2.4.0","content-security-policy-parser":"^0.6.0","dotenv":"^17.2.3","es-module-lexer":"^2.1.0","extension-from-store":"^0.1.1","go-git-it":"^5.1.5","ignore":"^7.0.5","less":"4.6.7","less-loader":"13.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","postcss":"8.5.10","postcss-loader":"8.2.1","postcss-preset-env":"11.1.1","postcss-scss":"4.0.9","preact":"10.27.3","prefers-yarn":"2.0.1","react-refresh":"0.18.0","sass-loader":"17.0.0","schema-utils":"^4.3.3","svelte-loader":"3.2.4","tiny-glob":"^0.2.9","typescript":"5.9.3","vue":"3.5.26","vue-loader":"17.4.2","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.20.1"}}');
+var package_namespaceObject = /*#__PURE__*/ JSON.parse('{"rE":"4.0.9-canary.1784113746.dc729329","El":{"@prefresh/core":"1.5.9","@prefresh/utils":"1.2.1","@rspack/core":"^2.1.1","@rspack/dev-server":"2.1.0","@rspack/plugin-preact-refresh":"2.0.1","@rspack/plugin-react-refresh":"2.0.2","@vue/compiler-sfc":"3.5.26","adm-zip":"^0.5.16","browser-extension-manifest-fields":"^2.2.9","case-sensitive-paths-webpack-plugin":"^2.4.0","content-security-policy-parser":"^0.6.0","dotenv":"^17.2.3","es-module-lexer":"^2.1.0","extension-from-store":"^0.1.1","go-git-it":"^5.1.5","ignore":"^7.0.5","less":"4.6.7","less-loader":"13.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","postcss":"8.5.10","postcss-loader":"8.2.1","postcss-preset-env":"11.1.1","postcss-scss":"4.0.9","preact":"10.27.3","prefers-yarn":"2.0.1","react-refresh":"0.18.0","sass-loader":"17.0.0","schema-utils":"^4.3.3","svelte-loader":"3.2.4","tiny-glob":"^0.2.9","typescript":"5.9.3","vue":"3.5.26","vue-loader":"17.4.2","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.20.1"}}');
 function asAbsolute(p) {
     return __rspack_external_path.isAbsolute(p) ? p : __rspack_external_path.resolve(p);
 }
@@ -1574,6 +1581,15 @@ function sanitize(obj) {
 function nowISO() {
     return new Date().toISOString();
 }
+const MAX_CONTRACT_ERRORS = 10;
+const ANSI_PATTERN = /\u001b\[[0-9;]*m/g;
+function formatStatsErrors(errors) {
+    if (!Array.isArray(errors)) return [];
+    return errors.slice(0, MAX_CONTRACT_ERRORS).map((error)=>{
+        const message = error && 'object' == typeof error ? String(error.message ?? '') : String(error ?? '');
+        return message.replace(ANSI_PATTERN, '').trim();
+    }).filter(Boolean);
+}
 function createRunId() {
     return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
 }
@@ -1715,17 +1731,20 @@ class PlaywrightPlugin {
             });
             const errorsCount = Array.isArray(errorsJson?.errors) ? errorsJson.errors.length : 0;
             if (hasErrors) {
+                const errorMessages = formatStatsErrors(errorsJson?.errors);
+                const contractErrors = errorMessages.length ? errorMessages : [
+                    `errors: ${String(errorsCount || 1)}`
+                ];
                 this.writer.appendEvent({
                     type: 'compile_error',
                     ts: nowISO(),
                     command: this.command,
                     browser: this.browser,
                     durationMs: Number.isFinite(durationMs) ? durationMs : void 0,
-                    errorCount: Number.isFinite(errorsCount) ? errorsCount : 1
+                    errorCount: Number.isFinite(errorsCount) ? errorsCount : 1,
+                    errors: contractErrors
                 });
-                this.writer.writeError('compile_error', 'Compilation failed', [
-                    `errors: ${String(errorsCount || 1)}`
-                ]);
+                this.writer.writeError('compile_error', 'Compilation failed', contractErrors);
                 return;
             }
             this.writer.appendEvent({
@@ -2120,4 +2139,4 @@ async function extensionPreview(pathOrRemoteUrl, previewOptions, browserLauncher
     await browserLauncher(resolvedOpts);
     metadata.writeReady();
 }
-export { PlaywrightPlugin, asAbsolute, assertNoManagedDependencyConflicts, authorInstallNotice, autoExitForceKill, autoExitModeEnabled, autoExitTriggered, browserRunnerDisabled, buildCommandFailed, buildSuccess, buildSuccessWithWarnings, buildWarningsDetails, buildWebpack, bundlerFatalError, bundlerRecompiling, computeExtensionsToLoad, constants_isGeckoBasedBrowser, createPlaywrightMetadataWriter, debugBrowser, debugContextPath, debugDirs, debugExtensionsToLoad, debugOutputPath, devServerStartTimeout, downloadingText, extensionJsRunnerError, extensionPreview, failedToDownloadOrExtractZIPFileError, getDirs, getDistPath, getProjectStructure, getSpecialFoldersDataForCompiler, getSpecialFoldersDataForProjectRoot, invalidRemoteZip, isChromiumBasedBrowser, loadBrowserConfig, loadCommandConfig, loadCustomConfig, localZipNotFound, manifestInvalidJson, messages_ready, needsInstall, noCompanionExtensionsResolved, noEntrypointsDetected, normalizeBrowser, notAZipArchive, package_namespaceObject, packagingDistributionFiles, packagingSourceFiles, portInUse, projectInstallFallbackToNpm, projectInstallScriptsDisabled, resolveCompanionExtensionDirs, resolveCompanionExtensionsConfig, sanitize, spacerLine, toPosixPath, treeWithDistFilesbrowser, treeWithSourceAndDistFiles, treeWithSourceFiles, unpackagedSuccessfully, unpackagingExtension, writingTypeDefinitions, writingTypeDefinitionsError };
+export { PlaywrightPlugin, asAbsolute, assertNoManagedDependencyConflicts, authorInstallNotice, autoExitForceKill, autoExitModeEnabled, autoExitTriggered, browserRunnerDisabled, buildCommandFailed, buildSuccess, buildSuccessWithWarnings, buildWarningsDetails, buildWebpack, bundlerFatalError, bundlerRecompiling, computeExtensionsToLoad, constants_isGeckoBasedBrowser, createPlaywrightMetadataWriter, debugBrowser, debugContextPath, debugDirs, debugExtensionsToLoad, debugOutputPath, devCommandFailed, devServerStartTimeout, downloadingText, extensionJsRunnerError, extensionPreview, failedToDownloadOrExtractZIPFileError, getDirs, getDistPath, getProjectStructure, getSpecialFoldersDataForCompiler, getSpecialFoldersDataForProjectRoot, invalidRemoteZip, isChromiumBasedBrowser, loadBrowserConfig, loadCommandConfig, loadCustomConfig, localZipNotFound, manifestInvalidJson, messages_ready, needsInstall, noCompanionExtensionsResolved, noEntrypointsDetected, normalizeBrowser, notAZipArchive, package_namespaceObject, packagingDistributionFiles, packagingSourceFiles, portInUse, projectInstallFallbackToNpm, projectInstallScriptsDisabled, resolveCompanionExtensionDirs, resolveCompanionExtensionsConfig, sanitize, spacerLine, toPosixPath, treeWithDistFilesbrowser, treeWithSourceAndDistFiles, treeWithSourceFiles, unpackagedSuccessfully, unpackagingExtension, writingTypeDefinitions, writingTypeDefinitionsError };

package/dist/839.mjs

@@ -4,7 +4,7 @@ import { execFileSync, spawn, spawnSync as external_child_process_spawnSync } fr
 import { buildExecEnv, detectPackageManagerFromLockfile } from "prefers-yarn";
 import pintor from "pintor";
 import { EventEmitter } from "node:events";
-import { package_namespaceObject, buildSuccessWithWarnings, buildWarningsDetails, loadCommandConfig, needsInstall, getDirs, buildCommandFailed, getSpecialFoldersDataForProjectRoot, writingTypeDefinitions, sanitize, projectInstallFallbackToNpm, buildWebpack, assertNoManagedDependencyConflicts, debugDirs, debugBrowser, normalizeBrowser, debugOutputPath, loadCustomConfig, buildSuccess, writingTypeDefinitionsError, getDistPath, loadBrowserConfig, projectInstallScriptsDisabled, authorInstallNotice, getProjectStructure, resolveCompanionExtensionsConfig } from "./101.mjs";
+import { package_namespaceObject, buildSuccessWithWarnings, buildWarningsDetails, loadCommandConfig, needsInstall, getDirs, buildCommandFailed, getSpecialFoldersDataForProjectRoot, writingTypeDefinitions, sanitize, projectInstallFallbackToNpm, buildWebpack, assertNoManagedDependencyConflicts, debugDirs, debugBrowser, normalizeBrowser, debugOutputPath, loadCustomConfig, buildSuccess, devCommandFailed, writingTypeDefinitionsError, getDistPath, loadBrowserConfig, projectInstallScriptsDisabled, authorInstallNotice, getProjectStructure, resolveCompanionExtensionsConfig } from "./101.mjs";
 import { stripBom, parseJsonSafe } from "./23.mjs";
 import { hasProjectDependency, findNearestProjectManifestDirSync } from "./80.mjs";
 import { getCanonicalContentScriptEntryName } from "./291.mjs";
@@ -1280,7 +1280,16 @@ async function extensionBuild(pathOrRemoteUrl, buildOptions) {
                 }
             });
         });
-        if (('safari' === browser || 'webkit-based' === browser) && buildOptions?.safariPackager) await buildOptions.safariPackager(distPath, 'full');
+        if (('safari' === browser || 'webkit-based' === browser) && buildOptions?.safariPackager) {
+            const safariConfig = await loadBrowserConfig(packageJsonDir, browser);
+            await buildOptions.safariPackager(distPath, 'full', {
+                appName: buildOptions.appName ?? safariConfig.appName,
+                bundleId: buildOptions.bundleId ?? safariConfig.bundleId,
+                macOsOnly: buildOptions.macOsOnly ?? safariConfig.macOsOnly,
+                forceRegenerate: buildOptions.forceRegenerate,
+                safariBinary: buildOptions.safariBinary ?? safariConfig.safariBinary
+            });
+        }
         return summary;
     } catch (error) {
         const isAuthor = 'true' === process.env.EXTENSION_AUTHOR_MODE;
@@ -1716,7 +1725,15 @@ async function extensionDev(pathOrRemoteUrl, devOptions) {
             ...sanitize(devOptions)
         };
         if (('safari' === browser || 'webkit-based' === browser) && !devOptions.noBrowser && devOptions.safariPackager) {
-            browsersPlugin = new SafariDevPlugin(devOptions.safariPackager);
+            const safariPackager = devOptions.safariPackager;
+            const safariOverrides = {
+                appName: merged.appName,
+                bundleId: merged.bundleId,
+                macOsOnly: merged.macOsOnly,
+                forceRegenerate: merged.forceRegenerate,
+                safariBinary: merged.safariBinary
+            };
+            browsersPlugin = new SafariDevPlugin((distPath, packagerMode)=>safariPackager(distPath, packagerMode, safariOverrides));
             emitter = browsersPlugin.emitter;
         } else if (devOptions.launcher && !devOptions.noBrowser) {
             browsersPlugin = new BrowsersPlugin({
@@ -1759,7 +1776,8 @@ async function extensionDev(pathOrRemoteUrl, devOptions) {
         });
         return emitter;
     } catch (error) {
-        console.error(error);
+        if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.error(error);
+        else console.error(devCommandFailed(error));
         process.exit(1);
     }
 }

package/dist/845.mjs

@@ -43,6 +43,14 @@ function cssParseErrorShippedVerbatim(resourcePath, error) {
         'PostCSS/Tailwind processing was NOT applied to this file. Fix the CSS to re-enable it.'
     ].join('\n');
 }
+function preprocessorShippedUncompiled(resourcePath, tool) {
+    const pkg = 'sass' === tool ? 'sass' : 'less';
+    return [
+        `${pintor.yellow('⏵⏵⏵')} ${pintor.underline(resourcePath)} shipped UNCOMPILED — ${pintor.brightBlue(`"${pkg}"`)} is not installed in this project.`,
+        `The raw ${'sass' === tool ? 'Sass/SCSS' : 'Less'} source was copied as-is into the output .css, which browsers will treat as broken CSS (unstyled surfaces).`,
+        `Install it to compile this file, for example: ${pintor.gray(`npm install --save-dev ${pkg}`)}`
+    ].join('\n');
+}
 function deadCssUrlRef(issuerPath, request) {
     return [
         `Missing file in ${pintor.underline(issuerPath)}.`,
@@ -52,4 +60,4 @@ function deadCssUrlRef(issuerPath, request) {
         `${pintor.red('NOT FOUND')} ${pintor.underline(request)}`
     ].join('\n');
 }
-export { cssConfigsDetected, cssIntegrationsEnabled, cssParseErrorShippedVerbatim, deadCssUrlRef, isUsingIntegration, missingSassDependency, postCssPluginNotResolved };
+export { cssConfigsDetected, cssIntegrationsEnabled, cssParseErrorShippedVerbatim, deadCssUrlRef, isUsingIntegration, missingSassDependency, postCssPluginNotResolved, preprocessorShippedUncompiled };