extension-develop 3.18.5-canary.local-b4fd0431 → 4.0.1

package/dist/0~rspack-config.mjs

@@ -12,11 +12,11 @@ import { getManifestFieldsData } from "browser-extension-manifest-fields";
 import content_security_policy_parser from "content-security-policy-parser";
 import path_0 from "path";
 import fs from "fs";
+import { isResourceUnderDirs, findNearestPackageJsonSync, backgroundIsRequiredMessageOnly, canonicalizeDir } from "./775.mjs";
 import { getCanonicalContentScriptEntryName, parseCanonicalContentScriptAsset, getCanonicalContentScriptJsAssetName, getCanonicalContentScriptCssAssetName, EXTENSIONJS_CONTENT_SCRIPT_LAYER } from "./291.mjs";
 import { isUsingTypeScript, jsFrameworksIntegrationsEnabled, ensureTypeScriptConfig, ensureOptionalContractModuleLoaded, resolveDevelopInstallRoot, isUsingCustomLoader, resolveOptionalDependencySync, loadOptionalContractModuleWithoutInstall, isUsingIntegration as messages_isUsingIntegration, resolveOptionalContractPackageWithoutInstall, jsFrameworksHmrSummary, parseJsonSafe, getUserTypeScriptConfigFile, jsFrameworksConfigsDetected, hasDependency, resolveDevelopDistFile, optional_deps_resolver_ensureOptionalContractPackageResolved } from "./839.mjs";
 import { debugExtensionsToLoad, treeWithSourceFiles, getDirs, bundlerFatalError, bundlerRecompiling, asAbsolute, browserRunnerDisabled, packagingDistributionFiles, PlaywrightPlugin, resolveCompanionExtensionDirs, debugContextPath, noEntrypointsDetected, packagingSourceFiles, debugBrowser, spacerLine, debugOutputPath, messages_ready, manifestInvalidJson, treeWithSourceAndDistFiles, treeWithDistFilesbrowser, getSpecialFoldersDataForCompiler, computeExtensionsToLoad, noCompanionExtensionsResolved } from "./101.mjs";
 import { scrubBrand, makeSanitizedConsole } from "./0~branding.mjs";
-import { findNearestPackageJsonSync, backgroundIsRequiredMessageOnly } from "./224.mjs";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { dirname as __rspack_dirname } from "node:path";
 var __rspack_import_meta_dirname__ = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
@@ -66,13 +66,27 @@ function filterKeysForThisBrowser(manifest, browser) {
         'gecko',
         'firefox'
     ]);
-    const patchedManifest = JSON.parse(JSON.stringify(manifest), function(key, value) {
-        const indexOfColon = key.indexOf(':');
-        if (-1 === indexOfColon) return value;
-        const prefix = key.substring(0, indexOfColon);
-        if (prefix === browser || isChromiumTarget && chromiumPrefixes.has(prefix) || isGeckoTarget && geckoPrefixes.has(prefix)) this[key.substring(indexOfColon + 1)] = value;
-    });
-    return patchedManifest;
+    const prefixMatchesTarget = (prefix)=>prefix === browser || isChromiumTarget && chromiumPrefixes.has(prefix) || isGeckoTarget && geckoPrefixes.has(prefix);
+    const resolve = (node)=>{
+        if (Array.isArray(node)) return node.map((item)=>resolve(item));
+        if (node && 'object' == typeof node) {
+            const result = {};
+            const prefixedMatches = {};
+            for (const [key, value] of Object.entries(node)){
+                const indexOfColon = key.indexOf(':');
+                if (-1 === indexOfColon) {
+                    result[key] = resolve(value);
+                    continue;
+                }
+                const prefix = key.substring(0, indexOfColon);
+                if (prefixMatchesTarget(prefix)) prefixedMatches[key.substring(indexOfColon + 1)] = resolve(value);
+            }
+            for (const [strippedKey, value] of Object.entries(prefixedMatches))result[strippedKey] = value;
+            return result;
+        }
+        return node;
+    };
+    return resolve(manifest);
 }
 function normalizePath(filePath) {
     return filePath.replace(/\\/g, '/');
@@ -149,9 +163,9 @@ function resolveTranspilePackageDirs(projectRoot, transpilePackages) {
     return Array.from(resolvedDirs);
 }
 function isSubPath(resourcePath, directoryPath) {
-    const resource = normalizePath(resourcePath);
-    const dir = normalizePath(directoryPath).replace(/\/+$/, '');
-    return resource === dir || resource.startsWith(`${dir}/`);
+    return isResourceUnderDirs(resourcePath, [
+        canonicalizeDir(directoryPath)
+    ]);
 }
 function serverRestartRequiredFromSpecialFolderMessageOnly(addingOrRemoving, folder, typeOfAsset) {
     return `${pintor.red('ERROR')} in ${pintor.yellow('manifest.json')} entrypoint: ${addingOrRemoving} ${pintor.yellow(typeOfAsset)} in ${pintor.underline(folder + '/')} requires a dev server restart to apply changes.`;
@@ -1008,42 +1022,8 @@ function getManifestContent(compilation, manifestPath) {
         return cjsRequire(manifestPath);
     }
 }
-function manifest_filterKeysForThisBrowser(manifest, browser) {
-    const isChromiumTarget = isChromiumBasedBrowser(String(browser));
-    const isGeckoTarget = isGeckoBasedBrowser(String(browser));
-    const chromiumPrefixes = new Set([
-        'chromium',
-        'chrome',
-        'edge'
-    ]);
-    const geckoPrefixes = new Set([
-        'gecko',
-        'firefox'
-    ]);
-    const prefixMatchesTarget = (prefix)=>prefix === browser || isChromiumTarget && chromiumPrefixes.has(prefix) || isGeckoTarget && geckoPrefixes.has(prefix);
-    const resolve = (node)=>{
-        if (Array.isArray(node)) return node.map((item)=>resolve(item));
-        if (node && 'object' == typeof node) {
-            const result = {};
-            const prefixedMatches = {};
-            for (const [key, value] of Object.entries(node)){
-                const indexOfColon = key.indexOf(':');
-                if (-1 === indexOfColon) {
-                    result[key] = resolve(value);
-                    continue;
-                }
-                const prefix = key.substring(0, indexOfColon);
-                if (prefixMatchesTarget(prefix)) prefixedMatches[key.substring(indexOfColon + 1)] = resolve(value);
-            }
-            for (const [strippedKey, value] of Object.entries(prefixedMatches))result[strippedKey] = value;
-            return result;
-        }
-        return node;
-    };
-    return resolve(manifest);
-}
 function buildCanonicalManifest(manifestPath, manifest, browser) {
-    const filteredManifest = manifest_filterKeysForThisBrowser(manifest, browser);
+    const filteredManifest = filterKeysForThisBrowser(manifest, browser);
     return {
         ...filteredManifest,
         ...JSON.parse(getManifestOverrides(manifestPath, filteredManifest))
@@ -5424,17 +5404,6 @@ function getMainWorldBridgeScripts(manifestPath) {
     } catch  {}
     return bridgeScripts;
 }
-function canonicalizeDir(dir) {
-    try {
-        return __rspack_external_fs.realpathSync.native(dir);
-    } catch  {
-        try {
-            return __rspack_external_fs.realpathSync(dir);
-        } catch  {
-            return dir;
-        }
-    }
-}
 class AddContentScriptWrapper {
     static getBridgeScripts(manifestPath) {
         return getMainWorldBridgeScripts(manifestPath);
@@ -5461,10 +5430,13 @@ class AddContentScriptWrapper {
             manifestDir,
             packageJsonDir
         ];
+        const includeMatcher = (resource)=>isResourceUnderDirs(resource, includeDirs);
         compiler.options.module.rules.push({
             test: /\.(js|cjs|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
             resourceQuery: /__extensionjs_classic_concat__/,
-            include: includeDirs,
+            include: [
+                includeMatcher
+            ],
             exclude: [
                 /([\\/])node_modules\1/
             ],
@@ -5483,7 +5455,9 @@ class AddContentScriptWrapper {
         });
         compiler.options.module.rules.push({
             test: /\.(js|cjs|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
-            include: includeDirs,
+            include: [
+                includeMatcher
+            ],
             exclude: [
                 /([\\/])node_modules\1/
             ],
@@ -6561,8 +6535,8 @@ class WebExtensionPlugin {
     }
 }
 const webpack_target_webextension_fork = WebExtensionPlugin;
-function scripts_lib_manifest_filterKeysForThisBrowser(manifest, browser) {
-    return manifest_filterKeysForThisBrowser(manifest, browser);
+function manifest_filterKeysForThisBrowser(manifest, browser) {
+    return filterKeysForThisBrowser(manifest, browser);
 }
 class SetupBackgroundEntry {
     manifestPath;
@@ -6574,7 +6548,7 @@ class SetupBackgroundEntry {
     getMissingBackgroundError(bgFile) {
         if (!__rspack_external_fs.existsSync(bgFile) && this.manifestPath) {
             const manifest = JSON.parse(__rspack_external_fs.readFileSync(this.manifestPath, 'utf8'));
-            const patched = scripts_lib_manifest_filterKeysForThisBrowser(manifest, this.browser);
+            const patched = manifest_filterKeysForThisBrowser(manifest, this.browser);
             const fieldKey = 3 === patched.manifest_version ? 'background/service_worker' : "background/scripts";
             return backgroundIsRequiredMessageOnly(fieldKey);
         }
@@ -6594,7 +6568,7 @@ class SetupBackgroundEntry {
         const browser = this.browser;
         const minimumBgScript = resolveDevelopDistFile('firefox' === browser || 'gecko-based' === browser ? 'minimum-firefox-file' : 'minimum-chromium-file');
         const dirname = __rspack_external_path.dirname(this.manifestPath);
-        const filteredManifest = scripts_lib_manifest_filterKeysForThisBrowser(manifest, browser) || manifest;
+        const filteredManifest = manifest_filterKeysForThisBrowser(manifest, browser) || manifest;
         const manifestBg = filteredManifest?.background ?? manifest.background;
         const manifestVersion = filteredManifest?.manifest_version ?? manifest.manifest_version;
         function hookError(maybeError) {
@@ -6611,7 +6585,14 @@ class SetupBackgroundEntry {
             } else this.addDefaultEntry(compiler, "background/script", minimumBgScript);
             return;
         }
-        if (3 === manifestVersion) {
+        if (2 === manifestVersion) {
+            const bgScripts = manifestBg?.scripts;
+            if (bgScripts && bgScripts.length > 0) {
+                const bgScriptPath = __rspack_external_path.join(dirname, bgScripts[0]);
+                const maybeError = this.getMissingBackgroundError(bgScriptPath);
+                if (maybeError) hookError(maybeError);
+            } else this.addDefaultEntry(compiler, "background/script", minimumBgScript);
+        } else {
             const serviceWorker = manifestBg?.service_worker;
             if (serviceWorker) {
                 const swPath = __rspack_external_path.join(dirname, serviceWorker);
@@ -6620,13 +6601,6 @@ class SetupBackgroundEntry {
                 const existingEntry = compiler.options.entry && 'background/service_worker' in compiler.options.entry ? compiler.options.entry['background/service_worker'] : void 0;
                 if (!existingEntry && __rspack_external_fs.existsSync(swPath)) this.addDefaultEntry(compiler, 'background/service_worker', swPath);
             } else this.addDefaultEntry(compiler, 'background/service_worker', minimumBgScript);
-        } else if (2 === manifestVersion) {
-            const bgScripts = manifestBg?.scripts;
-            if (bgScripts && bgScripts.length > 0) {
-                const bgScriptPath = __rspack_external_path.join(dirname, bgScripts[0]);
-                const maybeError = this.getMissingBackgroundError(bgScriptPath);
-                if (maybeError) hookError(maybeError);
-            } else this.addDefaultEntry(compiler, "background/script", minimumBgScript);
         }
     }
 }
@@ -6663,7 +6637,7 @@ class SetupReloadStrategy {
     }
     apply(compiler) {
         const manifest = JSON.parse(__rspack_external_fs.readFileSync(this.manifestPath, 'utf-8'));
-        const patchedManifest = scripts_lib_manifest_filterKeysForThisBrowser(manifest, this.browser);
+        const patchedManifest = manifest_filterKeysForThisBrowser(manifest, this.browser);
         const contentScriptsMeta = {};
         try {
             const csList = Array.isArray(patchedManifest.content_scripts) ? patchedManifest.content_scripts : [];

package/dist/101.mjs

@@ -13,7 +13,7 @@ import * as __rspack_external_fs from "fs";
 import * as __rspack_external_path from "path";
 import * as __rspack_external_os from "os";
 import * as __rspack_external_vm from "vm";
-var package_namespaceObject = /*#__PURE__*/ JSON.parse('{"rE":"3.18.5-canary.local-b4fd0431","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.7","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.5.1","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.1","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.7","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.5.1","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"}}');
 const fmt = {
     heading: (title)=>pintor.underline(pintor.blue(title)),
     label: (key)=>pintor.gray(key.toUpperCase()),

package/dist/{224.mjs → 775.mjs}

@@ -32,4 +32,32 @@ function reservedScriptsFolder(relPath, indicators) {
     const reasons = indicators.map((r)=>`- ${pintor.gray(r)}`).join('\n');
     return `${pintor.red('ERROR')} scripts/ is a reserved folder in Extension.js.\nEvery file under ${pintor.yellow("scripts/")} is wrapped with the browser content-script mount runtime, so Node.js-only files placed here will fail to parse or run.\nRename the folder at the project root (for example ${pintor.yellow('bin/')}, ${pintor.yellow('tools/')}, ${pintor.yellow('ops/')}, ${pintor.yellow('tasks/')}, or ${pintor.yellow("ci-scripts/")}) or move the file out of scripts/.\n\n${pintor.red('NODE.JS SHAPE')}\n${reasons}\n${pintor.red('NOT ALLOWED')} ${pintor.underline(relPath)}`;
 }
-export { backgroundIsRequiredMessageOnly, findNearestPackageJsonSync, reservedScriptsFolder };
+function canonicalizeDir(dir) {
+    try {
+        return __rspack_external_fs.realpathSync.native(dir);
+    } catch  {
+        try {
+            return __rspack_external_fs.realpathSync(dir);
+        } catch  {
+            return dir;
+        }
+    }
+}
+function canonicalizeResourcePath(resourcePath) {
+    if ('string' != typeof resourcePath || 0 === resourcePath.length) return resourcePath;
+    try {
+        return __rspack_external_path.normalize(__rspack_external_path.join(canonicalizeDir(__rspack_external_path.dirname(resourcePath)), __rspack_external_path.basename(resourcePath)));
+    } catch  {
+        return __rspack_external_path.normalize(resourcePath);
+    }
+}
+function isResourceUnderDirs(resource, dirs) {
+    if ('string' != typeof resource || 0 === resource.length) return false;
+    const candidate = canonicalizeResourcePath(resource);
+    return dirs.some((dir)=>{
+        if (candidate === dir) return true;
+        const rel = __rspack_external_path.relative(dir, candidate);
+        return rel.length > 0 && !rel.startsWith('..') && !__rspack_external_path.isAbsolute(rel);
+    });
+}
+export { backgroundIsRequiredMessageOnly, canonicalizeDir, canonicalizeResourcePath, findNearestPackageJsonSync, isResourceUnderDirs, reservedScriptsFolder };