Skip to content

content rules from the JS config that are also covered by the automatic source detection should not be migrated to CSS #14714

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 3 commits into from
Oct 18, 2024
+45 −13
Merged

content rules from the JS config that are also covered by the automatic source detection should not be migrated to CSS #14714

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e3c3e6
`content` rules from the JS config that are also covered by the autom…
philipp-spiess Oct 18, 2024
0265259
Update CHANGELOG.md
philipp-spiess Oct 18, 2024
c0de36d
Update packages/@tailwindcss-upgrade/src/migrate-js-config.ts
philipp-spiess Oct 18, 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
Update packages/@tailwindcss-upgrade/src/migrate-js-config.ts
  • Loading branch information
@philipp-spiess
philipp-spiess committed Oct 18, 2024
commit c0de36d0ac9cb26517f7cb29684d40588a5ce5bf
16 changes: 6 additions & 10 deletions packages/@tailwindcss-upgrade/src/migrate-js-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import type { ThemeConfig } from '../../tailwindcss/src/compat/config/types'
import { darkModePlugin } from '../../tailwindcss/src/compat/dark-mode'
import type { DesignSystem } from '../../tailwindcss/src/design-system'
import { findStaticPlugins, type StaticPluginOptions } from './utils/extract-static-plugins'
import { info, warn } from './utils/renderer'
import { info } from './utils/renderer'

const __filename = fileURLToPath(import.meta.url)
const __dirname = dirname(__filename)
Expand Down Expand Up @@ -163,15 +163,15 @@ async function migrateContent(
unresolvedConfig: Config & { content: any },
base: string,
): Promise<{ base: string; pattern: string }[]> {
let autoContentFiles = listAutoContentFiles(base)
let autoContentFiles = autodetectedSourceFiles(base)

let sources = []
for (let content of unresolvedConfig.content) {
if (typeof content !== 'string') {
throw new Error('Unsupported content value: ' + content)
}

let sourceFiles = listSourceContentFiles({ base, pattern: content })
let sourceFiles = patternSourceFiles({ base, pattern: content })

let autoContentContainsAllSourceFiles = true
for (let sourceFile of sourceFiles) {
Expand All @@ -181,11 +181,7 @@ async function migrateContent(
}
}

if (autoContentContainsAllSourceFiles) {
warn(
'The `content` configuration `${content}` is already included in the automatic content file discovery and will not be migrated.',
)
} else {
if (!autoContentContainsAllSourceFiles) {
sources.push({ base, pattern: content })
}
}
Expand Down Expand Up @@ -274,13 +270,13 @@ function keyframesToCss(keyframes: Record<string, unknown>): string {
return toCss(ast).trim() + '\n'
}

function listAutoContentFiles(base: string) {
function autodetectedSourceFiles(base: string) {
let scanner = new Scanner({ detectSources: { base } })
scanner.scan()
return scanner.files
}

function listSourceContentFiles(source: { base: string; pattern: string }): string[] {
function patternSourceFiles(source: { base: string; pattern: string }): string[] {
let scanner = new Scanner({ sources: [source] })
scanner.scan()
return scanner.files
Expand Down