Fix node API by using require.resolve over path.resolve, whoops/

packages/@tailwindcss-node/src/compile.ts

@@ -14,14 +14,16 @@ export async function compile(
   return await _compile(css, base, {
     async loadModule(id, base) {
       if (id[0] !== '.') {
-        let resolvedPath = path.resolve(base, id)
+        let resolvedPath = require.resolve(id, { paths: [base] })
+
+        let module = await importModule(pathToFileURL(resolvedPath).href)
         return {
           base: basename(resolvedPath),
-          module: importModule(pathToFileURL(resolvedPath).href).then((m) => m.default ?? m),
+          module: module.default ?? module,
         }
       }
 
-      let resolvedPath = path.resolve(base, id)
+      let resolvedPath = require.resolve(id, { paths: [base] })
       let [module, moduleDependencies] = await Promise.all([
         importModule(pathToFileURL(resolvedPath).href + '?id=' + Date.now()),
         getModuleDependencies(resolvedPath),

packages/@tailwindcss-postcss/src/index.test.ts

@@ -179,7 +179,7 @@ describe('plugins', () => {
     expect(result.css.trim()).toMatchInlineSnapshot(`
       ".text-2xl {
         font-size: var(--font-size-2xl, 1.5rem);
-        line-height: var(--font-size-2xl--line-height, 2rem);
+        line-height: var(--tw-leading, var(--font-size-2xl--line-height, 2rem));
       }
 
       .text-black\\/50 {
@@ -192,12 +192,26 @@ describe('plugins', () => {
 
       @media (width >= 96rem) {
         .\\32 xl\\:font-bold {
+          --tw-font-weight: 700;
           font-weight: 700;
         }
       }
 
       .foo {
         color: var(--color-red-500, #ef4444);
+      }
+
+      @supports (-moz-orient: inline) {
+        @layer base {
+          *, :before, :after, ::backdrop {
+            --tw-font-weight: initial;
+          }
+        }
+      }
+
+      @property --tw-font-weight {
+        syntax: "*";
+        inherits: false
       }"
     `)
   })

packages/@tailwindcss-postcss/src/index.ts

@@ -141,12 +141,7 @@ function tailwindcss(opts: PluginOptions = {}): AcceptedPlugin {
           // Look for candidates used to generate the CSS
           let scanner = new Scanner({
             detectSources: { base },
-            sources: context.compiler.globs.map(({ origin, pattern }) => ({
-              // Ensure the glob is relative to the input CSS file or the config
-              // file where it is specified.
-              base: origin ? path.dirname(path.resolve(inputBasePath, origin)) : inputBasePath,
-              pattern,
-            })),
+            sources: context.compiler.globs,
           })
 
           //

packages/@tailwindcss-vite/src/index.ts

@@ -418,12 +418,7 @@ export class Root {
       })
 
       this.scanner = new Scanner({
-        sources: this.compiler.globs.map(({ origin, pattern }) => ({
-          // Ensure the glob is relative to the input CSS file or the config
-          // file where it is specified.
-          base: origin ? path.dirname(path.resolve(inputBase, origin)) : inputBase,
-          pattern,
-        })),
+        sources: this.compiler.globs,
       })
     }
 

packages/tailwindcss/src/index.ts

@@ -333,7 +333,7 @@ export async function compile(
   base: string,
   opts: CompileOptions = {},
 ): Promise<{
-  globs: { origin?: string; pattern: string }[]
+  globs: { base: string; pattern: string }[]
   build(candidates: string[]): string
 }> {
   let { designSystem, ast, globs } = await parseCss(css, base, opts)

packages/tailwindcss/src/plugin.test.ts

@@ -10,15 +10,16 @@ test('plugin', async () => {
   `
 
   let compiler = await compile(input, '/root', {
-    loadPlugin: async () => {
-      return plugin(function ({ addBase }) {
+    loadModule: async () => ({
+      module: plugin(function ({ addBase }) {
         addBase({
           body: {
             margin: '0',
           },
         })
-      })
-    },
+      }),
+      base: '/root',
+    }),
   })
 
   expect(compiler.build([])).toMatchInlineSnapshot(`
@@ -37,17 +38,18 @@ test('plugin.withOptions', async () => {
   `
 
   let compiler = await compile(input, '/root', {
-    loadPlugin: async () => {
-      return plugin.withOptions(function (opts = { foo: '1px' }) {
+    loadModule: async () => ({
+      module: plugin.withOptions(function (opts = { foo: '1px' }) {
         return function ({ addBase }) {
           addBase({
             body: {
               margin: opts.foo,
             },
           })
         }
-      })
-    },
+      }),
+      base: '/root',
+    }),
   })
 
   expect(compiler.build([])).toMatchInlineSnapshot(`