vike 0.4.171-commit-2876124 → 0.4.172-commit-ea2b76c

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles.js

@@ -31,6 +31,7 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
             //
             !outDirRelativeFromUserRootDir.startsWith('../')));
     const timeBefore = new Date().getTime();
+    // Crawl
     let files = [];
     const res = await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir);
     if (res &&
@@ -41,7 +42,7 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
     else {
         files = await fastGlob(userRootDir, outDirRelativeFromUserRootDir);
     }
-    files = files.filter((file) => !(0, transpileAndExecuteFile_js_1.isTemporaryBuildFile)(file));
+    // Check performance
     {
         const timeAfter = new Date().getTime();
         const timeSpent = timeAfter - timeBefore;
@@ -53,10 +54,13 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
             });
         }
     }
-    const plusFiles = files.map((p) => {
-        p = (0, utils_js_1.toPosixPath)(p);
-        (0, utils_js_1.assert)(!p.startsWith(userRootDir));
-        const filePathAbsoluteUserRootDir = path_1.default.posix.join('/', p);
+    // Normalize
+    const plusFiles = files.map((filePath) => {
+        // Both `$ git-ls files` and fast-glob return posix paths
+        (0, utils_js_1.assertPosixPath)(filePath);
+        (0, utils_js_1.assert)(!filePath.startsWith(userRootDir));
+        (0, utils_js_1.assert)(!(0, transpileAndExecuteFile_js_1.isTemporaryBuildFile)(filePath));
+        const filePathAbsoluteUserRootDir = path_1.default.posix.join('/', filePath);
         return { filePathAbsoluteUserRootDir };
     });
     return plusFiles;
@@ -66,10 +70,17 @@ exports.crawlPlusFiles = crawlPlusFiles;
 async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
     if (gitIsNotUsable)
         return null;
+    // Preserve UTF-8 file paths.
+    // https://github.com/vikejs/vike/issues/1658
+    // https://stackoverflow.com/questions/22827239/how-to-make-git-properly-display-utf-8-encoded-pathnames-in-the-console-window/22828826#22828826
+    // https://stackoverflow.com/questions/15884180/how-do-i-override-git-configuration-options-by-command-line-parameters/15884261#15884261
+    const preserveUTF8 = '-c core.quotepath=off';
     const ignoreAsPatterns = getIgnoreAsPatterns(outDirRelativeFromUserRootDir);
     const ignoreAsFilterFn = getIgnoreAsFilterFn(outDirRelativeFromUserRootDir);
     const cmd = [
-        'git ls-files',
+        'git',
+        preserveUTF8,
+        'ls-files',
         ...utils_js_1.scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
         ...ignoreAsPatterns.map((pattern) => `--exclude="${pattern}"`),
         // --others lists untracked files only (but using .gitignore because --exclude-standard)

package/dist/cjs/node/runtime/renderPage.js

@@ -205,7 +205,7 @@ function logHttpRequest(urlOriginal, httpRequestId) {
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(getRequestInfoMessage(urlOriginal), httpRequestId, 'info', clearErrors);
 }
 function getRequestInfoMessage(urlOriginal) {
-    return `HTTP request: ${picocolors_1.default.bold(urlOriginal)}`;
+    return `HTTP request: ${prettyUrl(urlOriginal)}`;
 }
 function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
     const statusCode = pageContextReturn.httpResponse?.statusCode ?? null;
@@ -221,7 +221,7 @@ function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
             //   - We should show `HTTP response ${urlOriginal} ERR` instead.
             //   - Maybe we can/should make the error available at pageContext.errorWhileRendering
             (0, utils_js_1.assert)(errorWhileRendering === null || errorWhileRendering === undefined);
-            msg = `HTTP response ${picocolors_1.default.bold(urlOriginal)} ${picocolors_1.default.dim('null')}`;
+            msg = `HTTP response ${prettyUrl(urlOriginal)} ${picocolors_1.default.dim('null')}`;
             // Erroneous value (it shoud sometimes be `false`) but it's fine as it doesn't seem to have much of an impact.
             isNominal = true;
         }
@@ -241,7 +241,7 @@ function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
                 const urlRedirect = headerRedirect[1];
                 urlOriginal = urlRedirect;
             }
-            msg = `HTTP ${type} ${picocolors_1.default.bold(urlOriginal)} ${color(statusCode ?? 'ERR')}`;
+            msg = `HTTP ${type} ${prettyUrl(urlOriginal)} ${color(statusCode ?? 'ERR')}`;
         }
     }
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(msg, httpRequestId, isNominal ? 'info' : 'error');
@@ -449,9 +449,12 @@ function checkBaseUrl(pageContextInit, httpRequestId) {
     const { urlWithoutPageContextRequestSuffix } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     const { hasBaseServer } = (0, utils_js_1.parseUrl)(urlWithoutPageContextRequestSuffix, baseServer);
     if (!hasBaseServer) {
-        (0, loggerRuntime_js_1.logRuntimeInfo)?.(`${getRequestInfoMessage(urlOriginal)} skipped because URL ${picocolors_1.default.bold(urlOriginal)} doesn't start with Base URL ${picocolors_1.default.bold(baseServer)} (https://vike.dev/base-url)`, httpRequestId, 'info');
+        (0, loggerRuntime_js_1.logRuntimeInfo)?.(`${getRequestInfoMessage(urlOriginal)} skipped because URL ${prettyUrl(urlOriginal)} doesn't start with Base URL ${prettyUrl(baseServer)} (https://vike.dev/base-url)`, httpRequestId, 'info');
         const pageContextHttpResponseNull = getPageContextHttpResponseNull(pageContextInit);
         return pageContextHttpResponseNull;
     }
     return null;
 }
+function prettyUrl(url) {
+    return picocolors_1.default.bold(decodeURI(url));
+}

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.171-commit-2876124';
+const PROJECT_VERSION = '0.4.172-commit-ea2b76c';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles.js

@@ -1,5 +1,5 @@
 export { crawlPlusFiles };
-import { assertPosixPath, assert, toPosixPath, assertWarning, scriptFileExtensionList, scriptFileExtensions, humanizeTime, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove } from '../../../../utils.js';
+import { assertPosixPath, assert, assertWarning, scriptFileExtensionList, scriptFileExtensions, humanizeTime, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove } from '../../../../utils.js';
 import path from 'path';
 import glob from 'fast-glob';
 import { exec } from 'child_process';
@@ -26,6 +26,7 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
             //
             !outDirRelativeFromUserRootDir.startsWith('../')));
     const timeBefore = new Date().getTime();
+    // Crawl
     let files = [];
     const res = await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir);
     if (res &&
@@ -36,7 +37,7 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
     else {
         files = await fastGlob(userRootDir, outDirRelativeFromUserRootDir);
     }
-    files = files.filter((file) => !isTemporaryBuildFile(file));
+    // Check performance
     {
         const timeAfter = new Date().getTime();
         const timeSpent = timeAfter - timeBefore;
@@ -48,10 +49,13 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
             });
         }
     }
-    const plusFiles = files.map((p) => {
-        p = toPosixPath(p);
-        assert(!p.startsWith(userRootDir));
-        const filePathAbsoluteUserRootDir = path.posix.join('/', p);
+    // Normalize
+    const plusFiles = files.map((filePath) => {
+        // Both `$ git-ls files` and fast-glob return posix paths
+        assertPosixPath(filePath);
+        assert(!filePath.startsWith(userRootDir));
+        assert(!isTemporaryBuildFile(filePath));
+        const filePathAbsoluteUserRootDir = path.posix.join('/', filePath);
         return { filePathAbsoluteUserRootDir };
     });
     return plusFiles;
@@ -60,10 +64,17 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
 async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
     if (gitIsNotUsable)
         return null;
+    // Preserve UTF-8 file paths.
+    // https://github.com/vikejs/vike/issues/1658
+    // https://stackoverflow.com/questions/22827239/how-to-make-git-properly-display-utf-8-encoded-pathnames-in-the-console-window/22828826#22828826
+    // https://stackoverflow.com/questions/15884180/how-do-i-override-git-configuration-options-by-command-line-parameters/15884261#15884261
+    const preserveUTF8 = '-c core.quotepath=off';
     const ignoreAsPatterns = getIgnoreAsPatterns(outDirRelativeFromUserRootDir);
     const ignoreAsFilterFn = getIgnoreAsFilterFn(outDirRelativeFromUserRootDir);
     const cmd = [
-        'git ls-files',
+        'git',
+        preserveUTF8,
+        'ls-files',
         ...scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
         ...ignoreAsPatterns.map((pattern) => `--exclude="${pattern}"`),
         // --others lists untracked files only (but using .gitignore because --exclude-standard)

package/dist/esm/node/runtime/renderPage.js

@@ -199,7 +199,7 @@ function logHttpRequest(urlOriginal, httpRequestId) {
     logRuntimeInfo?.(getRequestInfoMessage(urlOriginal), httpRequestId, 'info', clearErrors);
 }
 function getRequestInfoMessage(urlOriginal) {
-    return `HTTP request: ${pc.bold(urlOriginal)}`;
+    return `HTTP request: ${prettyUrl(urlOriginal)}`;
 }
 function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
     const statusCode = pageContextReturn.httpResponse?.statusCode ?? null;
@@ -215,7 +215,7 @@ function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
             //   - We should show `HTTP response ${urlOriginal} ERR` instead.
             //   - Maybe we can/should make the error available at pageContext.errorWhileRendering
             assert(errorWhileRendering === null || errorWhileRendering === undefined);
-            msg = `HTTP response ${pc.bold(urlOriginal)} ${pc.dim('null')}`;
+            msg = `HTTP response ${prettyUrl(urlOriginal)} ${pc.dim('null')}`;
             // Erroneous value (it shoud sometimes be `false`) but it's fine as it doesn't seem to have much of an impact.
             isNominal = true;
         }
@@ -235,7 +235,7 @@ function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
                 const urlRedirect = headerRedirect[1];
                 urlOriginal = urlRedirect;
             }
-            msg = `HTTP ${type} ${pc.bold(urlOriginal)} ${color(statusCode ?? 'ERR')}`;
+            msg = `HTTP ${type} ${prettyUrl(urlOriginal)} ${color(statusCode ?? 'ERR')}`;
         }
     }
     logRuntimeInfo?.(msg, httpRequestId, isNominal ? 'info' : 'error');
@@ -443,9 +443,12 @@ function checkBaseUrl(pageContextInit, httpRequestId) {
     const { urlWithoutPageContextRequestSuffix } = handlePageContextRequestUrl(urlOriginal);
     const { hasBaseServer } = parseUrl(urlWithoutPageContextRequestSuffix, baseServer);
     if (!hasBaseServer) {
-        logRuntimeInfo?.(`${getRequestInfoMessage(urlOriginal)} skipped because URL ${pc.bold(urlOriginal)} doesn't start with Base URL ${pc.bold(baseServer)} (https://vike.dev/base-url)`, httpRequestId, 'info');
+        logRuntimeInfo?.(`${getRequestInfoMessage(urlOriginal)} skipped because URL ${prettyUrl(urlOriginal)} doesn't start with Base URL ${prettyUrl(baseServer)} (https://vike.dev/base-url)`, httpRequestId, 'info');
         const pageContextHttpResponseNull = getPageContextHttpResponseNull(pageContextInit);
         return pageContextHttpResponseNull;
     }
     return null;
 }
+function prettyUrl(url) {
+    return pc.bold(decodeURI(url));
+}

package/dist/esm/utils/projectInfo.d.ts

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.171-commit-2876124";
+declare const PROJECT_VERSION: "0.4.172-commit-ea2b76c";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.171-commit-2876124";
+    projectVersion: "0.4.172-commit-ea2b76c";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.171-commit-2876124';
+const PROJECT_VERSION = '0.4.172-commit-ea2b76c';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.171-commit-2876124",
+  "version": "0.4.172-commit-ea2b76c",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -195,7 +195,7 @@
     "@brillout/import": "^0.2.3",
     "@brillout/json-serializer": "^0.5.8",
     "@brillout/picocolors": "^1.0.10",
-    "@brillout/release-me": "^0.3.7",
+    "@brillout/release-me": "^0.3.8",
     "@brillout/require-shim": "^0.1.2",
     "@brillout/vite-plugin-server-entry": "^0.4.0",
     "@types/estree": "^1.0.5",