Chore: Remove same-origin dependency

Fix #879 Close #916
webhintio · Mar 22, 2018 · 7ca95d4 · 7ca95d4
1 parent e410953
commit 7ca95d4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/packages/rule-disown-opener/package.json b/packages/rule-disown-opener/package.json
@@ -8,8 +8,7 @@
   },
   "dependencies": {
     "caniuse-api": "^2.0.0",
-    "pluralize": "^7.0.0",
-    "same-origin": "^0.1.1"
+    "pluralize": "^7.0.0"
   },
   "description": "sonarwhal rule that checks if external links disown the opener",
   "devDependencies": {

diff --git a/packages/rule-disown-opener/src/rule.ts b/packages/rule-disown-opener/src/rule.ts
@@ -14,10 +14,9 @@ import { URL } from 'url';
 
 import { isSupported } from 'caniuse-api';
 import * as pluralize from 'pluralize';
-import * as sameOrigin from 'same-origin';
 
 import { Category } from 'sonarwhal/dist/src/lib/enums/category';
-import { cutString, isRegularProtocol } from 'sonarwhal/dist/src/lib/utils/misc';
+import { cutString, isRegularProtocol, sameOrigin } from 'sonarwhal/dist/src/lib/utils/misc';
 import { debug as d } from 'sonarwhal/dist/src/lib/utils/debug';
 import { IAsyncHTMLElement, ElementFound, IRule, RuleMetadata } from 'sonarwhal/dist/src/lib/types';
 import { normalizeString } from 'sonarwhal/dist/src/lib/utils/misc';

diff --git a/packages/sonarwhal/src/lib/utils/misc.ts b/packages/sonarwhal/src/lib/utils/misc.ts
@@ -344,6 +344,10 @@ const getSonarwhalPackage = () => {
     return require(path.join(__dirname, '../../../../package.json'));
 };
 
+const sameOrigin = (url1: string, url2: string): boolean => {
+    return new URL(url1).origin === new URL(url2).origin;
+};
+
 export {
     cutString,
     delay,
@@ -375,6 +379,7 @@ export {
     readFileAsync,
     requestJSONAsync,
     requestAsync,
+    sameOrigin,
     toCamelCase,
     writeFileAsync
 };
diff --git a/yarn.lock b/yarn.lock
@@ -6671,10 +6671,6 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-same-origin@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/same-origin/-/same-origin-0.1.1.tgz#c2287d3192577df517acbbd6d1451a9c3c3914f5"
-
 samsam@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"