Merge pull request #1779 from BorderTech/feature/fix-css-cache-buster

Fix style.js loader to add the cache buster
BorderTech · Jun 16, 2021 · 6a8be16 · 6a8be16
2 parents 36cb3f7 + 74c6d6d
commit 6a8be16
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/github-actions-build.yml b/.github/workflows/github-actions-build.yml
@@ -25,13 +25,13 @@ jobs:
         restore-keys: ${{ runner.os }}-m2
 
     - name: Build Test and Verify
-      run: mvn -B -U clean verify -Dmaven.javadoc.skip=true -Dpmd.verbose=false -DskipOptionalQA=true -PskipCoreOptionalTests
+      run: mvn -B -U clean install -Dmaven.javadoc.skip=true -Dpmd.verbose=false -DskipOptionalQA=true -PskipCoreOptionalTests
       env:
         MOZ_HEADLESS: 1
 
     - name: SonarCloud Scan
       run: |
-          if ["$SONAR_TOKEN"] == ""; then
+          if ["$SONAR_TOKEN" == ""]; then
             echo "Sonar secure variables NOT available"
           else
             echo "Sonar secure variables ARE available"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@
 ### Enhancements
 ### Bug Fixes
 
+* Fix style.js loader to add the cache buster to URLs loaded #1778.
+
 ## 1.5.25
 
 ### Bug Fixes

diff --git a/wcomponents-theme/src/main/js/wc/loader/style.js b/wcomponents-theme/src/main/js/wc/loader/style.js
@@ -124,9 +124,11 @@ define(["wc/has", "wc/mixin", "wc/urlParser", "wc/config", "wc/dom/tag"], functi
 		 */
 		function getCachebusterFromMainCss() {
 			var cssUrl = instance.getMainCss(true),
-				parsedUrl;
-			if (cssUrl && (parsedUrl = urlParser.parse(cssUrl))) {
-				return parsedUrl.queryString;
+				parsedUrl,
+				parsedSearch;
+			if (cssUrl && (parsedUrl = urlParser.parse(cssUrl)) && (parsedSearch = parsedUrl.search)) {
+				// If parsed URL has a search queryString it is always prefixed with a ?
+				return parsedSearch.substring(1, parsedSearch.length);
 			}
 			return ""; // no cachebuster
 		}