Merge pull request #69 from anime-skip/funimation-setup

Funimation Setup & Page Action

src/content-scripts/funimation/index.ts

@@ -5,10 +5,10 @@ console.log('INJECTED content-scripts/funimation/index.ts');
 
 global.service = 'funimation';
 global.getRootQuery = (): string => {
-  return 'body>div';
+  return 'body #funimation-player';
 };
 global.getVideoQuery = (): string => {
-  return 'video';
+  return '#brightcove-player > video';
 };
 
 document.body.classList.add('hide-for-anime-skip');

src/content-scripts/funimation/style.scss

@@ -1,3 +1,9 @@
-.hide-for-anime-skip * {
-  display: none !important;
+.hide-for-anime-skip {
+  .vjs-poster,
+  .vjs-text-track-display,
+  #funimation-gradient,
+  .vjs-dock-shelf,
+  .vjs-dock-text {
+    display: none !important;
+  }
 }

src/manifest.js

@@ -7,14 +7,17 @@ const services = [
   {
     folder: 'example',
     matches: ['file:///*/example/index.html'],
+    page_matches: ['file:///*/example/index.html'],
   },
   {
     folder: 'vrv',
     matches: ['https://static.vrv.co/*'],
+    page_matches: ['https://vrv.co/*'],
   },
   {
     folder: 'funimation',
-    matches: ['https://www.funimation.com/*'],
+    matches: ['https://www.funimation.com/player/*'],
+    page_matches: ['https://www.funimation.com/*'],
   },
 ];
 
@@ -39,6 +42,12 @@ services.forEach(service => {
     css: ['player/index.css', `content-scripts/${service.folder}/index.css`],
     all_frames: true,
   });
+
+  // Add urls to the page_action
+  manifest.page_action.show_matches.push(...service.page_matches);
 });
 
-module.exports = manifest;
+module.exports = {
+  manifest,
+  services,
+};

src/manifest.json

@@ -3,7 +3,11 @@
   "description": "Skip intros, credits, filler and more on supported services",
   "manifest_version": 2,
   "permissions": ["storage", "tabs"],
-  "browser_action": {
+  "page_action": {
+    "show_matches": [
+      "https://www.anime-skip.com/get-started*",
+      "https://anime-skip.com/get-started*"
+    ],
     "browser_style": true,
     "default_icon": {
       "16": "assets/extension-logo/16.png",

webpack.config.js

@@ -7,6 +7,7 @@ const { VueLoaderPlugin } = require('vue-loader');
 const { version } = require('./package.json');
 const WebpackShellPluginNext = require('webpack-shell-plugin-next');
 const path = require('path');
+const { services } = require('./src/manifest');
 
 const example = path.resolve(__dirname, 'example', 'index.html');
 
@@ -21,11 +22,17 @@ const config = {
     'options/index': './options/index.ts',
 
     'player/index': './player/index.ts',
-    'content-scripts/example/index': './content-scripts/example/index.ts',
-    'content-scripts/vrv/index': './content-scripts/vrv/index.ts',
     'content-scripts/all': './content-scripts/all.ts',
     'content-scripts/keyboard-blocker': './content-scripts/keyboard-blocker.ts',
     'content-scripts/anime-skip/index': './content-scripts/anime-skip/index.ts',
+
+    ...services.reduce(
+      (map, service) => ({
+        ...map,
+        [`content-scripts/${service.folder}/index`]: `./content-scripts/${service.folder}/index.ts`,
+      }),
+      {}
+    ),
   },
   output: {
     path: __dirname + '/dist',
@@ -117,14 +124,14 @@ const config = {
         from: 'manifest.json',
         to: 'manifest.json',
         transform: _ => {
-          const content = require('./src/manifest');
+          const { manifest } = require('./src/manifest');
 
           if (config.mode === 'development') {
-            content['content_security_policy'] =
+            manifest['content_security_policy'] =
               "script-src 'self' 'unsafe-eval'; object-src 'self'";
           }
 
-          return JSON.stringify(content, null, 2);
+          return JSON.stringify(manifest, null, 2);
         },
       },
     ]),