7 years ago · 6393d70a33
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ node_modules
 
				 public/upload.js
			
 
				 public/download.js
			
 
				 public/version.json
			
 
				+public/l20n.min.js
			
 
				 static/*
			
 
				 !static/info.txt
			
 
				 test/frontend/bundle.js
			
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -9,18 +9,12 @@
 
				     "bytes": "^2.5.0",
			
 
				     "connect-busboy": "0.0.2",
			
 
				     "convict": "^3.0.0",
			
 
				-    "cross-env": "^5.0.1",
			
 
				     "express": "^4.15.3",
			
 
				     "express-handlebars": "^3.0.0",
			
 
				     "helmet": "^3.8.0",
			
 
				-    "jquery": "^3.2.1",
			
 
				-    "jquery-circle-progress": "^1.2.2",
			
 
				-    "l20n": "^5.0.0",
			
 
				     "mozlog": "^2.1.1",
			
 
				     "raven": "^2.1.0",
			
 
				-    "raven-js": "^3.17.0",
			
 
				-    "redis": "^2.7.1",
			
 
				-    "testpilot-ga": "^0.3.0"
			
 
				+    "redis": "^2.7.1"
			
 
				   },
			
 
				   "devDependencies": {
			
 
				     "browserify": "^14.4.0",
			
@@ -29,15 +23,20 @@
 
				     "eslint-plugin-node": "^5.1.1",
			
 
				     "eslint-plugin-security": "^1.4.0",
			
 
				     "git-rev-sync": "^1.9.1",
			
 
				+    "jquery": "^3.2.1",
			
 
				+    "jquery-circle-progress": "^1.2.2",
			
 
				+    "l20n": "^5.0.0",
			
 
				     "mocha": "^3.4.2",
			
 
				     "npm-run-all": "^4.0.2",
			
 
				     "prettier": "^1.5.3",
			
 
				     "proxyquire": "^1.8.0",
			
 
				+    "raven-js": "^3.17.0",
			
 
				     "selenium-webdriver": "^3.4.0",
			
 
				     "sinon": "^2.3.8",
			
 
				     "stylelint": "^7.13.0",
			
 
				     "stylelint-config-standard": "^16.0.0",
			
 
				     "supertest": "^3.0.0",
			
 
				+    "testpilot-ga": "^0.3.0",
			
 
				     "uglifyify": "^4.0.3"
			
 
				   },
			
 
				   "engines": {
			
@@ -51,6 +50,7 @@
 
				     "build:upload": "browserify frontend/src/upload.js -g uglifyify -o public/upload.js",
			
 
				     "build:download": "browserify frontend/src/download.js -g uglifyify -o public/download.js",
			
 
				     "build:version": "node scripts/version",
			
 
				+    "build:l10n": "cp node_modules/l20n/dist/web/l20n.min.js public",
			
 
				     "dev": "npm run build && npm start",
			
 
				     "format": "prettier '{frontend/src/,scripts/,server/,test/}*.js' 'public/*.css' --single-quote --write",
			
 
				     "lint": "npm-run-all lint:*",
			
--- a/server/server.js
+++ b/server/server.js
@@ -19,8 +19,6 @@ const mozlog = require('./log.js');
 
				 const log = mozlog('send.server');
			
 
				 
			
 
				 const STATIC_PATH = path.join(__dirname, '../public');
			
 
				-const L20N = path.join(__dirname, '../node_modules/l20n');
			
 
				-const LOCALES = path.join(__dirname, '../public/locales');
			
 
				 
			
 
				 const app = express();
			
 
				 
			
@@ -73,8 +71,6 @@ app.use(
 
				 );
			
 
				 app.use(bodyParser.json());
			
 
				 app.use(express.static(STATIC_PATH));
			
 
				-app.use('/l20n', express.static(L20N));
			
 
				-app.use('/locales', express.static(LOCALES));
			
 
				 
			
 
				 app.get('/', (req, res) => {
			
 
				   res.render('index');
			
--- a/views/layouts/main.handlebars
+++ b/views/layouts/main.handlebars
@@ -9,7 +9,7 @@
 
				   <meta name="defaultLanguage" content="en-US">
			
 
				   <meta name="availableLanguages" content="en-US">
			
 
				   <link rel="localization" href="/locales/send.{locale}.ftl">
			
 
				-  <script defer src="/l20n/dist/web/l20n.js"></script>
			
 
				+  <script defer src="/l20n.min.js"></script>
			
 
				 </head>
			
 
				 <body>
			
 
				   <div class="send-logo">