Skip to content

Commit 8cf070e

Browse files
committed
fix(gulp): use consistent regex for tailwind import detection and removal
1 parent 4740bac commit 8cf070e

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

gulpfile.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,11 @@ gulp.task("generate-live-editing", async () => {
6161
const sharedJson = JSON.parse(fs.readFileSync(sharedJsonPath, 'utf8'));
6262
const stylesFile = sharedJson.files && sharedJson.files.find(f => f.path === 'src/styles.scss');
6363
if (stylesFile) {
64-
const stylesWithTailwind = stylesFile.content.includes('@import "tailwindcss"')
64+
const tailwindImportRegex = /@import\s+["']tailwindcss["']\s*;?\r?\n?/g;
65+
const stylesWithTailwind = tailwindImportRegex.test(stylesFile.content)
6566
? stylesFile.content
6667
: stylesFile.content.replace(/((?:@use [^\n]+\n)+)/, '$1@import "tailwindcss";\n');
67-
stylesFile.content = stylesFile.content.replace(/@import ["']tailwindcss["'];?\r?\n?/g, '');
68+
stylesFile.content = stylesFile.content.replace(tailwindImportRegex, '');
6869
fs.writeFileSync(sharedJsonPath, JSON.stringify(sharedJson));
6970

7071
fs.readdirSync(samplesDir)
@@ -193,10 +194,12 @@ const processApp = (projectPath, dest, directoriesToExclude) => {
193194
}
194195
if (sampleFile.path === 'src/styles.scss') {
195196
const deps = JSON.parse(jsonObj.sampleDependencies);
196-
if (deps['tailwindcss'] && !sampleContent.includes('@import "tailwindcss"')) {
197+
const tailwindImportRegex = /@import\s+["']tailwindcss["'];?/;
198+
const tailwindImportStripRegex = /@import\s+["']tailwindcss["'];?\r?\n?/g;
199+
if (deps['tailwindcss'] && !tailwindImportRegex.test(sampleContent)) {
197200
sampleContent = sampleContent.replace(/((?:@use [^\n]+\n)+)/, '$1@import "tailwindcss";\n');
198201
} else if (!deps['tailwindcss']) {
199-
sampleContent = sampleContent.replace(/@import ["']tailwindcss["'];?\r?\n?/g, '');
202+
sampleContent = sampleContent.replace(tailwindImportStripRegex, '');
200203
}
201204
}
202205
const paths = sampleFile.path.replace("./", "").split("/");

0 commit comments

Comments
 (0)