extension-develop 4.0.27 → 4.0.29-next.0

package/dist/0~rspack-config.mjs

@@ -1065,8 +1065,15 @@ function getManifestOverrides(manifestPath, manifest) {
     return JSON.stringify(merged, null, 2);
 }
 const manifest_cjsRequire = createRequire(import.meta.url);
-const INTERNAL_MANIFEST_SOURCE = '__extensionjs_manifest_source__';
-const INTERNAL_MANIFEST_CURRENT_SOURCE = '__extensionjs_manifest_current_source__';
+const manifestSourceStore = new WeakMap();
+function manifestSourceEntry(compilation) {
+    let entry = manifestSourceStore.get(compilation);
+    if (!entry) {
+        entry = {};
+        manifestSourceStore.set(compilation, entry);
+    }
+    return entry;
+}
 function readAssetSource(asset) {
     if (!asset) return '';
     const source = asset.source;
@@ -1082,16 +1089,16 @@ function readAssetSource(asset) {
     return '';
 }
 function setOriginalManifestContent(compilation, source) {
-    compilation[INTERNAL_MANIFEST_SOURCE] = source;
+    manifestSourceEntry(compilation).original = source;
 }
 function getOriginalManifestContent(compilation) {
-    return compilation[INTERNAL_MANIFEST_SOURCE];
+    return manifestSourceStore.get(compilation)?.original;
 }
 function setCurrentManifestContent(compilation, source) {
-    compilation[INTERNAL_MANIFEST_CURRENT_SOURCE] = source;
+    manifestSourceEntry(compilation).current = source;
 }
 function getCurrentManifestContent(compilation) {
-    return compilation[INTERNAL_MANIFEST_CURRENT_SOURCE];
+    return manifestSourceStore.get(compilation)?.current;
 }
 function getManifestContent(compilation, manifestPath) {
     const currentManifest = getCurrentManifestContent(compilation);
@@ -10730,6 +10737,15 @@ function collectRequiredManifestFiles(manifest) {
     const backgroundScripts = background?.scripts;
     if (Array.isArray(backgroundScripts)) for (const script of backgroundScripts)addFile(script);
     addFile(manifestObj?.side_panel?.default_path);
+    addFile(manifestObj?.action?.default_popup);
+    addFile(manifestObj?.browser_action?.default_popup);
+    addFile(manifestObj?.page_action?.default_popup);
+    addFile(manifestObj?.options_ui?.page);
+    addFile(manifestObj?.options_page);
+    addFile(manifestObj?.devtools_page);
+    addFile(manifestObj?.chrome_url_overrides?.newtab);
+    addFile(manifestObj?.chrome_url_overrides?.history);
+    addFile(manifestObj?.chrome_url_overrides?.bookmarks);
     const contentScripts = manifestObj?.content_scripts;
     if (Array.isArray(contentScripts)) for (const contentScript of contentScripts){
         const js = contentScript?.js;
@@ -11009,6 +11025,845 @@ function patchChromiumBackground(manifest, browser) {
         }
     };
 }
+const NAMED_CSS_COLORS = {
+    aliceblue: [
+        240,
+        248,
+        255
+    ],
+    antiquewhite: [
+        250,
+        235,
+        215
+    ],
+    aqua: [
+        0,
+        255,
+        255
+    ],
+    aquamarine: [
+        127,
+        255,
+        212
+    ],
+    azure: [
+        240,
+        255,
+        255
+    ],
+    beige: [
+        245,
+        245,
+        220
+    ],
+    bisque: [
+        255,
+        228,
+        196
+    ],
+    black: [
+        0,
+        0,
+        0
+    ],
+    blanchedalmond: [
+        255,
+        235,
+        205
+    ],
+    blue: [
+        0,
+        0,
+        255
+    ],
+    blueviolet: [
+        138,
+        43,
+        226
+    ],
+    brown: [
+        165,
+        42,
+        42
+    ],
+    burlywood: [
+        222,
+        184,
+        135
+    ],
+    cadetblue: [
+        95,
+        158,
+        160
+    ],
+    chartreuse: [
+        127,
+        255,
+        0
+    ],
+    chocolate: [
+        210,
+        105,
+        30
+    ],
+    coral: [
+        255,
+        127,
+        80
+    ],
+    cornflowerblue: [
+        100,
+        149,
+        237
+    ],
+    cornsilk: [
+        255,
+        248,
+        220
+    ],
+    crimson: [
+        220,
+        20,
+        60
+    ],
+    cyan: [
+        0,
+        255,
+        255
+    ],
+    darkblue: [
+        0,
+        0,
+        139
+    ],
+    darkcyan: [
+        0,
+        139,
+        139
+    ],
+    darkgoldenrod: [
+        184,
+        134,
+        11
+    ],
+    darkgray: [
+        169,
+        169,
+        169
+    ],
+    darkgreen: [
+        0,
+        100,
+        0
+    ],
+    darkgrey: [
+        169,
+        169,
+        169
+    ],
+    darkkhaki: [
+        189,
+        183,
+        107
+    ],
+    darkmagenta: [
+        139,
+        0,
+        139
+    ],
+    darkolivegreen: [
+        85,
+        107,
+        47
+    ],
+    darkorange: [
+        255,
+        140,
+        0
+    ],
+    darkorchid: [
+        153,
+        50,
+        204
+    ],
+    darkred: [
+        139,
+        0,
+        0
+    ],
+    darksalmon: [
+        233,
+        150,
+        122
+    ],
+    darkseagreen: [
+        143,
+        188,
+        143
+    ],
+    darkslateblue: [
+        72,
+        61,
+        139
+    ],
+    darkslategray: [
+        47,
+        79,
+        79
+    ],
+    darkslategrey: [
+        47,
+        79,
+        79
+    ],
+    darkturquoise: [
+        0,
+        206,
+        209
+    ],
+    darkviolet: [
+        148,
+        0,
+        211
+    ],
+    deeppink: [
+        255,
+        20,
+        147
+    ],
+    deepskyblue: [
+        0,
+        191,
+        255
+    ],
+    dimgray: [
+        105,
+        105,
+        105
+    ],
+    dimgrey: [
+        105,
+        105,
+        105
+    ],
+    dodgerblue: [
+        30,
+        144,
+        255
+    ],
+    firebrick: [
+        178,
+        34,
+        34
+    ],
+    floralwhite: [
+        255,
+        250,
+        240
+    ],
+    forestgreen: [
+        34,
+        139,
+        34
+    ],
+    fuchsia: [
+        255,
+        0,
+        255
+    ],
+    gainsboro: [
+        220,
+        220,
+        220
+    ],
+    ghostwhite: [
+        248,
+        248,
+        255
+    ],
+    gold: [
+        255,
+        215,
+        0
+    ],
+    goldenrod: [
+        218,
+        165,
+        32
+    ],
+    gray: [
+        128,
+        128,
+        128
+    ],
+    green: [
+        0,
+        128,
+        0
+    ],
+    greenyellow: [
+        173,
+        255,
+        47
+    ],
+    grey: [
+        128,
+        128,
+        128
+    ],
+    honeydew: [
+        240,
+        255,
+        240
+    ],
+    hotpink: [
+        255,
+        105,
+        180
+    ],
+    indianred: [
+        205,
+        92,
+        92
+    ],
+    indigo: [
+        75,
+        0,
+        130
+    ],
+    ivory: [
+        255,
+        255,
+        240
+    ],
+    khaki: [
+        240,
+        230,
+        140
+    ],
+    lavender: [
+        230,
+        230,
+        250
+    ],
+    lavenderblush: [
+        255,
+        240,
+        245
+    ],
+    lawngreen: [
+        124,
+        252,
+        0
+    ],
+    lemonchiffon: [
+        255,
+        250,
+        205
+    ],
+    lightblue: [
+        173,
+        216,
+        230
+    ],
+    lightcoral: [
+        240,
+        128,
+        128
+    ],
+    lightcyan: [
+        224,
+        255,
+        255
+    ],
+    lightgoldenrodyellow: [
+        250,
+        250,
+        210
+    ],
+    lightgray: [
+        211,
+        211,
+        211
+    ],
+    lightgreen: [
+        144,
+        238,
+        144
+    ],
+    lightgrey: [
+        211,
+        211,
+        211
+    ],
+    lightpink: [
+        255,
+        182,
+        193
+    ],
+    lightsalmon: [
+        255,
+        160,
+        122
+    ],
+    lightseagreen: [
+        32,
+        178,
+        170
+    ],
+    lightskyblue: [
+        135,
+        206,
+        250
+    ],
+    lightslategray: [
+        119,
+        136,
+        153
+    ],
+    lightslategrey: [
+        119,
+        136,
+        153
+    ],
+    lightsteelblue: [
+        176,
+        196,
+        222
+    ],
+    lightyellow: [
+        255,
+        255,
+        224
+    ],
+    lime: [
+        0,
+        255,
+        0
+    ],
+    limegreen: [
+        50,
+        205,
+        50
+    ],
+    linen: [
+        250,
+        240,
+        230
+    ],
+    magenta: [
+        255,
+        0,
+        255
+    ],
+    maroon: [
+        128,
+        0,
+        0
+    ],
+    mediumaquamarine: [
+        102,
+        205,
+        170
+    ],
+    mediumblue: [
+        0,
+        0,
+        205
+    ],
+    mediumorchid: [
+        186,
+        85,
+        211
+    ],
+    mediumpurple: [
+        147,
+        112,
+        219
+    ],
+    mediumseagreen: [
+        60,
+        179,
+        113
+    ],
+    mediumslateblue: [
+        123,
+        104,
+        238
+    ],
+    mediumspringgreen: [
+        0,
+        250,
+        154
+    ],
+    mediumturquoise: [
+        72,
+        209,
+        204
+    ],
+    mediumvioletred: [
+        199,
+        21,
+        133
+    ],
+    midnightblue: [
+        25,
+        25,
+        112
+    ],
+    mintcream: [
+        245,
+        255,
+        250
+    ],
+    mistyrose: [
+        255,
+        228,
+        225
+    ],
+    moccasin: [
+        255,
+        228,
+        181
+    ],
+    navajowhite: [
+        255,
+        222,
+        173
+    ],
+    navy: [
+        0,
+        0,
+        128
+    ],
+    oldlace: [
+        253,
+        245,
+        230
+    ],
+    olive: [
+        128,
+        128,
+        0
+    ],
+    olivedrab: [
+        107,
+        142,
+        35
+    ],
+    orange: [
+        255,
+        165,
+        0
+    ],
+    orangered: [
+        255,
+        69,
+        0
+    ],
+    orchid: [
+        218,
+        112,
+        214
+    ],
+    palegoldenrod: [
+        238,
+        232,
+        170
+    ],
+    palegreen: [
+        152,
+        251,
+        152
+    ],
+    paleturquoise: [
+        175,
+        238,
+        238
+    ],
+    palevioletred: [
+        219,
+        112,
+        147
+    ],
+    papayawhip: [
+        255,
+        239,
+        213
+    ],
+    peachpuff: [
+        255,
+        218,
+        185
+    ],
+    peru: [
+        205,
+        133,
+        63
+    ],
+    pink: [
+        255,
+        192,
+        203
+    ],
+    plum: [
+        221,
+        160,
+        221
+    ],
+    powderblue: [
+        176,
+        224,
+        230
+    ],
+    purple: [
+        128,
+        0,
+        128
+    ],
+    rebeccapurple: [
+        102,
+        51,
+        153
+    ],
+    red: [
+        255,
+        0,
+        0
+    ],
+    rosybrown: [
+        188,
+        143,
+        143
+    ],
+    royalblue: [
+        65,
+        105,
+        225
+    ],
+    saddlebrown: [
+        139,
+        69,
+        19
+    ],
+    salmon: [
+        250,
+        128,
+        114
+    ],
+    sandybrown: [
+        244,
+        164,
+        96
+    ],
+    seagreen: [
+        46,
+        139,
+        87
+    ],
+    seashell: [
+        255,
+        245,
+        238
+    ],
+    sienna: [
+        160,
+        82,
+        45
+    ],
+    silver: [
+        192,
+        192,
+        192
+    ],
+    skyblue: [
+        135,
+        206,
+        235
+    ],
+    slateblue: [
+        106,
+        90,
+        205
+    ],
+    slategray: [
+        112,
+        128,
+        144
+    ],
+    slategrey: [
+        112,
+        128,
+        144
+    ],
+    snow: [
+        255,
+        250,
+        250
+    ],
+    springgreen: [
+        0,
+        255,
+        127
+    ],
+    steelblue: [
+        70,
+        130,
+        180
+    ],
+    tan: [
+        210,
+        180,
+        140
+    ],
+    teal: [
+        0,
+        128,
+        128
+    ],
+    thistle: [
+        216,
+        191,
+        216
+    ],
+    tomato: [
+        255,
+        99,
+        71
+    ],
+    turquoise: [
+        64,
+        224,
+        208
+    ],
+    violet: [
+        238,
+        130,
+        238
+    ],
+    wheat: [
+        245,
+        222,
+        179
+    ],
+    white: [
+        255,
+        255,
+        255
+    ],
+    whitesmoke: [
+        245,
+        245,
+        245
+    ],
+    yellow: [
+        255,
+        255,
+        0
+    ],
+    yellowgreen: [
+        154,
+        205,
+        50
+    ]
+};
+const isChannel = (entry)=>'number' == typeof entry && Number.isInteger(entry) && entry >= 0 && entry <= 255;
+const isFiniteNumber = (entry)=>'number' == typeof entry && Number.isFinite(entry);
+function parseHexThemeColor(value) {
+    if ('string' != typeof value) return;
+    const match = /^#([0-9a-f]{3,4}|[0-9a-f]{6}|[0-9a-f]{8})$/i.exec(value.trim());
+    if (!match) return;
+    const hex = match[1];
+    const digits = hex.length >= 6 ? hex.match(/../g) : hex.split('').map((digit)=>digit + digit);
+    const bytes = digits.map((pair)=>parseInt(pair, 16));
+    if (3 === bytes.length) return bytes;
+    return [
+        ...bytes.slice(0, 3),
+        Math.round(bytes[3] / 255 * 1000) / 1000
+    ];
+}
+function parseCssThemeColor(value) {
+    const hex = parseHexThemeColor(value);
+    if (hex) return hex;
+    if ('string' != typeof value) return;
+    const keyword = value.trim().toLowerCase();
+    if ('transparent' === keyword) return [
+        0,
+        0,
+        0,
+        0
+    ];
+    const named = NAMED_CSS_COLORS[keyword];
+    if (named) return [
+        ...named
+    ];
+    const match = /^rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(0|1|0?\.\d+|1\.0+)\s*)?\)$/.exec(keyword);
+    if (!match) return;
+    const channels = match.slice(1, 4).map(Number);
+    if (channels.some((channel)=>channel > 255)) return;
+    if (void 0 === match[4]) return channels;
+    return [
+        ...channels,
+        Number(match[4])
+    ];
+}
+function colorValueDetail(value) {
+    if (parseCssThemeColor(value)) return;
+    if (!Array.isArray(value) || 3 !== value.length && 4 !== value.length) return 'Chrome only accepts an [R, G, B] or [R, G, B, A] array here.';
+    for (const entry of value.slice(0, 3))if (!isChannel(entry)) return 'Chrome only accepts integer color channels from 0 to 255 here.';
+    if (4 === value.length && !isFiniteNumber(value[3])) return 'Chrome only accepts a numeric alpha channel here.';
+}
+function tintValueDetail(value) {
+    if (!Array.isArray(value) || 3 !== value.length || !value.every(isFiniteNumber)) return 'Chrome only accepts a [hue, saturation, lightness] array of 3 numbers here.';
+}
+function collectThemeValueIssues(manifest) {
+    const issues = [];
+    const theme = manifest?.theme;
+    if (!theme || 'object' != typeof theme) return issues;
+    const groups = [
+        [
+            'colors',
+            theme.colors,
+            colorValueDetail
+        ],
+        [
+            'tints',
+            theme.tints,
+            tintValueDetail
+        ]
+    ];
+    for (const [group, container, detailFor] of groups)if (!(!container || 'object' != typeof container || Array.isArray(container))) for (const [key, value] of Object.entries(container)){
+        const detail = detailFor(value);
+        if (detail) issues.push({
+            field: `theme.${group}.${key}`,
+            detail,
+            value: JSON.stringify(value)
+        });
+    }
+    return issues;
+}
+function patchChromiumThemeColors(manifest, browser) {
+    if (!isChromiumBasedBrowser(String(browser))) return manifest;
+    const theme = manifest.theme;
+    if (!theme || 'object' != typeof theme || Array.isArray(theme)) return manifest;
+    const colors = theme.colors;
+    if (!colors || 'object' != typeof colors || Array.isArray(colors)) return manifest;
+    let converted = false;
+    const patchedColors = {};
+    for (const [key, value] of Object.entries(colors)){
+        const rgb = parseCssThemeColor(value);
+        patchedColors[key] = rgb ?? value;
+        if (rgb) converted = true;
+    }
+    if (!converted) return manifest;
+    return {
+        ...manifest,
+        theme: {
+            ...theme,
+            colors: patchedColors
+        }
+    };
+}
 function patchDevContentScriptManifestPaths(compilation, manifest) {
     if ('development' !== compilation.options.mode) return manifest;
     const cs = manifest.content_scripts;
@@ -11127,6 +11982,7 @@ class UpdateManifest {
                 let patchedManifest = buildCanonicalManifest(this.manifestPath, manifest, this.browser);
                 patchedManifest = patchGeckoBackground(patchedManifest, this.browser);
                 patchedManifest = patchChromiumBackground(patchedManifest, this.browser);
+                patchedManifest = patchChromiumThemeColors(patchedManifest, this.browser);
                 const overrides = getManifestOverrides(this.manifestPath, manifest);
                 if ('development' === compiler.options.mode) {
                     if (patchedManifest.content_scripts) patchedManifest.content_scripts = this.applyDevOverrides(patchedManifest);
@@ -11168,42 +12024,6 @@ class UpdateManifest {
         });
     }
 }
-const isChannel = (entry)=>'number' == typeof entry && Number.isInteger(entry) && entry >= 0 && entry <= 255;
-const isFiniteNumber = (entry)=>'number' == typeof entry && Number.isFinite(entry);
-function colorValueDetail(value) {
-    if (!Array.isArray(value) || 3 !== value.length && 4 !== value.length) return 'Chrome only accepts an [R, G, B] or [R, G, B, A] array here.';
-    for (const entry of value.slice(0, 3))if (!isChannel(entry)) return 'Chrome only accepts integer color channels from 0 to 255 here.';
-    if (4 === value.length && !isFiniteNumber(value[3])) return 'Chrome only accepts a numeric alpha channel here.';
-}
-function tintValueDetail(value) {
-    if (!Array.isArray(value) || 3 !== value.length || !value.every(isFiniteNumber)) return 'Chrome only accepts a [hue, saturation, lightness] array of 3 numbers here.';
-}
-function collectThemeValueIssues(manifest) {
-    const issues = [];
-    const theme = manifest?.theme;
-    if (!theme || 'object' != typeof theme) return issues;
-    const groups = [
-        [
-            'colors',
-            theme.colors,
-            colorValueDetail
-        ],
-        [
-            'tints',
-            theme.tints,
-            tintValueDetail
-        ]
-    ];
-    for (const [group, container, detailFor] of groups)if (!(!container || 'object' != typeof container || Array.isArray(container))) for (const [key, value] of Object.entries(container)){
-        const detail = detailFor(value);
-        if (detail) issues.push({
-            field: `theme.${group}.${key}`,
-            detail,
-            value: JSON.stringify(value)
-        });
-    }
-    return issues;
-}
 class ValidateThemeValues {
     static name = 'manifest:validate-theme-values';
     manifestPath;
@@ -11730,10 +12550,13 @@ class WebResourcesPlugin {
 function isCriticalJsonFeatureKey(key) {
     return key.startsWith('declarative_net_request') || 'storage.managed_schema' === key;
 }
+function toComparablePath(value) {
+    return 'string' == typeof value ? value : JSON.stringify(value);
+}
 function flattenValues(map) {
     const paths = [];
-    for (const val of Object.values(map || {}))if (Array.isArray(val)) paths.push(...val.filter(Boolean));
-    else if (val) paths.push(val);
+    for (const val of Object.values(map || {}))if (Array.isArray(val)) paths.push(...val.filter(Boolean).map(toComparablePath));
+    else if (val) paths.push(toComparablePath(val));
     return paths;
 }
 function diffArray(prev, next) {
@@ -11786,7 +12609,7 @@ class ManifestFieldsChangeDetector {
         else if (val) scripts.push(val);
         const html = fields.html || {};
         const iconsRaw = fields.icons;
-        const icons = iconsRaw ? Array.isArray(iconsRaw) ? iconsRaw : flattenValues(iconsRaw) : [];
+        const icons = iconsRaw ? Array.isArray(iconsRaw) ? iconsRaw.filter(Boolean).map(toComparablePath) : flattenValues(iconsRaw) : [];
         const jsonMap = fields.json || {};
         const json = [];
         for (const [key, val] of Object.entries(jsonMap))if (isCriticalJsonFeatureKey(key)) {