v3.4.9

.gitlab/issue_templates/release.md

@@ -57,28 +57,37 @@ repo: https://github.com/Windscribe/browser-extension
 Note: Keep the Dev Console open in the background and watch for any console errors. Any and all Console errors must be reported as bugs.
 
 ## 1. Update checks
+
 Update from the previous version and verify that:
+
 - [ ] General settings are retained.
 - [ ] Blocker settings are retained.
 - [ ] Privacy settings are retained.
-- [ ] Whitelist is retained.
-​
-​
+- [ ] Allowlist is retained.
+      ​
+      ​
+
 ## 2. Full Browser Shutdown & Restart
+
 - [ ] General settings are retained.
 - [ ] Blocker settings are retained.
 - [ ] Privacy settings are retained.
-- [ ] Whitelist is retained. 
-​
+- [ ] Allowlist is retained.
+      ​
+
 ## 3. Server List Updates
+
 Server List should update when:
+
 - [ ] Account status changes.
 - [ ] loc_hash changes.
 - [ ] Pro status changes.
 - [ ] ALC changes.
 - [ ] If new list does not contain current connect location, move up the location tree and fallback to Auto-Pilot.
-​
+      ​
+
 ## 4. Feature / Functionality Checks
+
 - ### General:
 - [ ] Auto-connect works.
 - [ ] Notifications work.
@@ -105,12 +114,14 @@ Server List should update when:
 - ### Account:
 - [ ] Edit Account works.
 - [ ] E-mail linking to account works.
-- ### Whitelist:
-- [ ] Adding to Whitelist works.
-- [ ] Editing element in Whitelist works.
-- [ ] Removing from Whitelist works.
-​
+- ### Allowlist:
+- [ ] Adding to Allowlist works.
+- [ ] Editing element in Allowlist works.
+- [ ] Removing from Allowlist works.
+      ​
+
 ## 5. UX Tests:
+
 - [ ] "Sign up" redirects to relevant locations on the website.
 - [ ] "Forgot Password" works.
 - [ ] Alphabetical / Geographical Location toggle works.
@@ -128,8 +139,10 @@ Server List should update when:
 - - [ ] Removing locations from favorites works.
 - - [ ] Favorites are saved between restarts.
 - - [ ] Connecting to favorite location works (and IP changes).
-​
+        ​
+
 ## 6. Other Tests:
+
 - [ ] General UI glitches
 - - [ ] View persistence.
 - - [ ] Fonts.

README.md

@@ -17,6 +17,7 @@ Source code of the Windscribe Chrome and Firefox browser extensions. This extens
 
 ```
 yarn cache clean && yarn install
+cd modules/ext && cp .env.schema .env
 yarn workspace ws-api-client build
 yarn workspace ext build
 ```

modules/ext.code-workspace

@@ -1,45 +1,44 @@
 {
   "folders": [
-	{
-		"path": "ext"
-	},
-	{
-		"path": "ui"
-	},
-	{
-		"path": "ws-api-client"
-	}
-],
-"settings": {
-  "files.exclude": {
-    "**/.git": true,
-    "**/.svn": true,
-    "**/.hg": true,
-    "**/CVS": true,
-    "**/.DS_Store": true,
-    "**/*.hot-update.json": true,
-    "**/*.hot-update.js": true
-  },
-  "path-autocomplete.pathMappings": {
-    "$root": "${workspace}/src"
-  },
-  "cSpell.words": [
-    "Onboarding",
-    "all",
-    "include",
-    "subdomains",
-    "whitelisted"
+    {
+      "path": "ext"
+    },
+    {
+      "path": "ui"
+    },
+    {
+      "path": "ws-api-client"
+    }
   ],
-  "javascript.validate.enable": false,
-  "typescript.surveys.enabled": false
-
-},
-"extensions": {
-	"recommendations": [
-		"ionutvmi.path-autocomplete",
-    "EditorConfig.EditorConfig",
-    "esbenp.prettier-vscode",
-    "jpoissonnier.vscode-styled-components"
-	]
-}
+  "settings": {
+    "files.exclude": {
+      "**/.git": true,
+      "**/.svn": true,
+      "**/.hg": true,
+      "**/CVS": true,
+      "**/.DS_Store": true,
+      "**/*.hot-update.json": true,
+      "**/*.hot-update.js": true
+    },
+    "path-autocomplete.pathMappings": {
+      "$root": "${workspace}/src"
+    },
+    "cSpell.words": [
+      "Onboarding",
+      "all",
+      "include",
+      "subdomains",
+      "allowlisted"
+    ],
+    "javascript.validate.enable": false,
+    "typescript.surveys.enabled": false
+  },
+  "extensions": {
+    "recommendations": [
+      "ionutvmi.path-autocomplete",
+      "EditorConfig.EditorConfig",
+      "esbenp.prettier-vscode",
+      "jpoissonnier.vscode-styled-components"
+    ]
+  }
 }

modules/ext/automated_tests/chrome.tests.js

@@ -5,7 +5,7 @@ const fs = require('fs-extra')
 const rimraf = require('rimraf')
 const path = require('path')
 const argv = require('yargs')
-  .alias('W', 'whitelist')
+  .alias('W', 'allowlist')
   .array('W')
   .boolean('keepOpen')
   .boolean('autoConnect')
@@ -101,9 +101,9 @@ describe('chrome extension', () => {
     await setupBrowser({ showPopup: argv.e2e || argv.ghost })
   })
 
-  const logicTests = argv.logic ? getLogicTests(argv.whitelist) : []
-  const e2eTests = argv.e2e ? getE2eTests(argv.whitelist) : []
-  const ghostTests = argv.ghost ? getGhostTests(argv.whitelist) : []
+  const logicTests = argv.logic ? getLogicTests(argv.allowlist) : []
+  const e2eTests = argv.e2e ? getE2eTests(argv.allowlist) : []
+  const ghostTests = argv.ghost ? getGhostTests(argv.allowlist) : []
   const allTests = [...e2eTests, ...logicTests, ...ghostTests]
 
   for (let t of allTests) {

modules/ext/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ext",
-  "version": "3.4.8",
+  "version": "3.4.9",
   "private": true,
   "dependencies": {
     "@babel/plugin-proposal-export-default-from": "~7.8.3",
@@ -53,7 +53,7 @@
     "react": "^16.8.0",
     "react-axe": "^3.3.0",
     "react-custom-scrollbars": "4.2.1",
-    "react-devtools": "^4.8.2",
+    "react-devtools": "^4.24.7",
     "react-dom": "^16.8.0",
     "react-i18next": "^10.4.1",
     "react-joyride": "^2.1.1",
@@ -134,7 +134,7 @@
     "web-ext": "~4.0.0",
     "webpack-dev-server": "^3.11.0"
   },
-  "uBlockVersion": "ws-v1.44.4",
+  "uBlockVersion": "ws-1.51.0",
   "main": "index.js",
   "license": "MIT"
 }

modules/ext/public/content-scripts/language-switch.js

@@ -28,7 +28,7 @@ function navigatorLanguages(localeCode) {
 
 const switchLocale = localeCode =>
   injectScript(`
-  if (typeof wsWhitelisted === 'undefined') {
+  if (typeof wsAllowlisted === 'undefined') {
     ${intlLocale.toString()}
     intlLocale('${localeCode.toString()}');
     ${navigatorLanguage.toString()}

modules/ext/public/content-scripts/proxy-time.js

@@ -262,7 +262,7 @@ const injectScript = content => {
 
 const shiftTime = timeWarp =>
   injectScript(`
-  if (typeof wsWhitelisted === 'undefined') {
+  if (typeof wsAllowlisted === 'undefined') {
     if (!window.ODate) {
       window.ODate = Date
     }

modules/ext/public/content-scripts/worker-block.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-undef */
 const blockWorker = () =>
   injectScript(`
-    if (typeof wsWhitelisted === 'undefined') {
+    if (typeof wsAllowlisted === 'undefined') {
       window.manageWebWorkers = new (function() {
         let oldWorker = window.Worker
         let newWorker = function() {

modules/ext/public/manifest/base.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Windscribe - Free Proxy and Ad Blocker",
   "short_name": "Windscribe",
-  "version": "3.4.8",
+  "version": "3.4.9",
   "description": "Windscribe helps you mask your physical location, circumvent censorship, and block ads and trackers on websites you use every day",
   "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self';",
   "default_locale": "en",