Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
28 changes: 14 additions & 14 deletions integrations/upgrade/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ test(

--- ./src/input.css ---
@import 'tailwindcss';
@config "../tailwind.config.js";
@config '../tailwind.config.js';
"
`)

Expand Down Expand Up @@ -97,7 +97,7 @@ test(
--- ./src/input.css ---
@import 'tailwindcss' prefix(tw);

@config "../tailwind.config.js";
@config '../tailwind.config.js';

.btn {
@apply tw:rounded-md! tw:px-2 tw:py-1 tw:bg-blue-500 tw:text-white;
Expand Down Expand Up @@ -145,7 +145,7 @@ test(
--- ./src/index.css ---
@import 'tailwindcss';

@config "../tailwind.config.js";
@config '../tailwind.config.js';

.a {
@apply flex;
Expand Down Expand Up @@ -201,7 +201,7 @@ test(
--- ./src/index.css ---
@import 'tailwindcss';

@config "../tailwind.config.js";
@config '../tailwind.config.js';

@layer base {
html {
Expand Down Expand Up @@ -262,7 +262,7 @@ test(
--- ./src/index.css ---
@import 'tailwindcss';

@config "../tailwind.config.js";
@config '../tailwind.config.js';

@utility btn {
@apply rounded-md px-2 py-1 bg-blue-500 text-white;
Expand Down Expand Up @@ -631,7 +631,7 @@ test(
--- ./src/index.css ---
@import 'tailwindcss';
@import './utilities.css';
@config "../tailwind.config.js";
@config '../tailwind.config.js';

--- ./src/utilities.css ---
@utility no-scrollbar {
Expand Down Expand Up @@ -748,7 +748,7 @@ test(
@import './c.1.css' layer(utilities);
@import './c.1.utilities.css';
@import './d.1.css';
@config "../tailwind.config.js";
@config '../tailwind.config.js';

--- ./src/a.1.css ---
@import './a.1.utilities.css'
Expand Down Expand Up @@ -882,17 +882,17 @@ test(
--- ./src/root.1.css ---
@import 'tailwindcss/utilities' layer(utilities);
@import './a.1.css' layer(utilities);
@config "../tailwind.config.js";
@config '../tailwind.config.js';

--- ./src/root.2.css ---
@import 'tailwindcss/utilities' layer(utilities);
@import './a.1.css' layer(components);
@config "../tailwind.config.js";
@config '../tailwind.config.js';

--- ./src/root.3.css ---
@import 'tailwindcss/utilities' layer(utilities);
@import './a.1.css' layer(utilities);
@config "../tailwind.config.js";
@config '../tailwind.config.js';
"
`)
},
Expand Down Expand Up @@ -974,7 +974,7 @@ test(
--- ./src/root.1.css ---
/* Inject missing @config */
@import 'tailwindcss';
@config "../tailwind.config.ts";
@config '../tailwind.config.ts';

--- ./src/root.2.css ---
/* Already contains @config */
Expand All @@ -984,7 +984,7 @@ test(
--- ./src/root.3.css ---
/* Inject missing @config above first @theme */
@import 'tailwindcss';
@config "../tailwind.config.ts";
@config '../tailwind.config.ts';

@variant hocus (&:hover, &:focus);

Expand All @@ -1000,7 +1000,7 @@ test(
/* Inject missing @config due to nested imports with tailwind imports */
@import './root.4/base.css';
@import './root.4/utilities.css';
@config "../tailwind.config.ts";
@config '../tailwind.config.ts';

--- ./src/root.5.css ---
@import './root.5/tailwind.css';
Expand All @@ -1015,7 +1015,7 @@ test(
--- ./src/root.5/tailwind.css ---
/* Inject missing @config in this file, due to full import */
@import 'tailwindcss';
@config "../../tailwind.config.ts";
@config '../../tailwind.config.ts';
"
`)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export function migrateAtConfig(
return WalkAction.Skip
})

let configNode = new AtRule({ name: 'config', params: `"${relative}"` })
let configNode = new AtRule({ name: 'config', params: `'${relative}'` })

if (!locationNode) {
root.prepend(configNode)
Expand Down
6 changes: 3 additions & 3 deletions packages/@tailwindcss-upgrade/src/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ it('should migrate a stylesheet', async () => {
).toMatchInlineSnapshot(`
"@import 'tailwindcss';

@config "./tailwind.config.js";
@config './tailwind.config.js';

@layer base {
html {
Expand Down Expand Up @@ -148,7 +148,7 @@ it('should migrate a stylesheet (with imports)', async () => {
@import './my-base.css' layer(base);
@import './my-components.css' layer(components);
@import './my-utilities.css' layer(utilities);
@config "./tailwind.config.js";"
@config './tailwind.config.js';"
`)
})

Expand All @@ -173,7 +173,7 @@ it('should migrate a stylesheet (with preceding rules that should be wrapped in
@layer foo, bar, baz;
/**! My license comment */
@import 'tailwindcss';
@config "./tailwind.config.js";
@config './tailwind.config.js';
@layer base {
html {
color: red;
Expand Down