vike 0.4.142 → 0.4.143-commit-dc6fea0

package/dist/esm/node/plugin/plugins/importUserCode/generateEagerImport.d.ts

@@ -1,5 +1,16 @@
 export { generateEagerImport };
-declare function generateEagerImport(importPath: string, varCounter?: number, importName?: string): {
-    importVar: string;
+/**
+ * Naming:
+ *   `import { someExport as someImport } from './some-file'`
+ * <=>
+ *   `{`
+ *      `importPath: './some-file',`
+ *      `exportName: 'someExport',`
+ *      `importName: 'someImport',`
+ *    `}`
+ * We discard the information that the import variable is called `someImport` because we don't need it.
+ */
+declare function generateEagerImport(importPath: string, varCounter?: number, exportName?: string): {
+    importName: string;
     importStatement: string;
 };

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

@@ -1,18 +1,29 @@
 export { generateEagerImport };
 let varCounterGlobal = 0;
-function generateEagerImport(importPath, varCounter, importName) {
+/**
+ * Naming:
+ *   `import { someExport as someImport } from './some-file'`
+ * <=>
+ *   `{`
+ *      `importPath: './some-file',`
+ *      `exportName: 'someExport',`
+ *      `importName: 'someImport',`
+ *    `}`
+ * We discard the information that the import variable is called `someImport` because we don't need it.
+ */
+function generateEagerImport(importPath, varCounter, exportName) {
     if (varCounter === undefined)
         varCounter = varCounterGlobal++;
-    const importVar = `import_${varCounter}`;
+    const importName = `import_${varCounter}`;
     const importLiteral = (() => {
-        if (!importName || importName === '*') {
-            return `* as ${importVar}`;
+        if (!exportName || exportName === '*') {
+            return `* as ${importName}`;
         }
-        if (importName === 'default') {
-            return importVar;
+        if (exportName === 'default') {
+            return importName;
         }
-        return `{ ${importName} as ${importVar} }`;
+        return `{ ${exportName} as ${importName} }`;
     })();
     const importStatement = `import ${importLiteral} from '${importPath}';`;
-    return { importVar, importStatement };
+    return { importName, importStatement };
 }

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

@@ -121,9 +121,9 @@ function addImport(importPath, fileType, exportNames, isBuild) {
             return `() => import('${importPath}${query}')`;
         }
         else {
-            const { importVar, importStatement } = generateEagerImport(`${importPath}${query}`);
+            const { importName, importStatement } = generateEagerImport(`${importPath}${query}`);
             fileContent += importStatement + '\n';
-            return importVar;
+            return importName;
         }
     })();
     fileContent += `${mapVar}['${importPath}'] = ${value};\n`;

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, getFilePathVite, getVirtualFileId, isDev1, isDev1_onConfigureServer, isVirtualFileId, resolveVirtualFileId } from '../../utils.js';
+import { assert, assertPosixPath, getFilePathRelativeToUserRootDir, getVirtualFileId, isDev1, isDev1_onConfigureServer, 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';
@@ -116,7 +116,7 @@ function isVikeConfigModule(filePathAbsolute) {
 }
 function reloadConfig(filePath, config, configVike, op) {
     {
-        const filePathToShowToUser = pc.dim(getFilePathVite(filePath, config.root, true));
+        const filePathToShowToUser = pc.dim(getFilePathRelativeToUserRootDir(filePath, config.root, true));
         const msg = `${op} ${filePathToShowToUser}`;
         logConfigInfo(msg, 'info');
     }

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

@@ -1,7 +1,24 @@
 export { getFilePathToShowToUser };
 export type { FilePath };
 type FilePath = {
+    /** The file's path relative to the filesystem root.
+     *
+     * Example: `/home/rom/code/my-app/pages/some-page/Page.js`
+     */
     filePathAbsolute: string;
-    filePathRelativeToUserRootDir: null | string;
-};
+} & ({
+    /** The file's path relative to the Vite's root (i.e. the user's project root directory).
+     *
+     * Example: `/pages/some-page/Page.js`
+     */
+    filePathRelativeToUserRootDir: string;
+    importPathAbsolute: null;
+} | {
+    filePathRelativeToUserRootDir: null;
+    /** The file's absolute import path.
+     *
+     * Example: `vike-react/config`
+     */
+    importPathAbsolute: string;
+});
 declare function getFilePathToShowToUser(filePath: FilePath): string;

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

@@ -1,5 +1,11 @@
 export { getFilePathToShowToUser };
 import { assert } from '../../../utils.js';
+/*
+const f: FilePath = 1 as any
+if (f.filePathRelativeToUserRootDir === null) {
+  f.importPathAbsolute
+}
+//*/
 function getFilePathToShowToUser(filePath) {
     const filePathToShowToUser = filePath.filePathRelativeToUserRootDir ?? filePath.filePathAbsolute;
     assert(filePathToShowToUser);

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

@@ -31,17 +31,18 @@ type ConfigDefinition = {
     effect?: ConfigEffect;
 };
 type ConfigEffect = (config: {
-    /** The resolved config value.
+    /** The config value.
      *
      * https://vike.dev/meta
      */
     configValue: unknown;
-    /** Place where the resolved config value comes from.
+    /** Where the config value is defined.
      *
      * https://vike.dev/meta
      */
     configDefinedAt: `Config ${string}`;
 }) => Config | undefined;
+/** For Vike internal use */
 type ConfigDefinitionInternal = Omit<ConfigDefinition, 'env'> & {
     _computed?: (pageConfig: PageConfigBuildTime) => unknown;
     _valueIsFilePath?: true;

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

@@ -2,11 +2,11 @@ export { getVikeConfig };
 export { reloadVikeConfig };
 export { vikeConfigDependencies };
 export { isVikeConfigFile };
-import type { PageConfigGlobalData, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
+import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
 import type { ExtensionResolved } from '../../../../../shared/ConfigVike.js';
 type VikeConfig = {
     pageConfigs: PageConfigBuildTime[];
-    pageConfigGlobal: PageConfigGlobalData;
+    pageConfigGlobal: PageConfigGlobalBuildTime;
     globalVikeConfig: Record<string, unknown>;
 };
 declare const vikeConfigDependencies: Set<string>;