Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Add new standalone builds of Tailwind CSS v4 ([#14270](https://github.com/tailwindlabs/tailwindcss/pull/14270))
- Support JavaScript configuration files using `@config` ([#14239](https://github.com/tailwindlabs/tailwindcss/pull/14239))
- Support plugin options in CSS ([#14264](https://github.com/tailwindlabs/tailwindcss/pull/14264))
Comment thread
adamwathan marked this conversation as resolved.
Outdated

### Fixed

Expand Down
45 changes: 45 additions & 0 deletions integrations/cli/plugins.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,51 @@ test(
},
)

test(
'builds the `@tailwindcss/forms` plugin utilities (with options)',
{
fs: {
'package.json': json`
{
"dependencies": {
"@tailwindcss/forms": "^0.5.7",
"tailwindcss": "workspace:^",
"@tailwindcss/cli": "workspace:^"
}
}
`,
'index.html': html`
<input type="text" class="form-input" />
<textarea class="form-textarea"></textarea>
`,
'src/index.css': css`
@import 'tailwindcss';
@plugin '@tailwindcss/forms' {
strategy: base;
}
`,
},
},
async ({ fs, exec }) => {
await exec('pnpm tailwindcss --input src/index.css --output dist/out.css')

await fs.expectFileToContain('dist/out.css', [
//
`::-webkit-date-and-time-value`,
`[type='checkbox']:indeterminate`,
])

// No classes are included even though they are used in the HTML
// because the `base` strategy is used
await fs.expectFileNotToContain('dist/out.css', [
//
candidate`form-input`,
candidate`form-textarea`,
candidate`form-radio`,
])
},
)

test(
'builds the `tailwindcss-animate` plugin utilities',
{
Expand Down
229 changes: 224 additions & 5 deletions packages/tailwindcss/src/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import fs from 'node:fs'
import path from 'node:path'
import { describe, expect, it, test } from 'vitest'
import { compile } from '.'
import plugin from './plugin'
import type { PluginAPI } from './plugin-api'
import { compileCss, optimizeCss, run } from './test-utils/run'

Expand Down Expand Up @@ -1294,13 +1295,27 @@ describe('Parsing themes values from CSS', () => {
})

describe('plugins', () => {
test('@plugin can not have a body.', async () =>
test('@plugin need a path', () =>
expect(
compile(
css`
@plugin {
color: red;
}
@plugin;
`,
{
loadPlugin: async () => {
return ({ addVariant }: PluginAPI) => {
addVariant('hocus', '&:hover, &:focus')
}
},
},
),
).rejects.toThrowErrorMatchingInlineSnapshot(`[Error: \`@plugin\` must have a path.]`))

test('@plugin can not have an empty path', () =>
expect(
compile(
css`
@plugin '';
`,
{
loadPlugin: async () => {
Expand All @@ -1310,7 +1325,7 @@ describe('plugins', () => {
},
},
),
).rejects.toThrowErrorMatchingInlineSnapshot(`[Error: \`@plugin\` cannot have a body.]`))
).rejects.toThrowErrorMatchingInlineSnapshot(`[Error: \`@plugin\` must have a path.]`))

test('@plugin cannot be nested.', () =>
expect(
Expand All @@ -1330,6 +1345,210 @@ describe('plugins', () => {
),
).rejects.toThrowErrorMatchingInlineSnapshot(`[Error: \`@plugin\` cannot be nested.]`))

test('@plugin can accept options', async () => {
expect.hasAssertions()

let { build } = await compile(
css`
@tailwind utilities;
@plugin "my-plugin" {
color: red;
}
`,
{
loadPlugin: async () => {
return plugin.withOptions((options) => {
expect(options).toEqual({
color: 'red',
})

return ({ addUtilities }) => {
addUtilities({
'.text-primary': {
color: options.color,
},
})
}
})
},
},
)

let compiled = build(['text-primary'])

expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
".text-primary {
color: red;
}"
`)
})

test('@plugin options can be null, booleans, string, numbers, or arrays including those types', async () => {
expect.hasAssertions()

await compile(
css`
@tailwind utilities;
@plugin "my-plugin" {
is-null: null;
is-true: true;
is-false: false;
is-int: 1234567;
is-float: 1.35;
is-sci: 1.35e-5;
Comment thread
philipp-spiess marked this conversation as resolved.
is-str-null: 'null';
is-str-true: 'true';
is-str-false: 'false';
is-str-int: '1234567';
is-str-float: '1.35';
is-str-sci: '1.35e-5';
is-arr: foo, bar;
is-arr-mixed: null, true, false, 1234567, 1.35, foo, 'bar', 'true';
}
`,
{
loadPlugin: async () => {
return plugin.withOptions((options) => {
expect(options).toEqual({
'is-null': null,
'is-true': true,
'is-false': false,
'is-int': 1234567,
'is-float': 1.35,
'is-sci': 1.35e-5,
'is-str-null': 'null',
'is-str-true': 'true',
'is-str-false': 'false',
'is-str-int': '1234567',
'is-str-float': '1.35',
'is-str-sci': '1.35e-5',
'is-arr': ['foo', 'bar'],
'is-arr-mixed': [null, true, false, 1234567, 1.35, 'foo', 'bar', 'true'],
})

return () => {}
})
},
},
)
})

test('@plugin options can only be simple key/value pairs', () => {
expect(
compile(
css`
@plugin "my-plugin" {
color: red;
sizes {
sm: 1rem;
md: 2rem;
}
}
`,
{
loadPlugin: async () => {
return plugin.withOptions((options) => {
return ({ addUtilities }) => {
addUtilities({
'.text-primary': {
color: options.color,
},
})
}
})
},
},
),
).rejects.toThrowErrorMatchingInlineSnapshot(
`
[Error: Unexpected \`@plugin\` option:

sizes {
sm: 1rem;
md: 2rem;
}


Plugins can only contain a flat list of declarations.]
`,
)
})

test('@plugin options can only be provided to plugins using withOptions', () => {
expect(
compile(
css`
@plugin "my-plugin" {
color: red;
}
`,
{
loadPlugin: async () => {
return plugin(({ addUtilities }) => {
addUtilities({
'.text-primary': {
color: 'red',
},
})
})
},
},
),
).rejects.toThrowErrorMatchingInlineSnapshot(
`[Error: The plugin "my-plugin" does not accept options]`,
)
})

test('@plugin errors on array-like syntax', () => {
expect(
compile(
css`
@plugin "my-plugin" {
--color: [ 'red', 'green', 'blue'];
}
`,
{
loadPlugin: async () => plugin(() => {}),
},
),
).rejects.toThrowErrorMatchingInlineSnapshot(
`
[Error: Unexpected \`@plugin\` option: Value of declaration \`--color: [ 'red', 'green', 'blue'];\` is not supported.

It looks like you want to pass an array to plugin options. This is not supported in CSS.]
`,
)
})

test('@plugin errors on object-like syntax', () => {
expect(
compile(
css`
@plugin "my-plugin" {
--color: {
red: 100;
green: 200;
blue: 300;
};
}
`,
{
loadPlugin: async () => plugin(() => {}),
},
),
).rejects.toThrowErrorMatchingInlineSnapshot(
`
[Error: Unexpected \`@plugin\` option: Value of declaration \`--color: {
red: 100;
green: 200;
blue: 300;
};\` is not supported.

It looks like you want to pass an object to plugin options. This is not supported in CSS.]
`,
)
})

test('addVariant with string selector', async () => {
let { build } = await compile(
css`
Expand Down
Loading