[releases] Use native URL class (firefox-devtools#6678)

Author: Jiberson

.babel/transform-mc.js

@@ -33,8 +33,7 @@ const VENDORS = [
   "react-aria-components/src/tabs",
   "react-transition-group/Transition",
   "reselect",
-  "Svg",
-  "url"
+  "Svg"
 ];
 
 /*

src/test/mochitest/browser_dbg-sources-named-eval.js

@@ -31,6 +31,5 @@ add_task(async function() {
   });
 
   await waitForSourceCount(dbg, 3);
-
   is(getLabel(dbg, 3), "evaled.js", "evaled exists");
 });

src/test/tests-setup.js

@@ -44,6 +44,9 @@ global.L10N.setBundle(
 global.jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000;
 global.performance = { now: () => 0 };
 
+const { URL } = require("url");
+global.URL = URL;
+
 Enzyme.configure({ adapter: new Adapter() });
 
 function formatException(reason, p) {

src/utils/source.js

@@ -10,11 +10,11 @@
  */
 
 import { isOriginalId } from "devtools-source-map";
+import { getUnicodeUrl } from "devtools-modules";
+
 import { endTruncateStr } from "./utils";
 import { truncateMiddleText } from "../utils/text";
-
-import { parse as parseURL } from "url";
-import { getUnicodeUrl } from "devtools-modules";
+import { parse as parseURL } from "../utils/url";
 export { isMinified } from "./isMinified";
 import { getURL, getFileExtension } from "./sources-tree";
 import { prefs } from "./prefs";
@@ -155,7 +155,6 @@ export function getFilename(source: Source) {
   }
 
   const { filename } = getURL(source);
-
   return getRawSourceURL(filename);
 }
 

src/utils/sources-tree/getURL.js

@@ -4,7 +4,7 @@
 
 // @flow
 
-import { parse } from "url";
+import { parse } from "../../utils/url";
 import { getUnicodeHostname, getUnicodeUrlPath } from "devtools-modules";
 
 import type { Source } from "../../types";
@@ -80,7 +80,7 @@ function _getURL(source: Source, defaultDomain: string): ParsedURL {
         filename: url
       };
 
-    case null:
+    case "":
       if (pathname && pathname.startsWith("/")) {
         // use file protocol for a URL like "/foo/bar.js"
         return {
@@ -89,7 +89,7 @@ function _getURL(source: Source, defaultDomain: string): ParsedURL {
           filename,
           group: "file://"
         };
-      } else if (host === null) {
+      } else if (!host) {
         return {
           ...def,
           path: url,

src/utils/sources-tree/tests/getUrl.spec.js

@@ -6,7 +6,7 @@
 
 import { getURL } from "../getURL";
 import { createSource } from "../../../reducers/sources";
-import Url from "url";
+import * as Url from "../../url";
 
 let spy;
 
@@ -121,7 +121,6 @@ describe("getUrl", () => {
         url: "http://example.com/foo/bar/baz.js"
       });
 
-      spy = jest.spyOn(Url, "parse");
       getURL(source);
       const url = getURL(source2);
       expect(spy).toHaveBeenCalledTimes(2);

src/utils/sources-tree/treeOrder.js

@@ -4,7 +4,7 @@
 
 // @flow
 
-import { parse } from "url";
+import { parse } from "../url";
 
 import { nodeHasChildren } from "./utils";
 

src/utils/sources-tree/utils.js

@@ -4,7 +4,7 @@
 
 // @flow
 
-import { parse } from "url";
+import { parse } from "../../utils/url";
 
 import type { TreeNode, TreeSource, TreeDirectory, ParentMap } from "./types";
 import type { Source } from "../../types";

src/utils/url.js

@@ -0,0 +1,35 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
+
+const defaultUrl = {
+  hash: "",
+  host: "",
+  hostname: "",
+  href: "",
+  origin: "null",
+  password: "",
+  path: "",
+  pathname: "",
+  port: "",
+  protocol: "",
+  search: "",
+  // This should be a "URLSearchParams" object
+  searchParams: {},
+  username: ""
+};
+
+export function parse(url: string): URL | object {
+  try {
+    const urlObj = new URL(url);
+    urlObj.path = urlObj.pathname + urlObj.search;
+    return urlObj;
+  } catch (err) {
+    // If we're given simply a filename...
+    if (url) {
+      return { ...defaultUrl, path: url, pathname: url };
+    }
+
+    return defaultUrl;
+  }
+}