vike 0.4.200 → 0.4.201

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

@@ -78,8 +78,8 @@ function resolveImportPathWithNode(pointerImportData, importerFilePath) {
     const importerFilePathAbsolute = importerFilePath.filePathAbsoluteFilesystem;
     (0, utils_js_1.assertPosixPath)(importerFilePathAbsolute);
     const cwd = path_1.default.posix.dirname(importerFilePathAbsolute);
-    // We can't use import.meta.resolve() as of Junary 2023 (and probably for a lot longer)
-    // https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment137174954_62272600:~:text=But%20the%20argument%20parent%20(aka%20cwd)%20still%20requires%20a%20flag
+    // We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
+    // - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
     // filePathAbsoluteFilesystem is expected to be null when pointerImportData.importPath is a Vite path alias
     const filePathAbsoluteFilesystem = (0, utils_js_1.requireResolve)(pointerImportData.importPath, cwd);
     return filePathAbsoluteFilesystem;

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

@@ -17,8 +17,15 @@ const transformPointerImports_js_1 = require("./transformPointerImports.js");
 const getVikeConfig_js_1 = require("../getVikeConfig.js");
 require("source-map-support/register.js");
 const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
+const module_1 = require("module");
+// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+const importMetaUrl = `file://${__filename}`;
+const require_ = (0, module_1.createRequire)(importMetaUrl);
 (0, utils_js_1.assertIsNotProductionRuntime)();
 const debug = (0, utils_js_1.createDebugger)('vike:pointer-imports');
+const debugEsbuildResolve = (0, utils_js_1.createDebugger)('vike:esbuild-resolve');
+if (debugEsbuildResolve.isActivated)
+    debugEsbuildResolve('esbuild version', esbuild_1.version);
 async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
     const fileExtension = getFileExtension(filePathAbsoluteFilesystem);
@@ -100,20 +107,38 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                 build.onResolve({ filter: /.*/ }, async (args) => {
                     if (args.kind !== 'import-statement')
                         return;
+                    if (debugEsbuildResolve.isActivated)
+                        debugEsbuildResolve('args', args);
                     // Avoid infinite loop: https://github.com/evanw/esbuild/issues/3095#issuecomment-1546916366
                     const useEsbuildResolver = 'useEsbuildResolver';
                     if (args.pluginData?.[useEsbuildResolver])
                         return;
                     const { path, ...opts } = args;
                     opts.pluginData = { [useEsbuildResolver]: true };
-                    const resolved = await build.resolve(path, opts);
+                    let resolved = await build.resolve(path, opts);
+                    if (debugEsbuildResolve.isActivated)
+                        debugEsbuildResolve('resolved', resolved);
+                    // Temporary workaround for https://github.com/vikejs/vike/issues/1729
+                    // - Required for esbuild@0.24.0 (November 2024).
+                    // - Let's try to remove this workaround after some time.
                     if (resolved.errors.length > 0) {
+                        let resolvedWithNode;
+                        try {
+                            resolvedWithNode = require_.resolve(path, { paths: [args.resolveDir] });
+                        }
+                        catch { }
+                        if (debugEsbuildResolve.isActivated)
+                            debugEsbuildResolve('resolvedWithNode', resolvedWithNode);
+                        if (resolvedWithNode)
+                            resolved = { path: resolvedWithNode };
+                    }
+                    if (resolved.errors && resolved.errors.length > 0) {
                         /* We could do the following to let Node.js throw the error, but we don't because the error shown by esbuild is prettier: the Node.js error refers to the transpiled [build-f7i251e0iwnw]+config.ts.mjs whereas esbuild refers to the source +config.ts file.
                         pointerImports[args.path] = false
                         return { external: true }
                         */
-                        cleanEsbuildErrors(resolved.errors);
                         // Let esbuild throw the error
+                        cleanEsbuildErrors(resolved.errors);
                         return resolved;
                     }
                     (0, utils_js_1.assert)(resolved.path);

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

@@ -71,7 +71,7 @@ urlLogical) {
     return createHttpResponse(statusCode, 'text/html;charset=utf-8', headers, 
     // For bots / programmatic crawlig: show what's going on.
     // For users: showing a blank page is probably better than a flickering text.
-    `<p style="display: none">Redirecting to ${url}</p><script>console.log('This HTTP response was generated by Vike.')</script>`);
+    `<p style="display: none">Redirecting to ${(0, utils_js_1.escapeHtml)(url)}</p><script>console.log('This HTTP response was generated by Vike.')</script>`);
 }
 function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints = [], renderHook = null) {
     headers.push(['Content-Type', contentType]);

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.200';
+exports.PROJECT_VERSION = '0.4.201';

package/dist/cjs/utils/debug.js

@@ -29,7 +29,8 @@ const flags = [
     'vike:routing',
     'vike:setup',
     'vike:stream',
-    'vike:virtual-files'
+    'vike:virtual-files',
+    'vike:esbuild-resolve'
 ];
 const flagRegex = /\bvike:[a-zA-Z-]+/g;
 assertDEBUG();

package/dist/cjs/utils/requireResolve.js

@@ -12,6 +12,8 @@ const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 (0, assertIsNotProductionRuntime_js_1.assertIsNotProductionRuntime)();
+// We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
+// - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
 function requireResolve(importPath, cwd) {
     (0, filesystemPathHandling_js_1.assertPosixPath)(cwd);
     const clean = addFileExtensionsToRequireResolve();

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

@@ -73,8 +73,8 @@ function resolveImportPathWithNode(pointerImportData, importerFilePath) {
     const importerFilePathAbsolute = importerFilePath.filePathAbsoluteFilesystem;
     assertPosixPath(importerFilePathAbsolute);
     const cwd = path.posix.dirname(importerFilePathAbsolute);
-    // We can't use import.meta.resolve() as of Junary 2023 (and probably for a lot longer)
-    // https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment137174954_62272600:~:text=But%20the%20argument%20parent%20(aka%20cwd)%20still%20requires%20a%20flag
+    // We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
+    // - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
     // filePathAbsoluteFilesystem is expected to be null when pointerImportData.importPath is a Vite path alias
     const filePathAbsoluteFilesystem = requireResolve(pointerImportData.importPath, cwd);
     return filePathAbsoluteFilesystem;

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

@@ -2,7 +2,7 @@ export { transpileAndExecuteFile };
 export { getConfigBuildErrorFormatted };
 export { getConfigExecutionErrorIntroMsg };
 export { isTemporaryBuildFile };
-import { build, formatMessages } from 'esbuild';
+import { build, formatMessages, version } from 'esbuild';
 import fs from 'fs';
 import path from 'path';
 import pc from '@brillout/picocolors';
@@ -12,8 +12,15 @@ import { transformPointerImports } from './transformPointerImports.js';
 import { vikeConfigDependencies } from '../getVikeConfig.js';
 import 'source-map-support/register.js';
 import { getFilePathAbsoluteUserRootDir } from '../../../../shared/getFilePath.js';
+import { createRequire } from 'module';
+// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+const importMetaUrl = import.meta.url;
+const require_ = createRequire(importMetaUrl);
 assertIsNotProductionRuntime();
 const debug = createDebugger('vike:pointer-imports');
+const debugEsbuildResolve = createDebugger('vike:esbuild-resolve');
+if (debugEsbuildResolve.isActivated)
+    debugEsbuildResolve('esbuild version', version);
 async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
     const fileExtension = getFileExtension(filePathAbsoluteFilesystem);
@@ -95,20 +102,38 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                 build.onResolve({ filter: /.*/ }, async (args) => {
                     if (args.kind !== 'import-statement')
                         return;
+                    if (debugEsbuildResolve.isActivated)
+                        debugEsbuildResolve('args', args);
                     // Avoid infinite loop: https://github.com/evanw/esbuild/issues/3095#issuecomment-1546916366
                     const useEsbuildResolver = 'useEsbuildResolver';
                     if (args.pluginData?.[useEsbuildResolver])
                         return;
                     const { path, ...opts } = args;
                     opts.pluginData = { [useEsbuildResolver]: true };
-                    const resolved = await build.resolve(path, opts);
+                    let resolved = await build.resolve(path, opts);
+                    if (debugEsbuildResolve.isActivated)
+                        debugEsbuildResolve('resolved', resolved);
+                    // Temporary workaround for https://github.com/vikejs/vike/issues/1729
+                    // - Required for esbuild@0.24.0 (November 2024).
+                    // - Let's try to remove this workaround after some time.
                     if (resolved.errors.length > 0) {
+                        let resolvedWithNode;
+                        try {
+                            resolvedWithNode = require_.resolve(path, { paths: [args.resolveDir] });
+                        }
+                        catch { }
+                        if (debugEsbuildResolve.isActivated)
+                            debugEsbuildResolve('resolvedWithNode', resolvedWithNode);
+                        if (resolvedWithNode)
+                            resolved = { path: resolvedWithNode };
+                    }
+                    if (resolved.errors && resolved.errors.length > 0) {
                         /* We could do the following to let Node.js throw the error, but we don't because the error shown by esbuild is prettier: the Node.js error refers to the transpiled [build-f7i251e0iwnw]+config.ts.mjs whereas esbuild refers to the source +config.ts file.
                         pointerImports[args.path] = false
                         return { external: true }
                         */
-                        cleanEsbuildErrors(resolved.errors);
                         // Let esbuild throw the error
+                        cleanEsbuildErrors(resolved.errors);
                         return resolved;
                     }
                     assert(resolved.path);

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

@@ -3,7 +3,7 @@ export { createHttpResponsePageContextJson };
 export { createHttpResponseError };
 export { createHttpResponseRedirect };
 export { createHttpResponseFavicon404 };
-import { assert, assertWarning } from '../utils.js';
+import { assert, assertWarning, escapeHtml } from '../utils.js';
 import { getErrorPageId, isErrorPage } from '../../../shared/error-page.js';
 import { getHttpResponseBody, getHttpResponseBodyStreamHandlers } from './getHttpResponseBody.js';
 import { getEarlyHints } from './getEarlyHints.js';
@@ -69,7 +69,7 @@ urlLogical) {
     return createHttpResponse(statusCode, 'text/html;charset=utf-8', headers, 
     // For bots / programmatic crawlig: show what's going on.
     // For users: showing a blank page is probably better than a flickering text.
-    `<p style="display: none">Redirecting to ${url}</p><script>console.log('This HTTP response was generated by Vike.')</script>`);
+    `<p style="display: none">Redirecting to ${escapeHtml(url)}</p><script>console.log('This HTTP response was generated by Vike.')</script>`);
 }
 function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints = [], renderHook = null) {
     headers.push(['Content-Type', contentType]);

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.200";
+export declare const PROJECT_VERSION: "0.4.201";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.200';
+export const PROJECT_VERSION = '0.4.201';

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

@@ -1,7 +1,7 @@
 export { createDebugger };
 export { isDebugActivated };
 export type { Debug };
-declare const flags: readonly ["vike:error", "vike:extractAssets", "vike:extractExportNames", "vike:glob", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:routing", "vike:setup", "vike:stream", "vike:virtual-files"];
+declare const flags: readonly ["vike:error", "vike:extractAssets", "vike:extractExportNames", "vike:glob", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:routing", "vike:setup", "vike:stream", "vike:virtual-files", "vike:esbuild-resolve"];
 type Flag = (typeof flags)[number];
 type Debug = ReturnType<typeof createDebugger>;
 type Options = {

package/dist/esm/utils/debug.js

@@ -24,7 +24,8 @@ const flags = [
     'vike:routing',
     'vike:setup',
     'vike:stream',
-    'vike:virtual-files'
+    'vike:virtual-files',
+    'vike:esbuild-resolve'
 ];
 const flagRegex = /\bvike:[a-zA-Z-]+/g;
 assertDEBUG();

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.200";
+    projectVersion: "0.4.201";
 };

package/dist/esm/utils/requireResolve.js

@@ -10,6 +10,8 @@ const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 assertIsNotBrowser();
 assertIsNotProductionRuntime();
+// We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
+// - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
 function requireResolve(importPath, cwd) {
     assertPosixPath(cwd);
     const clean = addFileExtensionsToRequireResolve();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.200",
+  "version": "0.4.201",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {