Merge pull request #1310 from mozilla/updates

added promo string to ftl & updated deps

app/ui/archiveTile.js

@@ -448,7 +448,7 @@ module.exports.empty = function(state, emit) {
       </div>
       <input
         id="file-upload"
-        class="opacity-0 w-0 h-0 appearance-none absolute"
+        class="opacity-0 w-0 h-0 appearance-none absolute overflow-hidden"
         type="file"
         multiple
         onfocus="${focus}"

app/ui/body.js

@@ -10,7 +10,6 @@ function banner(state) {
   const show =
     !state.capabilities.standalone &&
     !/firefox/i.test(navigator.userAgent) &&
-    document.querySelector('html').lang.startsWith('en') &&
     !state.route.startsWith('/unsupported/');
   if (show) {
     return state.cache(Promo, 'promo').render();

app/ui/promo.js

@@ -3,8 +3,9 @@ const Component = require('choo/component');
 const assets = require('../../common/assets');
 
 class Promo extends Component {
-  constructor(name) {
+  constructor(name, state) {
     super(name);
+    this.state = state;
   }
 
   update() {
@@ -22,13 +23,12 @@ class Promo extends Component {
             class="w-6"
             alt="Firefox"
           />
-          <span class="ml-3"
+          <span class="ml-3">
-            >Send is brought to you by the all-new Firefox.${' '}
+            ${this.state.translate('downloadFirefoxPromo')}${' '}
             <a
               class="text-blue"
               href="https://www.mozilla.org/firefox/new/?utm_campaign=send-acquisition&utm_medium=referral&utm_source=send.firefox.com"
-            >
+              >${this.state.translate('downloadFirefox')}</a
-              Download Firefox now ≫</a
             >
           </span>
         </div>

package.json

@@ -65,15 +65,14 @@
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "^7.4.3",
     "@dannycoates/webcrypto-liner": "^0.1.37",
-    "@dannycoates/webpack-dev-server": "^3.1.4",
+    "@fullhuman/postcss-purgecss": "^1.2.0",
-    "@fullhuman/postcss-purgecss": "^1.1.0",
     "@mattiasbuelens/web-streams-polyfill": "0.2.1",
     "asmcrypto.js": "^0.22.0",
     "babel-loader": "^8.0.5",
-    "babel-plugin-istanbul": "^5.1.2",
+    "babel-plugin-istanbul": "^5.1.3",
     "base64-js": "^1.3.0",
     "content-disposition": "^0.5.3",
-    "copy-webpack-plugin": "^5.0.2",
+    "copy-webpack-plugin": "^5.0.3",
     "core-js": "^3.0.1",
     "crc": "^3.8.0",
     "cross-env": "^5.2.0",
@@ -93,12 +92,12 @@
     "git-rev-sync": "^1.12.0",
     "html-loader": "^0.5.5",
     "http_ece": "^1.1.0",
-    "husky": "^1.3.1",
+    "husky": "^2.1.0",
     "lint-staged": "^8.1.5",
-    "mocha": "^6.1.3",
+    "mocha": "^6.1.4",
     "morgan": "^1.9.1",
     "nanobus": "^4.4.0",
-    "nanohtml": "^1.5.0",
+    "nanohtml": "^1.6.0",
     "nanotiming": "^7.3.1",
     "npm-run-all": "^4.1.5",
     "nyc": "^14.0.0",
@@ -106,7 +105,7 @@
     "postcss-preset-env": "^6.6.0",
     "prettier": "^1.17.0",
     "proxyquire": "^2.1.0",
-    "puppeteer": "1.11.0",
+    "puppeteer": "^1.15.0",
     "raven-js": "^3.27.0",
     "raw-loader": "^2.0.0",
     "redis-mock": "^0.43.0",
@@ -129,18 +128,19 @@
     "wdio-selenium-standalone-service": "0.0.12",
     "wdio-spec-reporter": "^0.1.5",
     "webdriverio": "^4.14.4",
-    "webpack": "4.28.4",
+    "webpack": "^4.30.0",
-    "webpack-cli": "^3.3.0",
+    "webpack-cli": "^3.3.1",
     "webpack-dev-middleware": "^3.6.2",
+    "webpack-dev-server": "^3.3.1",
     "webpack-manifest-plugin": "^2.0.4",
     "webpack-unassert-loader": "^1.2.0"
   },
   "dependencies": {
     "@google-cloud/storage": "^2.5.0",
-    "aws-sdk": "^2.438.0",
+    "aws-sdk": "^2.443.0",
-    "body-parser": "^1.18.3",
+    "body-parser": "^1.19.0",
     "choo": "^6.13.3",
-    "cldr-core": "^35.0.0",
+    "cldr-core": "^35.1.0",
     "convict": "^4.4.1",
     "express": "^4.16.3",
     "express-ws": "github:dannycoates/express-ws",
@@ -150,12 +150,12 @@
     "helmet": "^3.16.0",
     "mkdirp": "^0.5.1",
     "mozlog": "^2.2.0",
-    "node-fetch": "^2.3.0",
+    "node-fetch": "^2.4.0",
     "raven": "^2.6.4",
     "redis": "^2.8.0",
     "selenium-standalone": "^6.15.6",
     "ua-parser-js": "^0.7.19",
-    "websocket-stream": "^5.4.0"
+    "websocket-stream": "^5.5.0"
   },
   "availableLanguages": [
     "en-US",

public/locales/en-US/send.ftl

@@ -137,3 +137,4 @@ noStreamsWarning = This browser might not be able to decrypt a file this big.
 noStreamsOptionCopy = Copy the link to open in another browser
 noStreamsOptionFirefox = Try our favorite browser
 noStreamsOptionDownload = Continue with this browser
+downloadFirefoxPromo = { -send-short-brand } is brought to you by the all-new { -firefox }.