vike 0.4.195-commit-3f77496 → 0.4.195-commit-c68b18f

package/dist/cjs/utils/warnIfErrorIsNotObject.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.warnIfErrorIsNotObject = void 0;
+exports.warnIfErrorIsNotObject = warnIfErrorIsNotObject;
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 const isObject_js_1 = require("./isObject.js");
@@ -21,4 +21,3 @@ function warnIfErrorIsNotObject(err) {
         (0, assert_js_1.assertWarning)(false, `One of your hooks threw an error ${picocolors_1.default.cyan('throw someValue')} but ${picocolors_1.default.cyan('someValue')} isn't an object (it's ${picocolors_1.default.cyan(`typeof someValue === ${typeof err}`)} instead). Make sure thrown values are always wrapped with ${picocolors_1.default.cyan('new Error()')}, in other words: ${picocolors_1.default.cyan('throw someValue')} should be replaced with ${picocolors_1.default.cyan('throw new Error(someValue)')}. The thrown value is printed above.`, { onlyOnce: false });
     }
 }
-exports.warnIfErrorIsNotObject = warnIfErrorIsNotObject;

package/dist/esm/node/plugin/plugins/fileEnv.js

@@ -1,105 +1,127 @@
 export { fileEnv };
-import { assert, assertUsage, assertWarning, capitalizeFirstLetter } from '../utils.js';
+import { assert, assertUsage, assertWarning, capitalizeFirstLetter, joinEnglish } from '../utils.js';
 import { extractAssetsRE } from './extractAssetsPlugin.js';
 import { extractExportNamesRE } from './extractExportNamesPlugin.js';
 import pc from '@brillout/picocolors';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
+import { sourceMapRemove } from '../shared/rollupSourceMap.js';
+import { getExportNames } from '../shared/parseEsModule.js';
 function fileEnv() {
     let config;
-    let isDev = false;
+    let viteDevServer;
     return {
         name: 'vike:fileEnv',
-        // - We need to set `enforce: 'pre'` because, otherwise, the resolvedId() hook of Vite's internal plugin `vite:resolve` is called before and it doesn't seem to call `this.resolve()` which means that the resolveId() hook below is never called.
-        //   - Vite's `vite:resolve` plugin: https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
-        // - It's actually a good thing if the resolveId() hook below is the first one to be called because it doesn't actually resolve any ID, so all other resolveId() hooks will be called as normal. And with `this.resolve()` we get the information we want from all other resolvedId() hooks.
-        // - Path aliases are already resolved, even when using `enforce: 'pre'`. For example:
-        //   ```js
-        //   // /pages/index/+Page.tsx
-        //
-        //   // The value of `source` is `/home/rom/code/vike/examples/path-aliases/components/Counter` (instead of `#root/components/Counter`)
-        //   // The value of `importer` is `/home/rom/code/vike/examples/path-aliases/pages/index/+Page.tsx`
-        //   import { Counter } from '#root/components/Counter'
-        //   ```
-        enforce: 'pre',
-        resolveId: {
-            /* I don't know why, but path aliases aren't resolved anymore when setting `order: 'pre'`. (In principle, I'd assume that `this.resolve()` would resolve the alias but it doesn't.)
-            order: 'pre',
-            */
-            async handler(source, importer, options) {
-                // It seems like Vite's scan doesn't apply transformers. (We need the `.telefunc.js` transformer to apply for our analysis to be correct.)
-                // @ts-expect-error Vite's type is wrong
-                if (options.scan)
-                    return;
-                // TODO/v1-release: remove
-                if (extractAssetsRE.test(source) || extractExportNamesRE.test(source))
-                    return;
-                // Seems like Vite is doing some funky stuff here.
-                if (importer?.endsWith('.html'))
-                    return;
-                const resolved = await this.resolve(source, importer, {
-                    // Needed for old Vite plugins: https://vitejs.dev/guide/migration#rollup-4:~:text=For%20Vite%20plugins%2C%20this.resolve%20skipSelf%20option%20is%20now%20true%20by%20default.
-                    skipSelf: true,
-                    ...options
-                });
-                // resolved is null when import path is erroneous and doesn't actually point to a file
-                if (!resolved)
-                    return;
-                const moduleId = resolved.id;
-                const modulePath = moduleId.split('?')[0];
-                // `.server.js` and `.client.js` should only apply to user files
-                if (modulePath.includes('/node_modules/'))
-                    return;
-                // TODO/v1-release: remove
-                // - I don't remember exactly, but I think I've added `TODO/v1-release: remove` because I vaguely remember that we can remove this after we remove the 0.4 design.
-                if (modulePath.endsWith('.css'))
-                    return;
-                const isServerSide = options?.ssr;
-                const envActual = isServerSide ? 'server' : 'client';
-                const envExpect = isServerSide ? 'client' : 'server';
-                const suffix = `.${envExpect}.`;
-                // Everything is good
-                if (!modulePath.includes(suffix))
+        load(id, options) {
+            // In build, we use generateBundle() instead of the load() hook. Using load() works for dynamic imports in dev thanks to Vite's lazy transpiling, but it doesn't work in build because Rollup transpiles any dynamically imported module even if it's never actually imported.
+            if (!viteDevServer)
+                return;
+            if (skip(id))
+                return;
+            const moduleInfo = viteDevServer.moduleGraph.getModuleById(id);
+            assert(moduleInfo);
+            const importers = Array.from(moduleInfo.importers)
+                .map((m) => m.id)
+                .filter((id) => id !== null);
+            assertFileEnv(id, !!options?.ssr, importers, 
+            // In dev, we only show a warning because we don't want to disrupt when the user plays with settings such as [ssr](https://vike.dev/ssr).
+            true);
+        },
+        // In production, we have to use transform() to replace modules with a runtime error because generateBundle() doesn't work for dynamic imports. In production, dynamic imports can only be verified at runtime.
+        async transform(code, id, options) {
+            // In dev, only using load() is enough as it also works for dynamic imports (see sibling comment).
+            if (viteDevServer)
+                return;
+            if (skip(id))
+                return;
+            const isServerSide = !!options?.ssr;
+            if (!isWrongEnv(id, isServerSide))
+                return;
+            const { importers } = this.getModuleInfo(id);
+            // Throwing a verbose error doesn't waste client-side KBs as dynamic imports are code splitted.
+            const errMsg = getErrorMessage(id, isServerSide, importers, false, true);
+            // We have to inject empty exports to avoid Rollup complaining about missing exports, see https://gist.github.com/brillout/5ea45776e65bd65100a52ecd7bfda3ff
+            const { exportNames } = await getExportNames(code);
+            return sourceMapRemove([
+                `throw new Error(${JSON.stringify(errMsg)});`,
+                ...exportNames.map((name) => name === 'default' ? 'export default undefined;' : `export const ${name} = undefined;`)
+            ].join('\n'));
+        },
+        generateBundle() {
+            Array.from(this.getModuleIds())
+                .filter((id) => !skip(id))
+                .forEach((moduleId) => {
+                const { importers, dynamicImporters } = this.getModuleInfo(moduleId);
+                if (importers.length === 0) {
+                    // Dynamic imports can only be verified at runtime
+                    assert(dynamicImporters.length > 0);
                     return;
-                // Show error message
-                let errMsg;
-                let modulePathPretty = getModuleFilePathAbsolute(moduleId, config);
-                modulePathPretty = modulePathPretty.replaceAll(suffix, pc.bold(suffix));
-                errMsg = `${capitalizeFirstLetter(envExpect)}-only file ${modulePathPretty} (https://vike.dev/file-env) imported on the ${envActual}-side`;
-                if (importer &&
-                    // Don't show Vike's virtual modules that import the entry plus files such as /pages/about/+Page.js
-                    !importer.includes('virtual:vike:') &&
-                    // I don't know why and who sets importer to '<stdin>' (I guess Vite?)
-                    importer !== '<stdin>') {
-                    const importerPath = getModuleFilePathAbsolute(importer, config);
-                    errMsg += ` by ${importerPath}`;
-                }
-                if (isDev) {
-                    errMsg += ' and, therefore, Vike will prevent building your app for production.';
-                    assertWarning(false, errMsg, { onlyOnce: true });
-                }
-                else {
-                    assertUsage(false, errMsg);
                 }
-            }
+                assertFileEnv(moduleId, !!config.build.ssr, importers, false);
+            });
         },
         configResolved(config_) {
             config = config_;
         },
-        configureServer() {
-            isDev = true;
-        },
-        // Ensure this plugin works
-        transform(_code, id, options) {
-            if (isDev)
-                return;
-            // TODO/v1-release: remove
-            if (extractAssetsRE.test(id) || extractExportNamesRE.test(id))
-                return;
-            if (id.split('?')[0].endsWith('.css'))
-                return;
-            const isServerSide = options?.ssr;
-            const envWrong = isServerSide ? 'client' : 'server';
-            assert(!id.includes(`.${envWrong}.`));
+        configureServer(viteDevServer_) {
+            viteDevServer = viteDevServer_;
         }
     };
+    function assertFileEnv(moduleId, isServerSide, importers, onlyWarn) {
+        if (!isWrongEnv(moduleId, isServerSide))
+            return;
+        const errMsg = getErrorMessage(moduleId, isServerSide, importers, onlyWarn, false);
+        if (onlyWarn) {
+            assertWarning(false, errMsg, { onlyOnce: true });
+        }
+        else {
+            assertUsage(false, errMsg);
+        }
+    }
+    function getErrorMessage(moduleId, isServerSide, importers, onlyWarn, noColor) {
+        const modulePath = getModulePath(moduleId);
+        const envActual = isServerSide ? 'server' : 'client';
+        const envExpect = isServerSide ? 'client' : 'server';
+        let errMsg;
+        let modulePathPretty = getModuleFilePathAbsolute(modulePath, config);
+        if (!noColor) {
+            const suffix = getSuffix(envExpect);
+            modulePathPretty = modulePathPretty.replaceAll(suffix, pc.bold(suffix));
+        }
+        errMsg = `${capitalizeFirstLetter(envExpect)}-only file ${modulePathPretty} (https://vike.dev/file-env) imported on the ${envActual}-side`;
+        if (importers.length > 0) {
+            const importPaths = importers.map((importer) => getModuleFilePathAbsolute(importer, config));
+            errMsg += ` by ${joinEnglish(importPaths, 'and')}`;
+        }
+        if (onlyWarn) {
+            errMsg += ' and, therefore, Vike will prevent building your app for production.';
+        }
+        return errMsg;
+    }
+    function isWrongEnv(moduleId, isServerSide) {
+        const modulePath = getModulePath(moduleId);
+        const suffixWrong = getSuffix(isServerSide ? 'client' : 'server');
+        return modulePath.includes(suffixWrong);
+    }
+    function skip(id) {
+        // TODO/v1-release: remove
+        if (extractAssetsRE.test(id) || extractExportNamesRE.test(id))
+            return true;
+        if (!id.includes(getSuffix('client')) && !id.includes(getSuffix('server')))
+            return true;
+        if (getModulePath(id).endsWith('.css'))
+            return true;
+        // Apply `.server.js` and `.client.js` only to user files
+        if (id.includes('/node_modules/'))
+            return true;
+        // Only user files
+        if (!id.startsWith(config.root))
+            return true;
+        return false;
+    }
+    function getSuffix(env) {
+        return `.${env}.`;
+    }
+    function getModulePath(moduleId) {
+        return moduleId.split('?')[0];
+    }
 }

package/dist/esm/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -72,7 +72,6 @@ ${await getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, c
     fileTypes
         .filter((fileType) => fileType !== '.css')
         .forEach((fileType) => {
-        assert(fileType !== '.css');
         const { includeImport, includeExportNames } = determineInjection({
             fileType,
             isForClientSide,

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/debug.d.ts

@@ -1,8 +1,8 @@
 export declare const debug: ((...msgs: unknown[]) => void) & {
     options: (optionsLocal: {
         serialization?: {
-            emptyArray?: string | undefined;
-        } | undefined;
+            emptyArray?: string;
+        };
     }) => (...msgs: unknown[]) => void;
     isActivated: boolean;
 };

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

@@ -176,12 +176,11 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                     }
                     if (debug.isActivated)
                         debug('onResolved()', { args, resolved, importPathTranspiled, isPointerImport, isExternal });
-                    pointerImports[importPathTranspiled] = isPointerImport;
                     if (isExternal) {
+                        pointerImports[importPathTranspiled] = isPointerImport;
                         return { external: true, path: importPathTranspiled };
                     }
                     else {
-                        resolved.path = importPathTranspiled;
                         return resolved;
                     }
                 });

package/dist/esm/node/runtime/html/stream.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 export { processStream };
 export { streamToString };
 export { stampPipe };

package/dist/esm/node/runtime/index-deprecated.d.ts

@@ -13,5 +13,5 @@ export * from '../../types/index-dreprecated.js';
  * See https://vike.dev/render
  */
 export declare const RenderErrorPage: (args_0?: {
-    pageContext?: Record<string, unknown> | undefined;
+    pageContext?: Record<string, unknown>;
 } | undefined) => Error;

package/dist/esm/node/runtime/renderPage/getHttpResponseBody.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 export { getHttpResponseBody };
 export { getHttpResponseBodyStreamHandlers };
 export type { HttpResponseBody };

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -78,7 +78,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlRewrite: null;
         _httpRequestId: number | null;
         _usesClientRouter: boolean;
-        _pageContextAlreadyProvidedByOnPrerenderHook?: true | undefined;
+        _pageContextAlreadyProvidedByOnPrerenderHook?: true;
         is404: null | boolean;
     } & {
         isClientSideNavigation: boolean;
@@ -129,7 +129,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlRewrite: null;
         _httpRequestId: number | null;
         _usesClientRouter: boolean;
-        _pageContextAlreadyProvidedByOnPrerenderHook?: true | undefined;
+        _pageContextAlreadyProvidedByOnPrerenderHook?: true;
         is404: null | boolean;
     } & {
         isClientSideNavigation: boolean;
@@ -181,8 +181,8 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _urlRewrite: null;
         _httpRequestId: number | null;
         _usesClientRouter: boolean;
-        _pageContextAlreadyProvidedByOnPrerenderHook?: true | undefined;
-        is404: boolean | null;
+        _pageContextAlreadyProvidedByOnPrerenderHook?: true;
+        is404: null | boolean;
     } & {
         isClientSideNavigation: boolean;
         _urlHandler: null;
@@ -232,8 +232,8 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _urlRewrite: null;
         _httpRequestId: number | null;
         _usesClientRouter: boolean;
-        _pageContextAlreadyProvidedByOnPrerenderHook?: true | undefined;
-        is404: boolean | null;
+        _pageContextAlreadyProvidedByOnPrerenderHook?: true;
+        is404: null | boolean;
     } & {
         isClientSideNavigation: boolean;
         _urlHandler: null;

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.195-commit-3f77496";
+export declare const PROJECT_VERSION: "0.4.195-commit-c68b18f";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.195-commit-3f77496';
+export const PROJECT_VERSION = '0.4.195-commit-c68b18f';

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

@@ -1,8 +1,8 @@
 export declare const debugGlob: ((...msgs: unknown[]) => void) & {
     options: (optionsLocal: {
         serialization?: {
-            emptyArray?: string | undefined;
-        } | undefined;
+            emptyArray?: string;
+        };
     }) => (...msgs: unknown[]) => void;
     isActivated: boolean;
 };

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.195-commit-3f77496";
+    projectVersion: "0.4.195-commit-c68b18f";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.195-commit-3f77496",
+  "version": "0.4.195-commit-c68b18f",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -242,7 +242,7 @@
     "semver": "^7.6.3",
     "sirv": "^2.0.4",
     "source-map-support": "^0.5.21",
-    "typescript": "^5.4.5",
+    "typescript": "^5.6.2",
     "vite": "^5.4.0"
   },
   "scripts": {