extension-develop 4.1.31 → 4.1.32

package/README.md

@@ -292,6 +292,8 @@ dist/
 - Built on the Rspack stack; user config is loaded when an `extension.config.*` is present.
 - Only `EXTENSION_PUBLIC_*` variables are injected into client code; avoid secrets in templated `.json`/`.html`.
 
+- A `dev` session started within the watcher's accuracy margin of the last source write (up to 2 s, usually 10 to 100 ms, for example `create` followed at once by `dev`) compiles twice at startup. The second compile is the watcher reporting files written just before it attached, not a change in the project, and the session is unaffected.
+
 ## Plugins
 
 | Name                 | Group | Summary                                                                                                                                                                                                         |

package/dist/105~0.mjs

@@ -95,4 +95,4 @@ function publicRootsFor(compiler) {
     if (!compiler) return [];
     return publicRootsByCompiler.get(compiler) || [];
 }
-export { findPublicFile, inspectPublicFolders, publicContainmentRoot, publicFolderOrDefault, publicRelativePath, publicResolveRoots, publicRootsFor, rememberPublicRoots, turnedOffPublicFolders };
+export { findPublicFile, inspectPublicFolders, publicContainmentRoot, publicFolderOrDefault, publicRelativePath, publicResolveRoots, publicRootsFor, rememberPublicRoots, resolvePublicFolder, turnedOffPublicFolders };

package/dist/177~0.mjs

@@ -1,8 +1,62 @@
 import { createRequire as __extjsCreateRequire } from "node:module"; const require = __extjsCreateRequire(import.meta.url);
-import { publicContainmentRoot } from "./105~0.mjs";
-import { replaceCssUrlRefs } from "./273~0.mjs";
+import { resolvePublicFolder, publicContainmentRoot } from "./105~0.mjs";
+import { replaceCssUrlRefs, publicOwnedOutputName } from "./273~0.mjs";
 import * as __rspack_external_node_fs_1b05aee1 from "node:fs";
 import * as __rspack_external_node_path_806ed179 from "node:path";
+const BASE64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+function vlq(value) {
+    let rest = value < 0 ? -value << 1 | 1 : value << 1;
+    let out = '';
+    do {
+        let digit = 31 & rest;
+        rest >>>= 5;
+        if (rest > 0) digit |= 32;
+        out += BASE64[digit];
+    }while (rest > 0);
+    return out;
+}
+function commonSuffixLength(a, b, limit) {
+    let length = 0;
+    while(length < limit && a[a.length - 1 - length] === b[b.length - 1 - length])length++;
+    return length;
+}
+function lineRewriteSourceMap(original, rewritten, source) {
+    const originalLines = original.split('\n');
+    const rewrittenLines = rewritten.split('\n');
+    const lines = [];
+    let previousLine = 0;
+    let previousColumn = 0;
+    for(let index = 0; index < rewrittenLines.length; index++){
+        const from = originalLines[index] ?? '';
+        const to = rewrittenLines[index];
+        const segments = [
+            `${vlq(0)}${vlq(0)}${vlq(index - previousLine)}${vlq(0 - previousColumn)}`
+        ];
+        previousLine = index;
+        previousColumn = 0;
+        if (from !== to) {
+            let prefix = 0;
+            while(prefix < from.length && prefix < to.length && from[prefix] === to[prefix])prefix++;
+            const suffix = commonSuffixLength(from, to, Math.min(from.length, to.length) - prefix);
+            const generatedColumn = to.length - suffix;
+            const originalColumn = from.length - suffix;
+            segments.push(`${vlq(generatedColumn)}${vlq(0)}${vlq(0)}${vlq(originalColumn)}`);
+            previousColumn = originalColumn;
+        }
+        lines.push(segments.join(','));
+    }
+    return {
+        version: 3,
+        sources: [
+            source
+        ],
+        sourcesContent: [
+            original
+        ],
+        names: [],
+        mappings: lines.join(';')
+    };
+}
 const PUBLIC_ROOT_SCHEME = 'https://extensionjs-public.invalid';
 function isFile(candidate) {
     try {
@@ -11,27 +65,41 @@ function isFile(candidate) {
         return false;
     }
 }
-function keepPublicRootRefs(source, publicRoot) {
-    return replaceCssUrlRefs(source, (request)=>{
-        if (!request.startsWith('/') || request.startsWith('//')) return;
+function publicPathOfRelativeRef(req, { issuerDir, publicDir }) {
+    if (!req || /^[a-z][a-z0-9+.-]*:/i.test(req)) return;
+    if (req.startsWith('~') || req.startsWith('@')) return;
+    const absolutePath = __rspack_external_node_path_806ed179.resolve(issuerDir, req);
+    if (!isFile(absolutePath)) return;
+    return publicOwnedOutputName(absolutePath, publicDir);
+}
+function keepPublicRootRefs(source, publicRoot, relative) {
+    return replaceCssUrlRefs(source, (request, { isImport })=>{
+        if (request.startsWith('//')) return;
         const suffixAt = request.search(/[?#]/);
-        const rel = (-1 === suffixAt ? request : request.slice(0, suffixAt)).slice(1);
-        if (!rel || !isFile(__rspack_external_node_path_806ed179.join(publicRoot, rel))) return;
-        return `${PUBLIC_ROOT_SCHEME}${request}`;
+        const req = -1 === suffixAt ? request : request.slice(0, suffixAt);
+        if (req.startsWith('/')) {
+            const rel = req.slice(1);
+            if (!rel || !isFile(__rspack_external_node_path_806ed179.join(publicRoot, rel))) return;
+            return `${PUBLIC_ROOT_SCHEME}${request}`;
+        }
+        if (!relative || isImport) return;
+        const publicPath = publicPathOfRelativeRef(req, relative);
+        if (!publicPath) return;
+        return `${PUBLIC_ROOT_SCHEME}/${publicPath}${request.slice(req.length)}`;
     });
 }
-function restorePublicRootRefs(source) {
-    return source.split(PUBLIC_ROOT_SCHEME).join('');
-}
-function publicCssUrlLoader(source) {
+function publicCssUrlLoader(source, map) {
     const { manifestPath, projectPath } = this.getOptions() || {};
-    if (!manifestPath || !projectPath) return source;
-    try {
+    let rewritten = source;
+    if (manifestPath && projectPath) try {
         const publicRoot = publicContainmentRoot(manifestPath, projectPath);
-        return keepPublicRootRefs(source, publicRoot);
-    } catch  {
-        return source;
-    }
+        const publicDir = resolvePublicFolder(manifestPath, projectPath);
+        rewritten = keepPublicRootRefs(source, publicRoot, publicDir && this.resourcePath ? {
+            issuerDir: __rspack_external_node_path_806ed179.dirname(this.resourcePath),
+            publicDir
+        } : void 0);
+    } catch  {}
+    this.callback(null, rewritten, map ?? (rewritten === source ? void 0 : lineRewriteSourceMap(source, rewritten, this.resourcePath || '')));
 }
 export default publicCssUrlLoader;
-export { PUBLIC_ROOT_SCHEME, keepPublicRootRefs, restorePublicRootRefs };
+export { PUBLIC_ROOT_SCHEME, keepPublicRootRefs };

package/dist/273~0.mjs

@@ -1,4 +1,5 @@
 import { createRequire as __extjsCreateRequire } from "node:module"; const require = __extjsCreateRequire(import.meta.url);
+import { canonicalizeDir, canonicalizeResourcePath } from "./712~0.mjs";
 import * as __rspack_external_node_fs_1b05aee1 from "node:fs";
 import * as __rspack_external_node_path_806ed179 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;
@@ -20,11 +21,20 @@ function isDeadCssUrlRef(rawRequest, { issuerDir, roots }) {
     ];
     return !candidates.some((candidate)=>__rspack_external_node_fs_1b05aee1.existsSync(candidate));
 }
+function publicOwnedOutputName(absolutePath, publicDir) {
+    if (!publicDir) return;
+    const rel = __rspack_external_node_path_806ed179.relative(canonicalizeDir(publicDir), canonicalizeResourcePath(absolutePath));
+    if (!rel || __rspack_external_node_path_806ed179.isAbsolute(rel) || '..' === rel.split(__rspack_external_node_path_806ed179.sep)[0]) return;
+    return toPosixPath(rel);
+}
 function replaceCssUrlRefs(source, replacer) {
-    return source.replace(URL_REF, (whole, dq, sq, bare)=>{
+    return source.replace(URL_REF, (whole, dq, sq, bare, offset)=>{
         const request = dq ?? sq ?? bare ?? '';
         if (!request) return whole;
-        const next = replacer(request);
+        const before = source.slice(Math.max(0, offset - 32), offset);
+        const next = replacer(request, {
+            isImport: /@import\s*$/i.test(before)
+        });
         if (void 0 === next) return whole;
         return `url("${next.replace(/["\\]/g, '\\$&')}")`;
     });
@@ -42,4 +52,4 @@ function extractCssUrlRefs(source) {
     }
     return found;
 }
-export { extractCssUrlRefs, isDeadCssUrlRef, replaceCssUrlRefs, toPosixPath };
+export { extractCssUrlRefs, isDeadCssUrlRef, publicOwnedOutputName, replaceCssUrlRefs, toPosixPath };