mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-dev

Browse source
This commit is contained in:
Travis Ralston 2020-01-09 13:43:25 -07:00
commit 9bf1c65971
8 changed files with 57 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -32,10 +32,14 @@
"i18n": "matrix-gen-i18n",
"prunei18n": "matrix-prune-i18n",
"diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
<<<<<<< HEAD
"reskindex": "reskindex -h src/header",
"reskindex:watch": "reskindex -h src/header -w",
"clean": "rimraf lib webapp electron_app/dist",
"build": "yarn clean && yarn build:res && yarn build:compile && yarn build:types && yarn build:bundle",
=======
"postinstall": "node scripts/yarn-sub.js matrix-js-sdk install && node scripts/yarn-sub.js matrix-react-sdk install",
>>>>>>> develop
"build:res": "node scripts/copy-res.js",
"build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
"build:compile": "yarn reskindex && babel -d lib --verbose --extensions \".ts,.js\" src",
@ -158,7 +162,7 @@
},
"build": {
"appId": "im.riot.app",
"electronVersion": "7.1.3",
"electronVersion": "7.1.7",
"files": [
"node_modules/**",
"src/**"