extension-develop 4.1.4 → 4.1.6

package/dist/0~rspack-config.mjs

@@ -12,7 +12,7 @@ import { filterKeysForThisBrowser as external_browser_extension_manifest_fields_
 import content_security_policy_parser from "content-security-policy-parser";
 import node_fs from "node:fs";
 import node_path from "node:path";
-import { debugExtensionsToLoad, package_namespaceObject, getDirs, asAbsolute, browserRunnerDisabled, treeWithDistFilesBrowser, packagingDistributionFiles, toPosixPath, resolveCompanionExtensionDirs, debugContextPath, specialFoldersSetupSummary, isGeckoBasedBrowser, spacerLine, isWebkitBasedBrowser, PlaywrightPlugin, messages_ready, CHROMIUM_FAMILY_ALIASES, treeWithSourceAndDistFiles, computeExtensionsToLoad, noCompanionExtensionsResolved, treeWithSourceFiles, bundlerFatalError, bundlerRecompiling, serverRestartRequiredFromSpecialFolderMessageOnly, noEntrypointsDetected, GECKO_FAMILY_ALIASES, packagingSourceFiles, getPreloadedEnvKeys, debugBrowser, debugOutputPath, manifestInvalidJson, specialFolderChangeDetected, isChromiumBasedBrowser, getSpecialFoldersDataForCompiler } from "./101.mjs";
+import { debugExtensionsToLoad, package_namespaceObject, getDirs, asAbsolute, browserRunnerDisabled, treeWithDistFilesBrowser, packagingDistributionFiles, toPosixPath as paths_toPosixPath, resolveCompanionExtensionDirs, debugContextPath, specialFoldersSetupSummary, isGeckoBasedBrowser, spacerLine, isWebkitBasedBrowser, PlaywrightPlugin, messages_ready, CHROMIUM_FAMILY_ALIASES, treeWithSourceAndDistFiles, computeExtensionsToLoad, noCompanionExtensionsResolved, treeWithSourceFiles, bundlerFatalError, bundlerRecompiling, serverRestartRequiredFromSpecialFolderMessageOnly, noEntrypointsDetected, GECKO_FAMILY_ALIASES, packagingSourceFiles, getPreloadedEnvKeys, debugBrowser, debugOutputPath, manifestInvalidJson, specialFolderChangeDetected, isChromiumBasedBrowser, getSpecialFoldersDataForCompiler } from "./101.mjs";
 import { stripBom, parseJsonSafe } from "./23.mjs";
 import { isResourceUnderDirs, canonicalizeDir, toResourceKey } from "./93.mjs";
 import { prefix as messaging_prefix, isDebug } from "./349.mjs";
@@ -21,6 +21,7 @@ import { renderStatsBlocks, makeSanitizedConsole } from "./0~stats-handler.mjs";
 import { getCanonicalContentScriptEntryName, parseCanonicalContentScriptAsset, EXTENSIONJS_CONTENT_SCRIPT_LAYER, isCanonicalContentScriptAsset, getCanonicalContentScriptJsAssetName, getCanonicalContentScriptCssAssetName } from "./291.mjs";
 import { hasProjectDependency, findNearestProjectManifestSync, PROJECT_MANIFEST_FILENAMES, readProjectDependencies } from "./80.mjs";
 import { cssIntegrationsEnabled, cssConfigsDetected, deadCssUrlRef, missingSassDependency, isUsingIntegration, postCssPluginNotResolved } from "./845.mjs";
+import { toPosixPath } from "./86.mjs";
 import { injectedFileDependencyMissing, importScriptsDependencyMissing, getURLDependencyMissing, staticImportDependencyMissing, fetchedFileDependencyMissing, runtimeSetSurfaceDependencyMissing } from "./266.mjs";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { dirname as __rspack_dirname } from "node:path";
@@ -2641,7 +2642,7 @@ async function commonStyleLoaders(projectPath, opts) {
 }
 async function buildCssRules(projectPath, mode, usage, opts) {
     const { useSass = true, useLess = true } = usage;
-    const { nonModuleType, issuer } = opts;
+    const { nonModuleType, issuer, manifestPath } = opts;
     const fileTypes = [
         {
             test: /\.module\.css$/,
@@ -2725,6 +2726,13 @@ async function buildCssRules(projectPath, mode, usage, opts) {
         if ('css' === type || 'css/module' === type) use.unshift({
             loader: resolveDevelopDistFile('late-css-import-loader')
         });
+        if ('asset/inline' === type && manifestPath) use.unshift({
+            loader: resolveDevelopDistFile('dead-css-url-loader'),
+            options: {
+                manifestPath,
+                projectPath
+            }
+        });
         return {
             test,
             exclude,
@@ -2768,7 +2776,8 @@ function isContentScriptEntry(absolutePath, manifestPath, projectPath) {
 async function cssInContentScriptLoader(projectPath, manifestPath, mode, usage = {}) {
     return buildCssRules(projectPath, mode, usage, {
         nonModuleType: 'asset/inline',
-        issuer: (issuer)=>isContentScriptEntry(issuer, manifestPath, projectPath)
+        issuer: (issuer)=>isContentScriptEntry(issuer, manifestPath, projectPath),
+        manifestPath
     });
 }
 async function cssInHtmlLoader(projectPath, mode, manifestPath, usage = {}) {
@@ -2864,8 +2873,9 @@ class CssPlugin {
                 const key = `${issuer}|${req}`;
                 if (!warned.has(key) && compilation?.warnings) {
                     warned.add(key);
-                    const warning = new core_WebpackError(deadCssUrlRef(__rspack_external_node_path_c5b9b54f.relative(manifestDir, issuer) || issuer, raw));
-                    warning.file = __rspack_external_node_path_c5b9b54f.relative(manifestDir, issuer);
+                    const issuerPath = toPosixPath(__rspack_external_node_path_c5b9b54f.relative(manifestDir, issuer) || issuer);
+                    const warning = new core_WebpackError(deadCssUrlRef(issuerPath, raw));
+                    warning.file = issuerPath;
                     compilation?.warnings.push(warning);
                 }
                 return false;
@@ -12670,44 +12680,76 @@ class KeepGetURLImportsNative {
         });
     }
 }
-class ValidateContentScriptSyntax {
+const requireModule = createRequire(import.meta.url);
+class ValidateEmittedScriptSyntax {
     apply(compiler) {
         if (!compiler?.hooks?.thisCompilation?.tap) return;
-        compiler.hooks.thisCompilation.tap("scripts:validate-content-script-syntax", (compilation)=>{
+        compiler.hooks.thisCompilation.tap("scripts:validate-emitted-script-syntax", (compilation)=>{
             compilation.hooks.processAssets.tap({
-                name: "scripts:validate-content-script-syntax",
+                name: "scripts:validate-emitted-script-syntax",
                 stage: core_Compilation.PROCESS_ASSETS_STAGE_REPORT
             }, ()=>{
                 const assets = 'function' == typeof compilation.getAssets ? compilation.getAssets() : [];
                 for (const asset of assets){
                     const name = asset?.name || '';
-                    if (!isCanonicalContentScriptAsset(name)) continue;
-                    if (!name.endsWith('.js')) continue;
+                    if (!/\.[cm]?js$/i.test(name)) continue;
                     let source = '';
                     try {
                         source = asset.source?.source?.().toString() || '';
                     } catch  {
                         continue;
                     }
-                    if (source) try {
-                        new Function(source);
-                    } catch (caught) {
-                        const error = caught;
-                        if (error?.name !== 'SyntaxError') continue;
-                        const err = new core_WebpackError([
-                            `${name} is not valid JavaScript: ${error.message}.`,
-                            "The browser will silently skip an unparsable content script:",
-                            'it never injects and reports no error anywhere. Fix the syntax',
-                            "error in the source file(s) this content_scripts entry bundles."
-                        ].join('\n'));
-                        err.file = name;
-                        compilation.errors.push(err);
-                    }
+                    if (!source) continue;
+                    const error = findSyntaxError(source);
+                    if (!error) continue;
+                    const err = new core_WebpackError([
+                        `${name} is not valid JavaScript: ${error.message}.`,
+                        ...describeSlot(name)
+                    ].join('\n'));
+                    err.file = name;
+                    compilation.errors.push(err);
                 }
             });
         });
     }
 }
+function describeSlot(name) {
+    if (isCanonicalContentScriptAsset(name)) return [
+        "The browser will silently skip an unparsable content script:",
+        'it never injects and reports no error anywhere. Fix the syntax',
+        "error in the source file(s) this content_scripts entry bundles."
+    ];
+    return [
+        'The browser refuses to run a file it cannot parse, so the surface this',
+        'backs is dead on arrival. Fix the syntax error in the source file(s)',
+        'this entry bundles.'
+    ];
+}
+function findSyntaxError(source) {
+    try {
+        new Function(source);
+        return;
+    } catch (caught) {
+        const error = caught;
+        if (error?.name !== 'SyntaxError') return;
+        if (parsesAsModule(source)) return;
+        return error;
+    }
+}
+function parsesAsModule(source) {
+    try {
+        const acorn = requireModule('acorn');
+        acorn.parse(source, {
+            ecmaVersion: 'latest',
+            sourceType: 'module',
+            allowAwaitOutsideFunction: true,
+            allowHashBang: true
+        });
+        return true;
+    } catch  {
+        return false;
+    }
+}
 class ScriptsPlugin {
     manifestPath;
     includeList;
@@ -12736,7 +12778,7 @@ class ScriptsPlugin {
             browser: this.browser
         }).apply(compiler);
         if ('production' === compiler.options.mode) new AddPublicPathRuntimeModule().apply(compiler);
-        new ValidateContentScriptSyntax().apply(compiler);
+        new ValidateEmittedScriptSyntax().apply(compiler);
     }
 }
 class CollectContentEntryImports {
@@ -13306,8 +13348,8 @@ function webpackConfig(projectStructure, devOptions) {
                 ...transpilePackageDirs.length > 0 ? [] : [
                     '**/node_modules/**'
                 ],
-                `${toPosixPath(primaryExtensionOutputDir)}/**`,
-                `${toPosixPath(__rspack_external_node_path_c5b9b54f.join(packageJsonDir, 'dist'))}/**`,
+                `${paths_toPosixPath(primaryExtensionOutputDir)}/**`,
+                `${paths_toPosixPath(__rspack_external_node_path_c5b9b54f.join(packageJsonDir, 'dist'))}/**`,
                 '**/extension-js/profiles/**'
             ],
             ...'true' === process.env.EXTENSION_WATCH_POLL ? {

package/dist/101.mjs

@@ -699,7 +699,7 @@ async function config_loader_isUsingExperimentalConfig(projectPath) {
     }
     return false;
 }
-var package_namespaceObject = /*#__PURE__*/ JSON.parse('{"rE":"4.1.4","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","acorn":"^8.16.0","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.2.5","fflate":"^0.8.3","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.23","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","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.1.6","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","acorn":"^8.16.0","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.2.5","fflate":"^0.8.3","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.23","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","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_node_path_c5b9b54f.isAbsolute(p) ? p : __rspack_external_node_path_c5b9b54f.resolve(p);
 }
@@ -2058,6 +2058,25 @@ function collectReferenceCorpus(projectRoot) {
     walk(projectRoot);
     return 0 === files ? '' : parts.join('\n');
 }
+const COMPILED_TO_JS_EXTS = new Set([
+    '.ts',
+    '.tsx',
+    '.jsx',
+    '.mts',
+    '.cts',
+    '.mjs',
+    '.cjs'
+]);
+function referenceSpellings(relativePath) {
+    const ext = node_path.extname(relativePath).toLowerCase();
+    if (!COMPILED_TO_JS_EXTS.has(ext)) return [
+        relativePath
+    ];
+    return [
+        relativePath,
+        `${relativePath.slice(0, -ext.length)}.js`
+    ];
+}
 const warnedDroppedScripts = new Set();
 function filterUnreferencedScripts(list, projectRoot) {
     const entries = Object.entries(list || {});
@@ -2068,7 +2087,7 @@ function filterUnreferencedScripts(list, projectRoot) {
         const abs = String(entry);
         if (!node_path.isAbsolute(abs)) return true;
         const rel = node_path.relative(projectRoot, abs).split(node_path.sep).join('/');
-        return corpus.includes(rel);
+        return referenceSpellings(rel).some((spelling)=>corpus.includes(spelling));
     };
     const next = {};
     const dropped = [];

package/dist/494.mjs

@@ -1,4 +1,5 @@
 import { createRequire as __extjsCreateRequire } from "node:module"; const require = __extjsCreateRequire(import.meta.url);
+import { spawnSync } from "node:child_process";
 import * as __rspack_external_node_fs_5ea92f0c from "node:fs";
 import * as __rspack_external_node_path_c5b9b54f from "node:path";
 function sessionStateDir(projectPath) {
@@ -33,6 +34,22 @@ function ensureSessionArtifactsIgnoreFile(projectPath) {
         __rspack_external_node_fs_5ea92f0c.writeFileSync(ignoreFile, SESSION_ARTIFACTS_IGNORE_CONTENT);
     } catch  {}
 }
+function isAlreadyIgnoredByGit(projectPath) {
+    try {
+        const result = spawnSync('git', [
+            'check-ignore',
+            '-q',
+            '--',
+            '.extension-js/'
+        ], {
+            cwd: projectPath,
+            stdio: 'ignore'
+        });
+        return 0 === result.status;
+    } catch  {
+        return false;
+    }
+}
 function ensureSessionStateInProjectGitignore(projectPath) {
     try {
         const gitignorePath = __rspack_external_node_path_c5b9b54f.resolve(projectPath, '.gitignore');
@@ -40,6 +57,7 @@ function ensureSessionStateInProjectGitignore(projectPath) {
         const content = __rspack_external_node_fs_5ea92f0c.readFileSync(gitignorePath, 'utf8');
         const lines = content.split(/\r?\n/).map((line)=>line.trim());
         if (lines.includes('.extension-js') || lines.includes('.extension-js/')) return;
+        if (isAlreadyIgnoredByGit(projectPath)) return;
         const prefix = content.length > 0 && !content.endsWith('\n') ? '\n' : '';
         __rspack_external_node_fs_5ea92f0c.appendFileSync(gitignorePath, `${prefix}\n# extension.js local session state\n.extension-js\n`);
     } catch  {}

package/dist/839.mjs

@@ -973,9 +973,13 @@ function defaultTypeScriptConfig(projectPath, _opts) {
     };
 }
 function getUserTypeScriptConfigFile(projectPath) {
-    const pkgDir = findNearestPackageJsonDirectory(projectPath);
-    if (pkgDir) {
-        const tsconfigPath = __rspack_external_node_path_c5b9b54f.join(pkgDir, 'tsconfig.json');
+    const searchDirs = [
+        findNearestPackageJsonDirectory(projectPath),
+        projectPath
+    ];
+    for (const dir of searchDirs){
+        if (!dir) continue;
+        const tsconfigPath = __rspack_external_node_path_c5b9b54f.join(dir, 'tsconfig.json');
         if (__rspack_external_node_fs_5ea92f0c.existsSync(tsconfigPath)) return tsconfigPath;
     }
 }

package/dist/86.mjs

@@ -0,0 +1,36 @@
+import { createRequire as __extjsCreateRequire } from "node:module"; const require = __extjsCreateRequire(import.meta.url);
+import * as __rspack_external_node_fs_5ea92f0c from "node:fs";
+import * as __rspack_external_node_path_c5b9b54f from "node:path";
+const ASSET_EXT = /\.(png|jpe?g|gif|webp|svg|avif|ico|bmp|cur|woff2?|ttf|otf|eot|mp3|mp4|webm|ogg|wav)$/i;
+const URL_REF = /url\(\s*(?:"([^"\n]*)"|'([^'\n]*)'|([^)'"\s]*))\s*\)/g;
+function toPosixPath(value) {
+    return String(value).split(__rspack_external_node_path_c5b9b54f.sep).join('/');
+}
+function isDeadCssUrlRef(rawRequest, { issuerDir, roots }) {
+    const req = String(rawRequest).split('?')[0].split('#')[0];
+    if (!req || req.startsWith('//') || /^[a-z][a-z0-9+.-]*:/i.test(req)) return false;
+    if (req.startsWith('~') || req.startsWith('@')) return false;
+    const isRootRef = req.startsWith('/');
+    const isRelativeRef = req.startsWith('./') || req.startsWith('../');
+    const isBareAssetRef = !isRootRef && !isRelativeRef && ASSET_EXT.test(req);
+    if (!isRootRef && !isRelativeRef && !isBareAssetRef) return false;
+    const candidates = isRootRef ? roots.map((root)=>__rspack_external_node_path_c5b9b54f.join(root, req.slice(1))) : [
+        __rspack_external_node_path_c5b9b54f.resolve(issuerDir, req),
+        ...isBareAssetRef ? roots.map((root)=>__rspack_external_node_path_c5b9b54f.join(root, req)) : []
+    ];
+    return !candidates.some((candidate)=>__rspack_external_node_fs_5ea92f0c.existsSync(candidate));
+}
+function extractCssUrlRefs(source) {
+    const found = [];
+    const seen = new Set();
+    URL_REF.lastIndex = 0;
+    let match;
+    while(null !== (match = URL_REF.exec(source))){
+        const request = match[1] ?? match[2] ?? match[3] ?? '';
+        if (!request || seen.has(request)) continue;
+        seen.add(request);
+        found.push(request);
+    }
+    return found;
+}
+export { extractCssUrlRefs, isDeadCssUrlRef, toPosixPath };

package/dist/bridge.mjs

@@ -196,7 +196,9 @@ class BridgeController {
                 if (!settled) {
                     settled = true;
                     clearTimeout(connectTimer);
-                    reject(new Error(`control channel refused the controller (code ${code}${reason ? `: ${reason}` : ''}). Is the session started with ${this.opts.unlockFlag || '--allow-control'}?`));
+                    const flag = this.opts.unlockFlag || '--allow-control';
+                    const detail = 4003 === code ? `the session has no control channel. It is opened by a running \`dev\` session started with ${flag}; a session started without it, or already stopped, has none to connect to.` : `is the session started with ${flag}?`;
+                    reject(new Error(`control channel refused the controller (code ${code}${reason ? `: ${reason}` : ''}). ${detail}`));
                 }
                 this.failAllPending(new Error(`control channel closed (code ${code})`));
                 this.socket = null;

package/dist/dead-css-url-loader.mjs

@@ -0,0 +1,34 @@
+import { createRequire as __extjsCreateRequire } from "node:module"; const require = __extjsCreateRequire(import.meta.url);
+import { WebpackError } from "@rspack/core";
+import { isDeadCssUrlRef, extractCssUrlRefs, toPosixPath } from "./86.mjs";
+import { deadCssUrlRef } from "./845.mjs";
+import * as __rspack_external_node_path_c5b9b54f from "node:path";
+function deadCssUrlLoader(source) {
+    try {
+        const { manifestPath, projectPath } = this.getOptions() || {};
+        if (!manifestPath || !projectPath) return source;
+        const manifestDir = __rspack_external_node_path_c5b9b54f.dirname(manifestPath);
+        const roots = [
+            __rspack_external_node_path_c5b9b54f.join(projectPath, 'public'),
+            manifestDir
+        ];
+        const issuerDir = __rspack_external_node_path_c5b9b54f.dirname(this.resourcePath);
+        const issuerPath = toPosixPath(__rspack_external_node_path_c5b9b54f.relative(manifestDir, this.resourcePath) || this.resourcePath);
+        const strict = 'true' === process.env.EXTENSION_STRICT_REFS;
+        const compilation = this._compilation;
+        for (const request of extractCssUrlRefs(source)){
+            if (!isDeadCssUrlRef(request, {
+                issuerDir,
+                roots
+            })) continue;
+            const report = new WebpackError(deadCssUrlRef(issuerPath, request));
+            report.file = issuerPath;
+            const sink = strict ? compilation?.errors : compilation?.warnings;
+            if (sink) sink.push(report);
+            else if (strict) this.emitError(report);
+            else this.emitWarning(report);
+        }
+    } catch  {}
+    return source;
+}
+export default deadCssUrlLoader;