Skip to content

Commit 60444e3

Browse files
authored
fix: clean commented css before handling (#14924)
Remove any comment blocks in CSS before creating link references. Fixes #14770
1 parent 9f07bbb commit 60444e3

3 files changed

Lines changed: 12 additions & 2 deletions

File tree

‎flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/default/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"glob": "7.2.3",
2121
"typescript": "4.7.4",
2222
"workbox-core": "6.5.0",
23-
"workbox-precaching": "6.5.0"
23+
"workbox-precaching": "6.5.0",
24+
"strip-css-comments": "5.0.0"
2425
}
2526
}

‎flow-server/src/main/resources/plugins/application-theme-plugin/theme-generator.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ const createLinkReferences = (css, target) => {
4747
// [5] matches media query on @import statement
4848
const importMatcher = /(?:@media\\s(.+?))?(?:\\s{)?\\@import\\s*(?:url\\(\\s*['"]?(.+?)['"]?\\s*\\)|(["'])((?:\\\\.|[^\\\\])*?)\\3)([^;]*);(?:})?/g
4949
50+
// Only cleanup if comment exist
51+
if(/\\/\\*(.|[\\r\\n])*?\\*\\//gm.exec(css) != null) {
52+
// clean up comments
53+
css = stripCssComments(css);
54+
}
55+
5056
var match;
5157
var styleCss = css;
5258
@@ -115,8 +121,9 @@ function generateThemeFile(themeFolder, themeName, themeProperties, productionMo
115121
}
116122

117123
if (themeProperties.parent) {
118-
themeFile += `import {applyTheme as applyBaseTheme} from './theme-${themeProperties.parent}.generated.js';`;
124+
themeFile += `import {applyTheme as applyBaseTheme} from './theme-${themeProperties.parent}.generated.js';\n`;
119125
}
126+
themeFile += `import stripCssComments from 'strip-css-comments';\n`;
120127

121128
themeFile += createLinkReferences;
122129
themeFile += injectGlobalCssMethod;

‎flow-server/src/test/java/com/vaadin/flow/server/frontend/NodeUpdaterTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ public void getDefaultDevDependencies_includesAllDependencies_whenUsingVite() {
177177
expectedDependencies.add("mkdirp");
178178
expectedDependencies.add("workbox-build");
179179
expectedDependencies.add("transform-ast");
180+
expectedDependencies.add("strip-css-comments");
180181

181182
Set<String> actualDependendencies = defaultDeps.keySet();
182183

@@ -208,6 +209,7 @@ public void getDefaultDevDependencies_includesAllDependencies_whenUsingWebpack()
208209
expectedDependencies.add("loader-utils");
209210
expectedDependencies.add("workbox-webpack-plugin");
210211
expectedDependencies.add("chokidar");
212+
expectedDependencies.add("strip-css-comments");
211213

212214
Set<String> actualDependendencies = defaultDeps.keySet();
213215

0 commit comments

Comments
 (0)