Skip to content

Commit 3a8dd7a

Browse files
Adress PR feedback
1 parent 44ad8ce commit 3a8dd7a

File tree

6 files changed

+18
-20
lines changed

6 files changed

+18
-20
lines changed

packages/@tailwindcss-node/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tailwindcss/node",
3-
"version": "4.0.0-alpha.19",
3+
"version": "4.0.0-alpha.20",
44
"description": "A utility-first CSS framework for rapidly building custom user interfaces.",
55
"license": "MIT",
66
"repository": {

packages/@tailwindcss-node/src/esm-cache.loader.mts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { isBuiltin, type ResolveHook } from 'node:module'
22

33
export let resolve: ResolveHook = async (specifier, context, nextResolve) => {
4-
const result = await nextResolve(specifier, context)
4+
let result = await nextResolve(specifier, context)
55

66
if (result.url === import.meta.url) return result
77
if (isBuiltin(result.url)) return result

packages/@tailwindcss-node/src/get-module-dependencies.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ const DEPENDENCY_PATTERNS = [
1919
// c // .ts
2020
// a.js
2121
// b // .js or .ts
22-
let jsExtensions = ['.js', '.cjs', '.mjs']
23-
let jsResolutionOrder = ['', '.js', '.cjs', '.mjs', '.ts', '.cts', '.mts', '.jsx', '.tsx']
24-
let tsResolutionOrder = ['', '.ts', '.cts', '.mts', '.tsx', '.js', '.cjs', '.mjs', '.jsx']
22+
const JS_EXTENSIONS = ['.js', '.cjs', '.mjs']
23+
const JS_RESOLUTION_ORDER = ['', '.js', '.cjs', '.mjs', '.ts', '.cts', '.mts', '.jsx', '.tsx']
24+
const TS_RESOLUTION_ORDER = ['', '.ts', '.cts', '.mts', '.tsx', '.js', '.cjs', '.mjs', '.jsx']
2525

2626
async function resolveWithExtension(file: string, extensions: string[]) {
2727
// Try to find `./a.ts`, `./a.cts`, ... from `./a`
@@ -55,7 +55,7 @@ async function traceDependencies(
5555
ext: string,
5656
): Promise<void> {
5757
// Try to find the file
58-
let extensions = jsExtensions.includes(ext) ? jsResolutionOrder : tsResolutionOrder
58+
let extensions = JS_EXTENSIONS.includes(ext) ? JS_RESOLUTION_ORDER : TS_RESOLUTION_ORDER
5959
let absoluteFile = await resolveWithExtension(path.resolve(base, filename), extensions)
6060
if (absoluteFile === null) return // File doesn't exist
6161

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export function clearRequireCache(files: string[]) {
2-
for (const key of files) {
2+
for (let key of files) {
33
delete require.cache[key]
44
}
55
}

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,11 @@ test('Config files can affect the theme', async ({ expect }) => {
185185
}),
186186
})
187187

188-
// TODO: This does not work yet but should
189-
// expect(compiler.build(['bg-primary'])).toMatchInlineSnapshot()
190-
191-
expect(compiler.build(['scrollbar-primary'])).toMatchInlineSnapshot(`
192-
".scrollbar-primary {
188+
expect(compiler.build(['bg-primary', 'scrollbar-primary'])).toMatchInlineSnapshot(`
189+
".bg-primary {
190+
background-color: #c0ffee;
191+
}
192+
.scrollbar-primary {
193193
scrollbar-color: #c0ffee;
194194
}
195195
"

packages/tailwindcss/src/compat/dark-mode.ts

+6-8
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@ export function darkModePlugin({ addVariant, config }: PluginAPI) {
2020
for (let format of formats) {
2121
if (format === '.dark') {
2222
mode = false
23-
console.warn('darkmode-variant-without-selector', [
24-
'When using `variant` for `darkMode`, you must provide a selector.',
25-
'Example: `darkMode: ["variant", ".your-selector &"]`',
26-
])
23+
console.warn(
24+
'When using `variant` for `darkMode`, you must provide a selector.\nExample: `darkMode: ["variant", ".your-selector &"]`',
25+
)
2726
} else if (!format.includes('&')) {
2827
mode = false
29-
console.warn('darkmode-variant-without-ampersand', [
30-
'When using `variant` for `darkMode`, your selector must contain `&`.',
31-
'Example `darkMode: ["variant", ".your-selector &"]`',
32-
])
28+
console.warn(
29+
'When using `variant` for `darkMode`, your selector must contain `&`.\nExample `darkMode: ["variant", ".your-selector &"]`',
30+
)
3331
}
3432
}
3533
}

0 commit comments

Comments
 (0)