inline optimizeCss in leaf packages

Instead of introducing a custom `@tailwindcss/optimize` package

packages/@tailwindcss-cli/package.json

@@ -30,8 +30,8 @@
   },
   "dependencies": {
     "@parcel/watcher": "^2.4.1",
-    "@tailwindcss/optimize": "workspace:^",
     "@tailwindcss/oxide": "workspace:^",
+    "lightningcss": "^1.24.0",
     "mri": "^1.2.0",
     "picocolors": "^1.0.0",
     "postcss": "8.4.24",

packages/@tailwindcss-cli/src/commands/build/index.ts

@@ -1,6 +1,6 @@
 import watcher from '@parcel/watcher'
-import { optimizeCss } from '@tailwindcss/optimize'
 import { IO, Parsing, scanDir, scanFiles, type ChangedContent } from '@tailwindcss/oxide'
+import { Features, transform } from 'lightningcss'
 import { existsSync } from 'node:fs'
 import fs from 'node:fs/promises'
 import path from 'node:path'
@@ -254,3 +254,27 @@ function handleImports(
       ),
     ])
 }
+
+function optimizeCss(
+  input: string,
+  { file = 'input.css', minify = false }: { file?: string; minify?: boolean } = {},
+) {
+  return transform({
+    filename: file,
+    code: Buffer.from(input),
+    minify,
+    sourceMap: false,
+    drafts: {
+      customMedia: true,
+    },
+    nonStandard: {
+      deepSelectorCombinator: true,
+    },
+    include: Features.Nesting,
+    exclude: Features.LogicalProperties,
+    targets: {
+      safari: (16 << 16) | (4 << 8),
+    },
+    errorRecovery: true,
+  }).code.toString()
+}

packages/@tailwindcss-postcss/package.json

@@ -29,8 +29,8 @@
     }
   },
   "dependencies": {
-    "@tailwindcss/optimize": "workspace:^",
     "@tailwindcss/oxide": "workspace:^",
+    "lightningcss": "^1.24.0",
     "postcss-import": "^16.0.0",
     "tailwindcss": "workspace:^"
   },

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

@@ -1,6 +1,6 @@
-import { optimizeCss } from '@tailwindcss/optimize'
 import { scanDir } from '@tailwindcss/oxide'
 import fs from 'fs'
+import { Features, transform } from 'lightningcss'
 import postcss, { type AcceptedPlugin, type PluginCreator } from 'postcss'
 import postcssImport from 'postcss-import'
 import { compile } from 'tailwindcss'
@@ -151,4 +151,28 @@ function tailwindcss(opts: PluginOptions = {}): AcceptedPlugin {
   }
 }
 
+function optimizeCss(
+  input: string,
+  { file = 'input.css', minify = false }: { file?: string; minify?: boolean } = {},
+) {
+  return transform({
+    filename: file,
+    code: Buffer.from(input),
+    minify,
+    sourceMap: false,
+    drafts: {
+      customMedia: true,
+    },
+    nonStandard: {
+      deepSelectorCombinator: true,
+    },
+    include: Features.Nesting,
+    exclude: Features.LogicalProperties,
+    targets: {
+      safari: (16 << 16) | (4 << 8),
+    },
+    errorRecovery: true,
+  }).code.toString()
+}
+
 export default Object.assign(tailwindcss, { postcss: true }) as PluginCreator<PluginOptions>

packages/@tailwindcss-vite/package.json

@@ -28,8 +28,8 @@
     }
   },
   "dependencies": {
-    "@tailwindcss/optimize": "workspace:^",
     "@tailwindcss/oxide": "workspace:^",
+    "lightningcss": "^1.24.0",
     "tailwindcss": "workspace:^"
   },
   "devDependencies": {

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

@@ -1,5 +1,5 @@
-import { optimizeCss } from '@tailwindcss/optimize'
 import { IO, Parsing, scanFiles } from '@tailwindcss/oxide'
+import { Features, transform } from 'lightningcss'
 import path from 'path'
 import { compile } from 'tailwindcss'
 import type { Plugin, Update, ViteDevServer } from 'vite'
@@ -182,3 +182,27 @@ export default function tailwindcss(): Plugin[] {
     },
   ] satisfies Plugin[]
 }
+
+function optimizeCss(
+  input: string,
+  { file = 'input.css', minify = false }: { file?: string; minify?: boolean } = {},
+) {
+  return transform({
+    filename: file,
+    code: Buffer.from(input),
+    minify,
+    sourceMap: false,
+    drafts: {
+      customMedia: true,
+    },
+    nonStandard: {
+      deepSelectorCombinator: true,
+    },
+    include: Features.Nesting,
+    exclude: Features.LogicalProperties,
+    targets: {
+      safari: (16 << 16) | (4 << 8),
+    },
+    errorRecovery: true,
+  }).code.toString()
+}

packages/tailwindcss/package.json

@@ -59,8 +59,8 @@
     "utilities.css"
   ],
   "devDependencies": {
-    "@tailwindcss/optimize": "workspace:^",
     "@tailwindcss/oxide": "workspace:^",
-    "@types/node": "^20.10.8"
+    "@types/node": "^20.10.8",
+    "lightningcss": "^1.24.0"
   }
 }

packages/tailwindcss/src/test-utils/run.ts

@@ -1,4 +1,4 @@
-import { optimizeCss } from '@tailwindcss/optimize'
+import { Features, transform } from 'lightningcss'
 import { compile } from '..'
 
 export function compileCss(css: string, candidates: string[] = []) {
@@ -8,3 +8,27 @@ export function compileCss(css: string, candidates: string[] = []) {
 export function run(candidates: string[]) {
   return optimizeCss(compile('@tailwind utilities;').build(candidates)).trim()
 }
+
+export function optimizeCss(
+  input: string,
+  { file = 'input.css', minify = false }: { file?: string; minify?: boolean } = {},
+) {
+  return transform({
+    filename: file,
+    code: Buffer.from(input),
+    minify,
+    sourceMap: false,
+    drafts: {
+      customMedia: true,
+    },
+    nonStandard: {
+      deepSelectorCombinator: true,
+    },
+    include: Features.Nesting,
+    exclude: Features.LogicalProperties,
+    targets: {
+      safari: (16 << 16) | (4 << 8),
+    },
+    errorRecovery: true,
+  }).code.toString()
+}

packages/tailwindcss/tests/ui.spec.ts

@@ -1,9 +1,9 @@
 import { expect, test, type Page } from '@playwright/test'
-import { optimizeCss } from '@tailwindcss/optimize'
 import { IO, Parsing, scanFiles } from '@tailwindcss/oxide'
 import fs from 'fs'
 import path from 'path'
 import { compile } from '../src'
+import { optimizeCss } from '../src/test-utils/run'
 
 const html = String.raw
 const css = String.raw