diff --git a/.gitignore b/.gitignore index d3ad95583f..8ff6a67965 100644 --- a/.gitignore +++ b/.gitignore @@ -6,11 +6,7 @@ /lib /node_modules /packages/ -/vector/bundle.* -/vector/emojione/ -/vector/config.json -/vector/index.html -/vector/olm.* +/vector .DS_Store npm-debug.log electron/dist diff --git a/vector/config.sample.json b/config.sample.json similarity index 100% rename from vector/config.sample.json rename to config.sample.json diff --git a/package.json b/package.json index f31f024aef..c9f54dc75d 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,8 @@ "matrix-react-parent": "matrix-react-sdk", "scripts": { "reskindex": "reskindex -h src/header", + "build:res": "cpx \"{src/skins/vector/fonts,src/skins/vector/img}/**\" vector/ && cpx \"{res/media,res/vector-icons}/**\" vector/", + "build:config": "cpx config.json vector/", "build:emojione": "cpx \"node_modules/emojione/assets/svg/*\" vector/emojione/svg/", "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js", "build:css": "mkdirp build && catw \"src/skins/vector/css/**/*.css\" -o build/components.css --no-watch", @@ -34,16 +36,18 @@ "build:bundle": "NODE_ENV=production webpack -p --progress", "build:bundle:dev": "webpack --optimize-occurence-order --progress", "build:electron": "build -lwm", - "build": "node scripts/babelcheck.js && npm run build:emojione && npm run build:css && npm run build:bundle", + "build": "node scripts/babelcheck.js && npm run build:res && npm run build:config && 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", "dist": "scripts/package.sh", + "start:res": "parallelshell \"cpx -w \\\"{src/skins/vector/fonts,src/skins/vector/img}/**\\\" vector/\" \"cpx \\\"{res/media,res/vector-icons}/**\\\" vector/\"", + "start:config": "cpx -w config.json vector/", "start:emojione": "cpx \"node_modules/emojione/assets/svg/*\" vector/emojione/svg/ -w", "start:js": "webpack-dev-server -w --progress", "start:js:prod": "NODE_ENV=production webpack-dev-server -w --progress", "start:skins:css": "mkdirp build && catw \"src/skins/vector/css/**/*.css\" -o build/components.css", - "start": "node scripts/babelcheck.js && parallelshell \"npm run start:emojione\" \"npm run start:js\" \"npm run start:skins:css\"", + "start": "node scripts/babelcheck.js && parallelshell \"npm run start:emojione\" \"npm run start:res\" \"npm run start:config\" \"npm run start:js\" \"npm run start:skins:css\"", "start:prod": "parallelshell \"npm run start:emojione\" \"npm run start:js:prod\" \"npm run start:skins:css\"", - "clean": "rimraf build lib vector/olm.* vector/bundle.* vector/emojione vector/index.html", + "clean": "rimraf build lib vector", "prepublish": "npm run build:compile", "test": "karma start --single-run=true --autoWatch=false --browsers PhantomJS --colors=false", "test:multi": "karma start" diff --git a/vector/media/busy.mp3 b/res/media/busy.mp3 similarity index 100% rename from vector/media/busy.mp3 rename to res/media/busy.mp3 diff --git a/vector/media/busy.ogg b/res/media/busy.ogg similarity index 100% rename from vector/media/busy.ogg rename to res/media/busy.ogg diff --git a/vector/media/callend.mp3 b/res/media/callend.mp3 similarity index 100% rename from vector/media/callend.mp3 rename to res/media/callend.mp3 diff --git a/vector/media/callend.ogg b/res/media/callend.ogg similarity index 100% rename from vector/media/callend.ogg rename to res/media/callend.ogg diff --git a/vector/media/message.mp3 b/res/media/message.mp3 similarity index 100% rename from vector/media/message.mp3 rename to res/media/message.mp3 diff --git a/vector/media/message.ogg b/res/media/message.ogg similarity index 100% rename from vector/media/message.ogg rename to res/media/message.ogg diff --git a/vector/media/ring.mp3 b/res/media/ring.mp3 similarity index 100% rename from vector/media/ring.mp3 rename to res/media/ring.mp3 diff --git a/vector/media/ring.ogg b/res/media/ring.ogg similarity index 100% rename from vector/media/ring.ogg rename to res/media/ring.ogg diff --git a/vector/media/ringback.mp3 b/res/media/ringback.mp3 similarity index 100% rename from vector/media/ringback.mp3 rename to res/media/ringback.mp3 diff --git a/vector/media/ringback.ogg b/res/media/ringback.ogg similarity index 100% rename from vector/media/ringback.ogg rename to res/media/ringback.ogg diff --git a/vector/vector-icons/android-chrome-144x144.png b/res/vector-icons/android-chrome-144x144.png similarity index 100% rename from vector/vector-icons/android-chrome-144x144.png rename to res/vector-icons/android-chrome-144x144.png diff --git a/vector/vector-icons/android-chrome-192x192.png b/res/vector-icons/android-chrome-192x192.png similarity index 100% rename from vector/vector-icons/android-chrome-192x192.png rename to res/vector-icons/android-chrome-192x192.png diff --git a/vector/vector-icons/android-chrome-36x36.png b/res/vector-icons/android-chrome-36x36.png similarity index 100% rename from vector/vector-icons/android-chrome-36x36.png rename to res/vector-icons/android-chrome-36x36.png diff --git a/vector/vector-icons/android-chrome-48x48.png b/res/vector-icons/android-chrome-48x48.png similarity index 100% rename from vector/vector-icons/android-chrome-48x48.png rename to res/vector-icons/android-chrome-48x48.png diff --git a/vector/vector-icons/android-chrome-72x72.png b/res/vector-icons/android-chrome-72x72.png similarity index 100% rename from vector/vector-icons/android-chrome-72x72.png rename to res/vector-icons/android-chrome-72x72.png diff --git a/vector/vector-icons/android-chrome-96x96.png b/res/vector-icons/android-chrome-96x96.png similarity index 100% rename from vector/vector-icons/android-chrome-96x96.png rename to res/vector-icons/android-chrome-96x96.png diff --git a/vector/vector-icons/apple-touch-icon-114x114.png b/res/vector-icons/apple-touch-icon-114x114.png similarity index 100% rename from vector/vector-icons/apple-touch-icon-114x114.png rename to res/vector-icons/apple-touch-icon-114x114.png diff --git a/vector/vector-icons/apple-touch-icon-120x120.png b/res/vector-icons/apple-touch-icon-120x120.png similarity index 100% rename from vector/vector-icons/apple-touch-icon-120x120.png rename to res/vector-icons/apple-touch-icon-120x120.png diff --git a/vector/vector-icons/apple-touch-icon-144x144.png b/res/vector-icons/apple-touch-icon-144x144.png similarity index 100% rename from vector/vector-icons/apple-touch-icon-144x144.png rename to res/vector-icons/apple-touch-icon-144x144.png diff --git a/vector/vector-icons/apple-touch-icon-152x152.png b/res/vector-icons/apple-touch-icon-152x152.png similarity index 100% rename from vector/vector-icons/apple-touch-icon-152x152.png rename to res/vector-icons/apple-touch-icon-152x152.png diff --git a/vector/vector-icons/apple-touch-icon-180x180.png b/res/vector-icons/apple-touch-icon-180x180.png similarity index 100% rename from vector/vector-icons/apple-touch-icon-180x180.png rename to res/vector-icons/apple-touch-icon-180x180.png diff --git a/vector/vector-icons/apple-touch-icon-57x57.png b/res/vector-icons/apple-touch-icon-57x57.png similarity index 100% rename from vector/vector-icons/apple-touch-icon-57x57.png rename to res/vector-icons/apple-touch-icon-57x57.png diff --git a/vector/vector-icons/apple-touch-icon-60x60.png b/res/vector-icons/apple-touch-icon-60x60.png similarity index 100% rename from vector/vector-icons/apple-touch-icon-60x60.png rename to res/vector-icons/apple-touch-icon-60x60.png diff --git a/vector/vector-icons/apple-touch-icon-72x72.png b/res/vector-icons/apple-touch-icon-72x72.png similarity index 100% rename from vector/vector-icons/apple-touch-icon-72x72.png rename to res/vector-icons/apple-touch-icon-72x72.png diff --git a/vector/vector-icons/apple-touch-icon-76x76.png b/res/vector-icons/apple-touch-icon-76x76.png similarity index 100% rename from vector/vector-icons/apple-touch-icon-76x76.png rename to res/vector-icons/apple-touch-icon-76x76.png diff --git a/vector/vector-icons/apple-touch-icon-precomposed.png b/res/vector-icons/apple-touch-icon-precomposed.png similarity index 100% rename from vector/vector-icons/apple-touch-icon-precomposed.png rename to res/vector-icons/apple-touch-icon-precomposed.png diff --git a/vector/vector-icons/apple-touch-icon.png b/res/vector-icons/apple-touch-icon.png similarity index 100% rename from vector/vector-icons/apple-touch-icon.png rename to res/vector-icons/apple-touch-icon.png diff --git a/vector/vector-icons/browserconfig.xml b/res/vector-icons/browserconfig.xml similarity index 100% rename from vector/vector-icons/browserconfig.xml rename to res/vector-icons/browserconfig.xml diff --git a/vector/vector-icons/favicon-16x16.png b/res/vector-icons/favicon-16x16.png similarity index 100% rename from vector/vector-icons/favicon-16x16.png rename to res/vector-icons/favicon-16x16.png diff --git a/vector/vector-icons/favicon-32x32.png b/res/vector-icons/favicon-32x32.png similarity index 100% rename from vector/vector-icons/favicon-32x32.png rename to res/vector-icons/favicon-32x32.png diff --git a/vector/vector-icons/favicon-96x96.png b/res/vector-icons/favicon-96x96.png similarity index 100% rename from vector/vector-icons/favicon-96x96.png rename to res/vector-icons/favicon-96x96.png diff --git a/vector/vector-icons/favicon.ico b/res/vector-icons/favicon.ico similarity index 100% rename from vector/vector-icons/favicon.ico rename to res/vector-icons/favicon.ico diff --git a/vector/vector-icons/manifest.json b/res/vector-icons/manifest.json similarity index 100% rename from vector/vector-icons/manifest.json rename to res/vector-icons/manifest.json diff --git a/vector/vector-icons/mstile-144x144.png b/res/vector-icons/mstile-144x144.png similarity index 100% rename from vector/vector-icons/mstile-144x144.png rename to res/vector-icons/mstile-144x144.png diff --git a/vector/vector-icons/mstile-150x150.png b/res/vector-icons/mstile-150x150.png similarity index 100% rename from vector/vector-icons/mstile-150x150.png rename to res/vector-icons/mstile-150x150.png diff --git a/vector/vector-icons/mstile-310x150.png b/res/vector-icons/mstile-310x150.png similarity index 100% rename from vector/vector-icons/mstile-310x150.png rename to res/vector-icons/mstile-310x150.png diff --git a/vector/vector-icons/mstile-310x310.png b/res/vector-icons/mstile-310x310.png similarity index 100% rename from vector/vector-icons/mstile-310x310.png rename to res/vector-icons/mstile-310x310.png diff --git a/vector/vector-icons/mstile-70x70.png b/res/vector-icons/mstile-70x70.png similarity index 100% rename from vector/vector-icons/mstile-70x70.png rename to res/vector-icons/mstile-70x70.png diff --git a/vector/fonts b/vector/fonts deleted file mode 120000 index 1c206eff7c..0000000000 --- a/vector/fonts +++ /dev/null @@ -1 +0,0 @@ -../src/skins/vector/fonts \ No newline at end of file diff --git a/vector/img b/vector/img deleted file mode 120000 index 855fa9738f..0000000000 --- a/vector/img +++ /dev/null @@ -1 +0,0 @@ -../src/skins/vector/img/ \ No newline at end of file