vike 0.4.259-commit-f6ecfb2 → 0.4.260-commit-8a30a91

package/dist/node/vite/plugins/pluginStripPointerImportAttribute.js

@@ -1,4 +1,5 @@
 export { pluginStripPointerImportAttribute };
+import { getImportStatements } from '../shared/parseEsModule.js';
 import { getMagicString } from '../shared/getMagicString.js';
 import '../assertEnvVite.js';
 // Match `with { type: 'vike:pointer' }` (with optional whitespace variations)
@@ -14,18 +15,38 @@ function pluginStripPointerImportAttribute() {
                     },
                 },
                 handler(code, id) {
-                    runtimeAttrRE.lastIndex = 0;
-                    if (!runtimeAttrRE.test(code))
-                        return;
-                    const { magicString, getMagicStringResult } = getMagicString(code, id);
-                    runtimeAttrRE.lastIndex = 0;
-                    let match;
-                    while ((match = runtimeAttrRE.exec(code)) !== null) {
-                        magicString.remove(match.index, match.index + match[0].length);
-                    }
-                    return getMagicStringResult();
+                    return stripPointerImportAttributes(code, id);
                 },
             },
         },
     ];
 }
+async function stripPointerImportAttributes(code, id) {
+    // Fast path: skip parsing when there is nothing to strip
+    runtimeAttrRE.lastIndex = 0;
+    if (!runtimeAttrRE.test(code))
+        return;
+    // Restrict stripping to genuine `import` statements, so that we don't touch occurrences
+    // inside string literals/comments (e.g. documentation code examples).
+    // https://github.com/brillout/docpress/issues/167
+    let importStatements;
+    try {
+        importStatements = await getImportStatements(code);
+    }
+    catch {
+        // Not parsable as an ES module (e.g. a raw Markdown file) => leave it untouched
+        return;
+    }
+    const { magicString, getMagicStringResult } = getMagicString(code, id);
+    for (const { ss, se } of importStatements)
+        stripAttribute(magicString, code, ss, se);
+    return getMagicStringResult();
+}
+function stripAttribute(magicString, code, start, end) {
+    const region = code.slice(start, end);
+    runtimeAttrRE.lastIndex = 0;
+    let match;
+    while ((match = runtimeAttrRE.exec(region)) !== null) {
+        magicString.remove(start + match.index, start + match.index + match[0].length);
+    }
+}

package/dist/node/vite/shared/getMagicString.d.ts

@@ -5,6 +5,6 @@ declare function getMagicString(code: string, id: string): {
     magicString: MagicString;
     getMagicStringResult: () => {
         code: string;
-        map: import("magic-string").SourceMap;
+        map: any;
     } | undefined;
 };

package/dist/node/vite/shared/getMagicString.js

@@ -9,6 +9,9 @@ function getMagicString(code, id) {
             return undefined;
         return {
             code: magicString.toString(),
+            // magic-string@1's SourceMap.sourcesContent is typed as (string | null)[], whereas Rollup's
+            // ExistingRawSourceMap expects string[]. We never pass `includeContent`, so sourcesContent is
+            // always undefined at runtime and this cast is safe.
             map: magicString.generateMap({ hires: true, source: id }),
         };
     };

package/dist/server/runtime/renderPageServer/html/injectAssets/injectHtmlTags.js

@@ -99,7 +99,9 @@ function injectBreakLines(htmlFragment, before, after) {
     const whitespaceExtra = paddingParent ? '  ' : '';
     const whitespace = `${paddingParent}${whitespaceExtra}`;
     const padding = `\n${whitespace}`;
-    htmlFragment = htmlFragment.replace(/<[^\/]/g, (match) => `${padding}${match}`);
+    // Match whole tags, and whole raw text elements (their content isn't markup): injecting a line break inside `<script>document.write('<div>')</script>` or inside an attribute value would corrupt it. https://github.com/vikejs/vike/issues/3457
+    const tagRE = /<(script|style|textarea|title)\b[^>]*>[\s\S]*?<\/\1>|<[^\/][^>]*>/gi;
+    htmlFragment = htmlFragment.replace(tagRE, (match) => `${padding}${match}`);
     if (isBlankLine) {
         assert(htmlFragment.startsWith(padding), { htmlFragment });
         htmlFragment = whitespaceExtra + htmlFragment.slice(padding.length);

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.259-commit-f6ecfb2";
+export declare const PROJECT_VERSION: "0.4.260-commit-8a30a91";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.259-commit-f6ecfb2';
+export const PROJECT_VERSION = '0.4.260-commit-8a30a91';

package/dist/utils/assertViteVersion.js

@@ -2,7 +2,7 @@ export { assertViteVersion };
 export { viteVersionMin };
 import { assertVersion } from './assertVersion.js';
 const viteVersionMin = '6.3.0';
-// node_modules/vike/package.json#peerDependencies isn't enough, as users often ignore it
+// package.json#peerDependencies isn't enough, as users often ignore it
 function assertViteVersion(viteVersion) {
     // - This assertion isn't reliable: the user may still use a Vite version older than 6.0.0 — see https://github.com/vitejs/vite/pull/19355
     //   - TO-DO/eventually: let's also use this.meta.viteVersion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.259-commit-f6ecfb2",
+  "version": "0.4.260-commit-8a30a91",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -128,23 +128,23 @@
     "@brillout/json-serializer": "^0.5.25",
     "@brillout/picocolors": "^1.0.31",
     "@brillout/vite-plugin-server-entry": "0.7.19",
-    "@universal-deploy/store": "^0.2.1",
-    "@universal-deploy/vite": "^0.1.10",
+    "@universal-deploy/store": "^0.2.2",
+    "@universal-deploy/vite": "^0.1.11",
     "@universal-middleware/core": "^0.4.18",
-    "@universal-middleware/node": "^0.2.1",
+    "@universal-middleware/node": "^0.2.2",
     "cac": "^6.0.0",
     "convert-route": "^1.1.1",
     "es-module-lexer": "^1.0.0",
     "esbuild": ">=0.19.0",
     "json5": "^2.0.0",
-    "magic-string": "^0.30.17",
-    "picomatch": "^4.0.4",
-    "semver": "^7.8.4",
+    "magic-string": "^1.1.0",
+    "picomatch": "^4.0.5",
+    "semver": "^7.8.5",
     "sirv": "^3.0.2",
     "source-map-support": "^0.5.0",
     "tinyglobby": "^0.2.17",
     "vite": ">=6.3.0",
-    "vite-plugin-wrapper": "^0.1.0"
+    "vite-plugin-wrapper": "^0.1.1"
   },
   "peerDependencies": {
     "react-streaming": ">=0.3.42",
@@ -259,11 +259,11 @@
     "./fetch.js"
   ],
   "devDependencies": {
-    "@brillout/release-me": "^0.4.15",
+    "@brillout/release-me": "^0.4.16",
     "@types/babel__core": "^7.20.5",
     "@types/estree": "^1.0.5",
     "@types/node": "^20.10.5",
-    "@types/picomatch": "^4.0.2",
+    "@types/picomatch": "^4.0.3",
     "@types/semver": "^7.7.1",
     "@types/source-map-support": "^0.5.10",
     "react-streaming": "^0.4.20",