vike 0.4.266 → 0.4.267

package/dist/node/vite/shared/resolveVikeConfigInternal/pointerImports.js

@@ -1,6 +1,7 @@
 export { transformPointerImports };
 export { parsePointerImportData };
 export { assertPointerImportPath };
+export { pointerImportAttributeSuffix };
 // Playground: https://github.com/brillout/acorn-playground
 // Notes about `with { type: 'pointer' }`
 // - It works well with TypeScript: it doesn't complain upon `with { type: 'unknown-to-typescript' }` and go-to-definition & types are preserved: https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-3.html#import-attributes
@@ -10,24 +11,23 @@ export { assertPointerImportPath };
 //   - Isn't stage 4 yet: https://github.com/tc39/proposal-import-attributes
 // - Using a import path suffix such as `import { Layout } from './Layout?real` breaks TypeScript, and TypeScript isn't working on supporting query params: https://github.com/microsoft/TypeScript/issues/10988#issuecomment-867135453
 // - Node.js >=21 supports import attributes: https://nodejs.org/api/esm.html#import-attributes
-// - Esbuid supports
-//   - Blocker: https://github.com/evanw/esbuild/issues/3646
-//     - Ugly hack to make it work: https://github.com/brillout/esbuild-playground/tree/experiment/import-attribute
-//   - Discussion with esbuild maintainer: https://github.com/evanw/esbuild/issues/3384
+// - Rolldown doesn't pass import attributes to plugins => we parse import attributes ourselves and mark the import path with pointerImportAttributeSuffix, see transpileFile()
 // - Using a magic comment `// @vike-real-import` is probably a bad idea:
-//   - Esbuild removes comments: https://github.com/evanw/esbuild/issues/1439#issuecomment-877656182
+//   - Bundlers usually remove comments, e.g. esbuild: https://github.com/evanw/esbuild/issues/1439#issuecomment-877656182
 //   - Using source maps to track these magic comments is brittle (source maps can easily break)
 import { parseSync } from '@babel/core';
-import { assert, assertUsage, assertWarning } from '../../../../utils/assert.js';
+import { assert, assertUsage } from '../../../../utils/assert.js';
 import { isFilePathAbsolute } from '../../../../utils/isFilePathAbsoluteFilesystem.js';
 import { isImportPath } from '../../../../utils/isImportPath.js';
-import { styleFileRE } from '../../../../utils/styleFileRE.js';
 import pc from '@brillout/picocolors';
 import { parseImportString, isImportString, serializeImportString } from '../importString.js';
 import '../../assertEnvVite.js';
-function transformPointerImports(code, filePathToShowToUser2, pointerImports, 
-// For ./transformPointerImports.spec.ts
-skipWarnings) {
+// Appended to the import path of imports with the import attribute `with { type: 'vike:pointer' }`, see transpileFile()
+const pointerImportAttributeSuffix = '?vike:pointer';
+function removePointerImportAttributeSuffix(str) {
+    return str.split(pointerImportAttributeSuffix).join('');
+}
+function transformPointerImports(code, pointerImports) {
     const spliceOperations = [];
     // Collect all const declarations to prepend at the top, so that they are
     // available before any code runs (import declarations are hoisted but const
@@ -53,34 +53,8 @@ skipWarnings) {
         }
         const { start, end } = node;
         const importStatementCode = code.slice(start, end);
-        /* Pointer import without importing any value => doesn't make sense and doesn't have any effect.
-        ```js
-        // Useless
-        import './some.css'
-        // Useless
-        import './Layout.jsx'
-        ``` */
-        if (node.specifiers.length === 0) {
-            const isWarning = !styleFileRE.test(importPath);
-            let quote = indent(importStatementCode);
-            if (isWarning) {
-                quote = pc.cyan(quote);
-            }
-            else {
-                quote = pc.bold(pc.red(quote));
-            }
-            const errMsg = [
-                `The following import in ${filePathToShowToUser2} has no effect:`,
-                quote,
-                'See https://vike.dev/config#pointer-imports',
-            ].join('\n');
-            if (!skipWarnings) {
-                if (!isWarning) {
-                    assertUsage(false, errMsg);
-                }
-                assertWarning(false, errMsg, { onlyOnce: true });
-            }
-        }
+        // Pointer import without importing any value, e.g. `import './some.css'` => we remove it (it doesn't have any effect).
+        // - Rolldown transforms unused imports `import { unused } from './some.js'` into `import './some.js'`
         let constDeclaration = '';
         node.specifiers.forEach((specifier) => {
             assert(specifier.type === 'ImportSpecifier' ||
@@ -99,7 +73,11 @@ skipWarnings) {
                 }
                 return importLocalName;
             })();
-            const importString = serializePointerImportData({ importPath, exportName, importStringWasGenerated: true });
+            const importString = serializePointerImportData({
+                importPath: removePointerImportAttributeSuffix(importPath),
+                exportName,
+                importStringWasGenerated: true,
+            });
             constDeclaration += `const ${importLocalName} = '${importString}';`;
         });
         if (constDeclaration)
@@ -162,7 +140,7 @@ function parsePointerImportData(importString) {
 // `importPath` is one of the following:
 // - A relative import path
 // - An npm package import
-// - A filesystem absolute path, see transpileWithEsbuild()
+// - A filesystem absolute path, see transpileFile()
 function assertPointerImportPath(importPath) {
     return isImportPath(importPath) || isFilePathAbsolute(importPath);
 }
@@ -189,9 +167,3 @@ function spliceMany(str, operations) {
     strMod += str.slice(endPrev, str.length);
     return strMod;
 }
-function indent(str) {
-    return str
-        .split('\n')
-        .map((s) => `  ${s}`)
-        .join('\n');
-}

package/dist/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.d.ts

@@ -2,18 +2,18 @@ export { transpileAndExecuteFile };
 export { getConfigBuildErrorFormatted };
 export { getConfigExecutionErrorIntroMsg };
 export { isTemporaryBuildFile };
-export type { EsbuildCache };
+export type { VikeTranspileCache };
 import type { FilePathResolved } from '../../../../types/FilePath.js';
 import '../../assertEnvVite.js';
 type FileExports = {
     fileExports: Record<string, unknown>;
 };
-type EsbuildCache = {
+type VikeTranspileCache = {
     transpileCache: Record<string, // filePathAbsoluteFilesystem
     Promise<FileExports>>;
     vikeConfigDependencies: Set<string>;
 };
-declare function transpileAndExecuteFile(filePath: FilePathResolved, userRootDir: string, isExtensionConfig: boolean, esbuildCache: EsbuildCache): Promise<FileExports>;
+declare function transpileAndExecuteFile(filePath: FilePathResolved, userRootDir: string, isExtensionConfig: boolean, vikeTranspileCache: VikeTranspileCache): Promise<FileExports>;
 declare function getConfigBuildErrorFormatted(err: unknown): `Failed to transpile ${string} because:
 ${string}` | null;
 declare function getConfigExecutionErrorIntroMsg(err: unknown): `Failed to execute ${string} because:` | null;