Skip to content

Commit d3ad41d

Browse files
authored
Merge branch 'master' into sourcemap-handle-null-sections
2 parents 57d871c + ea50a10 commit d3ad41d

6 files changed

Lines changed: 14 additions & 50 deletions

File tree

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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",

src/debugger/appWorker.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ Object.defineProperty(process, "versions", {
6363
value: undefined
6464
});
6565
66-
// TODO: Replace by url.fileURLToPath method when Node 10 LTS become deprecated
66+
// Polyfill for url.fileURLToPath - needed because this code runs in user's RN environment
67+
// where we cannot use import/require. Keep this implementation.
6768
function fileUrlToPath(url) {
6869
if (process.platform === 'win32') {
6970
return url.toString().replace('file:///', '');

src/debugger/forkedAppWorker.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ export class ForkedAppWorker implements IDebuggeeWorker {
203203
return promise;
204204
}
205205

206-
// TODO: Replace by url.pathToFileURL method when Node 10 LTS become deprecated
206+
// Simple and reliable implementation for converting file path to file:// URL
207+
// Keep this instead of using url.pathToFileURL() to avoid URL encoding issues
207208
public pathToFileUrl(url: string): string {
208209
const filePrefix = process.platform === "win32" ? "file:///" : "file://";
209210
return filePrefix + url;

src/extension/rn-extension.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
136136
onChangeWorkspaceFolders(event),
137137
),
138138
);
139-
EXTENSION_CONTEXT.subscriptions.push(
140-
vscode.workspace.onDidChangeConfiguration(() => onChangeConfiguration()),
141-
);
142139
EXTENSION_CONTEXT.subscriptions.push(TipNotificationService.getInstance());
143140
EXTENSION_CONTEXT.subscriptions.push(SurveyService.getInstance());
144141

@@ -259,11 +256,6 @@ function onChangeWorkspaceFolders(event: vscode.WorkspaceFoldersChangeEvent) {
259256
}
260257
}
261258

262-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
263-
function onChangeConfiguration() {
264-
// TODO implements
265-
}
266-
267259
export function createAdditionalWorkspaceFolder(folderPath: string): vscode.WorkspaceFolder | null {
268260
if (fs.existsSync(folderPath)) {
269261
const folderUri = vscode.Uri.file(folderPath);

tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"compilerOptions": {
33
"moduleResolution": "node",
44
"module": "commonjs",
5-
"target": "es6",
5+
"target": "es2020",
66
"lib": [
7-
"es2015"
7+
"es2020"
88
],
99
"rootDir": "./",
1010
"outDir": "./",

0 commit comments

Comments
 (0)