From 6396c606457d2c03837806660ac597ee6ade94c6 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 25 Oct 2016 17:07:43 +0100 Subject: [PATCH 1/2] Put a cachebuster in the names of CSS and JS files This means that clients can do better caching of assets, as it will mean we are no longer reliant on etags to ensure that clients get a fresh version. We inhibit the cachebuster for `npm start`, so that we don't get millions of copies of the bundles on dev boxes. --- .gitignore | 1 + package.json | 7 ++++--- {vector => src/vector}/index.html | 10 ++++++---- webpack.config.js | 24 +++++++++++++++++++++--- 4 files changed, 32 insertions(+), 10 deletions(-) rename {vector => src/vector}/index.html (92%) diff --git a/.gitignore b/.gitignore index 2abed01fe1..766f41c003 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /vector/bundle.* /vector/emojione/ /vector/config.json +/vector/index.html /vector/olm.* .DS_Store npm-debug.log diff --git a/package.json b/package.json index 95eff53184..bcc1ea4db1 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,13 @@ "build:dev": "npm run build:emojione && npm run build:css && npm run build:bundle:dev", "package": "scripts/package.sh", "start:emojione": "cpx \"node_modules/emojione/assets/svg/*\" vector/emojione/svg/ -w", - "start:js": "webpack -w --progress", - "start:js:prod": "NODE_ENV=production webpack -w --progress", + "start:js": "webpack -w --progress --no-cache-buster", + "start:js:prod": "NODE_ENV=production webpack -w --progress --no-cache-buster", "start:skins:css": "mkdirp build && catw \"src/skins/vector/css/**/*.css\" -o build/components.css", "//cache": "Note the -c 1 below due to https://code.google.com/p/chromium/issues/detail?id=508270", "start": "node scripts/babelcheck.js && parallelshell \"npm run start:emojione\" \"npm run start:js\" \"npm run start:skins:css\" \"http-server -c 1 vector\"", "start:prod": "parallelshell \"npm run start:emojione\" \"npm run start:js:prod\" \"npm run start:skins:css\" \"http-server -c 1 vector\"", - "clean": "rimraf build lib vector/olm.* vector/bundle.* vector/emojione", + "clean": "rimraf build lib vector/olm.* vector/bundle.* vector/emojione vector/index.html", "prepublish": "npm run build:css && npm run build:compile", "test": "karma start --single-run=true --autoWatch=false --browsers PhantomJS --colors=false", "test:multi": "karma start" @@ -80,6 +80,7 @@ "emojione": "^2.2.3", "expect": "^1.16.0", "fs-extra": "^0.30.0", + "html-webpack-plugin": "^2.24.0", "http-server": "^0.8.4", "json-loader": "^0.5.3", "karma": "^0.13.22", diff --git a/vector/index.html b/src/vector/index.html similarity index 92% rename from vector/index.html rename to src/vector/index.html index 8a536d61f0..73cdd2dfc8 100644 --- a/vector/index.html +++ b/src/vector/index.html @@ -20,14 +20,16 @@ + <% for(var i=0; i + + <% } %>
- - - - + <% for(var i=0; i + + <% } %>