Skip to content

Commit c39c7ca

Browse files
Bump vite from 7.3.1 to 8.0.3 in /Plan/react/dashboard (#4530)
* Bump vite from 7.3.1 to 8.0.3 in /Plan/react/dashboard Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 7.3.1 to 8.0.3. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/create-vite@8.0.3/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 8.0.3 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Fix bundle address correction issue from new vite version generating backtick URLs --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com>
1 parent 1f1d374 commit c39c7ca

4 files changed

Lines changed: 224 additions & 346 deletions

File tree

Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/BundleAddressCorrection.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
public class BundleAddressCorrection {
4141

4242
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");
4444

4545
private final PlanConfig config;
4646
private final Addresses addresses;
@@ -102,9 +102,10 @@ private String correctAddressInJavascript(String content, String basePath) {
102102

103103
Matcher matcher = JAVASCRIPT_ADDRESS_PATTERN.matcher(content);
104104
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);
108109
int startIndex = matcher.start();
109110
int endIndex = matcher.end();
110111

@@ -138,7 +139,7 @@ private String correctAddressInJavascript(String content, String basePath) {
138139
String replacementAddress = Strings.CS.equalsAny(addressStart, "/static", STATIC)
139140
? staticReplacement
140141
: relativeReplacement;
141-
String replacement = '"' + replacementAddress + file + '.' + extension + '"';
142+
String replacement = usedStringChar + replacementAddress + file + '.' + extension + usedStringChar;
142143

143144
output.append(content, lastIndex, startIndex) // Append non-match
144145
.append(replacement); // Append replaced address

Plan/react/dashboard/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"@vitejs/plugin-react": "5.2.0",
7474
"baseline-browser-mapping": "2.10.13",
7575
"typescript": "6.0.2",
76-
"vite": "7.3.1"
76+
"vite": "8.0.3"
7777
},
7878
"scarfSettings": {
7979
"enabled": false

Plan/react/dashboard/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default defineConfig({
1111
build: {
1212
outDir: 'build',
1313
assetsDir: 'static',
14-
rollupOptions: {
14+
rolldownOptions: {
1515
treeshake: {
1616
// Fixes an issue where backendConfiguration.staticSite if-blocks would get removed
1717
correctVarValueBeforeDeclaration: true

0 commit comments

Comments
 (0)