From f17e851435c2116908ac4fba6342324fc7cf1335 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 1 Nov 2016 15:22:06 +0000
Subject: [PATCH 1/2] Rename the package script/output dir to 'dist'

To match conventions from other projects and match the release
script which expects releasde artefacts in dist/
---
 README.md          | 6 +++---
 package.json       | 2 +-
 scripts/package.sh | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 180bcff5..1d18fbe1 100644
--- a/README.md
+++ b/README.md
@@ -54,14 +54,14 @@ to build.
    && npm install)`
 1. Configure the app by copying `config.sample.json` to `config.json` and
    modifying it (see below for details)
-1. `npm run package` to build a tarball to deploy. Untaring this file will give
+1. `npm run dist` to build a tarball to deploy. Untaring this file will give
    a version-specific directory containing all the files that need to go on your
    web server.
 
-Note that `npm run package` is not supported on Windows, so Windows users can run `npm
+Note that `npm run dist` is not supported on Windows, so Windows users can run `npm
 run build`, which will build all the necessary files into the `vector`
 directory. The version of Vector will not appear in Settings without
-using the package script. You can then mount the vector directory on your
+using the dist script. You can then mount the vector directory on your
 webserver to actually serve up the app, which is entirely static content.
 
 config.json
diff --git a/package.json b/package.json
index 3fb45661..619e1c59 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "build:bundle:dev": "webpack --optimize-occurence-order --progress",
     "build": "node scripts/babelcheck.js && npm run build:emojione && npm run build:css && npm run build:bundle",
     "build:dev": "npm run build:emojione && npm run build:css && npm run build:bundle:dev",
-    "package": "scripts/package.sh",
+    "dist": "scripts/package.sh",
     "start:emojione": "cpx \"node_modules/emojione/assets/svg/*\" vector/emojione/svg/ -w",
     "start:js": "webpack -w --progress --no-cache-buster",
     "start:js:prod": "NODE_ENV=production webpack -w --progress --no-cache-buster",
diff --git a/scripts/package.sh b/scripts/package.sh
index 73a1c511..7cfb3974 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -5,11 +5,11 @@ set -e
 version=`git describe --dirty --tags || echo unknown`
 
 npm run build
-mkdir -p packages
+mkdir -p dist
 cp -r vector vector-$version
 echo $version > vector-$version/version
-tar chvzf packages/vector-$version.tar.gz vector-$version
+tar chvzf dist/vector-$version.tar.gz vector-$version
 rm -r vector-$version
 
 echo
-echo "Packaged packages/vector-$version.tar.gz"
+echo "Packaged dist/vector-$version.tar.gz"

From 622ab27254e654dd8da1d4cf4d0dcae7e992f867 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 1 Nov 2016 15:35:41 +0000
Subject: [PATCH 2/2] gitignore dist

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 766f41c0..7811cc43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /build
 /cert.pem
+/dist
 /karma-reports
 /key.pem
 /lib