vike 0.4.237-commit-8749e81 → 0.4.237-commit-92dc549

package/dist/esm/utils/isScriptFile.js

@@ -1,8 +1,8 @@
 export { isScriptFile };
 export { isPlainScriptFile };
 export { isTemplateFile };
-export { scriptFileExtensionPattern };
 export { scriptFileExtensionList };
+export { scriptFileExtensionPattern };
 // We can't use a RegExp:
 //  - Needs to work with Micromatch: https://github.com/micromatch/micromatch because:
 //    - Vite's `import.meta.glob()` uses Micromatch

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

@@ -1,11 +1,13 @@
 export { pathJoin };
 export { pathIsRelative };
+export { pathIsAbsolute };
 export { toPosixPath };
 export { assertPosixPath };
 /**********************/
 /****** SHIMS *********/
 /**********************/
 declare function pathJoin(path1: string, path2: string): string;
+declare function pathIsAbsolute(filePath: string): boolean;
 /**********************/
 /****** UTILS *********/
 /**********************/

package/dist/esm/utils/path.js

@@ -1,5 +1,6 @@
 export { pathJoin };
 export { pathIsRelative };
+export { pathIsAbsolute };
 export { toPosixPath };
 export { assertPosixPath };
 // Utilities for handling file paths.
@@ -20,12 +21,11 @@ function pathJoin(path1, path2) {
         joined = '/' + joined;
     return joined;
 }
-/* https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
-const IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/
-function pathIsAbsolute(filePath: string) {
-  return IS_ABSOLUTE_RE.test(filePath)
+// https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
+const IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
+function pathIsAbsolute(filePath) {
+    return IS_ABSOLUTE_RE.test(filePath);
 }
-//*/
 /**********************/
 /****** UTILS *********/
 /**********************/

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

@@ -1,8 +1,8 @@
 export { requireResolveOptional };
 export { requireResolveOptionalDir };
 export { requireResolveNpmPackage };
-export { requireResolveVikeDistFile };
-export { getVikeNodeModulesRoot };
+export { requireResolveDistFile };
+export { getPackageNodeModulesDirectory };
 declare function requireResolveOptional({ importPath, importerFilePath, userRootDir, }: {
     importPath: string;
     importerFilePath: string;
@@ -17,5 +17,5 @@ declare function requireResolveNpmPackage({ importPathNpmPackage, userRootDir, }
     importPathNpmPackage: string;
     userRootDir: string;
 }): string;
-declare function requireResolveVikeDistFile(vikeDistFile: `dist/esm/${string}`): string;
-declare function getVikeNodeModulesRoot(): string;
+declare function requireResolveDistFile(distFile: `dist/esm/${string}.js`): string;
+declare function getPackageNodeModulesDirectory(): string;

package/dist/esm/utils/requireResolve.js

@@ -1,8 +1,8 @@
 export { requireResolveOptional };
 export { requireResolveOptionalDir };
 export { requireResolveNpmPackage };
-export { requireResolveVikeDistFile };
-export { getVikeNodeModulesRoot };
+export { requireResolveDistFile };
+export { getPackageNodeModulesDirectory };
 import { assert } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 import { assertIsNotProductionRuntime } from './assertSetup.js';
@@ -104,11 +104,11 @@ function requireResolveNpmPackage({ importPathNpmPackage, userRootDir, }) {
         throw res.err;
     return res.importPathResolvedFilePath;
 }
-function requireResolveVikeDistFile(vikeDistFile) {
-    const vikeNodeModulesRoot = getVikeNodeModulesRoot();
-    assertPosixPath(vikeNodeModulesRoot);
-    assertPosixPath(vikeDistFile);
-    const importPathResolvedFilePath = makeNodeFriendly(path.posix.join(vikeNodeModulesRoot, vikeDistFile));
+function requireResolveDistFile(distFile) {
+    const packageNodeModulesDirectory = getPackageNodeModulesDirectory();
+    assertPosixPath(packageNodeModulesDirectory);
+    assertPosixPath(distFile);
+    const importPathResolvedFilePath = makeNodeFriendly(path.posix.join(packageNodeModulesDirectory, distFile));
     // Double check
     {
         const res = requireResolve_(importPathResolvedFilePath, 
@@ -166,11 +166,12 @@ function addFileExtensionsToRequireResolve(require_) {
         }
     });
 }
-function getVikeNodeModulesRoot() {
-    // [RELATIVE_PATH_FROM_DIST] Current file: vike/dist/esm/utils/requireResolve.js
-    assert(importMetaUrl.includes('/dist/esm/') || importMetaUrl.includes('/dist/cjs/'));
-    const vikeNodeModulesRoot = path.posix.join(removeFilePrefix(importMetaUrl), '../../../../');
-    return vikeNodeModulesRoot;
+function getPackageNodeModulesDirectory() {
+    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/${packageName}/dist/esm/utils/requireResolve.js
+    assert(importMetaUrl.includes('/dist/esm/utils/') || importMetaUrl.includes('/dist/cjs/utils/'));
+    const packageNodeModulesDirectory = path.posix.join(removeFilePrefix(path.dirname(importMetaUrl)), '../../../');
+    // Return `node_modules/${packageName}/`
+    return packageNodeModulesDirectory;
 }
 function getFakeImporterFile(dirPath) {
     assertPosixPath(dirPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.237-commit-8749e81",
+  "version": "0.4.237-commit-92dc549",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -129,7 +129,7 @@
   },
   "dependencies": {
     "@brillout/import": "^0.2.6",
-    "@brillout/json-serializer": "^0.5.17",
+    "@brillout/json-serializer": "^0.5.20",
     "@brillout/picocolors": "^1.0.26",
     "@brillout/require-shim": "^0.1.2",
     "@brillout/vite-plugin-server-entry": "^0.7.12",

package/dist/esm/node/vite/shared/isViteServerBuild.d.ts

@@ -1,18 +0,0 @@
-export { isViteServerBuild };
-export { isViteClientBuild };
-export { isViteServerBuild_withoutEnv };
-export { isViteServerBuild_onlySsrEnv };
-export { isViteServerBuild_extraSafe };
-export type { ViteEnv };
-import type { Environment, EnvironmentOptions, ResolvedConfig, UserConfig } from 'vite';
-type ViteEnv = {
-    name?: string;
-    config: EnvironmentOptions | Environment['config'];
-};
-declare function isViteServerBuild_withoutEnv(configGlobal: ResolvedConfig | UserConfig, viteEnv?: ViteEnv): boolean;
-declare function isViteServerBuild(configGlobal: ResolvedConfig | UserConfig, viteEnv: ViteEnv): boolean;
-declare function isViteClientBuild(configGlobal: ResolvedConfig, viteEnv: ViteEnv): boolean;
-declare function isViteServerBuild_onlySsrEnv(configGlobal: ResolvedConfig, viteEnv: ViteEnv): boolean;
-declare function isViteServerBuild_extraSafe(config: ResolvedConfig, options: {
-    ssr?: boolean;
-} | undefined, viteEnv: ViteEnv): boolean;