vike 0.4.168-commit-ce94f5c → 0.4.168-commit-7678a7d

package/dist/cjs/node/plugin/plugins/buildConfig.js

@@ -232,7 +232,15 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
     let { pageId } = pageConfig;
     const entryTarget = (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, isForClientSide);
     let entryName = pageId;
+    // Avoid:
+    // ```
+    // dist/client/assets/entries/.Dp9wM6PK.js
+    // dist/server/entries/.mjs
+    // ```
+    if (entryName === '/')
+        entryName = 'root';
     entryName = (0, prependEntriesDir_js_1.prependEntriesDir)(entryName);
+    (0, utils_js_1.assert)(!entryName.endsWith('/'));
     return { entryName, entryTarget };
 }
 function resolve(filePath) {

package/dist/cjs/node/plugin/plugins/distFileNames.js

@@ -116,6 +116,12 @@ function clean(name, removePathSep, fixGlob) {
     }
     name = removeLeadingUnderscoreInFilename(name);
     name = removeUnderscoreDoublets(name);
+    // Avoid:
+    // ```
+    // dist/client/assets/entries/.Dp9wM6PK.js
+    // dist/server/entries/.mjs
+    // ```
+    (0, utils_js_1.assert)(!name.endsWith('/'));
     return name;
 }
 function fixExtractAssetsQuery(name) {

package/dist/cjs/node/plugin/plugins/importUserCode/index.js

@@ -18,9 +18,11 @@ const getFilePath_js_1 = require("../../shared/getFilePath.js");
 function importUserCode() {
     let config;
     let configVike;
+    let isDev_;
     return {
         name: 'vike:importUserCode',
-        config() {
+        config(_, env) {
+            isDev_ = (0, utils_js_1.isDev3)(env);
             return {
                 experimental: {
                     // TODO/v1-release: remove
@@ -48,7 +50,7 @@ function importUserCode() {
             }
         },
         async load(id, options) {
-            const isDev = (0, utils_js_1.isDev1)();
+            const isDev = isDev_ !== null ? isDev_ : (0, utils_js_1.isDev1)();
             if (!(0, utils_js_1.isVirtualFileId)(id))
                 return undefined;
             id = (0, utils_js_1.getVirtualFileId)(id);
@@ -62,7 +64,8 @@ function importUserCode() {
             }
         },
         configureServer(server) {
-            (0, utils_js_1.isDev1_onConfigureServer)();
+            if (isDev_ === null)
+                (0, utils_js_1.isDev1_onConfigureServer)();
             handleFileAddRemove(server, config);
         }
     };

package/dist/cjs/node/shared/prependEntriesDir.js

@@ -7,6 +7,7 @@ function prependEntriesDir(entryName) {
         entryName = entryName.slice(1);
     }
     (0, utils_js_1.assert)(!entryName.startsWith('/'));
+    (0, utils_js_1.assert)(entryName);
     entryName = `entries/${entryName}`;
     return entryName;
 }

package/dist/cjs/utils/isDev.js

@@ -1,10 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDev2 = exports.isDev1_onConfigureServer = exports.isDev1 = void 0;
-// There isn't any reliable way to test whether Vite is ran as dev/build/preview/optimizeDep
-//  - Failed attempt to make a PR: https://github.com/brillout/vite/tree/fix/config-operation
+exports.isDev3 = exports.isDev2 = exports.isDev1_onConfigureServer = exports.isDev1 = void 0;
+function isDev3(configEnv) {
+    const { isPreview, command } = configEnv;
+    if (command !== 'serve')
+        return false;
+    if (typeof isPreview === 'boolean')
+        return !isPreview;
+    // isPreview is undefined in older Vite versions, see https://github.com/vitejs/vite/commit/93fce55
+    return null;
+}
+exports.isDev3 = isDev3;
 // ********
-// Method 1 - most reliable
+// Method 1 - reliable
 // ********
 const assert_js_1 = require("./assert.js");
 const getGlobalObject_js_1 = require("./getGlobalObject.js");

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.168-commit-ce94f5c';
+const PROJECT_VERSION = '0.4.168-commit-7678a7d';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -227,7 +227,15 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
     let { pageId } = pageConfig;
     const entryTarget = getVirtualFileIdPageConfigValuesAll(pageId, isForClientSide);
     let entryName = pageId;
+    // Avoid:
+    // ```
+    // dist/client/assets/entries/.Dp9wM6PK.js
+    // dist/server/entries/.mjs
+    // ```
+    if (entryName === '/')
+        entryName = 'root';
     entryName = prependEntriesDir(entryName);
+    assert(!entryName.endsWith('/'));
     return { entryName, entryTarget };
 }
 function resolve(filePath) {

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

@@ -110,6 +110,12 @@ function clean(name, removePathSep, fixGlob) {
     }
     name = removeLeadingUnderscoreInFilename(name);
     name = removeUnderscoreDoublets(name);
+    // Avoid:
+    // ```
+    // dist/client/assets/entries/.Dp9wM6PK.js
+    // dist/server/entries/.mjs
+    // ```
+    assert(!name.endsWith('/'));
     return name;
 }
 function fixExtractAssetsQuery(name) {

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

@@ -3,7 +3,7 @@ import { normalizePath } from 'vite';
 import { getConfigVike } from '../../../shared/getConfigVike.js';
 import { getVirtualFilePageConfigValuesAll } from './v1-design/getVirtualFilePageConfigValuesAll.js';
 import { getVirtualFileImportUserCode } from './getVirtualFileImportUserCode.js';
-import { assert, assertPosixPath, getOutDirs, getVirtualFileId, isDev1, isDev1_onConfigureServer, isVirtualFileId, resolveVirtualFileId } from '../../utils.js';
+import { assert, assertPosixPath, getOutDirs, getVirtualFileId, isDev1, isDev1_onConfigureServer, isDev3, isVirtualFileId, resolveVirtualFileId } from '../../utils.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { isVirtualFileIdImportUserCode } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
 import { vikeConfigDependencies, reloadVikeConfig, isVikeConfigFile } from './v1-design/getVikeConfig.js';
@@ -13,9 +13,11 @@ import { getFilePathResolved } from '../../shared/getFilePath.js';
 function importUserCode() {
     let config;
     let configVike;
+    let isDev_;
     return {
         name: 'vike:importUserCode',
-        config() {
+        config(_, env) {
+            isDev_ = isDev3(env);
             return {
                 experimental: {
                     // TODO/v1-release: remove
@@ -43,7 +45,7 @@ function importUserCode() {
             }
         },
         async load(id, options) {
-            const isDev = isDev1();
+            const isDev = isDev_ !== null ? isDev_ : isDev1();
             if (!isVirtualFileId(id))
                 return undefined;
             id = getVirtualFileId(id);
@@ -57,7 +59,8 @@ function importUserCode() {
             }
         },
         configureServer(server) {
-            isDev1_onConfigureServer();
+            if (isDev_ === null)
+                isDev1_onConfigureServer();
             handleFileAddRemove(server, config);
         }
     };

package/dist/esm/node/shared/prependEntriesDir.js

@@ -5,6 +5,7 @@ function prependEntriesDir(entryName) {
         entryName = entryName.slice(1);
     }
     assert(!entryName.startsWith('/'));
+    assert(entryName);
     entryName = `entries/${entryName}`;
     return entryName;
 }

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

@@ -1,6 +1,9 @@
 export { isDev1 };
 export { isDev1_onConfigureServer };
 export { isDev2 };
+export { isDev3 };
+import type { ConfigEnv } from 'vite';
+declare function isDev3(configEnv: ConfigEnv): null | boolean;
 declare function isDev1(): boolean;
 declare function isDev1_onConfigureServer(): void | undefined;
 import type { ResolvedConfig } from 'vite';

package/dist/esm/utils/isDev.js

@@ -1,10 +1,18 @@
 export { isDev1 };
 export { isDev1_onConfigureServer };
 export { isDev2 };
-// There isn't any reliable way to test whether Vite is ran as dev/build/preview/optimizeDep
-//  - Failed attempt to make a PR: https://github.com/brillout/vite/tree/fix/config-operation
+export { isDev3 };
+function isDev3(configEnv) {
+    const { isPreview, command } = configEnv;
+    if (command !== 'serve')
+        return false;
+    if (typeof isPreview === 'boolean')
+        return !isPreview;
+    // isPreview is undefined in older Vite versions, see https://github.com/vitejs/vite/commit/93fce55
+    return null;
+}
 // ********
-// Method 1 - most reliable
+// Method 1 - reliable
 // ********
 import { assert } from './assert.js';
 import { getGlobalObject } from './getGlobalObject.js';

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.168-commit-ce94f5c";
+declare const PROJECT_VERSION: "0.4.168-commit-7678a7d";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.168-commit-ce94f5c";
+    projectVersion: "0.4.168-commit-7678a7d";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.168-commit-ce94f5c';
+const PROJECT_VERSION = '0.4.168-commit-7678a7d';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.168-commit-ce94f5c",
+  "version": "0.4.168-commit-7678a7d",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",