|
40 | 40 | public class BundleAddressCorrection { |
41 | 41 |
|
42 | 42 | private static final String STATIC = "static"; |
43 | | - private static final Pattern JAVASCRIPT_ADDRESS_PATTERN = Pattern.compile("\"(\\./|/?static)(.+?)\\.(json|js|css|png)\""); |
| 43 | + private static final Pattern JAVASCRIPT_ADDRESS_PATTERN = Pattern.compile("([\"`])(\\./|/?static)(.+?)\\.(json|js|css|png)\\1"); |
44 | 44 |
|
45 | 45 | private final PlanConfig config; |
46 | 46 | private final Addresses addresses; |
@@ -102,9 +102,10 @@ private String correctAddressInJavascript(String content, String basePath) { |
102 | 102 |
|
103 | 103 | Matcher matcher = JAVASCRIPT_ADDRESS_PATTERN.matcher(content); |
104 | 104 | while (matcher.find()) { |
105 | | - String addressStart = matcher.group(1); |
106 | | - String file = matcher.group(2); |
107 | | - String extension = matcher.group(3); |
| 105 | + String usedStringChar = matcher.group(1); |
| 106 | + String addressStart = matcher.group(2); |
| 107 | + String file = matcher.group(3); |
| 108 | + String extension = matcher.group(4); |
108 | 109 | int startIndex = matcher.start(); |
109 | 110 | int endIndex = matcher.end(); |
110 | 111 |
|
@@ -138,7 +139,7 @@ private String correctAddressInJavascript(String content, String basePath) { |
138 | 139 | String replacementAddress = Strings.CS.equalsAny(addressStart, "/static", STATIC) |
139 | 140 | ? staticReplacement |
140 | 141 | : relativeReplacement; |
141 | | - String replacement = '"' + replacementAddress + file + '.' + extension + '"'; |
| 142 | + String replacement = usedStringChar + replacementAddress + file + '.' + extension + usedStringChar; |
142 | 143 |
|
143 | 144 | output.append(content, lastIndex, startIndex) // Append non-match |
144 | 145 | .append(replacement); // Append replaced address |
|
0 commit comments