summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-10-07 09:26:16 -0700
committerCorey Hulen <corey@hulen.com>2015-10-07 09:26:16 -0700
commit5ac1a58063b9302f2ed88af2bbed0be850aa1666 (patch)
treea7c1aec2178e33663c48d742afa3ad90a62d16d2 /web/react
parent6a9acafe8a4dca2485a836e890ca0a7f2e8c3837 (diff)
parent3bcd304a3a57b4de732d664ba5f6ea0f8d00a440 (diff)
downloadchat-5ac1a58063b9302f2ed88af2bbed0be850aa1666.tar.gz
chat-5ac1a58063b9302f2ed88af2bbed0be850aa1666.tar.bz2
chat-5ac1a58063b9302f2ed88af2bbed0be850aa1666.zip
Merge pull request #959 from mattermost/build-fix
Moving external libraries to the install step and into a seperate bundle.
Diffstat (limited to 'web/react')
-rw-r--r--web/react/package.json21
1 files changed, 8 insertions, 13 deletions
diff --git a/web/react/package.json b/web/react/package.json
index a097b6aa8..e6a662375 100644
--- a/web/react/package.json
+++ b/web/react/package.json
@@ -5,7 +5,6 @@
"dependencies": {
"autolinker": "0.18.1",
"babel-runtime": "5.8.24",
- "bootstrap-colorpicker": "2.2.0",
"flux": "2.1.1",
"keymirror": "0.1.1",
"marked": "0.3.5",
@@ -13,18 +12,18 @@
"twemoji": "1.4.1"
},
"devDependencies": {
- "browserify": "11.0.1",
- "envify": "3.4.0",
- "babelify": "6.1.3",
+ "browserify": "11.2.0",
+ "babelify": "6.3.0",
"uglify-js": "2.4.24",
- "watchify": "3.3.1",
+ "watchify": "3.4.0",
"eslint": "1.6.0",
"eslint-plugin-react": "3.5.1"
},
"scripts": {
- "start": "watchify --extension=jsx -o ../static/js/bundle.js -v -d ./**/*.jsx",
- "build": "NODE_ENV=production browserify ./**/*.jsx | uglifyjs -c -m --screw-ie8 > ../static/js/bundle.min.js",
- "test": "jest"
+ "check": "",
+ "build-libs": "browserify -r crypto -r autolinker -r flux -r keymirror -r marked -r object-assign -r twemoji | uglifyjs -c -m --screw-ie8 > ../static/js/libs.min.js",
+ "start": "watchify --fast -x crypto -x node -x autolinker -x flux -x keymirror -x marked -x object-assign -x twemoji -o ../static/js/bundle.js -v -d ./**/*.jsx",
+ "build": "browserify -x crypto -x autolinker -x flux -x keymirror -x marked -x object-assign -x twemoji ./**/*.jsx | uglifyjs -c -m --screw-ie8 > ../static/js/bundle.min.js"
},
"browserify": {
"transform": [
@@ -35,11 +34,7 @@
"runtime"
]
}
- ],
- "envify"
+ ]
]
- },
- "jest": {
- "rootDir": "."
}
}