Add support for Firefox 63 and higher

core/interceptor.js

@@ -42,10 +42,6 @@ interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) {
         tabDomain = Address.EXAMPLE;
     }
 
-    if (interceptor.browserVersion === '63' || interceptor.browserVersion === '64') {
-        return interceptor._handleMissingCandidate(requestDetails.url);
-    }
-
     if (requestDetails.type === WebRequestType.XHR) {
 
         if (tabDomain !== interceptor.xhrTestDomain) {
@@ -181,12 +177,6 @@ chrome.storage.local.get(interceptor.relatedSettings, function (items) {
     interceptor.blockMissing = items.blockMissing || false;
 });
 
-chrome.runtime.getBrowserInfo(function (browserInformation) {
-
-    let browserVersion = browserInformation.version.substring(0, 2);
-    interceptor.browserVersion = browserVersion;
-});
-
 /**
  * Event Handlers
  */

core/mappings.js

@@ -37,39 +37,39 @@ var mappings = {
 
             // Basic Shorthand Notations [Deprecated]
             'dojo/1/dojo/dojo.': {
-                'path': 'resources/dojo/1.6.1/dojo/dojo.js.dec',
+                'path': 'resources/dojo/1.6.1/dojo/dojo.jsm',
                 'type': 'application/javascript'
             },
             'jquery/1/jquery.': {
-                'path': 'resources/jquery/1.11.1/jquery.min.js.dec',
+                'path': 'resources/jquery/1.11.1/jquery.min.jsm',
                 'type': 'application/javascript'
             },
             'jqueryui/1/jquery-ui.js': {
-                'path': 'resources/jqueryui/1.10.4/jquery-ui.min.js.dec',
+                'path': 'resources/jqueryui/1.10.4/jquery-ui.min.jsm',
                 'type': 'application/javascript'
             },
             'jqueryui/1/jquery-ui.min.js': {
-                'path': 'resources/jqueryui/1.10.4/jquery-ui.min.js.dec',
+                'path': 'resources/jqueryui/1.10.4/jquery-ui.min.jsm',
                 'type': 'application/javascript'
             },
             'mootools/1/mootools-yui-compressed.': {
-                'path': 'resources/mootools/1.1.2/mootools-yui-compressed.js.dec',
+                'path': 'resources/mootools/1.1.2/mootools-yui-compressed.jsm',
                 'type': 'application/javascript'
             },
             'prototype/1/prototype.': {
-                'path': 'resources/prototype/1.7.1.0/prototype.js.dec',
+                'path': 'resources/prototype/1.7.1.0/prototype.jsm',
                 'type': 'application/javascript'
             },
             'scriptaculous/1/scriptaculous.': {
-                'path': 'resources/scriptaculous/1.9.0/scriptaculous.js.dec',
+                'path': 'resources/scriptaculous/1.9.0/scriptaculous.jsm',
                 'type': 'application/javascript'
             },
             'swfobject/2/swfobject.': {
-                'path': 'resources/swfobject/2.2/swfobject.js.dec',
+                'path': 'resources/swfobject/2.2/swfobject.jsm',
                 'type': 'application/javascript'
             },
             'webfont/1/webfont.': {
-                'path': 'resources/webfont/1.5.18/webfont.js.dec',
+                'path': 'resources/webfont/1.5.18/webfont.jsm',
                 'type': 'application/javascript'
             }
         }
@@ -120,11 +120,11 @@ var mappings = {
 
             // Basic Shorthand Notations [Deprecated]
             'jquery-latest.': {
-                'path': 'resources/jquery/1.11.1/jquery.min.js.dec',
+                'path': 'resources/jquery/1.11.1/jquery.min.jsm',
                 'type': 'application/javascript'
             },
             'jquery.': {
-                'path': 'resources/jquery/1.11.1/jquery.min.js.dec',
+                'path': 'resources/jquery/1.11.1/jquery.min.jsm',
                 'type': 'application/javascript'
             }
         }

core/resources.js

@@ -21,72 +21,72 @@ var resources = {
 
     // AngularJS
     'angular': {
-        'path': 'resources/angularjs/{version}/angular.min.js.dec',
+        'path': 'resources/angularjs/{version}/angular.min.jsm',
         'type': 'application/javascript'
     },
     // Backbone.js
     'backbone': {
-        'path': 'resources/backbone.js/{version}/backbone-min.js.dec',
+        'path': 'resources/backbone.js/{version}/backbone-min.jsm',
         'type': 'application/javascript'
     },
     // Dojo
     'dojo': {
-        'path': 'resources/dojo/{version}/dojo/dojo.js.dec',
+        'path': 'resources/dojo/{version}/dojo/dojo.jsm',
         'type': 'application/javascript'
     },
     // Ember.js
     'ember': {
-        'path': 'resources/ember.js/{version}/ember.min.js.dec',
+        'path': 'resources/ember.js/{version}/ember.min.jsm',
         'type': 'application/javascript'
     },
     // Ext Core
     'extCore': {
-        'path': 'resources/ext-core/{version}/ext-core.js.dec',
+        'path': 'resources/ext-core/{version}/ext-core.jsm',
         'type': 'application/javascript'
     },
     // jQuery
     'jQuery': {
-        'path': 'resources/jquery/{version}/jquery.min.js.dec',
+        'path': 'resources/jquery/{version}/jquery.min.jsm',
         'type': 'application/javascript'
     },
     // jQuery UI
     'jQueryUI': {
-        'path': 'resources/jqueryui/{version}/jquery-ui.min.js.dec',
+        'path': 'resources/jqueryui/{version}/jquery-ui.min.jsm',
         'type': 'application/javascript'
     },
     // Modernizr
     'modernizr': {
-        'path': 'resources/modernizr/{version}/modernizr.min.js.dec',
+        'path': 'resources/modernizr/{version}/modernizr.min.jsm',
         'type': 'application/javascript'
     },
     // MooTools
     'mootools': {
-        'path': 'resources/mootools/{version}/mootools-yui-compressed.js.dec',
+        'path': 'resources/mootools/{version}/mootools-yui-compressed.jsm',
         'type': 'application/javascript'
     },
     // Prototype
     'prototypeJS': {
-        'path': 'resources/prototype/{version}/prototype.js.dec',
+        'path': 'resources/prototype/{version}/prototype.jsm',
         'type': 'application/javascript'
     },
     // Scriptaculous
     'scriptaculous': {
-        'path': 'resources/scriptaculous/{version}/scriptaculous.js.dec',
+        'path': 'resources/scriptaculous/{version}/scriptaculous.jsm',
         'type': 'application/javascript'
     },
     // SWFObject
     'swfobject': {
-        'path': 'resources/swfobject/{version}/swfobject.js.dec',
+        'path': 'resources/swfobject/{version}/swfobject.jsm',
         'type': 'application/javascript'
     },
     // Underscore.js
     'underscore': {
-        'path': 'resources/underscore.js/{version}/underscore-min.js.dec',
+        'path': 'resources/underscore.js/{version}/underscore-min.jsm',
         'type': 'application/javascript'
     },
     // Web Font Loader
     'webfont': {
-        'path': 'resources/webfont/{version}/webfont.js.dec',
+        'path': 'resources/webfont/{version}/webfont.jsm',
         'type': 'application/javascript'
     }
 };

core/shorthands.js

@@ -21,55 +21,55 @@ var shorthands = {
 
     // Google Hosted Libraries [Deprecated]
     'ajax.googleapis.com': {
-        'resources/jquery/1.8/jquery.min.js.dec': {
-            'path': 'resources/jquery/1.8.3/jquery.min.js.dec',
+        'resources/jquery/1.8/jquery.min.jsm': {
+            'path': 'resources/jquery/1.8.3/jquery.min.jsm',
             'version': '1.8.3'
         },
-        'resources/jquery/1.7/jquery.min.js.dec': {
-            'path': 'resources/jquery/1.7.2/jquery.min.js.dec',
+        'resources/jquery/1.7/jquery.min.jsm': {
+            'path': 'resources/jquery/1.7.2/jquery.min.jsm',
             'version': '1.7.2'
         },
-        'resources/jquery/1.6/jquery.min.js.dec': {
-            'path': 'resources/jquery/1.6.4/jquery.min.js.dec',
+        'resources/jquery/1.6/jquery.min.jsm': {
+            'path': 'resources/jquery/1.6.4/jquery.min.jsm',
             'version': '1.6.4'
         },
-        'resources/jquery/1.5/jquery.min.js.dec': {
-            'path': 'resources/jquery/1.5.2/jquery.min.js.dec',
+        'resources/jquery/1.5/jquery.min.jsm': {
+            'path': 'resources/jquery/1.5.2/jquery.min.jsm',
             'version': '1.5.2'
         },
-        'resources/jquery/1.4/jquery.min.js.dec': {
-            'path': 'resources/jquery/1.4.4/jquery.min.js.dec',
+        'resources/jquery/1.4/jquery.min.jsm': {
+            'path': 'resources/jquery/1.4.4/jquery.min.jsm',
             'version': '1.4.4'
         },
-        'resources/jquery/1.3/jquery.min.js.dec': {
-            'path': 'resources/jquery/1.3.2/jquery.min.js.dec',
+        'resources/jquery/1.3/jquery.min.jsm': {
+            'path': 'resources/jquery/1.3.2/jquery.min.jsm',
             'version': '1.3.2'
         },
-        'resources/jquery/1.2/jquery.min.js.dec': {
-            'path': 'resources/jquery/1.2.6/jquery.min.js.dec',
+        'resources/jquery/1.2/jquery.min.jsm': {
+            'path': 'resources/jquery/1.2.6/jquery.min.jsm',
             'version': '1.2.6'
         }
     },
     // jQuery CDN [Deprecated]
     'code.jquery.com': {
-        'resources/jquery/1.7/jquery.min.js.dec': {
-            'path': 'resources/jquery/1.7.0/jquery.min.js.dec',
+        'resources/jquery/1.7/jquery.min.jsm': {
+            'path': 'resources/jquery/1.7.0/jquery.min.jsm',
             'version': '1.7.0'
         },
-        'resources/jquery/1.6/jquery.min.js.dec': {
-            'path': 'resources/jquery/1.6.0/jquery.min.js.dec',
+        'resources/jquery/1.6/jquery.min.jsm': {
+            'path': 'resources/jquery/1.6.0/jquery.min.jsm',
             'version': '1.6.0'
         },
-        'resources/jquery/1.5/jquery.min.js.dec': {
-            'path': 'resources/jquery/1.5.0/jquery.min.js.dec',
+        'resources/jquery/1.5/jquery.min.jsm': {
+            'path': 'resources/jquery/1.5.0/jquery.min.jsm',
             'version': '1.5.0'
         },
-        'resources/jquery/1.4/jquery.min.js.dec': {
-            'path': 'resources/jquery/1.4.0/jquery.min.js.dec',
+        'resources/jquery/1.4/jquery.min.jsm': {
+            'path': 'resources/jquery/1.4.0/jquery.min.jsm',
             'version': '1.4.0'
         },
-        'resources/jquery/1.3/jquery.min.js.dec': {
-            'path': 'resources/jquery/1.3.0/jquery.min.js.dec',
+        'resources/jquery/1.3/jquery.min.jsm': {
+            'path': 'resources/jquery/1.3.0/jquery.min.jsm',
             'version': '1.3.0'
         }
     }

modules/internal/helpers.js

@@ -183,33 +183,33 @@ helpers.determineResourceName = function (filename) {
 
     switch (filename) {
 
-    case 'angular.min.js.dec':
+    case 'angular.min.jsm':
         return 'AngularJS';
-    case 'backbone-min.js.dec':
+    case 'backbone-min.jsm':
         return 'Backbone.js';
-    case 'dojo.js.dec':
+    case 'dojo.jsm':
         return 'Dojo';
-    case 'ember.min.js.dec':
+    case 'ember.min.jsm':
         return 'Ember.js';
-    case 'ext-core.js.dec':
+    case 'ext-core.jsm':
         return 'Ext Core';
-    case 'jquery.min.js.dec':
+    case 'jquery.min.jsm':
         return 'jQuery';
-    case 'jquery-ui.min.js.dec':
+    case 'jquery-ui.min.jsm':
         return 'jQuery UI';
-    case 'modernizr.min.js.dec':
+    case 'modernizr.min.jsm':
         return 'Modernizr';
-    case 'mootools-yui-compressed.js.dec':
+    case 'mootools-yui-compressed.jsm':
         return 'MooTools';
-    case 'prototype.js.dec':
+    case 'prototype.jsm':
         return 'Prototype';
-    case 'scriptaculous.js.dec':
+    case 'scriptaculous.jsm':
         return 'Scriptaculous';
-    case 'swfobject.js.dec':
+    case 'swfobject.jsm':
         return 'SWFObject';
-    case 'underscore-min.js.dec':
+    case 'underscore-min.jsm':
         return 'Underscore.js';
-    case 'webfont.js.dec':
+    case 'webfont.jsm':
         return 'Web Font Loader';
     default:
         return 'Unknown';