Skip to content

Commit bd8d727

Browse files
authored
Merge branch 'develop' into fix/dependabot-alert-1221-1222
2 parents 2c4f8af + 8808ea1 commit bd8d727

File tree

9 files changed

+55
-16
lines changed

9 files changed

+55
-16
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
66

7-
Work in this release was contributed by @roli-lpci. Thank you for your contribution!
7+
Work in this release was contributed by @roli-lpci. Thank you for your contributions!
88

99
## 10.45.0
1010

dev-packages/e2e-tests/test-applications/nextjs-15-intl/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@types/node": "^18.19.1",
1616
"@types/react": "18.0.26",
1717
"@types/react-dom": "18.0.9",
18-
"next": "15.5.13",
18+
"next": "15.5.14",
1919
"next-intl": "^4.3.12",
2020
"react": "latest",
2121
"react-dom": "latest",

dev-packages/e2e-tests/test-applications/nextjs-15/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@types/react": "18.0.26",
2121
"@types/react-dom": "18.0.9",
2222
"ai": "^3.0.0",
23-
"next": "15.5.13",
23+
"next": "15.5.14",
2424
"react": "latest",
2525
"react-dom": "latest",
2626
"typescript": "~5.0.0",

packages/ember/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"eslint-plugin-qunit": "8.0.0",
7676
"loader.js": "~4.7.0",
7777
"qunit": "~2.22.0",
78-
"qunit-dom": "~3.2.1",
78+
"qunit-dom": "~3.5.0",
7979
"sinon": "21.0.1",
8080
"webpack": "~5.104.1"
8181
},

packages/react-router/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
},
6060
"devDependencies": {
6161
"@react-router/dev": "^7.13.0",
62-
"@react-router/node": "^7.13.0",
62+
"@react-router/node": "^7.13.1",
6363
"react": "^18.3.1",
6464
"react-router": "^7.13.0",
6565
"vite": "^6.1.0"

packages/remix/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
"@sentry/core": "10.45.0",
7373
"@sentry/node": "10.45.0",
7474
"@sentry/react": "10.45.0",
75-
"glob": "^13.0.6",
7675
"yargs": "^17.6.0"
7776
},
7877
"devDependencies": {

packages/remix/scripts/deleteSourcemaps.js

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,49 @@
22
const fs = require('fs');
33
const path = require('path');
44

5-
const { globSync } = require('glob');
5+
/**
6+
* Recursively walks a directory and returns relative paths of all files
7+
* matching the given extension.
8+
*
9+
* Uses manual recursion instead of `fs.readdirSync({ recursive: true, withFileTypes: true })`
10+
* to avoid a bug in Node 18.17–18.18 where `withFileTypes` returns incorrect `parentPath` values
11+
* when combined with `recursive: true`.
12+
*
13+
* @param {string} rootDir - The root directory to start walking from.
14+
* @param {string} extension - The file extension to match (e.g. '.map').
15+
* @returns {string[]} Relative file paths from rootDir.
16+
*/
17+
function walkDirectory(rootDir, extension) {
18+
const results = [];
19+
20+
function walk(dir) {
21+
let entries;
22+
try {
23+
entries = fs.readdirSync(dir, { withFileTypes: true });
24+
} catch {
25+
return;
26+
}
27+
28+
for (const entry of entries) {
29+
const fullPath = path.join(dir, entry.name);
30+
31+
if (entry.isDirectory()) {
32+
walk(fullPath);
33+
} else if (entry.name.endsWith(extension)) {
34+
results.push(path.relative(rootDir, fullPath));
35+
}
36+
}
37+
}
38+
39+
walk(rootDir);
40+
return results;
41+
}
642

743
function deleteSourcemaps(buildPath) {
844
console.info(`[sentry] Deleting sourcemaps from ${buildPath}`);
945

1046
// Delete all .map files in the build folder and its subfolders
11-
const mapFiles = globSync('**/*.map', { cwd: buildPath });
47+
const mapFiles = walkDirectory(buildPath, '.map');
1248

1349
mapFiles.forEach(file => {
1450
fs.unlinkSync(path.join(buildPath, file));

packages/remix/test/integration/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@
3939
"@vanilla-extract/css": "1.13.0",
4040
"@vanilla-extract/integration": "6.2.4",
4141
"@types/mime": "^3.0.0",
42-
"@sentry/remix/glob": "<10.4.3",
43-
"jackspeak": "<3.4.1",
44-
"**/path-scurry/lru-cache": "10.2.0",
4542
"vite": "^6.0.0"
4643
},
4744
"engines": {

yarn.lock

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7383,13 +7383,20 @@
73837383
valibot "^1.2.0"
73847384
vite-node "^3.2.2"
73857385

7386-
"@react-router/node@7.13.0", "@react-router/node@^7.13.0":
7386+
"@react-router/node@7.13.0":
73877387
version "7.13.0"
73887388
resolved "https://registry.yarnpkg.com/@react-router/node/-/node-7.13.0.tgz#8146a95ab894a0035702e2f65cd069e834e25488"
73897389
integrity sha512-Mhr3fAou19oc/S93tKMIBHwCPfqLpWyWM/m0NWd3pJh/wZin8/9KhAdjwxhYbXw1TrTBZBLDENa35uZ+Y7oh3A==
73907390
dependencies:
73917391
"@mjackson/node-fetch-server" "^0.2.0"
73927392

7393+
"@react-router/node@^7.13.1":
7394+
version "7.13.1"
7395+
resolved "https://registry.yarnpkg.com/@react-router/node/-/node-7.13.1.tgz#aadedf2fb37afe63b9ac268d818e5eec4f5437ab"
7396+
integrity sha512-IWPPf+Q3nJ6q4bwyTf5leeGUfg8GAxSN1RKj5wp9SK915zKK+1u4TCOfOmr8hmC6IW1fcjKV0WChkM0HkReIiw==
7397+
dependencies:
7398+
"@mjackson/node-fetch-server" "^0.2.0"
7399+
73937400
"@redis/bloom@1.2.0":
73947401
version "1.2.0"
73957402
resolved "https://registry.yarnpkg.com/@redis/bloom/-/bloom-1.2.0.tgz#d3fd6d3c0af3ef92f26767b56414a370c7b63b71"
@@ -25853,10 +25860,10 @@ quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
2585325860
rimraf "^2.5.4"
2585425861
underscore.string "~3.3.4"
2585525862

25856-
qunit-dom@~3.2.1:
25857-
version "3.2.1"
25858-
resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-3.2.1.tgz#650707b818d5a889ac1923a5cdbdc0d9daf4db7a"
25859-
integrity sha512-+qSm8zQ7hPA9NijmTDVsUFNGEFP/K+DTymjlsU01O3NhkGtb9rsZRztJXwaiAlmVSX4vSzjydPxpZCRhpWIq4A==
25863+
qunit-dom@~3.5.0:
25864+
version "3.5.0"
25865+
resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-3.5.0.tgz#f10222b3a918300e0d9ead6d4a2938c97f063087"
25866+
integrity sha512-eemLM5bflWafzmBnwlYbjf9NrjEkV2j7NO7mTvsMzQBJbEaq2zFvUFDtHV9JaK0TT5mgRZt034LCUewYGmjjjQ==
2586025867
dependencies:
2586125868
dom-element-descriptors "^0.5.1"
2586225869

0 commit comments

Comments
 (0)