From 81a454d148efa3e272bd04630f664398e4eba210 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 26 Jun 2023 19:51:59 +0200
Subject: [PATCH] chore: re-enable node/no-deprecated-api linting (#38899)

* chore: re-enable node/no-deprecated-api linting

* chore: re-enable no-global-assign linting
---
 .eslintrc.json                        | 4 +---
 lib/browser/api/net-client-request.ts | 2 ++
 lib/browser/devtools.ts               | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 74e61c612d..44fd89858b 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -10,7 +10,6 @@
     "semi": ["error", "always"],
     "no-var": "error",
     "no-unused-vars": "off",
-    "no-global-assign": "off",
     "guard-for-in": "error",
     "@typescript-eslint/no-unused-vars": ["error", {
       "vars": "all",
@@ -20,8 +19,7 @@
     "prefer-const": ["error", {
       "destructuring": "all"
     }],
-    "standard/no-callback-literal": "off",
-    "node/no-deprecated-api": "off"
+    "standard/no-callback-literal": "off"
   },
   "parserOptions": {
     "ecmaVersion": 6,
diff --git a/lib/browser/api/net-client-request.ts b/lib/browser/api/net-client-request.ts
index 49476db8c5..cf37d60826 100644
--- a/lib/browser/api/net-client-request.ts
+++ b/lib/browser/api/net-client-request.ts
@@ -209,6 +209,7 @@ type ExtraURLLoaderOptions = {
    allowNonHttpProtocols: boolean;
 }
 function parseOptions (optionsIn: ClientRequestConstructorOptions | string): NodeJS.CreateURLLoaderOptions & ExtraURLLoaderOptions {
+  // eslint-disable-next-line node/no-deprecated-api
   const options: any = typeof optionsIn === 'string' ? url.parse(optionsIn) : { ...optionsIn };
 
   let urlStr: string = options.url;
@@ -241,6 +242,7 @@ function parseOptions (optionsIn: ClientRequestConstructorOptions | string): Nod
       // an invalid request.
       throw new TypeError('Request path contains unescaped characters');
     }
+    // eslint-disable-next-line node/no-deprecated-api
     const pathObj = url.parse(options.path || '/');
     urlObj.pathname = pathObj.pathname;
     urlObj.search = pathObj.search;
diff --git a/lib/browser/devtools.ts b/lib/browser/devtools.ts
index 89422f80a2..b6189e4001 100644
--- a/lib/browser/devtools.ts
+++ b/lib/browser/devtools.ts
@@ -1,6 +1,5 @@
 import { dialog, Menu } from 'electron/main';
 import * as fs from 'fs';
-import * as url from 'url';
 
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
@@ -49,7 +48,7 @@ const getEditMenuItems = function (): Electron.MenuItemConstructorOptions[] {
 };
 
 const isChromeDevTools = function (pageURL: string) {
-  const { protocol } = url.parse(pageURL);
+  const { protocol } = new URL(pageURL);
   return protocol === 'devtools:';
 };