goodby darkreader

.gitignore

@@ -4,8 +4,6 @@
 /misc/logo/jasper.icns
 /misc/data
 /.idea
-/src/Renderer/Fragment/Browser/BrowserFragmentAsset/darkreader.js
 /src/Renderer/asset/css/materialdesignicons.*
 /src/Renderer/asset/fonts/materialdesignicons*
 /src/Renderer/Library/Type/IconNameType.ts
-

package.json

@@ -24,7 +24,6 @@
   },
   "dependencies": {
     "@mdi/font": "^5.5.55",
-    "darkreader": "^4.9.17",
     "dayjs": "1.11.0",
     "diff": "3.5.0",
     "electron-squirrel-startup": "^1.0.0",

script/env/setup.sh

@@ -3,9 +3,5 @@
 # material design icon types
 ./script/env/setup-mdi.sh
 
-# dark reader
-./script/env/setup-darkreader.sh
-
 # styled-components
 ./script/env/setup-styled-components.sh
-

src/Renderer/Fragment/Browser/BrowserCodeExecFragment.tsx

@@ -14,7 +14,6 @@ import {GetIssueStateEntity} from '../../Library/Type/GetIssueStateEntity';
 import {StreamEntity} from '../../Library/Type/StreamEntity';
 import {StreamEvent} from '../../Event/StreamEvent';
 import {ShellUtil} from '../../Library/Util/ShellUtil';
-import {appTheme} from '../../Library/Style/appTheme';
 
 const jsdiff = require('diff');
 
@@ -46,7 +45,6 @@ export class BrowserCodeExecFragment extends React.Component<Props, State> {
   private readonly jsGetIssueState: string;
   private readonly jsProjectBoard: string;
   private readonly jsProjectNextBoard: string;
-  private readonly jsDarkReader: string;
 
   private projectStream: StreamEntity | null;
 
@@ -63,7 +61,6 @@ export class BrowserCodeExecFragment extends React.Component<Props, State> {
     this.jsGetIssueState = fs.readFileSync(`${dir}/get-issue-state.js`).toString();
     this.jsProjectBoard = fs.readFileSync(`${dir}/project-board.js`).toString();
     this.jsProjectNextBoard = fs.readFileSync(`${dir}/project-next-board.js`).toString();
-    this.jsDarkReader = fs.readFileSync(`${dir}/darkreader.js`).toString();
   }
 
   componentDidMount() {
@@ -75,7 +72,6 @@ export class BrowserCodeExecFragment extends React.Component<Props, State> {
     this.setupShowDiffBody();
     this.setupGetIssueState();
     this.setupProjectBoard();
-    this.setupDarkReader();
 
     IssueEvent.onSelectIssue(this, (issue, readBody) => this.setState({issue, readBody}));
   }
@@ -312,40 +308,6 @@ export class BrowserCodeExecFragment extends React.Component<Props, State> {
     }
   }
 
-  private setupDarkReader() {
-    const js = `
-    ${this.jsDarkReader}
-    // dark readerが外部リソースを取得しようとしてクロスオリジンに引っかかってしまう
-    // なので、setFetchMethodを使って、ダミーを返すようにする
-    DarkReader.setFetchMethod(async () => {
-      const blob = new Blob([' '], {type: 'text/plain'});
-      return {blob: () => blob};
-    });
-
-    DarkReader.enable({brightness: 100, contrast: 100});
-    document.body.classList.add('jasper-dark-mode');
-    setTimeout(() => {
-      document.body.style.visibility = 'visible';
-    }, 16);
-    `;
-
-    const hideBody = () => {
-      const theme = UserPrefRepo.getThemeName();
-      if (theme === 'dark' && UserPrefRepo.getPref().general.style.enableThemeModeOnGitHub) {
-        BrowserViewIPC.insertCSS(`html { background: ${appTheme().bg.primary}; } body { visibility: hidden; }`);
-      }
-    };
-    BrowserViewIPC.onEventDidStartNavigation(hideBody);
-    BrowserViewIPC.onEventDidNavigate(hideBody);
-
-    BrowserViewIPC.onEventDOMReady(async () => {
-      const theme = UserPrefRepo.getThemeName();
-      if (theme === 'dark' && UserPrefRepo.getPref().general.style.enableThemeModeOnGitHub) {
-        BrowserViewIPC.executeJavaScript(js);
-      }
-    });
-  }
-
   private isTargetIssuePage() {
     // if (!this.state.issue) return false;
     //

src/Renderer/Fragment/Pref/PrefEditorFragment.tsx

@@ -301,13 +301,6 @@ export class PrefEditorFragment extends React.Component<Props, State>{
         />
         <Space/>
 
-        <CheckBox
-          checked={this.state.pref.general.style.enableThemeModeOnGitHub}
-          onChange={c => this.setPref(() => this.state.pref.general.style.enableThemeModeOnGitHub = c)}
-          label='Enable theme mode on GitHub/GHE'
-        />
-        <Space/>
-
         <Translate onMessage={mc => mc.prefEditor.browse.browser.browser}/>
         <Select
           items={browseItems}

src/Renderer/Library/Type/UserPrefEntity.ts

@@ -21,7 +21,6 @@ export type UserPrefEntity = {
     githubNotificationSync: boolean;
     style: {
       themeMode: 'system' | 'light' | 'dark';
-      enableThemeModeOnGitHub: boolean;
       streamsWidth: number;
       issuesWidth: number;
     };

src/Renderer/Repository/UserPrefRepo.ts

@@ -216,8 +216,7 @@ class _UserPref {
 
       // migration: to v0.10.0
       if (!('githubNotificationSync' in pref.general)) (pref as UserPrefEntity).general.githubNotificationSync = true;
-      if (!('style' in pref.general)) (pref as UserPrefEntity).general.style = {themeMode: 'system', enableThemeModeOnGitHub: true, issuesWidth: 320, streamsWidth: 220};
-      if (!('enableThemeModeOnGitHub' in pref.general.style)) (pref as UserPrefEntity).general.style.enableThemeModeOnGitHub = true;
+      if (!('style' in pref.general)) (pref as UserPrefEntity).general.style = {themeMode: 'system', issuesWidth: 320, streamsWidth: 220};
 
       // migration: to v1.1.0
       if (!('user' in pref.github)) (pref as UserPrefEntity).github.user = null;
@@ -262,7 +261,6 @@ const TemplatePref: UserPrefEntity = {
     githubNotificationSync: true,
     style: {
       themeMode: 'system',
-      enableThemeModeOnGitHub: true,
       streamsWidth: 220,
       issuesWidth: 320,
     },