Skip to content

Commit c68ff20

Browse files
authored
Merge branch 'master' into dev/v-peq/removeNode10TodoComments
2 parents ac41100 + 4238aef commit c68ff20

10 files changed

Lines changed: 150 additions & 65 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ VSCodeUserData
3232
vscode-react-native-*.vsix
3333
vscode-react-native-*.vsix.zip
3434
*-report
35+
mochawesome-report/
3536

3637
# Sample Application auto-generated files
3738
SampleApplication/.vscode/.react/debuggerWorker.js

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
## 1.13.3
2+
* Align Android launch command naming [#2580](https://github.com/microsoft/vscode-react-native/pull/2580)
3+
* Improve packager status bar to display Metro port and connected device name [#2557](https://github.com/microsoft/vscode-react-native/pull/2557) [#2564](https://github.com/microsoft/vscode-react-native/pull/2564)
4+
* Remove deprecated Element Inspector feature [#2561](https://github.com/microsoft/vscode-react-native/pull/2561)
5+
* Update README with security dependency override guidance [#2582](https://github.com/microsoft/vscode-react-native/pull/2582)
6+
* Internal changes:
7+
* Fix shell injection risk in macOS app termination [#2550](https://github.com/microsoft/vscode-react-native/pull/2550)
8+
* Fix packager test failure [#2559](https://github.com/microsoft/vscode-react-native/pull/2559)
9+
* Add smoke test for simplified log grammar and stabilize app launch [#2551](https://github.com/microsoft/vscode-react-native/pull/2551)
10+
* Explore and fix TypeScript 7 compatibility [#2543](https://github.com/microsoft/vscode-react-native/pull/2543)
11+
* Pin and upgrade serialize-javascript to non-vulnerable versions [#2539](https://github.com/microsoft/vscode-react-native/pull/2539) [#2541](https://github.com/microsoft/vscode-react-native/pull/2541) [#2576](https://github.com/microsoft/vscode-react-native/pull/2576) [#2578](https://github.com/microsoft/vscode-react-native/pull/2578)
12+
* Exclude auto-generated mochawesome test reports [#2583](https://github.com/microsoft/vscode-react-native/pull/2583)
13+
* Bump minimatch in /test/smoke [#2537](https://github.com/microsoft/vscode-react-native/pull/2537)
14+
* Bump tar in /test/smoke to 7.5.11 [#2547](https://github.com/microsoft/vscode-react-native/pull/2547) [#2554](https://github.com/microsoft/vscode-react-native/pull/2554)
15+
* Bump @tootallnate/once and @vscode/test-electron [#2545](https://github.com/microsoft/vscode-react-native/pull/2545)
16+
* Bump flatted from 3.1.1 to 3.4.2 [#2565](https://github.com/microsoft/vscode-react-native/pull/2565)
17+
* Bump picomatch from 2.2.3 to 2.3.2 [#2569](https://github.com/microsoft/vscode-react-native/pull/2569)
18+
* Bump brace-expansion to 5.0.5 [#2572](https://github.com/microsoft/vscode-react-native/pull/2572)
19+
* Bump lodash from 4.17.23 to 4.18.1 [#2585](https://github.com/microsoft/vscode-react-native/pull/2585) [#2588](https://github.com/microsoft/vscode-react-native/pull/2588)
20+
121
## 1.13.2
222
* Add command to support Expo EAS workflow [#2432](https://github.com/microsoft/vscode-react-native/pull/2432)
323
* Improve and verify added launch/debug configuration in `launch.json` [#2442](https://github.com/microsoft/vscode-react-native/pull/2442) [#2424](https://github.com/microsoft/vscode-react-native/pull/2424)

README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ Using this extension, you can **debug your code and quickly run `react-native` o
7272
- [Change project root](#change-project-root)
7373
- [Configure an Android LogCat Monitor](#configure-an-android-logcat-monitor)
7474
- [Configure dependencies versions for debugging Expo projects](#configure-dependencies-versions-for-debugging-expo-projects)
75+
- [Security dependency overrides](#security-dependency-overrides)
7576
- [Configure custom key bindings for extension commands](#configure-custom-key-bindings-for-extension-commands)
7677
- [Configure custom colors for extension output logs](#configure-custom-colors-for-extension-output-logs)
7778
- [Set pnpm as package manager](#set-pnpm-as-package-manager)
@@ -995,6 +996,22 @@ To debug Expo applications the extension requires additional dependencies, such
995996

996997
To enable new versions of the dependencies, it's required to restart VS Code editor. After that the extension will download the new versions of the packages on the next Expo debugging starting.
997998

999+
## Security dependency overrides
1000+
1001+
Recent repository updates include a security pin for `serialize-javascript` via npm `overrides`.
1002+
If you maintain a fork or run local dependency audits, align your `package.json` with the following:
1003+
1004+
```json
1005+
{
1006+
"overrides": {
1007+
"js-yaml": "4.1.1",
1008+
"serialize-javascript": "7.0.5"
1009+
}
1010+
}
1011+
```
1012+
1013+
After updating `package.json`, run your package manager install command to refresh the lock file.
1014+
9981015
## Configure custom key bindings for extension commands
9991016

10001017
The extension provides context variables for the following features:

package-lock.json

Lines changed: 27 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vscode-react-native",
33
"displayName": "React Native Tools",
4-
"version": "1.13.2",
4+
"version": "1.13.3",
55
"private": true,
66
"publisher": "msjsdiag",
77
"icon": "resources/images/icon.png",
@@ -1439,7 +1439,7 @@
14391439
"extract-opts": "2.2.0",
14401440
"flatten-source-map": "0.0.2",
14411441
"glob": ">=10.5.0",
1442-
"ip-address": "^9.0.5",
1442+
"ip-address": "^10.1.1",
14431443
"js-base64": "3.6.0",
14441444
"json5": "^1.0.2",
14451445
"jsonc-parser": "3.0.0",
@@ -1457,7 +1457,7 @@
14571457
"source-map-resolve": "0.5.3",
14581458
"strip-json-comments": "2.0.1",
14591459
"tmp-promise": "3.0.2",
1460-
"uuid": "9.0.0",
1460+
"uuid": "14.0.0",
14611461
"vscode-cdp-proxy": "0.2.0",
14621462
"vscode-extension-telemetry": "0.4.5",
14631463
"vscode-nls": "4.1.2",

src/debugger/sourceMap.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as path from "path";
66
import { RawSourceMap } from "source-map";
77
import { SourceMapsCombinator } from "./sourceMapsCombinator";
88

9-
const IS_REMOTE = /^[A-z]{2,}:\/\//; // Detection remote sources or specific protocols (like "webpack:///")
9+
const IS_REMOTE = /^[A-Za-z]{2,}:\/\//; // Detection remote sources or specific protocols (like "webpack:///")
1010

1111
interface ISourceMap extends RawSourceMap {
1212
sections?: ISourceMapSection[];

test/smoke/package-lock.json

Lines changed: 25 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/smoke/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"test": "tsc && node ./node_modules/mocha/bin/_mocha --config ./.mocharc.js --reporter mocha-multi-reporters"
88
},
99
"devDependencies": {
10+
"@types/adm-zip": "^0.5.8",
1011
"@types/mkdirp": "^2.0.0",
1112
"@types/mocha": "10.0.10",
1213
"@types/node": "^24.3.0",
@@ -15,7 +16,9 @@
1516
"@types/semver": "^7.7.1",
1617
"@types/shell-quote": "^1.7.5",
1718
"@types/url-parse": "^1.4.11",
19+
"adm-zip": "^0.5.17",
1820
"ansi-styles": "^6.2.1",
21+
"js-yaml": "4.1.1",
1922
"minimatch": "^10.2.4",
2023
"mkdirp": "^3.0.1",
2124
"mocha": "11.7.2",
@@ -29,8 +32,7 @@
2932
"tree-kill": "^1.2.2",
3033
"ts-node": "10.9.2",
3134
"typescript": "5.9.2",
32-
"url-parse": "^1.5.10",
33-
"js-yaml": "4.1.1"
35+
"url-parse": "^1.5.10"
3436
},
3537
"overrides": {
3638
"serialize-javascript": "7.0.5"

0 commit comments

Comments
 (0)