Skip to content

Commit 772bc3f

Browse files
authored
Merge branch 'EFForg:master' into master
2 parents 21b56bc + e1ac7a1 commit 772bc3f

File tree

8 files changed

+113
-87
lines changed

8 files changed

+113
-87
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ matrix:
2121
- env: TEST="validations"
2222
- env: TEST="fetch"
2323
- env: TEST="preloaded"
24-
- addons:
25-
chrome: beta
26-
env: TEST="chrome beta" BROWSER=google-chrome-beta
24+
# - addons:
25+
# chrome: beta
26+
# env: TEST="chrome beta" BROWSER=google-chrome-beta
2727
- addons:
2828
chrome: stable
2929
env: TEST="chrome stable" BROWSER=google-chrome-stable

chromium/background-scripts/background.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -938,6 +938,23 @@ chrome.runtime.onMessage.addListener(function(message, sender, sendResponse) {
938938
}
939939
});
940940

941+
/**
942+
* @description Notify users about extension sunsetting in January 2023 and instructions turn on HTTPS natively
943+
* @link https://www.eff.org/deeplinks/2021/09/https-actually-everywhere
944+
*/
945+
chrome.runtime.onInstalled.addListener(async ({reason, temporary}) => {
946+
if (temporary) return;
947+
switch (reason) {
948+
case "install":
949+
case "update":
950+
{
951+
const url = "https://www.eff.org/https-everywhere/set-https-default-your-browser";
952+
await chrome.tabs.create({ active : false, url: url });
953+
}
954+
break;
955+
}
956+
});
957+
941958
/**
942959
* Clear any cache/ blacklist we have.
943960
*/

chromium/package-lock.json

Lines changed: 74 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

chromium/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"coveralls": "^3.1.0",
1111
"codemirror": "~5.65.0",
1212
"fetch-mock": "^9.10.7",
13-
"mocha": "^9.0.0",
13+
"mocha": "^10.0.0",
1414
"nan": "^2.14.1",
1515
"node-webcrypto-ossl": "^1.0.49",
1616
"nyc": "^15.1.0",
1717
"pako": "~2.0.2",
18-
"sinon": "^13.0.0",
18+
"sinon": "^14.0.0",
1919
"sinon-chrome": "^3.0.1",
2020
"text-encoding": "^0.7.0"
2121
},

utils/eslint/package-lock.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

utils/hsts-prune/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

utils/hsts-prune/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"license": "GPL-3.0",
1111
"dependencies": {
1212
"JSONStream": "^1.3.0",
13-
"async": "^2.1.4",
13+
"async": "^2.6.4",
1414
"base64-stream": "^0.1.3",
1515
"escape-string-regexp": "^1.0.5",
1616
"highland": "^2.10.1",

utils/trivialize-cdn-rules/package-lock.json

Lines changed: 3 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)