From 844505b78b5aa2d35d25c22230eebdcc982a7504 Mon Sep 17 00:00:00 2001 From: GameLord2011 <119822417+GameLord2011@users.noreply.github.com> Date: Wed, 5 Feb 2025 14:36:36 -0500 Subject: [PATCH 1/3] Add .scss files to upgrade script. I use an index.scss file in my project, and the upgrade script did not detect it. --- packages/@tailwindcss-upgrade/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@tailwindcss-upgrade/src/index.ts b/packages/@tailwindcss-upgrade/src/index.ts index 945b48ab42d9..863d807055c9 100644 --- a/packages/@tailwindcss-upgrade/src/index.ts +++ b/packages/@tailwindcss-upgrade/src/index.ts @@ -80,7 +80,7 @@ async function run() { if (files.length === 0) { info('Searching for CSS files in the current directory and its subdirectories…') - files = await globby(['**/*.css'], { + files = await globby(['**/*.css', '**/*.scss'], { absolute: true, gitignore: true, }) From d56760fb28c07ba91ec3c6ace24675fc49c009d2 Mon Sep 17 00:00:00 2001 From: GameLord2011 <119822417+GameLord2011@users.noreply.github.com> Date: Wed, 5 Feb 2025 14:51:59 -0500 Subject: [PATCH 2/3] Update resolve.ts --- packages/@tailwindcss-upgrade/src/utils/resolve.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@tailwindcss-upgrade/src/utils/resolve.ts b/packages/@tailwindcss-upgrade/src/utils/resolve.ts index 58f5834ba0c0..29067575ab9e 100644 --- a/packages/@tailwindcss-upgrade/src/utils/resolve.ts +++ b/packages/@tailwindcss-upgrade/src/utils/resolve.ts @@ -38,7 +38,7 @@ export function resolveJsId(id: string, base: string) { const resolver = EnhancedResolve.ResolverFactory.createResolver({ fileSystem: new EnhancedResolve.CachedInputFileSystem(fs, 4000), useSyncFileSystemCalls: true, - extensions: ['.css'], + extensions: ['.css', '.scss'], mainFields: ['style'], conditionNames: ['style'], }) From 39775a3e02a8ba700b7ed63ff7693848cae54a81 Mon Sep 17 00:00:00 2001 From: GameLord2011 <119822417+GameLord2011@users.noreply.github.com> Date: Wed, 5 Feb 2025 14:52:13 -0500 Subject: [PATCH 3/3] Update index.ts --- packages/@tailwindcss-upgrade/src/index.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/@tailwindcss-upgrade/src/index.ts b/packages/@tailwindcss-upgrade/src/index.ts index 863d807055c9..3d8746e3cfb6 100644 --- a/packages/@tailwindcss-upgrade/src/index.ts +++ b/packages/@tailwindcss-upgrade/src/index.ts @@ -78,16 +78,16 @@ async function run() { // Discover CSS files in case no files were provided if (files.length === 0) { - info('Searching for CSS files in the current directory and its subdirectories…') + info('Searching for CSS or SCSS files in the current directory and its subdirectories…') - files = await globby(['**/*.css', '**/*.scss'], { + files = await globby(['**/*.{css,scss}'], { absolute: true, gitignore: true, }) } - // Ensure we are only dealing with CSS files - files = files.filter((file) => file.endsWith('.css')) + // Ensure we are only dealing with CSS and SCSS files + files = files.filter((file) => file.endsWith('.css' || '.scss')) // Analyze the stylesheets let loadResults = await Promise.allSettled(files.map((filepath) => Stylesheet.load(filepath)))