Merge pull request #26 from kidonng/page-detect

package.json

@@ -58,6 +58,7 @@
   "homepage": "https://github.com/dderevjanik/github-vscode-icons#readme",
   "dependencies": {
     "fastdom": "^1.0.8",
+    "github-url-detection": "^2.0.5",
     "react": "^16.4.0",
     "react-dom": "^16.13.1",
     "select-dom": "^4.1.3",

packages/content/pages/GistGitHub.ts

@@ -1,4 +1,4 @@
-import { isGist } from '../utils/PageDetect';
+import { isGist } from 'github-url-detection';
 import { getIconForFile, getIconUrl } from '../utils/Icons';
 import { mutate } from 'fastdom';
 

packages/content/pages/GitHub.ts

@@ -7,7 +7,8 @@ import {
   DEFAULT_ROOT,
   DEFAULT_FILE
 } from '../utils/Icons';
-import { isRepoRoot, isHistoryForFile, isRepoTree, isSingleFile, isCommit, isGist } from '../utils/PageDetect';
+import { isCommit, isRepoRoot, isSingleFile, isRepoTree } from 'github-url-detection';
+import { isHistoryForFile } from '../utils/PageDetect';
 import { mutate } from 'fastdom';
 import { getFileIcon, getFolderIcon } from '../utils/Dev';
 

packages/content/utils/PageDetect.ts

@@ -1,64 +1,7 @@
-// COPIED FROM https://github.com/sindresorhus/refined-github/blob/master/src/libs/page-detect.js
-
 import * as select from 'select-dom';
+import { isRepo, utils } from 'github-url-detection';
 
-export const isTrending = () => location.pathname.startsWith('/trending');
-
-export const getRepoPath = () => location.pathname.replace(/^\/[^/]+\/[^/]+/, '');
-
-export const isRepoTree = () => isRepo() && /\/tree\//.test(getRepoPath());
-
-export const isPR = () => isRepo() && /^\/pull\/\d+/.test(getRepoPath());
-
-export const isPRFiles = () => isRepo() && /^\/pull\/\d+\/files/.test(getRepoPath());
-
-export const isPRCommit = () => isRepo() && /^\/pull\/\d+\/commits\/[0-9a-f]{5,40}/.test(getRepoPath());
-
-export const isSingleCommit = () => isRepo() && /^\/commit\/[0-9a-f]{5,40}/.test(getRepoPath());
-
-export const isCompare = () => isRepo() && /^\/compare/.test(getRepoPath());
-
-export const hasDiff = () =>
-  isRepo() &&
-  (isSingleCommit() || isPRCommit() || isPRFiles() || isCompare() || (isPR() && select.exists('.diff-table')));
-
-export const isReleases = () => isRepo() && /^\/(releases|tags)/.test(getRepoPath());
-
-export const isNotifications = () => location.pathname.startsWith('/notifications');
-
-export const isRepoSettings = () => isRepo() && /^\/settings/.test(getRepoPath());
-
-export const getOwnerAndRepo = () => {
-  const [, ownerName, repoName] = location.pathname.split('/');
-
-  return {
-    ownerName,
-    repoName
-  };
-};
-
-export const hasCommentForm = () => select.exists('.js-previewable-comment-form');
-
-/**
- * Github related detections
- */
-// @todo Replace with DOM-based test because this is too generic #708
-export const isRepo = () => !isGist() && !isTrending() && /^\/[^/]+\/[^/]+/.test(location.pathname);
-
-export const isSingleFile = () => {
-  const { ownerName, repoName } = getOwnerAndRepo();
-  const blobPattern = new RegExp(`/${ownerName}/${repoName}/blob/`);
-  return isRepo() && blobPattern.test(location.href);
-};
-
-export const isCommit = () => isSingleCommit() || isPRCommit() || (isPRFiles() && select.exists('.full-commit'));
-
-export const isRepoRoot = () =>
-  isRepo() && /^(\/?|\/tree\/?)$/.test(getRepoPath()) && select.exists('.repository-content');
-
-export const isHistoryForFile = () => isRepo() && /^\/commits\/[0-9a-f]{5,40}\/.+/.test(getRepoPath());
-
-export const isGist = () => location.hostname.startsWith('gist.') || location.pathname.startsWith('gist/');
+export const isHistoryForFile = () => isRepo() && /^\/commits\/[0-9a-f]{5,40}\/.+/.test(utils.getRepoPath());
 
 /**
  * BitBucket related detections