vike 0.4.169 → 0.4.171

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

@@ -139,9 +139,10 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                         //    - When tsconfig.js#compilerOptions.paths is set, then esbuild is able to resolve the path alias.
                         resolved.errors.length > 0;
                     (0, utils_js_1.assertPosixPath)(importPathResolved);
+                    const isNodeModules = importPathResolved.includes('/node_modules/');
                     const isExternal = isPointerImport ||
                         // Performance: npm package imports that aren't pointer imports can be externalized. For example, if Vike eventually adds support for setting Vite configs in the vike.config.js file, then the user may import a Vite plugin in his vike.config.js file. (We could as well let esbuild always transpile /node_modules/ code but it would be useless and would unnecessarily slow down transpilation.)
-                        importPathResolved.includes('/node_modules/');
+                        isNodeModules;
                     const filePathAbsoluteUserRootDir = (0, getFilePath_js_1.getFilePathAbsoluteUserRootDir)({
                         filePathAbsoluteFilesystem: importPathResolved,
                         userRootDir
@@ -166,8 +167,8 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                         // importPathOriginal is either:
                         //  - Npm package import
                         //  - Path alias
-                        if (filePathAbsoluteUserRootDir) {
-                            // importPathOriginal is most likely a path alias. (Is it even possible for an npm package import to resolved inside `userRootDir`?)
+                        if (filePathAbsoluteUserRootDir && !isNodeModules) {
+                            // importPathOriginal is most likely (always?) a path alias.
                             importPathTranspiled = importPathResolved;
                         }
                         else {

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

@@ -132,6 +132,7 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev) {
                         'vike-pinia',
                         'vike-solid'
                     ];
+                    (0, utils_js_1.assert)(extendsConfig.filePath.importPathAbsolute);
                     const extensionName = extendsConfig.filePath.importPathAbsolute.split('/')[0];
                     const warnMsg = alreadyMigrated.includes(extensionName)
                         ? `You're using a deprecated version of the Vike extension ${extensionName}, update ${extensionName} to its latest version.`
@@ -270,7 +271,6 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev) {
             if (isGlobalConfig(configName))
                 return;
             const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
-            configDef.env = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName);
             if (!isConfigEnv(configDef, configName))
                 return;
             const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile);
@@ -501,7 +501,7 @@ function isInterfaceFileUserLand(interfaceFile) {
 async function getConfigValueSource(configName, interfaceFile, configDef, userRootDir, importedFilesLoaded) {
     const conf = interfaceFile.fileExportsByConfigName[configName];
     (0, utils_js_1.assert)(conf);
-    const configEnv = configDef.env;
+    const configEnv = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName);
     const { locationId } = interfaceFile;
     const definedAtFilePath_ = {
         ...interfaceFile.filePath,
@@ -938,6 +938,7 @@ function mergeCumulative(configName, configValueSources) {
 function getConfigEnvValue(val, errMsgIntro) {
     const errInvalidValue = `${errMsgIntro} an invalid value ${picocolors_1.default.cyan(JSON.stringify(val))}`;
     // Legacy outdated values
+    // TODO/v1-release: remove
     if (typeof val === 'string') {
         const valConverted = (() => {
             if (val === 'client-only')

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.169';
+const PROJECT_VERSION = '0.4.171';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -136,9 +136,10 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                         //    - When tsconfig.js#compilerOptions.paths is set, then esbuild is able to resolve the path alias.
                         resolved.errors.length > 0;
                     assertPosixPath(importPathResolved);
+                    const isNodeModules = importPathResolved.includes('/node_modules/');
                     const isExternal = isPointerImport ||
                         // Performance: npm package imports that aren't pointer imports can be externalized. For example, if Vike eventually adds support for setting Vite configs in the vike.config.js file, then the user may import a Vite plugin in his vike.config.js file. (We could as well let esbuild always transpile /node_modules/ code but it would be useless and would unnecessarily slow down transpilation.)
-                        importPathResolved.includes('/node_modules/');
+                        isNodeModules;
                     const filePathAbsoluteUserRootDir = getFilePathAbsoluteUserRootDir({
                         filePathAbsoluteFilesystem: importPathResolved,
                         userRootDir
@@ -163,8 +164,8 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                         // importPathOriginal is either:
                         //  - Npm package import
                         //  - Path alias
-                        if (filePathAbsoluteUserRootDir) {
-                            // importPathOriginal is most likely a path alias. (Is it even possible for an npm package import to resolved inside `userRootDir`?)
+                        if (filePathAbsoluteUserRootDir && !isNodeModules) {
+                            // importPathOriginal is most likely (always?) a path alias.
                             importPathTranspiled = importPathResolved;
                         }
                         else {

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

@@ -127,6 +127,7 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev) {
                         'vike-pinia',
                         'vike-solid'
                     ];
+                    assert(extendsConfig.filePath.importPathAbsolute);
                     const extensionName = extendsConfig.filePath.importPathAbsolute.split('/')[0];
                     const warnMsg = alreadyMigrated.includes(extensionName)
                         ? `You're using a deprecated version of the Vike extension ${extensionName}, update ${extensionName} to its latest version.`
@@ -265,7 +266,6 @@ async function loadVikeConfig(userRootDir, outDirRoot, isDev) {
             if (isGlobalConfig(configName))
                 return;
             const configDef = getConfigDefinition(configDefinitions, configName, interfaceFile.filePath.filePathToShowToUser);
-            configDef.env = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName);
             if (!isConfigEnv(configDef, configName))
                 return;
             const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile);
@@ -496,7 +496,7 @@ function isInterfaceFileUserLand(interfaceFile) {
 async function getConfigValueSource(configName, interfaceFile, configDef, userRootDir, importedFilesLoaded) {
     const conf = interfaceFile.fileExportsByConfigName[configName];
     assert(conf);
-    const configEnv = configDef.env;
+    const configEnv = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName);
     const { locationId } = interfaceFile;
     const definedAtFilePath_ = {
         ...interfaceFile.filePath,
@@ -932,6 +932,7 @@ function mergeCumulative(configName, configValueSources) {
 function getConfigEnvValue(val, errMsgIntro) {
     const errInvalidValue = `${errMsgIntro} an invalid value ${pc.cyan(JSON.stringify(val))}`;
     // Legacy outdated values
+    // TODO/v1-release: remove
     if (typeof val === 'string') {
         const valConverted = (() => {
             if (val === 'client-only')

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.169";
+declare const PROJECT_VERSION: "0.4.171";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.169";
+    projectVersion: "0.4.171";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.169';
+const PROJECT_VERSION = '0.4.171';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.169",
+  "version": "0.4.171",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",