Make TypeScript a bit more happy

packages/tailwindcss/src/at-import.test.ts

@@ -15,12 +15,15 @@ async function run(
     candidates = [],
     optimize = true,
   }: {
-    loadStylesheet?: (id: string, base: string) => Promise<{ content: string; base: string }>
+    loadStylesheet?: (
+      id: string,
+      base: string,
+    ) => Promise<{ content: string; base: string; path: string }>
     loadModule?: (
       id: string,
       base: string,
       resourceHint: 'plugin' | 'config',
-    ) => Promise<{ module: Config | Plugin; base: string }>
+    ) => Promise<{ module: Config | Plugin; base: string; path: string }>
     candidates?: string[]
     optimize?: boolean
   },
@@ -41,6 +44,7 @@ test('can resolve relative @imports', async () => {
         }
       `,
       base: '/root/foo',
+      path: '',
     }
   }
 
@@ -67,6 +71,7 @@ test('can recursively resolve relative @imports', async () => {
           @import './bar/baz.css';
         `,
         base: '/root/foo',
+        path: '',
       }
     } else if (base === '/root/foo' && id === './bar/baz.css') {
       return {
@@ -76,6 +81,7 @@ test('can recursively resolve relative @imports', async () => {
           }
         `,
         base: '/root/foo/bar',
+        path: '',
       }
     }
 
@@ -107,6 +113,7 @@ let loadStylesheet = async (id: string) => {
   return {
     content: exampleCSS,
     base: '/root',
+    path: '',
   }
 }
 
@@ -415,6 +422,7 @@ test('supports theme(reference) imports', async () => {
               }
             `,
             base: '',
+            path: '',
           }),
         candidates: ['text-red-500'],
       },
@@ -435,8 +443,9 @@ test('updates the base when loading modules inside nested files', async () => {
         @plugin './nested-plugin.js';
       `,
       base: '/root/foo',
+      path: '',
     })
-  let loadModule = vi.fn().mockResolvedValue({ base: '', module: () => {} })
+  let loadModule = vi.fn().mockResolvedValue({ base: '', path: '', module: () => {} })
 
   expect(
     (
@@ -464,6 +473,7 @@ test('emits the right base for @source directives inside nested files', async ()
         @source './nested/**/*.css';
       `,
       base: '/root/foo',
+      path: '',
     })
 
   let compiler = await compile(
@@ -488,6 +498,7 @@ test('emits the right base for @source found inside JS configs and plugins from
         @plugin './nested-plugin.js';
       `,
       base: '/root/foo',
+      path: '',
     })
   let loadModule = vi.fn().mockImplementation((id: string) => {
     let base = id.includes('nested') ? '/root/foo' : '/root'
@@ -502,12 +513,14 @@ test('emits the right base for @source found inside JS configs and plugins from
           plugins: [plugin(() => {}, { content: [pluginGlob] })],
         } satisfies Config,
         base: base + '-config',
+        path: '',
       }
     } else {
       let glob = id.includes('nested') ? './nested-plugin/*.html' : './root-plugin/*.html'
       return {
         module: plugin(() => {}, { content: [glob] }),
         base: base + '-plugin',
+        path: '',
       }
     }
   })
@@ -540,6 +553,7 @@ test('it crashes when inside a cycle', async () => {
         @import 'foo.css';
       `,
       base: '/root',
+      path: '',
     })
 
   await expect(
@@ -568,6 +582,7 @@ test('resolves @reference as `@import "…" reference`', async () => {
         }
       `,
       base: '/root/foo',
+      path: '',
     }
   }
 
@@ -600,6 +615,7 @@ test('resolves `@variant` used as `@custom-variant` inside `@reference`', async
         }
       `,
       base: '/root/foo',
+      path: '',
     }
   }
 

packages/tailwindcss/src/compat/apply-compat-hooks.ts

@@ -353,7 +353,7 @@ function upgradeToFullPluginSupport({
   // config would otherwise expand into namespaces like `background-color` which
   // core utilities already read from.
   applyConfigToTheme(designSystem, resolvedUserConfig, replacedThemeKeys)
-  applyKeyframesToTheme(designSystem, resolvedUserConfig, replacedThemeKeys)
+  applyKeyframesToTheme(designSystem, resolvedUserConfig)
 
   registerThemeVariantOverrides(resolvedUserConfig, designSystem)
   registerScreensConfig(resolvedUserConfig, designSystem)

packages/tailwindcss/src/compat/apply-config-to-theme.test.ts

@@ -83,6 +83,7 @@ test('config values can be merged into the theme', () => {
       },
       base: '/root',
       reference: false,
+      src: undefined,
     },
   ])
   applyConfigToTheme(design, resolvedConfig, replacedThemeKeys)
@@ -160,6 +161,8 @@ test('will reset default theme values with overwriting theme values', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
   applyConfigToTheme(design, resolvedConfig, replacedThemeKeys)
@@ -189,6 +192,8 @@ test('invalid keys are not merged into the theme', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
 
@@ -227,6 +232,8 @@ test('converts opacity modifiers from decimal to percentage values', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
   applyConfigToTheme(design, resolvedConfig, replacedThemeKeys)
@@ -261,6 +268,7 @@ test('handles setting theme keys to null', async () => {
       },
       base: '/root',
       reference: false,
+      src: undefined,
     },
   ])
   applyConfigToTheme(design, resolvedConfig, replacedThemeKeys)

packages/tailwindcss/src/compat/apply-keyframes-to-theme.test.ts

@@ -9,7 +9,7 @@ test('keyframes can be merged into the theme', () => {
   let theme = new Theme()
   let design = buildDesignSystem(theme)
 
-  let { resolvedConfig, replacedThemeKeys } = resolveConfig(design, [
+  let { resolvedConfig } = resolveConfig(design, [
     {
       config: {
         theme: {
@@ -28,9 +28,11 @@ test('keyframes can be merged into the theme', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
-  applyKeyframesToTheme(design, resolvedConfig, replacedThemeKeys)
+  applyKeyframesToTheme(design, resolvedConfig)
 
   expect(toCss(design.theme.getKeyframes())).toMatchInlineSnapshot(`
     "@keyframes fade-in {
@@ -70,7 +72,7 @@ test('will append to the default keyframes with new keyframes', () => {
     ]),
   )
 
-  let { resolvedConfig, replacedThemeKeys } = resolveConfig(design, [
+  let { resolvedConfig } = resolveConfig(design, [
     {
       config: {
         theme: {
@@ -91,9 +93,11 @@ test('will append to the default keyframes with new keyframes', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
-  applyKeyframesToTheme(design, resolvedConfig, replacedThemeKeys)
+  applyKeyframesToTheme(design, resolvedConfig)
 
   expect(toCss(design.theme.getKeyframes())).toMatchInlineSnapshot(`
     "@keyframes slide-in {

packages/tailwindcss/src/compat/apply-keyframes-to-theme.ts

@@ -6,7 +6,6 @@ import { objectToAst } from './plugin-api'
 export function applyKeyframesToTheme(
   designSystem: DesignSystem,
   resolvedConfig: Pick<ResolvedConfig, 'theme'>,
-  replacedThemeKeys: Set<string>,
 ) {
   for (let rule of keyframesToRules(resolvedConfig)) {
     designSystem.theme.addKeyframes(rule)

packages/tailwindcss/src/compat/config/resolve-config.test.ts

@@ -20,6 +20,8 @@ test('top level theme keys are replaced', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
     {
       config: {
@@ -30,6 +32,8 @@ test('top level theme keys are replaced', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
     {
       config: {
@@ -40,6 +44,8 @@ test('top level theme keys are replaced', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
 
@@ -73,6 +79,8 @@ test('theme can be extended', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
     {
       config: {
@@ -85,6 +93,8 @@ test('theme can be extended', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
 
@@ -120,6 +130,8 @@ test('theme keys can reference other theme keys using the theme function regardl
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
     {
       config: {
@@ -133,6 +145,8 @@ test('theme keys can reference other theme keys using the theme function regardl
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
     {
       config: {
@@ -145,6 +159,8 @@ test('theme keys can reference other theme keys using the theme function regardl
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
 
@@ -212,6 +228,8 @@ test('theme keys can read from the CSS theme', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
 
@@ -274,6 +292,7 @@ test('handles null as theme values', () => {
       },
       base: '/root',
       reference: false,
+      src: undefined,
     },
     {
       config: {
@@ -287,6 +306,7 @@ test('handles null as theme values', () => {
       },
       base: '/root',
       reference: false,
+      src: undefined,
     },
   ])
 

packages/tailwindcss/src/compat/container-config.test.ts

@@ -27,6 +27,7 @@ test('creates a custom utility to extend the built-in container', async () => {
         },
       },
       base: '/root',
+      path: '',
     }),
   })
 
@@ -85,6 +86,7 @@ test('allows padding to be defined at custom breakpoints', async () => {
         },
       },
       base: '/root',
+      path: '',
     }),
   })
 
@@ -146,6 +148,7 @@ test('allows breakpoints to be overwritten', async () => {
         },
       },
       base: '/root',
+      path: '',
     }),
   })
 
@@ -212,6 +215,7 @@ test('padding applies to custom `container` screens', async () => {
         },
       },
       base: '/root',
+      path: '',
     }),
   })
 
@@ -275,6 +279,7 @@ test("an empty `screen` config will undo all custom media screens and won't appl
         },
       },
       base: '/root',
+      path: '',
     }),
   })
 
@@ -340,6 +345,7 @@ test('legacy container component does not interfere with new --container variabl
         },
       },
       base: '/root',
+      path: '',
     }),
   })
 
@@ -386,6 +392,7 @@ test('combines custom padding and screen overwrites', async () => {
         },
       },
       base: '/root',
+      path: '',
     }),
   })
 
@@ -498,6 +505,7 @@ test('filters out complex breakpoints', async () => {
         },
       },
       base: '/root',
+      path: '',
     }),
   })