vike 0.4.201 → 0.4.203

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

@@ -16,47 +16,22 @@ function assertExtensionsConventions(interfaceFile) {
     assertConfigExportPath(interfaceFile);
 }
 function assertConfigExportPath(interfaceFile) {
-    const { importPathAbsolute } = interfaceFile.filePath;
-    (0, utils_js_1.assert)(importPathAbsolute);
+    const { importPathAbsolute, filePathAbsoluteFilesystem } = interfaceFile.filePath;
+    // Ejected Vike extension
+    if (!importPathAbsolute) {
+        const p = filePathAbsoluteFilesystem;
+        (0, utils_js_1.assert)(!p.includes('node_modules'));
+        return;
+    }
     const name = getConfigNameValue(interfaceFile);
     (0, utils_js_1.assert)(name); // already asserted in assertExtensionName()
     const importPathAbsoluteExpected = `${name}/config`;
     (0, utils_js_1.assertWarning)(importPathAbsolute === importPathAbsoluteExpected, `The Vike configuration of ${picocolors_1.default.bold(name)} is exported at ${picocolors_1.default.bold(importPathAbsolute)}, but it should be exported at ${picocolors_1.default.bold(importPathAbsoluteExpected)} instead.`, { onlyOnce: true });
 }
 function assertExtensionName(interfaceFile) {
-    let nameDeduced;
-    {
-        const { importPathAbsolute } = interfaceFile.filePath;
-        (0, utils_js_1.assert)(importPathAbsolute);
-        nameDeduced = importPathAbsolute
-            .split('/')
-            .slice(0, importPathAbsolute.startsWith('@') ? 2 : 1)
-            .join('/');
-    }
-    const name = getConfigNameValue(interfaceFile);
     const filePathToShowToUser = getFilePathToShowToUser(interfaceFile);
-    if (name) {
-        (0, utils_js_1.assertWarning)(name === nameDeduced, `The setting ${picocolors_1.default.bold('name')} defined at ${filePathToShowToUser} is ${picocolors_1.default.bold(name)}, but it should be ${picocolors_1.default.bold(nameDeduced)} instead (the name of the npm package).`, { onlyOnce: true });
-    }
-    else {
-        if (
-        // Let's eventually remove this
-        [
-            'vike-react',
-            'vike-react-query',
-            'vike-react-zustand',
-            'vike-vue',
-            'vike-vue-query',
-            'vike-vue-pinia',
-            'vike-pinia',
-            'vike-solid'
-        ].includes(nameDeduced)) {
-            (0, utils_js_1.assertUsage)(false, `Update ${nameDeduced} to its latest version.`);
-        }
-        else {
-            (0, utils_js_1.assertUsage)(false, `The setting ${picocolors_1.default.bold('name')} is missing: it should be set by the config ${filePathToShowToUser} of ${picocolors_1.default.bold(nameDeduced)}.`);
-        }
-    }
+    const name = getConfigNameValue(interfaceFile);
+    (0, utils_js_1.assertUsage)(name, `Vike extension name missing: the config ${filePathToShowToUser} must define the setting ${picocolors_1.default.cyan('name')}`);
 }
 function assertExtensionsPeerDependencies(interfaceFilesRelevantList) {
     // Get installed extensions

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

@@ -167,6 +167,7 @@ async function fastGlob(userRootDir, outDirRelativeFromUserRootDir) {
 function getIgnoreAsPatterns(outDirRelativeFromUserRootDir) {
     const ignoreAsPatterns = [
         '**/node_modules/**',
+        '**/ejected/**',
         // Allow:
         // ```
         // +Page.js
@@ -184,6 +185,7 @@ function getIgnoreAsPatterns(outDirRelativeFromUserRootDir) {
 function getIgnoreAsFilterFn(outDirRelativeFromUserRootDir) {
     (0, utils_js_1.assert)(outDirRelativeFromUserRootDir === null || !outDirRelativeFromUserRootDir.startsWith('/'));
     return (file) => !file.includes('node_modules/') &&
+        !file.includes('ejected/') &&
         !file.includes('.telefunc.') &&
         (outDirRelativeFromUserRootDir === null || !file.startsWith(`${outDirRelativeFromUserRootDir}/`));
 }

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

@@ -60,14 +60,13 @@ function assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem) {
     (0, utils_js_1.assertUsage)(idx === -1, `Infinite extends loop ${[...loop, filePathAbsoluteFilesystem].join('>')}`);
 }
 async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir, visited) {
-    const extendsPointerImportData = getExtendsPointerImportData(configFileExports, configFilePath);
+    const { extendsPointerImportData, extendsConfigs } = getExtendsPointerImportData(configFileExports, configFilePath);
     const extendsConfigFiles = [];
     extendsPointerImportData.map((pointerImportData) => {
         const filePath = (0, resolvePointerImport_js_1.resolvePointerImport)(pointerImportData, configFilePath, userRootDir);
         (0, utils_js_1.assert)(filePath.filePathAbsoluteFilesystem);
         extendsConfigFiles.push(filePath);
     });
-    const extendsConfigs = [];
     await Promise.all(extendsConfigFiles.map(async (configFilePath) => {
         const result = await loadConfigFile(configFilePath, userRootDir, visited, true);
         extendsConfigs.push(result.configFile);
@@ -79,24 +78,35 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
 function getExtendsPointerImportData(configFileExports, configFilePath) {
     const { filePathToShowToUser } = configFilePath;
     const configFileExport = (0, getConfigFileExport_js_1.getConfigFileExport)(configFileExports, filePathToShowToUser);
-    const wrongUsage = `${filePathToShowToUser} sets the config ${picocolors_1.default.cyan('extends')} to an invalid value, see https://vike.dev/extends`;
-    let extendList;
-    if (!('extends' in configFileExport)) {
-        return [];
-    }
-    else if ((0, utils_js_1.hasProp)(configFileExport, 'extends', 'string')) {
-        extendList = [configFileExport.extends];
-    }
-    else if ((0, utils_js_1.hasProp)(configFileExport, 'extends', 'string[]')) {
-        extendList = configFileExport.extends;
-    }
-    else {
-        (0, utils_js_1.assertUsage)(false, wrongUsage);
+    const extendsConfigs = [];
+    const extendsPointerImportData = [];
+    if ('extends' in configFileExport) {
+        const extendsValue = configFileExport.extends;
+        const extendList = [];
+        const wrongUsage = `${filePathToShowToUser} sets the config ${picocolors_1.default.cyan('extends')} to an invalid value, see https://vike.dev/extends`;
+        if (typeof extendsValue === 'string') {
+            extendList.push(extendsValue);
+        }
+        else if ((0, utils_js_1.isArrayOfStrings)(extendsValue)) {
+            extendList.push(...extendsValue);
+        }
+        else if ((0, utils_js_1.isObject)(extendsValue)) {
+            /* If we want to implement this then we need to make filePath optional
+            extendsConfigs.push({
+              fileExports: extendsValue,
+              filePath: null,
+            })
+            */
+            (0, utils_js_1.assertUsage)(false, wrongUsage);
+        }
+        else {
+            (0, utils_js_1.assertUsage)(false, wrongUsage);
+        }
+        extendsPointerImportData.push(...extendList.map((importString) => {
+            const pointerImportData = (0, transformPointerImports_js_1.parsePointerImportData)(importString);
+            (0, utils_js_1.assertUsage)(pointerImportData, wrongUsage);
+            return pointerImportData;
+        }));
     }
-    const extendsPointerImportData = extendList.map((importString) => {
-        const pointerImportData = (0, transformPointerImports_js_1.parsePointerImportData)(importString);
-        (0, utils_js_1.assertUsage)(pointerImportData, wrongUsage);
-        return pointerImportData;
-    });
-    return extendsPointerImportData;
+    return { extendsPointerImportData, extendsConfigs };
 }

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

@@ -118,9 +118,9 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                     let resolved = await build.resolve(path, opts);
                     if (debugEsbuildResolve.isActivated)
                         debugEsbuildResolve('resolved', resolved);
-                    // Temporary workaround for https://github.com/vikejs/vike/issues/1729
-                    // - Required for esbuild@0.24.0 (November 2024).
-                    // - Let's try to remove this workaround after some time.
+                    // Temporary workaround for https://github.com/evanw/esbuild/issues/3973
+                    // - Sitll required for esbuild@0.24.0 (November 2024).
+                    // - Let's try to remove this workaround again later.
                     if (resolved.errors.length > 0) {
                         let resolvedWithNode;
                         try {
@@ -149,15 +149,16 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                     //   - assertIsNpmPackageImport()
                     //   - isNpmPackageImport(str, { cannotBePathAlias: true })
                     (0, utils_js_1.assertFilePathAbsoluteFilesystem)(importPathResolved);
-                    // vike-{react,vue,solid} follow the convention that their config export resolves to a file named +config.js
-                    //  - This is temporary, see comment below.
-                    const isVikeExtensionImport = importPathResolved.endsWith('+config.js');
+                    //  Should be remove this? See comment below.
+                    const isVikeExtensionImport = (path.startsWith('vike-') && path.endsWith('/config')) || importPathResolved.endsWith('+config.js');
                     const isPointerImport = transformImports === 'all' ||
                         // .jsx, .vue, .svg, ... => obviously not config code => pointer import
                         !(0, utils_js_1.isPlainJavaScriptFile)(importPathResolved) ||
                         // Import of a Vike extension config => make it a pointer import because we want to show nice error messages (that can display whether a config has been set by the user or by a Vike extension).
-                        //  - TODO/eventually: stop doing this and, instead, let Node.js directly load vike-{react,vue,solid} while enforcing Vike extensions to set 'name' in their +config.js file.
-                        //    - vike@0.4.162 already started soft-requiring Vike extensions to set the name config
+                        //  - Should we stop doing this? (And instead let Node.js directly load Vike extensions.)
+                        //    - In principle, we can use the setting 'name' value of Vike extensions.
+                        //      - vike@0.4.162 started soft-requiring Vike extensions to set the name config.
+                        //    - In practice, it seems like it requires some (non-trivial?) refactoring.
                         isVikeExtensionImport;
                     (0, utils_js_1.assertPosixPath)(importPathResolved);
                     const isNodeModules = importPathResolved.includes('/node_modules/');

package/dist/cjs/shared/page-configs/assertPlusFileExport.js

@@ -26,7 +26,7 @@ function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
     const exportNamed = picocolors_1.default.code(`export { ${configName} }`);
     (0, utils_js_1.assert)(exportNamesValid.length <= 2);
     if (exportNamesValid.length === 0) {
-        (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} should have a ${exportNamed} or ${exportDefault}`);
+        (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} should have ${exportNamed} or ${exportDefault}`);
     }
     if (exportNamesValid.length === 2) {
         (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser} is ambiguous: remove ${exportDefault} or ${exportNamed}`, {

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.201';
+exports.PROJECT_VERSION = '0.4.203';

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

@@ -11,47 +11,22 @@ function assertExtensionsConventions(interfaceFile) {
     assertConfigExportPath(interfaceFile);
 }
 function assertConfigExportPath(interfaceFile) {
-    const { importPathAbsolute } = interfaceFile.filePath;
-    assert(importPathAbsolute);
+    const { importPathAbsolute, filePathAbsoluteFilesystem } = interfaceFile.filePath;
+    // Ejected Vike extension
+    if (!importPathAbsolute) {
+        const p = filePathAbsoluteFilesystem;
+        assert(!p.includes('node_modules'));
+        return;
+    }
     const name = getConfigNameValue(interfaceFile);
     assert(name); // already asserted in assertExtensionName()
     const importPathAbsoluteExpected = `${name}/config`;
     assertWarning(importPathAbsolute === importPathAbsoluteExpected, `The Vike configuration of ${pc.bold(name)} is exported at ${pc.bold(importPathAbsolute)}, but it should be exported at ${pc.bold(importPathAbsoluteExpected)} instead.`, { onlyOnce: true });
 }
 function assertExtensionName(interfaceFile) {
-    let nameDeduced;
-    {
-        const { importPathAbsolute } = interfaceFile.filePath;
-        assert(importPathAbsolute);
-        nameDeduced = importPathAbsolute
-            .split('/')
-            .slice(0, importPathAbsolute.startsWith('@') ? 2 : 1)
-            .join('/');
-    }
-    const name = getConfigNameValue(interfaceFile);
     const filePathToShowToUser = getFilePathToShowToUser(interfaceFile);
-    if (name) {
-        assertWarning(name === nameDeduced, `The setting ${pc.bold('name')} defined at ${filePathToShowToUser} is ${pc.bold(name)}, but it should be ${pc.bold(nameDeduced)} instead (the name of the npm package).`, { onlyOnce: true });
-    }
-    else {
-        if (
-        // Let's eventually remove this
-        [
-            'vike-react',
-            'vike-react-query',
-            'vike-react-zustand',
-            'vike-vue',
-            'vike-vue-query',
-            'vike-vue-pinia',
-            'vike-pinia',
-            'vike-solid'
-        ].includes(nameDeduced)) {
-            assertUsage(false, `Update ${nameDeduced} to its latest version.`);
-        }
-        else {
-            assertUsage(false, `The setting ${pc.bold('name')} is missing: it should be set by the config ${filePathToShowToUser} of ${pc.bold(nameDeduced)}.`);
-        }
-    }
+    const name = getConfigNameValue(interfaceFile);
+    assertUsage(name, `Vike extension name missing: the config ${filePathToShowToUser} must define the setting ${pc.cyan('name')}`);
 }
 function assertExtensionsPeerDependencies(interfaceFilesRelevantList) {
     // Get installed extensions

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

@@ -162,6 +162,7 @@ async function fastGlob(userRootDir, outDirRelativeFromUserRootDir) {
 function getIgnoreAsPatterns(outDirRelativeFromUserRootDir) {
     const ignoreAsPatterns = [
         '**/node_modules/**',
+        '**/ejected/**',
         // Allow:
         // ```
         // +Page.js
@@ -179,6 +180,7 @@ function getIgnoreAsPatterns(outDirRelativeFromUserRootDir) {
 function getIgnoreAsFilterFn(outDirRelativeFromUserRootDir) {
     assert(outDirRelativeFromUserRootDir === null || !outDirRelativeFromUserRootDir.startsWith('/'));
     return (file) => !file.includes('node_modules/') &&
+        !file.includes('ejected/') &&
         !file.includes('.telefunc.') &&
         (outDirRelativeFromUserRootDir === null || !file.startsWith(`${outDirRelativeFromUserRootDir}/`));
 }

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

@@ -2,7 +2,7 @@
 export { loadImportedFile };
 export { loadValueFile };
 export { loadConfigFile };
-import { assert, assertUsage, hasProp, assertIsNotProductionRuntime } from '../../../../utils.js';
+import { assert, assertUsage, assertIsNotProductionRuntime, isArrayOfStrings, isObject } from '../../../../utils.js';
 import { transpileAndExecuteFile } from './transpileAndExecuteFile.js';
 import { assertPlusFileExport } from '../../../../../../shared/page-configs/assertPlusFileExport.js';
 import pc from '@brillout/picocolors';
@@ -55,14 +55,13 @@ function assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem) {
     assertUsage(idx === -1, `Infinite extends loop ${[...loop, filePathAbsoluteFilesystem].join('>')}`);
 }
 async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir, visited) {
-    const extendsPointerImportData = getExtendsPointerImportData(configFileExports, configFilePath);
+    const { extendsPointerImportData, extendsConfigs } = getExtendsPointerImportData(configFileExports, configFilePath);
     const extendsConfigFiles = [];
     extendsPointerImportData.map((pointerImportData) => {
         const filePath = resolvePointerImport(pointerImportData, configFilePath, userRootDir);
         assert(filePath.filePathAbsoluteFilesystem);
         extendsConfigFiles.push(filePath);
     });
-    const extendsConfigs = [];
     await Promise.all(extendsConfigFiles.map(async (configFilePath) => {
         const result = await loadConfigFile(configFilePath, userRootDir, visited, true);
         extendsConfigs.push(result.configFile);
@@ -74,24 +73,35 @@ async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir
 function getExtendsPointerImportData(configFileExports, configFilePath) {
     const { filePathToShowToUser } = configFilePath;
     const configFileExport = getConfigFileExport(configFileExports, filePathToShowToUser);
-    const wrongUsage = `${filePathToShowToUser} sets the config ${pc.cyan('extends')} to an invalid value, see https://vike.dev/extends`;
-    let extendList;
-    if (!('extends' in configFileExport)) {
-        return [];
-    }
-    else if (hasProp(configFileExport, 'extends', 'string')) {
-        extendList = [configFileExport.extends];
-    }
-    else if (hasProp(configFileExport, 'extends', 'string[]')) {
-        extendList = configFileExport.extends;
-    }
-    else {
-        assertUsage(false, wrongUsage);
+    const extendsConfigs = [];
+    const extendsPointerImportData = [];
+    if ('extends' in configFileExport) {
+        const extendsValue = configFileExport.extends;
+        const extendList = [];
+        const wrongUsage = `${filePathToShowToUser} sets the config ${pc.cyan('extends')} to an invalid value, see https://vike.dev/extends`;
+        if (typeof extendsValue === 'string') {
+            extendList.push(extendsValue);
+        }
+        else if (isArrayOfStrings(extendsValue)) {
+            extendList.push(...extendsValue);
+        }
+        else if (isObject(extendsValue)) {
+            /* If we want to implement this then we need to make filePath optional
+            extendsConfigs.push({
+              fileExports: extendsValue,
+              filePath: null,
+            })
+            */
+            assertUsage(false, wrongUsage);
+        }
+        else {
+            assertUsage(false, wrongUsage);
+        }
+        extendsPointerImportData.push(...extendList.map((importString) => {
+            const pointerImportData = parsePointerImportData(importString);
+            assertUsage(pointerImportData, wrongUsage);
+            return pointerImportData;
+        }));
     }
-    const extendsPointerImportData = extendList.map((importString) => {
-        const pointerImportData = parsePointerImportData(importString);
-        assertUsage(pointerImportData, wrongUsage);
-        return pointerImportData;
-    });
-    return extendsPointerImportData;
+    return { extendsPointerImportData, extendsConfigs };
 }

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

@@ -113,9 +113,9 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                     let resolved = await build.resolve(path, opts);
                     if (debugEsbuildResolve.isActivated)
                         debugEsbuildResolve('resolved', resolved);
-                    // Temporary workaround for https://github.com/vikejs/vike/issues/1729
-                    // - Required for esbuild@0.24.0 (November 2024).
-                    // - Let's try to remove this workaround after some time.
+                    // Temporary workaround for https://github.com/evanw/esbuild/issues/3973
+                    // - Sitll required for esbuild@0.24.0 (November 2024).
+                    // - Let's try to remove this workaround again later.
                     if (resolved.errors.length > 0) {
                         let resolvedWithNode;
                         try {
@@ -144,15 +144,16 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                     //   - assertIsNpmPackageImport()
                     //   - isNpmPackageImport(str, { cannotBePathAlias: true })
                     assertFilePathAbsoluteFilesystem(importPathResolved);
-                    // vike-{react,vue,solid} follow the convention that their config export resolves to a file named +config.js
-                    //  - This is temporary, see comment below.
-                    const isVikeExtensionImport = importPathResolved.endsWith('+config.js');
+                    //  Should be remove this? See comment below.
+                    const isVikeExtensionImport = (path.startsWith('vike-') && path.endsWith('/config')) || importPathResolved.endsWith('+config.js');
                     const isPointerImport = transformImports === 'all' ||
                         // .jsx, .vue, .svg, ... => obviously not config code => pointer import
                         !isPlainJavaScriptFile(importPathResolved) ||
                         // Import of a Vike extension config => make it a pointer import because we want to show nice error messages (that can display whether a config has been set by the user or by a Vike extension).
-                        //  - TODO/eventually: stop doing this and, instead, let Node.js directly load vike-{react,vue,solid} while enforcing Vike extensions to set 'name' in their +config.js file.
-                        //    - vike@0.4.162 already started soft-requiring Vike extensions to set the name config
+                        //  - Should we stop doing this? (And instead let Node.js directly load Vike extensions.)
+                        //    - In principle, we can use the setting 'name' value of Vike extensions.
+                        //      - vike@0.4.162 started soft-requiring Vike extensions to set the name config.
+                        //    - In practice, it seems like it requires some (non-trivial?) refactoring.
                         isVikeExtensionImport;
                     assertPosixPath(importPathResolved);
                     const isNodeModules = importPathResolved.includes('/node_modules/');

package/dist/esm/shared/page-configs/assertPlusFileExport.js

@@ -21,7 +21,7 @@ function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
     const exportNamed = pc.code(`export { ${configName} }`);
     assert(exportNamesValid.length <= 2);
     if (exportNamesValid.length === 0) {
-        assertUsage(false, `${filePathToShowToUser} should have a ${exportNamed} or ${exportDefault}`);
+        assertUsage(false, `${filePathToShowToUser} should have ${exportNamed} or ${exportDefault}`);
     }
     if (exportNamesValid.length === 2) {
         assertWarning(false, `${filePathToShowToUser} is ambiguous: remove ${exportDefault} or ${exportNamed}`, {

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.201";
+export declare const PROJECT_VERSION: "0.4.203";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.201';
+export const PROJECT_VERSION = '0.4.203';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.201";
+    projectVersion: "0.4.203";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.201",
+  "version": "0.4.203",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {