Merge branch 'main' into main

Author: thecrypticace

CHANGELOG.md

@@ -12,6 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Format quotes in `@source`, `@plugin`, and `@config` ([#387](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/387))
 - Support sorting in callable template literals ([#367](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/367))
 - Support sorting in function calls mixed with property accesses ([#367](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/367))
+- Handle quote escapes in LESS when sorting `@apply` ([#392](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/392))
+- Improved monorepo support by loading Tailwind CSS relative to the input file instead of prettier config file ([#386](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/386))
+- Improved monorepo support by loading v3 configs relative to the input file instead of prettier config file ([#386](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/386))
+- Fix whitespace removal inside nested concat and template expressions ([#396](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/396))
+- Fallback to Tailwind CSS v4 instead of v3 by default ([#390](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/390))
 - Support sorting in function calls in Twig ([#358](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/358))
 
 ## [0.6.14] - 2025-07-09

README.md

@@ -230,7 +230,6 @@ This plugin uses Prettier APIs that can only be used by one plugin at a time, ma
 - `prettier-plugin-multiline-arrays`
 - `prettier-plugin-organize-attributes`
 - `prettier-plugin-organize-imports`
-- `prettier-plugin-style-order`
 - `prettier-plugin-svelte`
 - `prettier-plugin-sort-imports`
 

build.mjs

@@ -1,4 +1,5 @@
 import * as fs from 'node:fs'
+import { readFile } from 'node:fs/promises'
 import * as path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import esbuild from 'esbuild'
@@ -30,6 +31,28 @@ function patchRecast() {
   }
 }
 
+/**
+ * @returns {import('esbuild').Plugin}
+ */
+function patchJiti() {
+  return {
+    name: 'patch-jiti',
+    setup(build) {
+      // TODO: Switch to rolldown and see if we can chunk split this instead?
+      build.onLoad({ filter: /jiti\/lib\/jiti\.mjs$/ }, async (args) => {
+        let original = await fs.promises.readFile(args.path, 'utf8')
+
+        return {
+          contents: original.replace(
+            'createRequire(import.meta.url)("../dist/babel.cjs")',
+            'require("../dist/babel.cjs")',
+          ),
+        }
+      })
+    },
+  }
+}
+
 /**
  * @returns {import('esbuild').Plugin}
  */
@@ -46,11 +69,11 @@ function patchCjsInterop() {
         let code = [
           `import {createRequire as __global__createRequire__} from 'module'`,
           `import {dirname as __global__dirname__} from 'path'`,
-          `import {fileURLToPath} from 'url'`,
+          `import {fileURLToPath as __global__fileURLToPath__} from 'url'`,
 
           // CJS interop fixes
           `const require=__global__createRequire__(import.meta.url)`,
-          `const __filename=fileURLToPath(import.meta.url)`,
+          `const __filename=__global__fileURLToPath__(import.meta.url)`,
           `const __dirname=__global__dirname__(__filename)`,
         ]
 
@@ -62,6 +85,47 @@ function patchCjsInterop() {
   }
 }
 
+/**
+ * @returns {import('esbuild').Plugin}
+ */
+function inlineCssImports() {
+  return {
+    name: 'inline-css-imports',
+    setup(build) {
+      // Inline CSS imports
+      build.onLoad({ filter: /\.css$/ }, async (args) => {
+        let content = await readFile(args.path, 'utf-8')
+
+        return {
+          loader: 'js',
+          contents: `export default ${JSON.stringify(content)}`,
+        }
+      })
+
+      // Inline preflight in v3
+      // TODO: This needs a test
+      build.onLoad({ filter: /corePlugins\.js$/ }, async (args) => {
+        let preflightPath = path.resolve(path.dirname(args.path), './css/preflight.css')
+        let preflightContent = await readFile(preflightPath, 'utf-8')
+
+        let content = await readFile(args.path, 'utf-8')
+
+        // This is a bit fragile but this is to inline preflight for the
+        // *bundled* version which means a failing test should be enough
+        content = content.replace(
+          `_fs.default.readFileSync(_path.join(__dirname, "./css/preflight.css"), "utf8")`,
+          JSON.stringify(preflightContent),
+        )
+
+        return {
+          loader: 'js',
+          contents: content,
+        }
+      })
+    },
+  }
+}
+
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 let context = await esbuild.context({
@@ -73,7 +137,7 @@ let context = await esbuild.context({
   entryPoints: [path.resolve(__dirname, './src/index.js')],
   outfile: path.resolve(__dirname, './dist/index.mjs'),
   format: 'esm',
-  plugins: [patchRecast(), patchCjsInterop()],
+  plugins: [patchRecast(), patchJiti(), patchCjsInterop(), inlineCssImports()],
 })
 
 await context.rebuild()