2024-10-03 16:21:54 +02:00
|
|
|
import QuickLRU from '@alloc/quick-lru'
|
2024-09-30 16:39:21 +02:00
|
|
|
import { compile, env } from '@tailwindcss/node'
|
2024-09-02 12:03:16 -04:00
|
|
|
import { clearRequireCache } from '@tailwindcss/node/require-cache'
|
Improve Oxide scanner API (#14187)
This PR updates the API for interacting with the Oxide API. Until now,
we used the name `scanDir(…)` which is fine, but we do way more work
right now.
We now have features such as:
1. Auto source detection (can be turned off, e.g.: `@tailwindcss/vite`
doesn't need it)
2. Scan based on `@source`s found in CSS files
3. Do "incremental" rebuilds (which means that the `scanDir(…)` result
was stateful).
To solve these issues, this PR introduces a new `Scanner` class where
you can pass in the `detectSources` and `sources` options. E.g.:
```ts
let scanner = new Scanner({
// Optional, omitting `detectSources` field disables automatic source detection
detectSources: { base: __dirname },
// List of glob entries to scan. These come from `@source` directives in CSS.
sources: [
{ base: __dirname, pattern: "src/**/*.css" },
// …
],
});
```
The scanner object has the following API:
```ts
export interface ChangedContent {
/** File path to the changed file */
file?: string
/** Contents of the changed file */
content?: string
/** File extension */
extension: string
}
export interface DetectSources {
/** Base path to start scanning from */
base: string
}
export interface GlobEntry {
/** Base path of the glob */
base: string
/** Glob pattern */
pattern: string
}
export interface ScannerOptions {
/** Automatically detect sources in the base path */
detectSources?: DetectSources
/** Glob sources */
sources?: Array<GlobEntry>
}
export declare class Scanner {
constructor(opts: ScannerOptions)
scan(): Array<string>
scanFiles(input: Array<ChangedContent>): Array<string>
get files(): Array<string>
get globs(): Array<GlobEntry>
}
```
The `scanFiles(…)` method is used for incremental rebuilds. It takes the
`ChangedContent` array for all the new/changes files. It returns whether
we scanned any new candidates or not.
Note that the `scanner` object is stateful, this means that we don't
have to track candidates in a `Set` anymore. We can just call
`getCandidates()` when we need it.
This PR also removed some unused code that we had in the `scanDir(…)`
function to allow for sequential or parallel `IO`, and sequential or
parallel `Parsing`. We only used the same `IO` and `Parsing` strategies
for all files, so I just got rid of it.
---------
Co-authored-by: Jordan Pittman <jordan@cryptica.me>
2024-08-16 15:05:42 +02:00
|
|
|
import { Scanner } from '@tailwindcss/oxide'
|
2024-03-13 17:25:16 +01:00
|
|
|
import { Features, transform } from 'lightningcss'
|
2024-11-04 17:52:11 +01:00
|
|
|
import fs from 'node:fs'
|
|
|
|
|
import path from 'node:path'
|
Resolve `@import` in core (#14446)
This PR brings `@import` resolution into Tailwind CSS core. This means
that our clients (PostCSS, Vite, and CLI) no longer need to depend on
`postcss` and `postcss-import` to resolve `@import`. Furthermore this
simplifies the handling of relative paths for `@source`, `@plugin`, or
`@config` in transitive CSS files (where the relative root should always
be relative to the CSS file that contains the directive). This PR also
fixes a plugin resolution bug where non-relative imports (e.g. directly
importing node modules like `@plugin '@tailwindcss/typography';`) would
not work in CSS files that are based in a different npm package.
### Resolving `@import`
The core of the `@import` resolution is inside
`packages/tailwindcss/src/at-import.ts`. There, to keep things
performant, we do a two-step process to resolve imports. Imagine the
following input CSS file:
```css
@import "tailwindcss/theme.css";
@import "tailwindcss/utilities.css";
```
Since our AST walks are synchronous, we will do a first traversal where
we start a loading request for each `@import` directive. Once all loads
are started, we will await the promise and do a second walk where we
actually replace the AST nodes with their resolved stylesheets. All of
this is recursive, so that `@import`-ed files can again `@import` other
files.
The core `@import` resolver also includes extensive test cases for
[various combinations of media query and supports conditionals as well
als layered
imports](https://developer.mozilla.org/en-US/docs/Web/CSS/@import).
When the same file is imported multiple times, the AST nodes are
duplicated but duplicate I/O is avoided on a per-file basis, so this
will only load one file, but include the `@theme` rules twice:
```css
@import "tailwindcss/theme.css";
@import "tailwindcss/theme.css";
```
### Adding a new `context` node to the AST
One limitation we had when working with the `postcss-import` plugin was
the need to do an additional traversal to rewrite relative `@source`,
`@plugin`, and `@config` directives. This was needed because we want
these paths to be relative to the CSS file that defines the directive
but when flattening a CSS file, this information is no longer part of
the stringifed CSS representation. We worked around this by rewriting
the content of these directives to be relative to the input CSS file,
which resulted in added complexity and caused a lot of issues with
Windows paths in the beginning.
Now that we are doing the `@import` resolution in core, we can use a
different data structure to persist this information. This PR adds a new
`context` node so that we can store arbitrary context like this inside
the Ast directly. This allows us to share information with the sub tree
_while doing the Ast walk_.
Here's an example of how the new `context` node can be used to share
information with subtrees:
```ts
const ast = [
rule('.foo', [decl('color', 'red')]),
context({ value: 'a' }, [
rule('.bar', [
decl('color', 'blue'),
context({ value: 'b' }, [
rule('.baz', [decl('color', 'green')]),
]),
]),
]),
]
walk(ast, (node, { context }) => {
if (node.kind !== 'declaration') return
switch (node.value) {
case 'red': assert(context.value === undefined)
case 'blue': assert(context.value === 'a')
case 'green': assert(context.value === 'b')
}
})
```
In core, we use this new Ast node specifically to persist the `base`
path of the current CSS file. We put the input CSS file `base` at the
root of the Ast and then overwrite the `base` on every `@import`
substitution.
### Removing the dependency on `postcss-import`
Now that we support `@import` resolution in core, our clients no longer
need a dependency on `postcss-import`. Furthermore, most dependencies
also don't need to know about `postcss` at all anymore (except the
PostCSS client, of course!).
This also means that our workaround for rewriting `@source`, the
`postcss-fix-relative-paths` plugin, can now go away as a shared
dependency between all of our clients. Note that we still have it for
the PostCSS plugin only, where it's possible that users already have
`postcss-import` running _before_ the `@tailwindcss/postcss` plugin.
Here's an example of the changes to the dependencies for our Vite client
✨ :
<img width="854" alt="Screenshot 2024-09-19 at 16 59 45"
src="https://github.com/user-attachments/assets/ae1f9d5f-d93a-4de9-9244-61af3aff1237">
### Performance
Since our Vite and CLI clients now no longer need to use `postcss` at
all, we have also measured a significant improvement to the initial
build times. For a small test setup that contains only a hand full of
files (nothing super-complex), we measured an improvement in the
**3.5x** range:
<img width="1334" alt="Screenshot 2024-09-19 at 14 52 49"
src="https://github.com/user-attachments/assets/06071fb0-7f2a-4de6-8ec8-f202d2cc78e5">
The code for this is in the commit history if you want to reproduce the
results. The test was based on the Vite client.
### Caveats
One thing to note is that we previously relied on finding specific
symbols in the input CSS to _bail out of Tailwind processing
completely_. E.g. if a file does not contain a `@tailwind` or `@apply`
directive, it can never be a Tailwind file.
Since we no longer have a string representation of the flattened CSS
file, we can no longer do this check. However, the current
implementation was already inconsistent with differences on the allowed
symbol list between our clients. Ideally, Tailwind CSS should figure out
wether a CSS file is a Tailwind CSS file. This, however, is left as an
improvement for a future API since it goes hand-in-hand with our planned
API changes for the core `tailwindcss` package.
---------
Co-authored-by: Jordan Pittman <jordan@cryptica.me>
2024-09-23 17:05:55 +02:00
|
|
|
import postcss, { type AcceptedPlugin, type PluginCreator } from 'postcss'
|
|
|
|
|
import fixRelativePathsPlugin from './postcss-fix-relative-paths'
|
2024-03-05 14:23:26 +01:00
|
|
|
|
2024-10-03 16:21:54 +02:00
|
|
|
interface CacheEntry {
|
|
|
|
|
mtimes: Map<string, number>
|
|
|
|
|
compiler: null | Awaited<ReturnType<typeof compile>>
|
|
|
|
|
scanner: null | Scanner
|
|
|
|
|
css: string
|
|
|
|
|
optimizedCss: string
|
|
|
|
|
fullRebuildPaths: string[]
|
|
|
|
|
}
|
|
|
|
|
let cache = new QuickLRU<string, CacheEntry>({ maxSize: 50 })
|
|
|
|
|
|
|
|
|
|
function getContextFromCache(inputFile: string, opts: PluginOptions): CacheEntry {
|
|
|
|
|
let key = `${inputFile}:${opts.base ?? ''}:${opts.optimize ?? ''}`
|
|
|
|
|
if (cache.has(key)) return cache.get(key)!
|
|
|
|
|
let entry = {
|
|
|
|
|
mtimes: new Map<string, number>(),
|
|
|
|
|
compiler: null,
|
|
|
|
|
scanner: null,
|
|
|
|
|
css: '',
|
|
|
|
|
optimizedCss: '',
|
|
|
|
|
fullRebuildPaths: [] as string[],
|
2024-03-11 20:01:28 +01:00
|
|
|
}
|
2024-10-03 16:21:54 +02:00
|
|
|
cache.set(key, entry)
|
|
|
|
|
return entry
|
2024-03-11 20:01:28 +01:00
|
|
|
}
|
|
|
|
|
|
2024-08-26 15:54:07 +02:00
|
|
|
export type PluginOptions = {
|
2024-03-05 14:23:26 +01:00
|
|
|
// The base directory to scan for class candidates.
|
|
|
|
|
base?: string
|
2024-03-08 18:36:07 +01:00
|
|
|
|
2024-03-11 18:29:21 +01:00
|
|
|
// Optimize and minify the output CSS.
|
2024-03-08 18:36:07 +01:00
|
|
|
optimize?: boolean | { minify?: boolean }
|
2024-03-05 14:23:26 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function tailwindcss(opts: PluginOptions = {}): AcceptedPlugin {
|
|
|
|
|
let base = opts.base ?? process.cwd()
|
2024-03-08 18:36:07 +01:00
|
|
|
let optimize = opts.optimize ?? process.env.NODE_ENV === 'production'
|
2024-03-05 14:23:26 +01:00
|
|
|
|
|
|
|
|
return {
|
2024-03-11 20:01:28 +01:00
|
|
|
postcssPlugin: '@tailwindcss/postcss',
|
2024-03-05 14:23:26 +01:00
|
|
|
plugins: [
|
2024-10-03 16:21:54 +02:00
|
|
|
// We need to handle the case where `postcss-import` might have run before
|
|
|
|
|
// the Tailwind CSS plugin is run. In this case, we need to manually fix
|
|
|
|
|
// relative paths before processing it in core.
|
2024-08-07 16:38:44 +02:00
|
|
|
fixRelativePathsPlugin(),
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
postcssPlugin: 'tailwindcss',
|
2024-08-08 17:49:06 +02:00
|
|
|
async OnceExit(root, { result }) {
|
2024-09-30 16:39:21 +02:00
|
|
|
env.DEBUG && console.time('[@tailwindcss/postcss] Total time in @tailwindcss/postcss')
|
2024-08-07 16:38:44 +02:00
|
|
|
let inputFile = result.opts.from ?? ''
|
2024-10-03 16:21:54 +02:00
|
|
|
let context = getContextFromCache(inputFile, opts)
|
2024-08-07 16:38:44 +02:00
|
|
|
let inputBasePath = path.dirname(path.resolve(inputFile))
|
|
|
|
|
|
2024-09-02 12:03:16 -04:00
|
|
|
async function createCompiler() {
|
2024-09-30 16:39:21 +02:00
|
|
|
env.DEBUG && console.time('[@tailwindcss/postcss] Setup compiler')
|
2024-09-02 12:03:16 -04:00
|
|
|
clearRequireCache(context.fullRebuildPaths)
|
|
|
|
|
|
|
|
|
|
context.fullRebuildPaths = []
|
|
|
|
|
|
2024-10-03 16:21:54 +02:00
|
|
|
let compiler = await compile(root.toString(), {
|
2024-09-02 12:03:16 -04:00
|
|
|
base: inputBasePath,
|
|
|
|
|
onDependency: (path) => {
|
|
|
|
|
context.fullRebuildPaths.push(path)
|
2024-08-07 16:38:44 +02:00
|
|
|
},
|
|
|
|
|
})
|
2024-09-30 16:39:21 +02:00
|
|
|
|
|
|
|
|
env.DEBUG && console.timeEnd('[@tailwindcss/postcss] Setup compiler')
|
|
|
|
|
return compiler
|
2024-08-07 16:38:44 +02:00
|
|
|
}
|
2024-03-05 14:23:26 +01:00
|
|
|
|
2024-10-03 16:21:54 +02:00
|
|
|
// Whether this is the first build or not, if it is, then we can
|
|
|
|
|
// optimize the build by not creating the compiler until we need it.
|
|
|
|
|
let isInitialBuild = context.compiler === null
|
|
|
|
|
|
2024-08-07 16:38:44 +02:00
|
|
|
// Setup the compiler if it doesn't exist yet. This way we can
|
|
|
|
|
// guarantee a `build()` function is available.
|
2024-08-08 17:49:06 +02:00
|
|
|
context.compiler ??= await createCompiler()
|
2024-08-07 16:38:44 +02:00
|
|
|
|
|
|
|
|
let rebuildStrategy: 'full' | 'incremental' = 'incremental'
|
|
|
|
|
|
|
|
|
|
// Track file modification times to CSS files
|
|
|
|
|
{
|
2024-09-02 12:03:16 -04:00
|
|
|
for (let file of context.fullRebuildPaths) {
|
|
|
|
|
result.messages.push({
|
|
|
|
|
type: 'dependency',
|
|
|
|
|
plugin: '@tailwindcss/postcss',
|
|
|
|
|
file,
|
|
|
|
|
parent: result.opts.from,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2024-08-07 16:38:44 +02:00
|
|
|
let files = result.messages.flatMap((message) => {
|
|
|
|
|
if (message.type !== 'dependency') return []
|
|
|
|
|
return message.file
|
|
|
|
|
})
|
|
|
|
|
files.push(inputFile)
|
2024-09-02 12:03:16 -04:00
|
|
|
|
2024-08-07 16:38:44 +02:00
|
|
|
for (let file of files) {
|
|
|
|
|
let changedTime = fs.statSync(file, { throwIfNoEntry: false })?.mtimeMs ?? null
|
|
|
|
|
if (changedTime === null) {
|
|
|
|
|
if (file === inputFile) {
|
|
|
|
|
rebuildStrategy = 'full'
|
|
|
|
|
}
|
|
|
|
|
continue
|
|
|
|
|
}
|
2024-03-05 14:23:26 +01:00
|
|
|
|
2024-08-07 16:38:44 +02:00
|
|
|
let prevTime = context.mtimes.get(file)
|
|
|
|
|
if (prevTime === changedTime) continue
|
2024-03-05 14:23:26 +01:00
|
|
|
|
2024-08-07 16:38:44 +02:00
|
|
|
rebuildStrategy = 'full'
|
|
|
|
|
context.mtimes.set(file, changedTime)
|
|
|
|
|
}
|
|
|
|
|
}
|
2024-03-05 14:23:26 +01:00
|
|
|
|
2024-08-07 16:38:44 +02:00
|
|
|
let css = ''
|
|
|
|
|
|
2024-10-03 16:21:54 +02:00
|
|
|
if (
|
|
|
|
|
rebuildStrategy === 'full' &&
|
|
|
|
|
// We can re-use the compiler if it was created during the
|
|
|
|
|
// initial build. If it wasn't, we need to create a new one.
|
|
|
|
|
!isInitialBuild
|
|
|
|
|
) {
|
|
|
|
|
context.compiler = await createCompiler()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (context.scanner === null || rebuildStrategy === 'full') {
|
Auto source detection improvements (#14820)
This PR introduces a new `source(…)` argument and improves on the
existing `@source`. The goal of this PR is to make the automatic source
detection configurable, let's dig in.
By default, we will perform automatic source detection starting at the
current working directory. Auto source detection will find plain text
files (no binaries, images, ...) and will ignore git-ignored files.
If you want to start from a different directory, you can use the new
`source(…)` next to the `@import "tailwindcss/utilities"
layer(utilities) source(…)`.
E.g.:
```css
/* ./src/styles/index.css */
@import 'tailwindcss/utilities' layer(utilities) source('../../');
```
Most people won't split their source files, and will just use the simple
`@import "tailwindcss";`, because of this reason, you can use
`source(…)` on the import as well:
E.g.:
```css
/* ./src/styles/index.css */
@import 'tailwindcss' source('../../');
```
Sometimes, you want to rely on auto source detection, but also want to
look in another directory for source files. In this case, yuo can use
the `@source` directive:
```css
/* ./src/index.css */
@import 'tailwindcss';
/* Look for `blade.php` files in `../resources/views` */
@source '../resources/views/**/*.blade.php';
```
However, you don't need to specify the extension, instead you can just
point the directory and all the same automatic source detection rules
will apply.
```css
/* ./src/index.css */
@import 'tailwindcss';
@source '../resources/views';
```
If, for whatever reason, you want to disable the default source
detection feature entirely, and only want to rely on very specific glob
patterns you define, then you can disable it via `source(none)`.
```css
/* Completely disable the default auto source detection */
@import 'tailwindcss' source(none);
/* Only look at .blade.php files, nothing else */
@source "../resources/views/**/*.blade.php";
```
Note: even with `source(none)`, if your `@source` points to a directory,
then auto source detection will still be performed in that directory. If
you don't want that, then you can simply add explicit files in the globs
as seen in the previous example.
```css
/* Completely disable the default auto source detection */
@import 'tailwindcss' source(none);
/* Run auto source detection in `../resources/views` */
@source "../resources/views";
```
---------
Co-authored-by: Jordan Pittman <jordan@cryptica.me>
Co-authored-by: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
2024-10-29 21:33:34 +01:00
|
|
|
let sources = (() => {
|
|
|
|
|
// Disable auto source detection
|
|
|
|
|
if (context.compiler.root === 'none') {
|
|
|
|
|
return []
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// No root specified, use the base directory
|
|
|
|
|
if (context.compiler.root === null) {
|
|
|
|
|
return [{ base, pattern: '**/*' }]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Use the specified root
|
|
|
|
|
return [context.compiler.root]
|
|
|
|
|
})().concat(context.compiler.globs)
|
|
|
|
|
|
2024-10-03 16:21:54 +02:00
|
|
|
// Look for candidates used to generate the CSS
|
Auto source detection improvements (#14820)
This PR introduces a new `source(…)` argument and improves on the
existing `@source`. The goal of this PR is to make the automatic source
detection configurable, let's dig in.
By default, we will perform automatic source detection starting at the
current working directory. Auto source detection will find plain text
files (no binaries, images, ...) and will ignore git-ignored files.
If you want to start from a different directory, you can use the new
`source(…)` next to the `@import "tailwindcss/utilities"
layer(utilities) source(…)`.
E.g.:
```css
/* ./src/styles/index.css */
@import 'tailwindcss/utilities' layer(utilities) source('../../');
```
Most people won't split their source files, and will just use the simple
`@import "tailwindcss";`, because of this reason, you can use
`source(…)` on the import as well:
E.g.:
```css
/* ./src/styles/index.css */
@import 'tailwindcss' source('../../');
```
Sometimes, you want to rely on auto source detection, but also want to
look in another directory for source files. In this case, yuo can use
the `@source` directive:
```css
/* ./src/index.css */
@import 'tailwindcss';
/* Look for `blade.php` files in `../resources/views` */
@source '../resources/views/**/*.blade.php';
```
However, you don't need to specify the extension, instead you can just
point the directory and all the same automatic source detection rules
will apply.
```css
/* ./src/index.css */
@import 'tailwindcss';
@source '../resources/views';
```
If, for whatever reason, you want to disable the default source
detection feature entirely, and only want to rely on very specific glob
patterns you define, then you can disable it via `source(none)`.
```css
/* Completely disable the default auto source detection */
@import 'tailwindcss' source(none);
/* Only look at .blade.php files, nothing else */
@source "../resources/views/**/*.blade.php";
```
Note: even with `source(none)`, if your `@source` points to a directory,
then auto source detection will still be performed in that directory. If
you don't want that, then you can simply add explicit files in the globs
as seen in the previous example.
```css
/* Completely disable the default auto source detection */
@import 'tailwindcss' source(none);
/* Run auto source detection in `../resources/views` */
@source "../resources/views";
```
---------
Co-authored-by: Jordan Pittman <jordan@cryptica.me>
Co-authored-by: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
2024-10-29 21:33:34 +01:00
|
|
|
context.scanner = new Scanner({ sources })
|
2024-10-03 16:21:54 +02:00
|
|
|
}
|
2024-08-07 16:38:44 +02:00
|
|
|
|
2024-09-30 16:39:21 +02:00
|
|
|
env.DEBUG && console.time('[@tailwindcss/postcss] Scan for candidates')
|
2024-10-03 16:21:54 +02:00
|
|
|
let candidates = context.scanner.scan()
|
2024-09-30 16:39:21 +02:00
|
|
|
env.DEBUG && console.timeEnd('[@tailwindcss/postcss] Scan for candidates')
|
Improve Oxide scanner API (#14187)
This PR updates the API for interacting with the Oxide API. Until now,
we used the name `scanDir(…)` which is fine, but we do way more work
right now.
We now have features such as:
1. Auto source detection (can be turned off, e.g.: `@tailwindcss/vite`
doesn't need it)
2. Scan based on `@source`s found in CSS files
3. Do "incremental" rebuilds (which means that the `scanDir(…)` result
was stateful).
To solve these issues, this PR introduces a new `Scanner` class where
you can pass in the `detectSources` and `sources` options. E.g.:
```ts
let scanner = new Scanner({
// Optional, omitting `detectSources` field disables automatic source detection
detectSources: { base: __dirname },
// List of glob entries to scan. These come from `@source` directives in CSS.
sources: [
{ base: __dirname, pattern: "src/**/*.css" },
// …
],
});
```
The scanner object has the following API:
```ts
export interface ChangedContent {
/** File path to the changed file */
file?: string
/** Contents of the changed file */
content?: string
/** File extension */
extension: string
}
export interface DetectSources {
/** Base path to start scanning from */
base: string
}
export interface GlobEntry {
/** Base path of the glob */
base: string
/** Glob pattern */
pattern: string
}
export interface ScannerOptions {
/** Automatically detect sources in the base path */
detectSources?: DetectSources
/** Glob sources */
sources?: Array<GlobEntry>
}
export declare class Scanner {
constructor(opts: ScannerOptions)
scan(): Array<string>
scanFiles(input: Array<ChangedContent>): Array<string>
get files(): Array<string>
get globs(): Array<GlobEntry>
}
```
The `scanFiles(…)` method is used for incremental rebuilds. It takes the
`ChangedContent` array for all the new/changes files. It returns whether
we scanned any new candidates or not.
Note that the `scanner` object is stateful, this means that we don't
have to track candidates in a `Set` anymore. We can just call
`getCandidates()` when we need it.
This PR also removed some unused code that we had in the `scanDir(…)`
function to allow for sequential or parallel `IO`, and sequential or
parallel `Parsing`. We only used the same `IO` and `Parsing` strategies
for all files, so I just got rid of it.
---------
Co-authored-by: Jordan Pittman <jordan@cryptica.me>
2024-08-16 15:05:42 +02:00
|
|
|
|
2024-08-07 16:38:44 +02:00
|
|
|
// Add all found files as direct dependencies
|
2024-10-03 16:21:54 +02:00
|
|
|
for (let file of context.scanner.files) {
|
2024-08-07 16:38:44 +02:00
|
|
|
result.messages.push({
|
|
|
|
|
type: 'dependency',
|
|
|
|
|
plugin: '@tailwindcss/postcss',
|
|
|
|
|
file,
|
|
|
|
|
parent: result.opts.from,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Register dependencies so changes in `base` cause a rebuild while
|
|
|
|
|
// giving tools like Vite or Parcel a glob that can be used to limit
|
|
|
|
|
// the files that cause a rebuild to only those that match it.
|
Fix Next.js endless loop when setting a custom `distDir` (#15053)
Closes #15050
In Tailwind CSS v4 Alpha 31 we changed how we scan template files. This
changes included a new folder-dependency that is emitted for the `base`
directory, so we can listen for new files being added as part of the
postcss dependency.
In our testing, this worked fine with the Next.js integration meaning a
new file in the project root would be picked up by Oxide and we could
update the CSS files accordingly.
This change is now, however, causing an issue. With Next.js 15 **and
with a custom `distDir` configured**, the postcss build, that will write
into the `distDir`, will cause another postcss run to be triggered,
starting an endless loop (regardless of wether or not the `distDir` was
also part of your gitignore list).
This PR now changes the postcss client to not emit the base directory as
a dependency to revert this changes. This does mean that new files and
folders created _directly in the project root_ will require a restart of
the Next.js server again (just like it did in Alpha 31 and before) for
now.
## Test Plan
Next 15 does not seem to run in our current integration test setup (for
some reason the server does not close correctly and it will fail on the
cleanup step), so this change was tested manually:
- First, clone the [templates
repo](https://github.com/philipp-spiess/tailwindcss-playgrounds) I use
for third party frameworks
- Then, do a full build in the parent repo `tailwindcss` via `pnpm
build`
- Now, install the local tarballs in the `tailwindcss-playgrounds` repo
via `pnpm install`
With this setup I have tested changes to a template file (that causes
new utilities to be added) and the CSS file (that will rebuild properly)
across both `pnpm dev` and `pnpm dev --turbo`. Furthermore integration
tests assert it still works in Next 14 like it did before:
https://github.com/user-attachments/assets/b0ccb3dd-d090-4e4c-97c5-74129a2789be
One thing to make sure of is to include the new `distDir` into the
`.gitignore` file as well, otherwise we will scrape it for changes which
inherently causes an endless loop issue again.
---------
Co-authored-by: Adam Wathan <adam.wathan@gmail.com>
2024-11-21 10:47:27 +01:00
|
|
|
for (let { base: globBase, pattern } of context.scanner.globs) {
|
|
|
|
|
// Avoid adding a dependency on the base directory itself, since it
|
|
|
|
|
// causes Next.js to start an endless recursion if the `distDir` is
|
|
|
|
|
// configured to anything other than the default `.next` dir.
|
|
|
|
|
if (pattern === '*' && base === globBase) {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
Auto source detection improvements (#14820)
This PR introduces a new `source(…)` argument and improves on the
existing `@source`. The goal of this PR is to make the automatic source
detection configurable, let's dig in.
By default, we will perform automatic source detection starting at the
current working directory. Auto source detection will find plain text
files (no binaries, images, ...) and will ignore git-ignored files.
If you want to start from a different directory, you can use the new
`source(…)` next to the `@import "tailwindcss/utilities"
layer(utilities) source(…)`.
E.g.:
```css
/* ./src/styles/index.css */
@import 'tailwindcss/utilities' layer(utilities) source('../../');
```
Most people won't split their source files, and will just use the simple
`@import "tailwindcss";`, because of this reason, you can use
`source(…)` on the import as well:
E.g.:
```css
/* ./src/styles/index.css */
@import 'tailwindcss' source('../../');
```
Sometimes, you want to rely on auto source detection, but also want to
look in another directory for source files. In this case, yuo can use
the `@source` directive:
```css
/* ./src/index.css */
@import 'tailwindcss';
/* Look for `blade.php` files in `../resources/views` */
@source '../resources/views/**/*.blade.php';
```
However, you don't need to specify the extension, instead you can just
point the directory and all the same automatic source detection rules
will apply.
```css
/* ./src/index.css */
@import 'tailwindcss';
@source '../resources/views';
```
If, for whatever reason, you want to disable the default source
detection feature entirely, and only want to rely on very specific glob
patterns you define, then you can disable it via `source(none)`.
```css
/* Completely disable the default auto source detection */
@import 'tailwindcss' source(none);
/* Only look at .blade.php files, nothing else */
@source "../resources/views/**/*.blade.php";
```
Note: even with `source(none)`, if your `@source` points to a directory,
then auto source detection will still be performed in that directory. If
you don't want that, then you can simply add explicit files in the globs
as seen in the previous example.
```css
/* Completely disable the default auto source detection */
@import 'tailwindcss' source(none);
/* Run auto source detection in `../resources/views` */
@source "../resources/views";
```
---------
Co-authored-by: Jordan Pittman <jordan@cryptica.me>
Co-authored-by: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
2024-10-29 21:33:34 +01:00
|
|
|
if (pattern === '') {
|
|
|
|
|
result.messages.push({
|
|
|
|
|
type: 'dependency',
|
|
|
|
|
plugin: '@tailwindcss/postcss',
|
Fix Next.js endless loop when setting a custom `distDir` (#15053)
Closes #15050
In Tailwind CSS v4 Alpha 31 we changed how we scan template files. This
changes included a new folder-dependency that is emitted for the `base`
directory, so we can listen for new files being added as part of the
postcss dependency.
In our testing, this worked fine with the Next.js integration meaning a
new file in the project root would be picked up by Oxide and we could
update the CSS files accordingly.
This change is now, however, causing an issue. With Next.js 15 **and
with a custom `distDir` configured**, the postcss build, that will write
into the `distDir`, will cause another postcss run to be triggered,
starting an endless loop (regardless of wether or not the `distDir` was
also part of your gitignore list).
This PR now changes the postcss client to not emit the base directory as
a dependency to revert this changes. This does mean that new files and
folders created _directly in the project root_ will require a restart of
the Next.js server again (just like it did in Alpha 31 and before) for
now.
## Test Plan
Next 15 does not seem to run in our current integration test setup (for
some reason the server does not close correctly and it will fail on the
cleanup step), so this change was tested manually:
- First, clone the [templates
repo](https://github.com/philipp-spiess/tailwindcss-playgrounds) I use
for third party frameworks
- Then, do a full build in the parent repo `tailwindcss` via `pnpm
build`
- Now, install the local tarballs in the `tailwindcss-playgrounds` repo
via `pnpm install`
With this setup I have tested changes to a template file (that causes
new utilities to be added) and the CSS file (that will rebuild properly)
across both `pnpm dev` and `pnpm dev --turbo`. Furthermore integration
tests assert it still works in Next 14 like it did before:
https://github.com/user-attachments/assets/b0ccb3dd-d090-4e4c-97c5-74129a2789be
One thing to make sure of is to include the new `distDir` into the
`.gitignore` file as well, otherwise we will scrape it for changes which
inherently causes an endless loop issue again.
---------
Co-authored-by: Adam Wathan <adam.wathan@gmail.com>
2024-11-21 10:47:27 +01:00
|
|
|
file: globBase,
|
Auto source detection improvements (#14820)
This PR introduces a new `source(…)` argument and improves on the
existing `@source`. The goal of this PR is to make the automatic source
detection configurable, let's dig in.
By default, we will perform automatic source detection starting at the
current working directory. Auto source detection will find plain text
files (no binaries, images, ...) and will ignore git-ignored files.
If you want to start from a different directory, you can use the new
`source(…)` next to the `@import "tailwindcss/utilities"
layer(utilities) source(…)`.
E.g.:
```css
/* ./src/styles/index.css */
@import 'tailwindcss/utilities' layer(utilities) source('../../');
```
Most people won't split their source files, and will just use the simple
`@import "tailwindcss";`, because of this reason, you can use
`source(…)` on the import as well:
E.g.:
```css
/* ./src/styles/index.css */
@import 'tailwindcss' source('../../');
```
Sometimes, you want to rely on auto source detection, but also want to
look in another directory for source files. In this case, yuo can use
the `@source` directive:
```css
/* ./src/index.css */
@import 'tailwindcss';
/* Look for `blade.php` files in `../resources/views` */
@source '../resources/views/**/*.blade.php';
```
However, you don't need to specify the extension, instead you can just
point the directory and all the same automatic source detection rules
will apply.
```css
/* ./src/index.css */
@import 'tailwindcss';
@source '../resources/views';
```
If, for whatever reason, you want to disable the default source
detection feature entirely, and only want to rely on very specific glob
patterns you define, then you can disable it via `source(none)`.
```css
/* Completely disable the default auto source detection */
@import 'tailwindcss' source(none);
/* Only look at .blade.php files, nothing else */
@source "../resources/views/**/*.blade.php";
```
Note: even with `source(none)`, if your `@source` points to a directory,
then auto source detection will still be performed in that directory. If
you don't want that, then you can simply add explicit files in the globs
as seen in the previous example.
```css
/* Completely disable the default auto source detection */
@import 'tailwindcss' source(none);
/* Run auto source detection in `../resources/views` */
@source "../resources/views";
```
---------
Co-authored-by: Jordan Pittman <jordan@cryptica.me>
Co-authored-by: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
2024-10-29 21:33:34 +01:00
|
|
|
parent: result.opts.from,
|
|
|
|
|
})
|
|
|
|
|
} else {
|
|
|
|
|
result.messages.push({
|
|
|
|
|
type: 'dir-dependency',
|
|
|
|
|
plugin: '@tailwindcss/postcss',
|
Fix Next.js endless loop when setting a custom `distDir` (#15053)
Closes #15050
In Tailwind CSS v4 Alpha 31 we changed how we scan template files. This
changes included a new folder-dependency that is emitted for the `base`
directory, so we can listen for new files being added as part of the
postcss dependency.
In our testing, this worked fine with the Next.js integration meaning a
new file in the project root would be picked up by Oxide and we could
update the CSS files accordingly.
This change is now, however, causing an issue. With Next.js 15 **and
with a custom `distDir` configured**, the postcss build, that will write
into the `distDir`, will cause another postcss run to be triggered,
starting an endless loop (regardless of wether or not the `distDir` was
also part of your gitignore list).
This PR now changes the postcss client to not emit the base directory as
a dependency to revert this changes. This does mean that new files and
folders created _directly in the project root_ will require a restart of
the Next.js server again (just like it did in Alpha 31 and before) for
now.
## Test Plan
Next 15 does not seem to run in our current integration test setup (for
some reason the server does not close correctly and it will fail on the
cleanup step), so this change was tested manually:
- First, clone the [templates
repo](https://github.com/philipp-spiess/tailwindcss-playgrounds) I use
for third party frameworks
- Then, do a full build in the parent repo `tailwindcss` via `pnpm
build`
- Now, install the local tarballs in the `tailwindcss-playgrounds` repo
via `pnpm install`
With this setup I have tested changes to a template file (that causes
new utilities to be added) and the CSS file (that will rebuild properly)
across both `pnpm dev` and `pnpm dev --turbo`. Furthermore integration
tests assert it still works in Next 14 like it did before:
https://github.com/user-attachments/assets/b0ccb3dd-d090-4e4c-97c5-74129a2789be
One thing to make sure of is to include the new `distDir` into the
`.gitignore` file as well, otherwise we will scrape it for changes which
inherently causes an endless loop issue again.
---------
Co-authored-by: Adam Wathan <adam.wathan@gmail.com>
2024-11-21 10:47:27 +01:00
|
|
|
dir: globBase,
|
Auto source detection improvements (#14820)
This PR introduces a new `source(…)` argument and improves on the
existing `@source`. The goal of this PR is to make the automatic source
detection configurable, let's dig in.
By default, we will perform automatic source detection starting at the
current working directory. Auto source detection will find plain text
files (no binaries, images, ...) and will ignore git-ignored files.
If you want to start from a different directory, you can use the new
`source(…)` next to the `@import "tailwindcss/utilities"
layer(utilities) source(…)`.
E.g.:
```css
/* ./src/styles/index.css */
@import 'tailwindcss/utilities' layer(utilities) source('../../');
```
Most people won't split their source files, and will just use the simple
`@import "tailwindcss";`, because of this reason, you can use
`source(…)` on the import as well:
E.g.:
```css
/* ./src/styles/index.css */
@import 'tailwindcss' source('../../');
```
Sometimes, you want to rely on auto source detection, but also want to
look in another directory for source files. In this case, yuo can use
the `@source` directive:
```css
/* ./src/index.css */
@import 'tailwindcss';
/* Look for `blade.php` files in `../resources/views` */
@source '../resources/views/**/*.blade.php';
```
However, you don't need to specify the extension, instead you can just
point the directory and all the same automatic source detection rules
will apply.
```css
/* ./src/index.css */
@import 'tailwindcss';
@source '../resources/views';
```
If, for whatever reason, you want to disable the default source
detection feature entirely, and only want to rely on very specific glob
patterns you define, then you can disable it via `source(none)`.
```css
/* Completely disable the default auto source detection */
@import 'tailwindcss' source(none);
/* Only look at .blade.php files, nothing else */
@source "../resources/views/**/*.blade.php";
```
Note: even with `source(none)`, if your `@source` points to a directory,
then auto source detection will still be performed in that directory. If
you don't want that, then you can simply add explicit files in the globs
as seen in the previous example.
```css
/* Completely disable the default auto source detection */
@import 'tailwindcss' source(none);
/* Run auto source detection in `../resources/views` */
@source "../resources/views";
```
---------
Co-authored-by: Jordan Pittman <jordan@cryptica.me>
Co-authored-by: Adam Wathan <4323180+adamwathan@users.noreply.github.com>
2024-10-29 21:33:34 +01:00
|
|
|
glob: pattern,
|
|
|
|
|
parent: result.opts.from,
|
|
|
|
|
})
|
|
|
|
|
}
|
2024-08-07 16:38:44 +02:00
|
|
|
}
|
|
|
|
|
|
2024-09-30 16:39:21 +02:00
|
|
|
env.DEBUG && console.time('[@tailwindcss/postcss] Build CSS')
|
Resolve `@import` in core (#14446)
This PR brings `@import` resolution into Tailwind CSS core. This means
that our clients (PostCSS, Vite, and CLI) no longer need to depend on
`postcss` and `postcss-import` to resolve `@import`. Furthermore this
simplifies the handling of relative paths for `@source`, `@plugin`, or
`@config` in transitive CSS files (where the relative root should always
be relative to the CSS file that contains the directive). This PR also
fixes a plugin resolution bug where non-relative imports (e.g. directly
importing node modules like `@plugin '@tailwindcss/typography';`) would
not work in CSS files that are based in a different npm package.
### Resolving `@import`
The core of the `@import` resolution is inside
`packages/tailwindcss/src/at-import.ts`. There, to keep things
performant, we do a two-step process to resolve imports. Imagine the
following input CSS file:
```css
@import "tailwindcss/theme.css";
@import "tailwindcss/utilities.css";
```
Since our AST walks are synchronous, we will do a first traversal where
we start a loading request for each `@import` directive. Once all loads
are started, we will await the promise and do a second walk where we
actually replace the AST nodes with their resolved stylesheets. All of
this is recursive, so that `@import`-ed files can again `@import` other
files.
The core `@import` resolver also includes extensive test cases for
[various combinations of media query and supports conditionals as well
als layered
imports](https://developer.mozilla.org/en-US/docs/Web/CSS/@import).
When the same file is imported multiple times, the AST nodes are
duplicated but duplicate I/O is avoided on a per-file basis, so this
will only load one file, but include the `@theme` rules twice:
```css
@import "tailwindcss/theme.css";
@import "tailwindcss/theme.css";
```
### Adding a new `context` node to the AST
One limitation we had when working with the `postcss-import` plugin was
the need to do an additional traversal to rewrite relative `@source`,
`@plugin`, and `@config` directives. This was needed because we want
these paths to be relative to the CSS file that defines the directive
but when flattening a CSS file, this information is no longer part of
the stringifed CSS representation. We worked around this by rewriting
the content of these directives to be relative to the input CSS file,
which resulted in added complexity and caused a lot of issues with
Windows paths in the beginning.
Now that we are doing the `@import` resolution in core, we can use a
different data structure to persist this information. This PR adds a new
`context` node so that we can store arbitrary context like this inside
the Ast directly. This allows us to share information with the sub tree
_while doing the Ast walk_.
Here's an example of how the new `context` node can be used to share
information with subtrees:
```ts
const ast = [
rule('.foo', [decl('color', 'red')]),
context({ value: 'a' }, [
rule('.bar', [
decl('color', 'blue'),
context({ value: 'b' }, [
rule('.baz', [decl('color', 'green')]),
]),
]),
]),
]
walk(ast, (node, { context }) => {
if (node.kind !== 'declaration') return
switch (node.value) {
case 'red': assert(context.value === undefined)
case 'blue': assert(context.value === 'a')
case 'green': assert(context.value === 'b')
}
})
```
In core, we use this new Ast node specifically to persist the `base`
path of the current CSS file. We put the input CSS file `base` at the
root of the Ast and then overwrite the `base` on every `@import`
substitution.
### Removing the dependency on `postcss-import`
Now that we support `@import` resolution in core, our clients no longer
need a dependency on `postcss-import`. Furthermore, most dependencies
also don't need to know about `postcss` at all anymore (except the
PostCSS client, of course!).
This also means that our workaround for rewriting `@source`, the
`postcss-fix-relative-paths` plugin, can now go away as a shared
dependency between all of our clients. Note that we still have it for
the PostCSS plugin only, where it's possible that users already have
`postcss-import` running _before_ the `@tailwindcss/postcss` plugin.
Here's an example of the changes to the dependencies for our Vite client
✨ :
<img width="854" alt="Screenshot 2024-09-19 at 16 59 45"
src="https://github.com/user-attachments/assets/ae1f9d5f-d93a-4de9-9244-61af3aff1237">
### Performance
Since our Vite and CLI clients now no longer need to use `postcss` at
all, we have also measured a significant improvement to the initial
build times. For a small test setup that contains only a hand full of
files (nothing super-complex), we measured an improvement in the
**3.5x** range:
<img width="1334" alt="Screenshot 2024-09-19 at 14 52 49"
src="https://github.com/user-attachments/assets/06071fb0-7f2a-4de6-8ec8-f202d2cc78e5">
The code for this is in the commit history if you want to reproduce the
results. The test was based on the Vite client.
### Caveats
One thing to note is that we previously relied on finding specific
symbols in the input CSS to _bail out of Tailwind processing
completely_. E.g. if a file does not contain a `@tailwind` or `@apply`
directive, it can never be a Tailwind file.
Since we no longer have a string representation of the flattened CSS
file, we can no longer do this check. However, the current
implementation was already inconsistent with differences on the allowed
symbol list between our clients. Ideally, Tailwind CSS should figure out
wether a CSS file is a Tailwind CSS file. This, however, is left as an
improvement for a future API since it goes hand-in-hand with our planned
API changes for the core `tailwindcss` package.
---------
Co-authored-by: Jordan Pittman <jordan@cryptica.me>
2024-09-23 17:05:55 +02:00
|
|
|
css = context.compiler.build(candidates)
|
2024-09-30 16:39:21 +02:00
|
|
|
env.DEBUG && console.timeEnd('[@tailwindcss/postcss] Build CSS')
|
2024-08-07 16:38:44 +02:00
|
|
|
|
|
|
|
|
// Replace CSS
|
|
|
|
|
if (css !== context.css && optimize) {
|
2024-09-30 16:39:21 +02:00
|
|
|
env.DEBUG && console.time('[@tailwindcss/postcss] Optimize CSS')
|
2024-08-07 16:38:44 +02:00
|
|
|
context.optimizedCss = optimizeCss(css, {
|
|
|
|
|
minify: typeof optimize === 'object' ? optimize.minify : true,
|
|
|
|
|
})
|
2024-09-30 16:39:21 +02:00
|
|
|
env.DEBUG && console.timeEnd('[@tailwindcss/postcss] Optimize CSS')
|
2024-08-07 16:38:44 +02:00
|
|
|
}
|
|
|
|
|
context.css = css
|
2024-09-30 16:39:21 +02:00
|
|
|
|
|
|
|
|
env.DEBUG && console.time('[@tailwindcss/postcss] Update PostCSS AST')
|
2024-08-07 16:38:44 +02:00
|
|
|
root.removeAll()
|
|
|
|
|
root.append(postcss.parse(optimize ? context.optimizedCss : context.css, result.opts))
|
2024-09-30 16:39:21 +02:00
|
|
|
env.DEBUG && console.timeEnd('[@tailwindcss/postcss] Update PostCSS AST')
|
|
|
|
|
env.DEBUG && console.timeEnd('[@tailwindcss/postcss] Total time in @tailwindcss/postcss')
|
2024-08-07 16:38:44 +02:00
|
|
|
},
|
2024-03-05 14:23:26 +01:00
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-13 17:25:16 +01:00
|
|
|
function optimizeCss(
|
|
|
|
|
input: string,
|
|
|
|
|
{ file = 'input.css', minify = false }: { file?: string; minify?: boolean } = {},
|
|
|
|
|
) {
|
2024-11-06 12:39:09 +01:00
|
|
|
function optimize(code: Buffer | Uint8Array) {
|
|
|
|
|
return transform({
|
|
|
|
|
filename: file,
|
|
|
|
|
code,
|
|
|
|
|
minify,
|
|
|
|
|
sourceMap: false,
|
|
|
|
|
drafts: {
|
|
|
|
|
customMedia: true,
|
|
|
|
|
},
|
|
|
|
|
nonStandard: {
|
|
|
|
|
deepSelectorCombinator: true,
|
|
|
|
|
},
|
|
|
|
|
include: Features.Nesting,
|
|
|
|
|
exclude: Features.LogicalProperties,
|
|
|
|
|
targets: {
|
|
|
|
|
safari: (16 << 16) | (4 << 8),
|
2024-11-26 12:22:12 +01:00
|
|
|
ios_saf: (16 << 16) | (4 << 8),
|
|
|
|
|
firefox: 128 << 16,
|
|
|
|
|
chrome: 120 << 16,
|
2024-11-06 12:39:09 +01:00
|
|
|
},
|
|
|
|
|
errorRecovery: true,
|
|
|
|
|
}).code
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Running Lightning CSS twice to ensure that adjacent rules are merged after
|
|
|
|
|
// nesting is applied. This creates a more optimized output.
|
|
|
|
|
return optimize(optimize(Buffer.from(input))).toString()
|
2024-03-13 17:25:16 +01:00
|
|
|
}
|
|
|
|
|
|
2024-08-26 15:54:07 +02:00
|
|
|
export default Object.assign(tailwindcss, { postcss: true }) as PluginCreator<PluginOptions>
|