Skip to content

Add simple JS config migration #14639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philipp-spiess merged 16 commits into from
Oct 11, 2024
Merged

Add simple JS config migration #14639

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cb2e7e7
Add simple JS config migration
philipp-spiess Oct 10, 2024
463d3b8
Section the CSS theme value so that it's nicer to read
philipp-spiess Oct 10, 2024
e6acf4a
Add darkMode migration
philipp-spiess Oct 10, 2024
4acd803
Append the generated CSS at the right place
philipp-spiess Oct 10, 2024
f377dab
Properly migrate borderRadius to --radius
philipp-spiess Oct 10, 2024
a2d8bcb
Add changelog
philipp-spiess Oct 10, 2024
15a785a
Fix unit tests
philipp-spiess Oct 10, 2024
45f7aff
Remove unnecesary async part
philipp-spiess Oct 10, 2024
bcba32d
Apply suggestions from code review
philipp-spiess Oct 11, 2024
c074f3b
Merge all keys correctly
philipp-spiess Oct 11, 2024
5e26bc8
Fix line breaks by keeping everything a string until it's necessary t…
philipp-spiess Oct 11, 2024
1cc9e6d
Add test to ensure values are correctly merged
philipp-spiess Oct 11, 2024
8d86de6
Upgrade all snapshots
philipp-spiess Oct 11, 2024
7490e11
Don't inject a config into the same stylesheet multiple times
philipp-spiess Oct 11, 2024
1d04ce1
Revert test changes
philipp-spiess Oct 11, 2024
d86af92
Add example for not migarting complex configs
philipp-spiess Oct 11, 2024
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
Prev Previous commit
Next Next commit
Revert test changes
  • Loading branch information
@philipp-spiess
philipp-spiess committed Oct 11, 2024
commit 1d04ce19c12460afb0d9191b62da3baa3bbb698b
9 changes: 4 additions & 5 deletions integrations/upgrade/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,18 +973,17 @@ test(
--- ./src/root.1.css ---
/* Inject missing @config */
@import 'tailwindcss';
@source './**/*.{html,js}';
@config '../tailwind.config.ts';

--- ./src/root.2.css ---
/* Already contains @config */
@import 'tailwindcss';
@source './**/*.{html,js}';
@config "../tailwind.config.js";

--- ./src/root.3.css ---
/* Inject missing @config above first @theme */
@import 'tailwindcss';
@source './**/*.{html,js}';
@config '../tailwind.config.ts';

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

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

--- ./src/root.5.css ---
@import './root.5/tailwind.css';
Expand All @@ -1015,7 +1014,7 @@ test(
--- ./src/root.5/tailwind.css ---
/* Inject missing @config in this file, due to full import */
@import 'tailwindcss';
@source '../**/*.{html,js}';
@config '../../tailwind.config.ts';
"
`)
},
Expand Down