vike 0.4.227 → 0.4.228-commit-1553dee

package/dist/esm/utils/assert.js

@@ -93,12 +93,9 @@ function assertWarning(condition, msg, { onlyOnce, showStackTrace }) {
     if (onlyOnce) {
         const { alreadyLogged } = globalObject;
         const key = onlyOnce === true ? msg : onlyOnce;
-        if (alreadyLogged.has(key)) {
+        if (alreadyLogged.has(key))
             return;
-        }
-        else {
-            alreadyLogged.add(key);
-        }
+        alreadyLogged.add(key);
     }
     globalObject.onBeforeLog?.();
     if (showStackTrace) {

package/dist/esm/utils/isFilePathAbsoluteFilesystem.js

@@ -19,8 +19,8 @@ function assertFilePathAbsoluteFilesystem(filePath) {
     // - For Linux users assertFilePathAbsoluteFilesystem() will erroneously succeed if `p` is a path absolute from the user root dir.
     //   - But that's okay because the assertion will eventually fail for Windows users.
     //   - On Linux there doesn't seem to be a way to distinguish between an absolute path starting from the filesystem root or starting from the user root directory, see comment at isFilePathAbsoluteFilesystem()
-    assert(isFilePathAbsoluteFilesystem(filePath));
     assertPosixPath(filePath);
+    assert(isFilePathAbsoluteFilesystem(filePath));
 }
 /**
  * Whether `filePath` is an absolute file path starting from the filesystem root.

package/dist/esm/utils/isNpmPackage.js

@@ -14,10 +14,10 @@ import { assert } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 assertIsNotBrowser();
 function isNpmPackageImport(str, { cannotBePathAlias }) {
-    // We cannot distinguish path alises that look like npm package imports
     assert(cannotBePathAlias);
     return isNpmPackageImport_unreliable(str);
 }
+// We cannot distinguish path aliases that look like npm package imports
 function isNpmPackageImport_unreliable(str) {
     const res = parse(str);
     return res !== null;

package/dist/esm/utils/isScriptFile.js

@@ -7,12 +7,12 @@ import { assert } from './assert.js';
 // We can't use a RegExp:
 //  - Needs to work with Micromatch: https://github.com/micromatch/micromatch because:
 //    - Vite's `import.meta.glob()` uses Micromatch
-//  - We need this to be a whitelist because:
+//  - We need this to be a allowlist because:
 //   - A pattern `*([a-zA-Z0-9]` doesn't work.
 //     - Because of ReScript: `.res` are ReScript source files which need to be ignored. (The ReScript compiler generates `.js` files alongside `.res` files.)
-//   - Black listing doesn't work.
-//     - We cannot implement a blacklist with a glob pattern.
-//     - A post `import.meta.glob()` blacklist filtering doesn't work because Vite would still process the files (e.g. including them in the bundle).
+//   - Block listing doesn't work.
+//     - We cannot implement a blocklist with a glob pattern.
+//     - A post `import.meta.glob()` blocklist filtering doesn't work because Vite would still process the files (e.g. including them in the bundle).
 // prettier-ignore
 // biome-ignore format:
 const extJavaScript = [

package/dist/esm/utils/parseUrl.js

@@ -182,14 +182,14 @@ function parseProtocol(uri) {
     return { protocol, uriWithoutProtocol };
 }
 function isUrlProtocol(protocol) {
-    // Is there an altenrative to having a blacklist?
-    // - If the blacklist becomes too big, maybe use a whitelist instead ['tauri://', 'file://', 'capacitor://', 'http://', 'https://']
-    const blacklist = [
+    // Is there an alternative to having a blocklist?
+    // - If the blocklist becomes too big, maybe use a allowlist instead ['tauri://', 'file://', 'capacitor://', 'http://', 'https://']
+    const blocklist = [
         // https://docs.ipfs.tech/how-to/address-ipfs-on-web
         'ipfs://',
         'ipns://'
     ];
-    if (blacklist.includes(protocol))
+    if (blocklist.includes(protocol))
         return false;
     return protocol.endsWith('://');
 }

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

@@ -0,0 +1,2 @@
+export { preservePropertyGetters };
+declare function preservePropertyGetters<T extends object>(objOriginal: T): void;

package/dist/esm/utils/preservePropertyGetters.js

@@ -0,0 +1,28 @@
+export { preservePropertyGetters };
+import { assert } from './assert.js';
+function preservePropertyGetters(objOriginal) {
+    // Store original getter descriptors
+    const getters = Object.fromEntries(Object.entries(Object.getOwnPropertyDescriptors(objOriginal)).filter(([_, desc]) => 'get' in desc));
+    // Make getters non-enumerable
+    for (const [key, desc] of Object.entries(getters)) {
+        Object.defineProperty(objOriginal, key, { ...desc, enumerable: false });
+    }
+    const restorePropertyGetters = function () {
+        const objCopy = this;
+        delete objOriginal._restorePropertyGetters;
+        delete objCopy._restorePropertyGetters;
+        for (const [key, desc] of Object.entries(getters)) {
+            if (objCopy !== objOriginal) {
+                assert(!(key in objCopy));
+                Object.defineProperty(objCopy, key, desc); // Add property getters to copy
+            }
+            assert(key in objOriginal);
+            Object.defineProperty(objOriginal, key, desc); // Restore original `enumerable` value
+        }
+    };
+    Object.defineProperty(objOriginal, '_restorePropertyGetters', {
+        value: restorePropertyGetters,
+        enumerable: true,
+        configurable: true
+    });
+}

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

@@ -1,2 +1,8 @@
 export { requireResolve };
-declare function requireResolve(importPath: string, cwd: string): string | null;
+export { requireResolveOptional };
+export { requireResolveNonUserFile };
+export { requireResolveOptionalNonUserFile };
+declare function requireResolveOptional(importPath: string, cwd: string): string | null;
+declare function requireResolveOptionalNonUserFile(importPath: string, cwd: string): string | null;
+declare function requireResolveNonUserFile(importPath: string, cwd: string): string;
+declare function requireResolve(importPath: string, cwd: string): string;

package/dist/esm/utils/requireResolve.js

@@ -1,35 +1,76 @@
 export { requireResolve };
+export { requireResolveOptional };
+export { requireResolveNonUserFile };
+export { requireResolveOptionalNonUserFile };
 import { assert } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 import { assertIsNotProductionRuntime } from './assertSetup.js';
 import { assertPosixPath, toPosixPath } from './path.js';
 import { scriptFileExtensionList } from './isScriptFile.js';
-import { createRequire } from 'module';
+import { createRequire } from 'node:module';
+import path from 'node:path';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 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) {
+function requireResolve_(importPath, cwd, options) {
     assertPosixPath(cwd);
-    const clean = addFileExtensionsToRequireResolve();
-    importPath = removeFileExtention(importPath);
+    assertPosixPath(importPath);
+    cwd = resolveCwd(cwd);
+    let clean = () => { };
+    if (!options?.doNotHandleFileExtension) {
+        clean = addFileExtensionsToRequireResolve();
+        importPath = removeFileExtention(importPath);
+    }
     let importedFile;
     try {
+        // 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
         importedFile = require_.resolve(importPath, { paths: [cwd] });
     }
-    catch {
-        importedFile = null;
-    }
-    finally {
+    catch (err) {
         clean();
+        return { importedFile: undefined, err, hasFailed: true };
     }
-    if (importedFile) {
-        importedFile = toPosixPath(importedFile);
+    clean();
+    importedFile = toPosixPath(importedFile);
+    return { importedFile, err: undefined, hasFailed: false };
+}
+function requireResolveOptional(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd);
+    if (res.hasFailed)
+        return null;
+    return res.importedFile;
+}
+function requireResolveOptionalNonUserFile(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd, { doNotHandleFileExtension: true });
+    if (res.hasFailed)
+        return null;
+    return res.importedFile;
+}
+function requireResolveNonUserFile(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd, { doNotHandleFileExtension: true });
+    if (res.hasFailed)
+        throw res.err;
+    return res.importedFile;
+}
+function requireResolve(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd);
+    if (res.hasFailed)
+        throw res.err;
+    return res.importedFile;
+}
+function resolveCwd(cwd) {
+    let prefix = 'file://';
+    if (process.platform === 'win32')
+        prefix += '/';
+    if (cwd.startsWith(prefix)) {
+        cwd = cwd.slice(prefix.length);
+        cwd = path.posix.dirname(cwd);
     }
-    return importedFile;
+    assert(!cwd.startsWith('file:'));
+    return cwd;
 }
 function removeFileExtention(importPath) {
     // Skip for Bun: https://github.com/vikejs/vike/issues/2204

package/dist/esm/{node/plugin/shared → utils}/rollupSourceMap.d.ts

@@ -1,14 +1,14 @@
-export { sourceMapRemove };
-export { sourceMapPassthrough };
+export { rollupSourceMapRemove };
+export { rollupSourceMapPassthrough };
 /** Remove entire source mapping, to save KBs. */
-declare function sourceMapRemove(code: string): {
+declare function rollupSourceMapRemove(code: string): {
     code: string;
     map: {
         mappings: '';
     };
 };
 /** Don't provide any source map, pass through current source map instead. */
-declare function sourceMapPassthrough(code: string): {
+declare function rollupSourceMapPassthrough(code: string): {
     code: string;
     map: null;
 };

package/dist/esm/{node/plugin/shared → utils}/rollupSourceMap.js

@@ -1,15 +1,15 @@
-export { sourceMapRemove };
-export { sourceMapPassthrough };
+export { rollupSourceMapRemove };
+export { rollupSourceMapPassthrough };
 // https://rollupjs.org/guide/en/#source-code-transformations
 /** Remove entire source mapping, to save KBs. */
-function sourceMapRemove(code) {
+function rollupSourceMapRemove(code) {
     return {
         code,
         map: { mappings: '' }
     };
 }
 /** Don't provide any source map, pass through current source map instead. */
-function sourceMapPassthrough(code) {
+function rollupSourceMapPassthrough(code) {
     return {
         code,
         map: null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.227",
+  "version": "0.4.228-commit-1553dee",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -123,12 +123,13 @@
     "@brillout/json-serializer": "^0.5.15",
     "@brillout/picocolors": "^1.0.26",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.7.1",
+    "@brillout/vite-plugin-server-entry": "^0.7.5",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",
     "esbuild": "^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0",
     "json5": "^2.0.0",
+    "magic-string": "^0.30.17",
     "picomatch": "^4.0.2",
     "semver": "^7.0.0",
     "sirv": "^3.0.1",