Rename domain -> host to better match the underlying window.location api.

Author: nedtwigg

browser-extension/src/entrypoints/content.ts

@@ -11,7 +11,7 @@ const enhancedTextareas = new TextareaRegistry()
 
 function detectLocation(): StrippedLocation {
   return {
-    domain: window.location.host,
+    host: window.location.host,
     pathname: window.location.pathname,
   }
 }

browser-extension/src/lib/enhancer.ts

@@ -24,7 +24,7 @@ export interface CommentEvent {
  * Avoids dependency on global window/location objects for better testability.
  */
 export interface StrippedLocation {
-  domain: string
+  host: string
   pathname: string
 }
 

browser-extension/src/lib/enhancers/github/githubIssueAddComment.tsx

@@ -27,7 +27,7 @@ export class GitHubIssueAddCommentEnhancer implements CommentEnhancer<GitHubIssu
     if (textarea.id === 'feedback') {
       return null
     }
-    if (location.domain !== 'github.com') {
+    if (location.host !== 'github.com') {
       return null
     }
 
@@ -44,7 +44,7 @@ export class GitHubIssueAddCommentEnhancer implements CommentEnhancer<GitHubIssu
     const unique_key = `github.com:${slug}:${number}`
     const title = 'TODO_TITLE'
     return {
-      domain: location.domain,
+      domain: location.host,
       number,
       slug,
       title,

browser-extension/src/lib/enhancers/github/githubIssueNewComment.tsx

@@ -20,7 +20,7 @@ export class GitHubIssueNewCommentEnhancer implements CommentEnhancer<GitHubIssu
     _textarea: HTMLTextAreaElement,
     location: StrippedLocation,
   ): GitHubIssueNewCommentSpot | null {
-    if (location.domain !== 'github.com') {
+    if (location.host !== 'github.com') {
       return null
     }
 
@@ -35,7 +35,7 @@ export class GitHubIssueNewCommentEnhancer implements CommentEnhancer<GitHubIssu
     const slug = `${owner}/${repo}`
     const unique_key = `github.com:${slug}:new`
     return {
-      domain: location.domain,
+      domain: location.host,
       slug,
       type: 'GH_ISSUE_NEW_COMMENT',
       unique_key,

browser-extension/src/lib/enhancers/github/githubPRAddComment.tsx

@@ -24,7 +24,7 @@ export class GitHubPRAddCommentEnhancer implements CommentEnhancer<GitHubPRAddCo
     location: StrippedLocation,
   ): GitHubPRAddCommentSpot | null {
     // Only handle github.com domains TODO: identify GitHub Enterprise somehow
-    if (location.domain !== 'github.com' || _textarea.id !== 'new_comment_field') {
+    if (location.host !== 'github.com' || _textarea.id !== 'new_comment_field') {
       return null
     }
 
@@ -40,7 +40,7 @@ export class GitHubPRAddCommentEnhancer implements CommentEnhancer<GitHubPRAddCo
     const unique_key = `github.com:${slug}:${number}`
     const title = 'TODO_TITLE'
     return {
-      domain: location.domain,
+      domain: location.host,
       number,
       slug,
       title,

browser-extension/src/lib/enhancers/github/githubPRNewComment.tsx

@@ -23,7 +23,7 @@ export class GitHubPRNewCommentEnhancer implements CommentEnhancer<GitHubPRNewCo
     if (textarea.id === 'feedback') {
       return null
     }
-    if (location.domain !== 'github.com') {
+    if (location.host !== 'github.com') {
       return null
     }
 
@@ -43,7 +43,7 @@ export class GitHubPRNewCommentEnhancer implements CommentEnhancer<GitHubPRNewCo
       : `${owner}/${repo}/${compareBranch}`
     const unique_key = `github.com:${slug}`
     return {
-      domain: location.domain,
+      domain: location.host,
       slug,
       type: 'GH_PR_NEW_COMMENT',
       unique_key,

browser-extension/tests/har-view.ts

@@ -334,7 +334,7 @@ function injectGitcassoScript(key: keyof typeof PAGES, html: string) {
                 /function detectLocation(): StrippedLocation {[sS]*?}/,
                 'function detectLocation() {\\n' +
                 '  return {\\n' +
-                '    domain: \\'${urlParts.host}\\',\\n' +
+                '    host: \\'${urlParts.host}\\',\\n' +
                 '    pathname: \\'${urlParts.pathname}\\'\\n' +
                 '  };\\n' +
                 '}'

browser-extension/tests/lib/enhancers/github.test.ts

@@ -10,7 +10,7 @@ const enhancers = new EnhancerRegistry()
 function enhancements(document: Document, window: Window) {
   const textareas = document.querySelectorAll('textarea')
   const location: StrippedLocation = {
-    domain: window.location.host,
+    host: window.location.host,
     pathname: window.location.pathname,
   }
   const spotsFound = []