vike 0.4.199-commit-29f9afc → 0.4.199-commit-749c7bd

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

@@ -5,6 +5,7 @@ const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
+const normalizeId_js_1 = require("../shared/normalizeId.js");
 // TODO/enventually: (after we implemented vike.config.js)
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -27,9 +28,11 @@ function envVarsPlugin() {
             config.plugins.sort((0, utils_js_1.lowerFirst)((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
         },
         transform(code, id, options) {
+            id = (0, normalizeId_js_1.normalizeId)(id);
             (0, utils_js_1.assertPosixPath)(id);
             if (id.includes('/node_modules/'))
                 return;
+            (0, utils_js_1.assertPosixPath)(config.root);
             if (!id.startsWith(config.root))
                 return;
             if (!code.includes('import.meta.env.'))

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

@@ -17,6 +17,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
+const normalizeId_js_1 = require("../shared/normalizeId.js");
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -36,6 +37,7 @@ function extractAssetsPlugin() {
             apply: 'build',
             enforce: 'post',
             async transform(src, id, options) {
+                id = (0, normalizeId_js_1.normalizeId)(id);
                 if (!extractAssetsRE.test(id)) {
                     return;
                 }

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

@@ -6,6 +6,7 @@ exports.isUsingClientRouter = isUsingClientRouter;
 const utils_js_1 = require("../utils.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
+const normalizeId_js_1 = require("../shared/normalizeId.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 exports.extractExportNamesRE = extractExportNamesRE;
 const debug = (0, utils_js_1.createDebugger)('vike:extractExportNames');
@@ -16,6 +17,7 @@ function extractExportNamesPlugin() {
         name: 'vike:extractExportNames',
         enforce: 'post',
         async transform(src, id, options) {
+            id = (0, normalizeId_js_1.normalizeId)(id);
             const isClientSide = !(0, utils_js_1.viteIsSSR_options)(options);
             if (extractExportNamesRE.test(id)) {
                 const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);

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

@@ -11,6 +11,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
+const normalizeId_js_1 = require("../shared/normalizeId.js");
 function fileEnv() {
     let config;
     let viteDevServer;
@@ -36,6 +37,7 @@ function fileEnv() {
         },
         // 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) {
+            id = (0, normalizeId_js_1.normalizeId)(id);
             // In dev, only using load() is enough as it also works for dynamic imports (see sibling comment).
             if (viteDevServer)
                 return;

package/dist/cjs/node/plugin/shared/normalizeId.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeId = normalizeId;
+const utils_js_1 = require("../utils.js");
+// In principle Vite/Rollup should always normalize the `id` in `transform(code, id)` but it seems to not always do it.
+// https://github.com/vikejs/vike/issues/1935
+function normalizeId(id) {
+    return (0, utils_js_1.toPosixPath)(id);
+}

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.199-commit-29f9afc';
+exports.PROJECT_VERSION = '0.4.199-commit-749c7bd';

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

@@ -3,6 +3,7 @@ import { loadEnv } from 'vite';
 import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArray, lowerFirst } from '../utils.js';
 import { sourceMapPassthrough } from '../shared/rollupSourceMap.js';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
+import { normalizeId } from '../shared/normalizeId.js';
 // TODO/enventually: (after we implemented vike.config.js)
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -25,9 +26,11 @@ function envVarsPlugin() {
             config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
         },
         transform(code, id, options) {
+            id = normalizeId(id);
             assertPosixPath(id);
             if (id.includes('/node_modules/'))
                 return;
+            assertPosixPath(config.root);
             if (!id.startsWith(config.root))
                 return;
             if (!code.includes('import.meta.env.'))

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

@@ -16,6 +16,7 @@ import pc from '@brillout/picocolors';
 import { fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { assertV1Design } from '../../shared/assertV1Design.js';
+import { normalizeId } from '../shared/normalizeId.js';
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
@@ -34,6 +35,7 @@ function extractAssetsPlugin() {
             apply: 'build',
             enforce: 'post',
             async transform(src, id, options) {
+                id = normalizeId(id);
                 if (!extractAssetsRE.test(id)) {
                     return;
                 }

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

@@ -4,6 +4,7 @@ export { extractExportNamesRE };
 import { assert, getFileExtension, viteIsSSR_options, createDebugger, getGlobalObject, assertUsage } from '../utils.js';
 import { getExportNames } from '../shared/parseEsModule.js';
 import { sourceMapRemove } from '../shared/rollupSourceMap.js';
+import { normalizeId } from '../shared/normalizeId.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 const debug = createDebugger('vike:extractExportNames');
 const globalObject = getGlobalObject('extractExportNamesPlugin.ts', {});
@@ -13,6 +14,7 @@ function extractExportNamesPlugin() {
         name: 'vike:extractExportNames',
         enforce: 'post',
         async transform(src, id, options) {
+            id = normalizeId(id);
             const isClientSide = !viteIsSSR_options(options);
             if (extractExportNamesRE.test(id)) {
                 const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);

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

@@ -6,6 +6,7 @@ import pc from '@brillout/picocolors';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import { getExportNames } from '../shared/parseEsModule.js';
+import { normalizeId } from '../shared/normalizeId.js';
 function fileEnv() {
     let config;
     let viteDevServer;
@@ -31,6 +32,7 @@ function fileEnv() {
         },
         // 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) {
+            id = normalizeId(id);
             // In dev, only using load() is enough as it also works for dynamic imports (see sibling comment).
             if (viteDevServer)
                 return;

package/dist/esm/node/plugin/shared/normalizeId.d.ts

@@ -0,0 +1,2 @@
+export { normalizeId };
+declare function normalizeId(id: string): string;

package/dist/esm/node/plugin/shared/normalizeId.js

@@ -0,0 +1,7 @@
+export { normalizeId };
+import { toPosixPath } from '../utils.js';
+// In principle Vite/Rollup should always normalize the `id` in `transform(code, id)` but it seems to not always do it.
+// https://github.com/vikejs/vike/issues/1935
+function normalizeId(id) {
+    return toPosixPath(id);
+}

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.199-commit-29f9afc";
+export declare const PROJECT_VERSION: "0.4.199-commit-749c7bd";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.199-commit-29f9afc';
+export const PROJECT_VERSION = '0.4.199-commit-749c7bd';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.199-commit-29f9afc";
+    projectVersion: "0.4.199-commit-749c7bd";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.199-commit-29f9afc",
+  "version": "0.4.199-commit-749c7bd",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {