Skip to content

fix(upgrade): use v3 config content patterns when no @source is set #19779

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

Open
SychO9 wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −7
Open

fix(upgrade): use v3 config content patterns when no @source is set #19779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions packages/@tailwindcss-upgrade/src/codemods/template/migrate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ export async function migrate(designSystem: DesignSystem, userConfig: Config | n
let fullPath = path.isAbsolute(file) ? file : path.resolve(process.cwd(), file)
let contents = await fs.readFile(fullPath, 'utf-8')

await fs.writeFile(
fullPath,
await migrateContents(designSystem, userConfig, contents, extname(file)),
)
let migrated = await migrateContents(designSystem, userConfig, contents, extname(file))
if (migrated !== contents) {
await fs.writeFile(fullPath, migrated)
}
}
12 changes: 9 additions & 3 deletions packages/@tailwindcss-upgrade/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,23 +293,29 @@ async function run() {
let designSystem = await sheet.designSystem()
if (!designSystem) continue

let config = configBySheet.get(sheet)

// Figure out the source files to migrate
let sources = (() => {
// Disable auto source detection
if (compiler.root === 'none') {
return []
}

// No root specified, use the base directory
// No root specified — during a v3→v4 migration the CSS entrypoint won't
// have an @source directive yet. Use the content patterns from the v3 JS
// config if available, rather than falling back to '**/*' which would
// scan every file in the project (including migrations, vendor files, etc.).
if (compiler.root === null) {
if (config?.sources && config.sources.length > 0) {
return config.sources
}
return [{ base, pattern: '**/*', negated: false }]
}

// Use the specified root
return [{ ...compiler.root, negated: false }]
})().concat(compiler.sources)

let config = configBySheet.get(sheet)
let scanner = new Scanner({ sources })
let filesToMigrate = []
for (let file of scanner.files) {
Expand Down