Merge pull request #666 from hogashi/add-domain

Add new domain
hogashi · May 17, 2024 · 56298d0 · 56298d0
2 parents a13abce + bec76bf
commit 56298d0
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 25 deletions.
diff --git a/__tests__/Constants.test.js b/__tests__/Constants.test.js
@@ -1,8 +1,12 @@
 import {
   GET_LOCAL_STORAGE,
+  HOST_MOBILE_TWITTER_COM,
+  HOST_MOBILE_X_COM,
   HOST_PRO_TWITTER_COM,
+  HOST_PRO_X_COM,
   HOST_TWEETDECK_TWITTER_COM,
   HOST_TWITTER_COM,
+  HOST_X_COM,
   INITIAL_ORIGINAL_BUTTON_TEXT,
   OPTIONS_TEXT,
   OPTION_KEYS,
@@ -27,13 +31,17 @@ describe('定数', () => {
 
   it('公式Web', () => {
     expect(HOST_TWITTER_COM).toBe('twitter.com');
+    expect(HOST_MOBILE_TWITTER_COM).toBe('mobile.twitter.com');
+    expect(HOST_X_COM).toBe('x.com');
+    expect(HOST_MOBILE_X_COM).toBe('mobile.x.com');
     expect(SHOW_ON_TIMELINE).toBe('SHOW_ON_TIMELINE');
     expect(SHOW_ON_TWEET_DETAIL).toBe('SHOW_ON_TWEET_DETAIL');
   });
 
   it('TweetDeck', () => {
     expect(HOST_TWEETDECK_TWITTER_COM).toBe('tweetdeck.twitter.com');
     expect(HOST_PRO_TWITTER_COM).toBe('pro.twitter.com');
+    expect(HOST_PRO_X_COM).toBe('pro.x.com');
     expect(SHOW_ON_TWEETDECK_TIMELINE).toBe('SHOW_ON_TWEETDECK_TIMELINE');
     expect(SHOW_ON_TWEETDECK_TWEET_DETAIL).toBe('SHOW_ON_TWEETDECK_TWEET_DETAIL');
   });

diff --git a/coverage/badge.svg b/coverage/badge.svg
diff --git a/dist/css/popup.css b/dist/css/popup.css
@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.3 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -32,9 +32,11 @@
 4. Use the user's configured `sans` font-family by default.
 5. Use the user's configured `sans` font-feature-settings by default.
 6. Use the user's configured `sans` font-variation-settings by default.
+7. Disable tap highlights on iOS
 */
 
-html {
+html,
+:host {
   line-height: 1.5;
   /* 1 */
   -webkit-text-size-adjust: 100%;
@@ -44,12 +46,14 @@ html {
   -o-tab-size: 4;
      tab-size: 4;
   /* 3 */
-  font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   /* 4 */
   font-feature-settings: normal;
   /* 5 */
   font-variation-settings: normal;
   /* 6 */
+  -webkit-tap-highlight-color: transparent;
+  /* 7 */
 }
 
 /*
@@ -121,8 +125,10 @@ strong {
 }
 
 /*
-1. Use the user's configured `mono` font family by default.
-2. Correct the odd `em` font sizing in all browsers.
+1. Use the user's configured `mono` font-family by default.
+2. Use the user's configured `mono` font-feature-settings by default.
+3. Use the user's configured `mono` font-variation-settings by default.
+4. Correct the odd `em` font sizing in all browsers.
 */
 
 code,
@@ -131,8 +137,12 @@ samp,
 pre {
   font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   /* 1 */
-  font-size: 1em;
+  font-feature-settings: normal;
   /* 2 */
+  font-variation-settings: normal;
+  /* 3 */
+  font-size: 1em;
+  /* 4 */
 }
 
 /*
@@ -201,6 +211,8 @@ textarea {
   /* 1 */
   line-height: inherit;
   /* 1 */
+  letter-spacing: inherit;
+  /* 1 */
   color: inherit;
   /* 1 */
   margin: 0;
@@ -224,9 +236,9 @@ select {
 */
 
 button,
-[type='button'],
-[type='reset'],
-[type='submit'] {
+input:where([type='button']),
+input:where([type='reset']),
+input:where([type='submit']) {
   -webkit-appearance: button;
   /* 1 */
   background-color: transparent;
@@ -482,6 +494,10 @@ video {
   --tw-backdrop-opacity:  ;
   --tw-backdrop-saturate:  ;
   --tw-backdrop-sepia:  ;
+  --tw-contain-size:  ;
+  --tw-contain-layout:  ;
+  --tw-contain-paint:  ;
+  --tw-contain-style:  ;
 }
 
 ::backdrop {
@@ -532,6 +548,10 @@ video {
   --tw-backdrop-opacity:  ;
   --tw-backdrop-saturate:  ;
   --tw-backdrop-sepia:  ;
+  --tw-contain-size:  ;
+  --tw-contain-layout:  ;
+  --tw-contain-paint:  ;
+  --tw-contain-style:  ;
 }
 
 .relative {

diff --git a/dist/manifest.json b/dist/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "twitter画像原寸ボタン",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "description": "twitterの画像ツイートにボタンを追加する拡張機能。追加されたボタンを押すとツイートの画像を原寸で新しいタブに表示する。連絡先: @hogextend",
   "author": "hogashi",
   "permissions": ["tabs", "storage"],
@@ -14,9 +14,12 @@
     {
       "matches": [
         "https://twitter.com/*",
+        "https://x.com/*",
         "https://mobile.twitter.com/*",
+        "https://mobile.x.com/*",
         "https://tweetdeck.twitter.com/*",
         "https://pro.twitter.com/*",
+        "https://pro.x.com/*",
         "https://pbs.twimg.com/*"
       ],
       "js": ["js/main.bundle.js"]

diff --git a/src/ButtonSetter.ts b/src/ButtonSetter.ts
@@ -1,6 +1,6 @@
 import {
   ORIGINAL_BUTTON_TEXT_OPTION_KEY,
-  OptionsBool,
+  type OptionsBool,
   SHOW_ON_TIMELINE,
   SHOW_ON_TWEETDECK_TIMELINE,
   SHOW_ON_TWEET_DETAIL,

diff --git a/src/ButtonSetterTweetDeck.ts b/src/ButtonSetterTweetDeck.ts
@@ -1,7 +1,7 @@
-import { ButtonSetterType } from './ButtonSetter';
+import type { ButtonSetterType } from './ButtonSetter';
 import {
   ORIGINAL_BUTTON_TEXT_OPTION_KEY,
-  OptionsBool,
+  type OptionsBool,
   SHOW_ON_TWEETDECK_TIMELINE,
   SHOW_ON_TWEETDECK_TWEET_DETAIL,
 } from './constants';

diff --git a/src/constants.ts b/src/constants.ts
@@ -9,11 +9,14 @@ export const GET_LOCAL_STORAGE = 'GET_LOCAL_STORAGE';
 // 公式Web
 export const HOST_TWITTER_COM = 'twitter.com';
 export const HOST_MOBILE_TWITTER_COM = 'mobile.twitter.com';
+export const HOST_X_COM = 'x.com';
+export const HOST_MOBILE_X_COM = 'mobile.x.com';
 export const SHOW_ON_TIMELINE = 'SHOW_ON_TIMELINE';
 export const SHOW_ON_TWEET_DETAIL = 'SHOW_ON_TWEET_DETAIL';
 // TweetDeck
 export const HOST_TWEETDECK_TWITTER_COM = 'tweetdeck.twitter.com';
 export const HOST_PRO_TWITTER_COM = 'pro.twitter.com';
+export const HOST_PRO_X_COM = 'pro.x.com';
 export const SHOW_ON_TWEETDECK_TIMELINE = 'SHOW_ON_TWEETDECK_TIMELINE';
 export const SHOW_ON_TWEETDECK_TWEET_DETAIL = 'SHOW_ON_TWEETDECK_TWEET_DETAIL';
 
@@ -64,10 +67,15 @@ export const OPTIONS_TEXT: { [key in keyof OptionsBool]: string } = {
 
 /** 公式Webかどうか */
 export const isTwitter = (): boolean =>
-  window.location.hostname === HOST_TWITTER_COM || window.location.hostname === HOST_MOBILE_TWITTER_COM;
+  window.location.hostname === HOST_TWITTER_COM ||
+  window.location.hostname === HOST_MOBILE_TWITTER_COM ||
+  window.location.hostname === HOST_X_COM ||
+  window.location.hostname === HOST_MOBILE_X_COM;
 /** Tweetdeckかどうか */
 export const isTweetdeck = (): boolean =>
-  window.location.hostname === HOST_TWEETDECK_TWITTER_COM || window.location.hostname === HOST_PRO_TWITTER_COM;
+  window.location.hostname === HOST_TWEETDECK_TWITTER_COM ||
+  window.location.hostname === HOST_PRO_TWITTER_COM ||
+  window.location.hostname === HOST_PRO_X_COM;
 
 /** Reactビューかどうか */
 export const isReactView = (): boolean => !!document.getElementById('react-root');

diff --git a/src/extension-contexts/background.ts b/src/extension-contexts/background.ts
@@ -1,5 +1,5 @@
 import { GET_LOCAL_STORAGE } from '../constants';
-import { MessageRequest, MessageResponseBool } from '../utils';
+import type { MessageRequest, MessageResponseBool } from '../utils';
 import { getOptions } from './options';
 
 // バックグラウンドで実行される

diff --git a/src/extension-contexts/options.ts b/src/extension-contexts/options.ts
@@ -1,4 +1,4 @@
-import { OPTION_KEYS, OptionsBool, initialOptionsBool } from '../constants';
+import { OPTION_KEYS, type OptionsBool, initialOptionsBool } from '../constants';
 
 export const setOptions = (options: OptionsBool, callback?: () => void): void => {
   chrome.storage.sync.set(options, () => {

diff --git a/src/extension-contexts/popup.tsx b/src/extension-contexts/popup.tsx
@@ -1,15 +1,18 @@
-import React, { ChangeEvent, useCallback, useState } from 'react';
+import React, { type ChangeEvent, useCallback, useState } from 'react';
 import ReactDOM from 'react-dom';
 import {
   HOST_MOBILE_TWITTER_COM,
+  HOST_MOBILE_X_COM,
   HOST_PRO_TWITTER_COM,
+  HOST_PRO_X_COM,
   HOST_TWEETDECK_TWITTER_COM,
   HOST_TWITTER_COM,
+  HOST_X_COM,
   OPTIONS_TEXT,
   OPTION_KEYS,
   OPTION_UPDATED,
   ORIGINAL_BUTTON_TEXT_OPTION_KEY,
-  OptionsBool,
+  type OptionsBool,
   SHOW_ON_TIMELINE,
   SHOW_ON_TWEETDECK_TIMELINE,
   SHOW_ON_TWEETDECK_TWEET_DETAIL,
@@ -55,9 +58,15 @@ export const Popup = (props: Props): JSX.Element => {
         }
         const tabUrl = new URL(tab.url).hostname;
         if (
-          ![HOST_TWITTER_COM, HOST_MOBILE_TWITTER_COM, HOST_TWEETDECK_TWITTER_COM, HOST_PRO_TWITTER_COM].some(
-            (url) => url === tabUrl,
-          )
+          ![
+            HOST_TWITTER_COM,
+            HOST_MOBILE_TWITTER_COM,
+            HOST_TWEETDECK_TWITTER_COM,
+            HOST_PRO_TWITTER_COM,
+            HOST_X_COM,
+            HOST_MOBILE_X_COM,
+            HOST_PRO_X_COM,
+          ].some((url) => url === tabUrl)
         ) {
           // 送り先タブが拡張機能が動作する対象ではないならメッセージを送らない
           return;

diff --git a/src/utils.ts b/src/utils.ts
@@ -1,9 +1,9 @@
-import { ButtonSetter, ButtonSetterType } from './ButtonSetter';
+import { ButtonSetter, type ButtonSetterType } from './ButtonSetter';
 import { ButtonSetterTweetDeck } from './ButtonSetterTweetDeck';
 import {
   GET_LOCAL_STORAGE,
   OPTION_UPDATED,
-  OptionsBool,
+  type OptionsBool,
   initialOptionsBool,
   isNativeChromeExtension,
   isReactView,