@tanstack/start-plugin-core 1.162.9 → 1.163.1

package/dist/esm/import-protection-plugin/defaults.js

@@ -6,11 +6,13 @@ function getDefaultImportProtectionRules() {
   return {
     client: {
       specifiers: clientSpecifiers,
-      files: ["**/*.server.*"]
+      files: ["**/*.server.*"],
+      excludeFiles: ["**/node_modules/**"]
     },
     server: {
       specifiers: [],
-      files: ["**/*.client.*"]
+      files: ["**/*.client.*"],
+      excludeFiles: ["**/node_modules/**"]
     }
   };
 }

package/dist/esm/import-protection-plugin/defaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.js","sources":["../../../src/import-protection-plugin/defaults.ts"],"sourcesContent":["import type { ImportProtectionEnvRules } from '../schema'\nimport type { Pattern } from './utils'\n\nexport interface DefaultImportProtectionRules {\n  client: Required<ImportProtectionEnvRules>\n  server: Required<ImportProtectionEnvRules>\n}\n\nconst frameworks = ['react', 'solid', 'vue'] as const\n\n/**\n * Returns the default import protection rules.\n *\n * All three framework variants are always included so that, e.g., a React\n * project also denies `@tanstack/solid-start/server` imports.\n */\nexport function getDefaultImportProtectionRules(): DefaultImportProtectionRules {\n  const clientSpecifiers: Array<Pattern> = frameworks.map(\n    (fw) => `@tanstack/${fw}-start/server`,\n  )\n\n  return {\n    client: {\n      specifiers: clientSpecifiers,\n      files: ['**/*.server.*'],\n    },\n    server: {\n      specifiers: [],\n      files: ['**/*.client.*'],\n    },\n  }\n}\n\n/**\n * Marker module specifiers that restrict a file to a specific environment.\n */\nexport function getMarkerSpecifiers(): {\n  serverOnly: Array<string>\n  clientOnly: Array<string>\n} {\n  return {\n    serverOnly: frameworks.map((fw) => `@tanstack/${fw}-start/server-only`),\n    clientOnly: frameworks.map((fw) => `@tanstack/${fw}-start/client-only`),\n  }\n}\n"],"names":[],"mappings":"AAQA,MAAM,aAAa,CAAC,SAAS,SAAS,KAAK;AAQpC,SAAS,kCAAgE;AAC9E,QAAM,mBAAmC,WAAW;AAAA,IAClD,CAAC,OAAO,aAAa,EAAE;AAAA,EAAA;AAGzB,SAAO;AAAA,IACL,QAAQ;AAAA,MACN,YAAY;AAAA,MACZ,OAAO,CAAC,eAAe;AAAA,IAAA;AAAA,IAEzB,QAAQ;AAAA,MACN,YAAY,CAAA;AAAA,MACZ,OAAO,CAAC,eAAe;AAAA,IAAA;AAAA,EACzB;AAEJ;AAKO,SAAS,sBAGd;AACA,SAAO;AAAA,IACL,YAAY,WAAW,IAAI,CAAC,OAAO,aAAa,EAAE,oBAAoB;AAAA,IACtE,YAAY,WAAW,IAAI,CAAC,OAAO,aAAa,EAAE,oBAAoB;AAAA,EAAA;AAE1E;"}
+{"version":3,"file":"defaults.js","sources":["../../../src/import-protection-plugin/defaults.ts"],"sourcesContent":["import type { ImportProtectionEnvRules } from '../schema'\nimport type { Pattern } from './utils'\n\nexport interface DefaultImportProtectionRules {\n  client: Required<ImportProtectionEnvRules>\n  server: Required<ImportProtectionEnvRules>\n}\n\nconst frameworks = ['react', 'solid', 'vue'] as const\n\n/**\n * Returns the default import protection rules.\n *\n * All three framework variants are always included so that, e.g., a React\n * project also denies `@tanstack/solid-start/server` imports.\n */\nexport function getDefaultImportProtectionRules(): DefaultImportProtectionRules {\n  const clientSpecifiers: Array<Pattern> = frameworks.map(\n    (fw) => `@tanstack/${fw}-start/server`,\n  )\n\n  return {\n    client: {\n      specifiers: clientSpecifiers,\n      files: ['**/*.server.*'],\n      excludeFiles: ['**/node_modules/**'],\n    },\n    server: {\n      specifiers: [],\n      files: ['**/*.client.*'],\n      excludeFiles: ['**/node_modules/**'],\n    },\n  }\n}\n\n/**\n * Marker module specifiers that restrict a file to a specific environment.\n */\nexport function getMarkerSpecifiers(): {\n  serverOnly: Array<string>\n  clientOnly: Array<string>\n} {\n  return {\n    serverOnly: frameworks.map((fw) => `@tanstack/${fw}-start/server-only`),\n    clientOnly: frameworks.map((fw) => `@tanstack/${fw}-start/client-only`),\n  }\n}\n"],"names":[],"mappings":"AAQA,MAAM,aAAa,CAAC,SAAS,SAAS,KAAK;AAQpC,SAAS,kCAAgE;AAC9E,QAAM,mBAAmC,WAAW;AAAA,IAClD,CAAC,OAAO,aAAa,EAAE;AAAA,EAAA;AAGzB,SAAO;AAAA,IACL,QAAQ;AAAA,MACN,YAAY;AAAA,MACZ,OAAO,CAAC,eAAe;AAAA,MACvB,cAAc,CAAC,oBAAoB;AAAA,IAAA;AAAA,IAErC,QAAQ;AAAA,MACN,YAAY,CAAA;AAAA,MACZ,OAAO,CAAC,eAAe;AAAA,MACvB,cAAc,CAAC,oBAAoB;AAAA,IAAA;AAAA,EACrC;AAEJ;AAKO,SAAS,sBAGd;AACA,SAAO;AAAA,IACL,YAAY,WAAW,IAAI,CAAC,OAAO,aAAa,EAAE,oBAAoB;AAAA,IACtE,YAAY,WAAW,IAAI,CAAC,OAAO,aAAa,EAAE,oBAAoB;AAAA,EAAA;AAE1E;"}

package/dist/esm/import-protection-plugin/plugin.d.ts

@@ -1,6 +1,5 @@
 import { PluginOption } from 'vite';
 import { CompileStartFrameworkOptions, GetConfigFn } from '../types.js';
-export { RESOLVED_MOCK_MODULE_ID } from './virtualModules.js';
 export { rewriteDeniedImports } from './rewriteDeniedImports.js';
 export { dedupePatterns, extractImportSources } from './utils.js';
 export type { Pattern } from './utils.js';

package/dist/esm/import-protection-plugin/plugin.js

@@ -8,11 +8,9 @@ import { findPostCompileUsagePos } from "./postCompileUsage.js";
 import { matchesAny, compileMatchers } from "./matchers.js";
 import { escapeRegExp, normalizeFilePath, getOrCreate, clearNormalizeFilePathCache, dedupePatterns, extractImportSources, relativizePath } from "./utils.js";
 import { collectMockExportNamesBySource } from "./rewriteDeniedImports.js";
-import { RESOLVED_MOCK_MODULE_ID, loadSilentMockModule, RESOLVED_MOCK_BUILD_PREFIX, RESOLVED_MOCK_EDGE_PREFIX, loadMockEdgeModule, RESOLVED_MOCK_RUNTIME_PREFIX, loadMockRuntimeModule, RESOLVED_MARKER_PREFIX, loadMarkerModule, MOCK_MODULE_ID, MOCK_EDGE_PREFIX, MOCK_RUNTIME_PREFIX, MARKER_PREFIX, mockRuntimeModuleIdFromViolation, makeMockEdgeModuleId } from "./virtualModules.js";
+import { loadResolvedVirtualModule, getResolvedVirtualModuleMatchers, resolveInternalVirtualModuleId, resolvedMarkerVirtualModuleId, mockRuntimeModuleIdFromViolation, makeMockEdgeModuleId, MOCK_BUILD_PREFIX } from "./virtualModules.js";
 import { clearImportPatternCache, pickOriginalCodeFromSourcesContent, buildLineIndex, ImportLocCache, findPostCompileUsageLocation, findImportStatementLocationFromTransformed, buildCodeSnippet, addTraceImportLocations } from "./sourceLocation.js";
 const SERVER_FN_LOOKUP_QUERY = "?" + SERVER_FN_LOOKUP;
-const RESOLVED_MARKER_SERVER_ONLY = resolveViteId(`${MARKER_PREFIX}server-only`);
-const RESOLVED_MARKER_CLIENT_ONLY = resolveViteId(`${MARKER_PREFIX}client-only`);
 const IMPORT_PROTECTION_DEBUG = process.env.TSR_IMPORT_PROTECTION_DEBUG === "1" || process.env.TSR_IMPORT_PROTECTION_DEBUG === "true";
 const IMPORT_PROTECTION_DEBUG_FILTER = process.env.TSR_IMPORT_PROTECTION_DEBUG_FILTER;
 function debugLog(...args) {
@@ -102,8 +100,8 @@ function importProtectionPlugin(opts) {
     logMode: "once",
     maxTraceDepth: 20,
     compiledRules: {
-      client: { specifiers: [], files: [] },
-      server: { specifiers: [], files: [] }
+      client: { specifiers: [], files: [], excludeFiles: [] },
+      server: { specifiers: [], files: [], excludeFiles: [] }
     },
     includeMatchers: [],
     excludeMatchers: [],
@@ -391,7 +389,7 @@ function importProtectionPlugin(opts) {
   function deferViolation(env, importerFile, info, mockReturnValue) {
     getOrCreate(env.pendingViolations, importerFile, () => []).push({
       info,
-      mockReturnValue: typeof mockReturnValue === "string" ? mockReturnValue : mockReturnValue?.id ?? ""
+      mockReturnValue: mockReturnValue ?? ""
     });
   }
   let buildViolationCounter = 0;
@@ -431,21 +429,30 @@ function importProtectionPlugin(opts) {
         config.mockAccess,
         config.root
       );
-      const importerFile = normalizeFilePath(info.importer);
-      const exports = env.mockExportsByImporter.get(importerFile)?.get(info.specifier) ?? [];
+      const importerFile2 = normalizeFilePath(info.importer);
+      const exports2 = env.mockExportsByImporter.get(importerFile2)?.get(info.specifier) ?? [];
       return resolveViteId(
-        makeMockEdgeModuleId(exports, info.specifier, runtimeId)
+        makeMockEdgeModuleId(exports2, info.specifier, runtimeId)
       );
     }
-    const mockId = `${RESOLVED_MOCK_BUILD_PREFIX}${buildViolationCounter++}`;
-    return { id: mockId, syntheticNamedExports: true };
+    const baseMockId = `${MOCK_BUILD_PREFIX}${buildViolationCounter++}`;
+    const importerFile = normalizeFilePath(info.importer);
+    const exports = env.mockExportsByImporter.get(importerFile)?.get(info.specifier) ?? [];
+    return resolveViteId(
+      makeMockEdgeModuleId(exports, info.specifier, baseMockId)
+    );
   }
   async function reportOrDeferViolation(ctx, env, importerFile, info, shouldDefer, isPreTransformResolve) {
     if (shouldDefer) {
       const result = await handleViolation(ctx, env, info, { silent: true });
       if (config.command === "build") {
-        const mockId = typeof result === "string" ? result : result?.id ?? "";
-        env.deferredBuildViolations.push({ info, mockModuleId: mockId });
+        const mockId = result ?? "";
+        env.deferredBuildViolations.push({
+          info,
+          mockModuleId: mockId,
+          // For marker violations, check importer survival instead of mock.
+          checkModuleId: info.type === "marker" ? info.importer : void 0
+        });
       } else {
         deferViolation(env, importerFile, info, result);
         await processPendingViolations(env, ctx.warn.bind(ctx));
@@ -501,15 +508,19 @@ function importProtectionPlugin(opts) {
           ...userOpts?.client?.specifiers ?? []
         ]);
         const clientFiles = userOpts?.client?.files ? [...userOpts.client.files] : [...defaults.client.files];
+        const clientExcludeFiles = userOpts?.client?.excludeFiles ? [...userOpts.client.excludeFiles] : [...defaults.client.excludeFiles];
         const serverSpecifiers = userOpts?.server?.specifiers ? dedupePatterns([...userOpts.server.specifiers]) : dedupePatterns([...defaults.server.specifiers]);
         const serverFiles = userOpts?.server?.files ? [...userOpts.server.files] : [...defaults.server.files];
+        const serverExcludeFiles = userOpts?.server?.excludeFiles ? [...userOpts.server.excludeFiles] : [...defaults.server.excludeFiles];
         config.compiledRules.client = {
           specifiers: compileMatchers(clientSpecifiers),
-          files: compileMatchers(clientFiles)
+          files: compileMatchers(clientFiles),
+          excludeFiles: compileMatchers(clientExcludeFiles)
         };
         config.compiledRules.server = {
           specifiers: compileMatchers(serverSpecifiers),
-          files: compileMatchers(serverFiles)
+          files: compileMatchers(serverFiles),
+          excludeFiles: compileMatchers(serverExcludeFiles)
         };
         if (userOpts?.include) {
           config.includeMatchers = compileMatchers(userOpts.include);
@@ -613,18 +624,8 @@ function importProtectionPlugin(opts) {
             });
           }
         }
-        if (source === MOCK_MODULE_ID) {
-          return RESOLVED_MOCK_MODULE_ID;
-        }
-        if (source.startsWith(MOCK_EDGE_PREFIX)) {
-          return resolveViteId(source);
-        }
-        if (source.startsWith(MOCK_RUNTIME_PREFIX)) {
-          return resolveViteId(source);
-        }
-        if (source.startsWith(MARKER_PREFIX)) {
-          return resolveViteId(source);
-        }
+        const internalVirtualId = resolveInternalVirtualModuleId(source);
+        if (internalVirtualId) return internalVirtualId;
         if (!importer) {
           env.graph.addEntry(source);
           await processPendingViolations(env, this.warn.bind(this));
@@ -678,7 +679,7 @@ function importProtectionPlugin(opts) {
               return markerResult;
             }
           }
-          return markerKind === "server" ? RESOLVED_MARKER_SERVER_ONLY : RESOLVED_MARKER_CLIENT_ONLY;
+          return markerKind === "server" ? resolvedMarkerVirtualModuleId("server") : resolvedMarkerVirtualModuleId("client");
         }
         if (!shouldCheckImporter(normalizedImporter)) {
           return void 0;
@@ -732,51 +733,54 @@ function importProtectionPlugin(opts) {
             env.serverFnLookupModules.add(resolved);
           }
           env.graph.addEdge(resolved, normalizedImporter, source);
-          const fileMatch = matchers.files.length > 0 ? matchesAny(relativePath, matchers.files) : void 0;
-          if (fileMatch) {
-            const info = await buildViolationInfo(
+          const isExcludedFile = matchers.excludeFiles.length > 0 && matchesAny(relativePath, matchers.excludeFiles);
+          if (!isExcludedFile) {
+            const fileMatch = matchers.files.length > 0 ? matchesAny(relativePath, matchers.files) : void 0;
+            if (fileMatch) {
+              const info = await buildViolationInfo(
+                provider,
+                env,
+                envName,
+                envType,
+                importer,
+                normalizedImporter,
+                source,
+                {
+                  type: "file",
+                  pattern: fileMatch.pattern,
+                  resolved,
+                  message: `Import "${source}" (resolved to "${relativePath}") is denied in the ${envType} environment`
+                }
+              );
+              return reportOrDeferViolation(
+                this,
+                env,
+                normalizedImporter,
+                info,
+                shouldDefer,
+                isPreTransformResolve
+              );
+            }
+            const markerInfo = await buildMarkerViolationFromResolvedImport(
               provider,
               env,
               envName,
               envType,
               importer,
-              normalizedImporter,
               source,
-              {
-                type: "file",
-                pattern: fileMatch.pattern,
-                resolved,
-                message: `Import "${source}" (resolved to "${relativePath}") is denied in the ${envType} environment`
-              }
-            );
-            return reportOrDeferViolation(
-              this,
-              env,
-              normalizedImporter,
-              info,
-              shouldDefer,
-              isPreTransformResolve
-            );
-          }
-          const markerInfo = await buildMarkerViolationFromResolvedImport(
-            provider,
-            env,
-            envName,
-            envType,
-            importer,
-            source,
-            resolved,
-            relativePath
-          );
-          if (markerInfo) {
-            return reportOrDeferViolation(
-              this,
-              env,
-              normalizedImporter,
-              markerInfo,
-              shouldDefer,
-              isPreTransformResolve
+              resolved,
+              relativePath
             );
+            if (markerInfo) {
+              return reportOrDeferViolation(
+                this,
+                env,
+                normalizedImporter,
+                markerInfo,
+                shouldDefer,
+                isPreTransformResolve
+              );
+            }
           }
         }
         return void 0;
@@ -784,13 +788,7 @@ function importProtectionPlugin(opts) {
       load: {
         filter: {
           id: new RegExp(
-            [
-              RESOLVED_MOCK_MODULE_ID,
-              RESOLVED_MOCK_BUILD_PREFIX,
-              RESOLVED_MARKER_PREFIX,
-              RESOLVED_MOCK_EDGE_PREFIX,
-              RESOLVED_MOCK_RUNTIME_PREFIX
-            ].map(escapeRegExp).join("|")
+            getResolvedVirtualModuleMatchers().map(escapeRegExp).join("|")
           )
         },
         handler(id) {
@@ -802,26 +800,7 @@ function importProtectionPlugin(opts) {
               });
             }
           }
-          if (id === RESOLVED_MOCK_MODULE_ID) {
-            return loadSilentMockModule();
-          }
-          if (id.startsWith(RESOLVED_MOCK_BUILD_PREFIX)) {
-            return loadSilentMockModule();
-          }
-          if (id.startsWith(RESOLVED_MOCK_EDGE_PREFIX)) {
-            return loadMockEdgeModule(
-              id.slice(RESOLVED_MOCK_EDGE_PREFIX.length)
-            );
-          }
-          if (id.startsWith(RESOLVED_MOCK_RUNTIME_PREFIX)) {
-            return loadMockRuntimeModule(
-              id.slice(RESOLVED_MOCK_RUNTIME_PREFIX.length)
-            );
-          }
-          if (id.startsWith(RESOLVED_MARKER_PREFIX)) {
-            return loadMarkerModule();
-          }
-          return void 0;
+          return loadResolvedVirtualModule(id);
         }
       },
       async generateBundle(_options, bundle) {
@@ -837,8 +816,13 @@ function importProtectionPlugin(opts) {
           }
         }
         const realViolations = [];
-        for (const { info, mockModuleId } of env.deferredBuildViolations) {
-          if (!survivingModules.has(mockModuleId)) continue;
+        for (const {
+          info,
+          mockModuleId,
+          checkModuleId
+        } of env.deferredBuildViolations) {
+          const checkId = checkModuleId ?? mockModuleId;
+          if (!survivingModules.has(checkId)) continue;
           if (config.onViolation) {
             const result = await config.onViolation(info);
             if (result === false) continue;
@@ -962,11 +946,8 @@ function importProtectionPlugin(opts) {
       // Separate plugin so the transform can be enabled/disabled per-environment.
       name: "tanstack-start-core:import-protection-mock-rewrite",
       enforce: "pre",
-      // Only needed during dev. In build, we rely on Rollup's syntheticNamedExports.
-      apply: "serve",
       applyToEnvironment(env) {
         if (!config.enabled) return false;
-        if (config.effectiveBehavior !== "mock") return false;
         return environmentNames.has(env.name);
       },
       transform: {
@@ -994,7 +975,6 @@ function importProtectionPlugin(opts) {
   ];
 }
 export {
-  RESOLVED_MOCK_MODULE_ID,
   dedupePatterns,
   extractImportSources,
   importProtectionPlugin