From 50e878bdb4fb04e9ad89896e7b4fada2572e02e1 Mon Sep 17 00:00:00 2001 From: "Jain, Sneha T" Date: Wed, 13 Feb 2019 14:56:20 +0530 Subject: [PATCH] removing filter --- package.json | 3 ++- src/utils/sources-tree/addToTree.js | 4 ++-- src/utils/sources-tree/tests/getUrl.spec.js | 12 +++++++++++- src/utils/url.js | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 30293c94c9..b0c4673ea9 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,8 @@ "react-transition-group": "^2.2.1", "reselect": "^4.0.0", "svg-inline-react": "^3.0.0", - "wasmparser": "^0.7.0" + "wasmparser": "^0.7.0", + "whatwg-url": "^7.0.0" }, "private": true, "workspaces": [ diff --git a/src/utils/sources-tree/addToTree.js b/src/utils/sources-tree/addToTree.js index 4692de6875..af73d37380 100644 --- a/src/utils/sources-tree/addToTree.js +++ b/src/utils/sources-tree/addToTree.js @@ -85,8 +85,8 @@ function traverseTree( tree: TreeDirectory, debuggeeHost: ?string ): TreeNode { - const parts = url.path.split("/").filter(p => p !== ""); - parts.unshift(url.group); + const parts = url.path.replace(/\/$/, "").split("/"); + parts[0] = url.group; let path = ""; return parts.reduce((subTree, part, index) => { diff --git a/src/utils/sources-tree/tests/getUrl.spec.js b/src/utils/sources-tree/tests/getUrl.spec.js index 659434520e..657af10697 100644 --- a/src/utils/sources-tree/tests/getUrl.spec.js +++ b/src/utils/sources-tree/tests/getUrl.spec.js @@ -79,10 +79,20 @@ describe("getUrl", () => { it("creates a group name for webpack", () => { const urlObject = getURL( createMockSource({ - url: "webpack://src/component.jsx", + url: "webpack:///src/component.jsx", id: "c3" }) ); expect(urlObject.group).toBe("webpack://"); }); + + it("creates a group name for angular source", () => { + const urlObject = getURL( + createMockSource({ + url: "ng://src/component.jsx", + id: "c3" + }) + ); + expect(urlObject.group).toBe("ng://"); + }); }); diff --git a/src/utils/url.js b/src/utils/url.js index d59ceb9db0..d886316acb 100644 --- a/src/utils/url.js +++ b/src/utils/url.js @@ -5,6 +5,7 @@ // @flow import { memoize } from "lodash"; +import { URL } from "whatwg-url"; const defaultUrl = { hash: "",