mirror of
https://github.com/element-hq/element-web
synced 2024-11-25 10:45:51 +03:00
Merge branch 'develop' into rav/cache_busting
This commit is contained in:
commit
c19538d6ce
2 changed files with 14 additions and 4 deletions
|
@ -1,3 +0,0 @@
|
||||||
example
|
|
||||||
examples
|
|
||||||
build/.module-cache
|
|
15
package.json
15
package.json
|
@ -8,6 +8,19 @@
|
||||||
"url": "https://github.com/vector-im/vector-web"
|
"url": "https://github.com/vector-im/vector-web"
|
||||||
},
|
},
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
|
"files": [
|
||||||
|
"AUTHORS.rst",
|
||||||
|
"CONTRIBUTING.rst",
|
||||||
|
"deploy",
|
||||||
|
"docs",
|
||||||
|
"karma.conf.js",
|
||||||
|
"lib",
|
||||||
|
"release.sh",
|
||||||
|
"scripts",
|
||||||
|
"src",
|
||||||
|
"test",
|
||||||
|
"webpack.config.js"
|
||||||
|
],
|
||||||
"style": "bundle.css",
|
"style": "bundle.css",
|
||||||
"matrix-react-parent": "matrix-react-sdk",
|
"matrix-react-parent": "matrix-react-sdk",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
@ -29,7 +42,7 @@
|
||||||
"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": "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\"",
|
"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 vector/index.html",
|
"clean": "rimraf build lib vector/olm.* vector/bundle.* vector/emojione vector/index.html",
|
||||||
"prepublish": "npm run build:css && npm run build:compile",
|
"prepublish": "npm run build:compile",
|
||||||
"test": "karma start --single-run=true --autoWatch=false --browsers PhantomJS --colors=false",
|
"test": "karma start --single-run=true --autoWatch=false --browsers PhantomJS --colors=false",
|
||||||
"test:multi": "karma start"
|
"test:multi": "karma start"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue