Skip to content

Commit 5b7f629

Browse files
dbkrdbkr
committed
Build to the 'webapp' directory instead
People may have config files in vector/ so it would be nonideal if we started overwriting them / blowing them away.
1 parent a4c16b8 commit 5b7f629

4 files changed

Lines changed: 15 additions & 14 deletions

File tree

‎electron/src/electron-main.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ electron.app.on('ready', () => {
160160
icon: `${__dirname}/../img/riot.ico`,
161161
width: 1024, height: 768,
162162
});
163-
mainWindow.loadURL(`file://${__dirname}/../../vector/index.html`);
163+
mainWindow.loadURL(`file://${__dirname}/../../webapp/index.html`);
164164
electron.Menu.setApplicationMenu(VectorMenu);
165165

166166
mainWindow.on('closed', () => {

‎package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"matrix-react-parent": "matrix-react-sdk",
2828
"scripts": {
2929
"reskindex": "reskindex -h src/header",
30-
"build:res": "cpx \"{src/skins/vector/fonts,src/skins/vector/img}/**\" vector/ && cpx \"{res/media,res/vector-icons}/**\" vector/",
31-
"build:config": "cpx config.json vector/",
32-
"build:emojione": "cpx \"node_modules/emojione/assets/svg/*\" vector/emojione/svg/",
30+
"build:res": "cpx \"{src/skins/vector/fonts,src/skins/vector/img}/**\" webapp/ && cpx \"{res/media,res/vector-icons}/**\" webapp/",
31+
"build:config": "cpx config.json webapp/",
32+
"build:emojione": "cpx \"node_modules/emojione/assets/svg/*\" webapp/emojione/svg/",
3333
"build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
3434
"build:css": "mkdirp build && catw \"src/skins/vector/css/**/*.css\" -o build/components.css --no-watch",
3535
"build:compile": "babel --source-maps -d lib src",
@@ -39,15 +39,15 @@
3939
"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",
4040
"build:dev": "npm run build:emojione && npm run build:css && npm run build:bundle:dev",
4141
"dist": "scripts/package.sh",
42-
"start:res": "parallelshell \"cpx -w \\\"{src/skins/vector/fonts,src/skins/vector/img}/**\\\" vector/\" \"cpx -w \\\"{res/media,res/vector-icons}/**\\\" vector/\"",
43-
"start:config": "cpx -w config.json vector/",
44-
"start:emojione": "cpx \"node_modules/emojione/assets/svg/*\" vector/emojione/svg/ -w",
42+
"start:res": "parallelshell \"cpx -w \\\"{src/skins/vector/fonts,src/skins/vector/img}/**\\\" webapp/\" \"cpx -w \\\"{res/media,res/vector-icons}/**\\\" webapp/\"",
43+
"start:config": "cpx -w config.json webapp/",
44+
"start:emojione": "cpx \"node_modules/emojione/assets/svg/*\" webapp/emojione/svg/ -w",
4545
"start:js": "webpack-dev-server -w --progress",
4646
"start:js:prod": "NODE_ENV=production webpack-dev-server -w --progress",
4747
"start:skins:css": "mkdirp build && catw \"src/skins/vector/css/**/*.css\" -o build/components.css",
4848
"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\"",
4949
"start:prod": "parallelshell \"npm run start:emojione\" \"npm run start:js:prod\" \"npm run start:skins:css\"",
50-
"clean": "rimraf build lib vector",
50+
"clean": "rimraf build lib webapp",
5151
"prepublish": "npm run build:compile",
5252
"test": "karma start --single-run=true --autoWatch=false --browsers PhantomJS --colors=false",
5353
"test:multi": "karma start"
@@ -132,12 +132,12 @@
132132
"//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
133133
"asar": false,
134134
"dereference": true,
135-
"//files": "We bundle everything, so we only need to include vector/",
135+
"//files": "We bundle everything, so we only need to include webapp/",
136136
"files": [
137137
"!**/*",
138138
"electron/src/**",
139139
"electron/img/**",
140-
"vector/**",
140+
"webapp/**",
141141
"package.json"
142142
],
143143
"squirrelWindows": {

‎scripts/package.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ else
88
version=`git describe --dirty --tags || echo unknown`
99
fi
1010

11+
npm run clean
1112
npm run build
1213
mkdir -p dist
13-
cp -r vector vector-$version
14+
cp -r webapp vector-$version
1415
echo $version > vector-$version/version
1516
tar chvzf dist/vector-$version.tar.gz vector-$version
1617
rm -r vector-$version

‎webpack.config.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ module.exports = {
3939
],
4040
},
4141
output: {
42-
path: path.join(__dirname, "vector"),
42+
path: path.join(__dirname, "webapp"),
4343
filename: "[name].[chunkhash].js",
4444
devtoolModuleFilenameTemplate: function(info) {
4545
// Reading input source maps gives only relative paths here for
@@ -98,8 +98,8 @@ module.exports = {
9898

9999
// configuration for the webpack-dev-server
100100
devServer: {
101-
// serve unwebpacked assets from vector.
102-
contentBase: './vector',
101+
// serve unwebpacked assets from webapp.
102+
contentBase: './webapp',
103103
},
104104
};
105105

0 commit comments

Comments
 (0)