Merge pull request #160 from defmethodinc/upgrade-to-manifest-v3

Upgrade to manifest v3

Author: sbrudz

.eslintignore

@@ -1,6 +1,5 @@
 node_modules/
 build/
 dist/
-background/google-analytics-bundle.js
 gulpfile.js
 webpack.config.js

.nvmrc

@@ -1 +1 @@
-v16.14
+v16.16

PRIVACY.md

@@ -4,28 +4,23 @@ This privacy policy has been compiled to better serve those who are concerned wi
 
 ### What information do we collect from the people that use our app?
 
-We do not collect any PII. We collect anonymous information via Google analytics, including the following:
+The JustNotSorry extension does not collect any PII. We collect anonymous, aggregated information which is sent to our Google analytics account, including the following:
 
 - Language
 - Country and City
 - Operating System
-- Screen Resolution
 
 ### When do we collect information?
 
-We collect this information from you when you install the JustNotSorry Chrome extension.
+Google collects this information from you when you install the JustNotSorry Chrome extension using the Chrome Web Store and then provides this information in aggregate form to the JustNotSorry developers.
 
 ### How do we use your information?
 
-We may use the information we collect from you to improve the JustNotSorry extension and to better understand who is using it.
-
-### How do we protect visitor information?
-
-We send all information to Google over SSL.
+We may use the information that the Chrome Web Store collects to improve the JustNotSorry extension and to better understand who is using it.
 
 ### Do we use 'cookies'?
 
-We use Google Analytics, which uses first party cookies to report on user interactions. These cookies are used to store non-personally identifiable information.
+We use Google Analytics via the Chrome Web Store, which uses first party cookies to report on user interactions. These cookies are used to store non-personally identifiable information.
 
 See https://support.google.com/analytics/answer/6004245 for more information.
 
@@ -39,7 +34,7 @@ We do not include or offer third party products or services on our website.
 
 ### Opting out
 
-Users can set preferences for whether or not JustNotSorry collects usage information by going to the JustNotSorry options page via the chrome://extensions/ link. Alternatively, you can opt out permanently using the Google Analytics Opt Out Browser add on.
+You can manage your privacy settings for your Google Account as described in the [Google Privacy Policy](https://policies.google.com/privacy). To opt out permanently from Google Analytics, you can use the [Google Analytics Opt Out Browser add on](https://chrome.google.com/webstore/detail/google-analytics-opt-out/fllaojicojecljbmefodhfapmkghcbnh?hl=en).
 
 ### California Online Privacy Protection Act
 

README.md

@@ -74,7 +74,6 @@ To publish this release, download the zip file from GitHub. Find the Just Not So
 For production:
 
 - [dom-regexp-match](https://github.com/webmodules/dom-regexp-match)
-- [chrome-platform-analytics](https://github.com/GoogleChrome/chrome-platform-analytics)
 - Based on [gmail-chrome-extension-boilerplate](https://github.com/KartikTalwar/gmail-chrome-extension-boilerplate)
 - [preact/compat](https://github.com/preactjs/preact-compat)
 

background/background.js

@@ -1,33 +1,4 @@
-var gaService = analytics.getService('JustNotSorryTest');
-
-chrome.runtime.onInstalled.addListener(async function ({ reason }) {
-  var tracker = gaService.getTracker('UA-3535278-4'); // prod
-  var timing = tracker.startTiming('Analytics Performance', 'Send Event');
-  tracker.sendAppView('JustNotSorryInstalled');
-  timing.send();
-
-  chrome.declarativeContent.onPageChanged.removeRules(undefined, function () {
-    chrome.declarativeContent.onPageChanged.addRules([
-      {
-        conditions: [
-          new chrome.declarativeContent.PageStateMatcher({
-            pageUrl: { urlContains: 'mail.google.com' },
-          }),
-          new chrome.declarativeContent.PageStateMatcher({
-            pageUrl: { urlContains: 'outlook.office.com' },
-          }),
-          new chrome.declarativeContent.PageStateMatcher({
-            pageUrl: { urlContains: 'outlook.live.com' },
-          }),
-          new chrome.declarativeContent.PageStateMatcher({
-            pageUrl: { urlContains: 'outlook.office365.com' },
-          }),
-        ],
-        actions: [new chrome.declarativeContent.ShowPageAction()],
-      },
-    ]);
-  });
-
+chrome.runtime.onInstalled.addListener(function ({ reason }) {
   if (reason === 'update') {
     const notificationId = `JNS-${Date.now()}`;
     const url = 'https://defmethodinc.github.io/just-not-sorry/releases.html';
@@ -37,20 +8,18 @@ chrome.runtime.onInstalled.addListener(async function ({ reason }) {
       iconUrl: 'img/JustNotSorry-48.png',
       title: `JustNotSorry updated to v${manifest.version_name}`,
       message: "Click here to see what's new",
+      buttons: [{ title: 'View Release Notes' }],
       type: 'basic',
     });
-    chrome.notifications.onClicked.addListener(function () {
-      window.open(url);
+    const handleClick = function () {
+      chrome.tabs.create({ url });
       chrome.notifications.clear(notificationId);
-    });
+    };
+    chrome.notifications.onClicked.addListener(handleClick);
+    chrome.notifications.onButtonClicked.addListener(handleClick);
   }
 });
 
-chrome.pageAction.onClicked.addListener(function () {
-  if (chrome.runtime.openOptionsPage) {
-    chrome.runtime.openOptionsPage();
-  } else {
-    // fallback to old way
-    window.open(chrome.runtime.getURL('options.html'));
-  }
+chrome.action.onClicked.addListener(function () {
+  chrome.runtime.openOptionsPage();
 });