Skip to content

Commit

Permalink
Merge branch 'master' into flow
Browse files Browse the repository at this point in the history
  • Loading branch information
helfer authored Jun 1, 2017
2 parents d9b6392 + 113a991 commit 80a6eb9
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"compile:coverage": "tsc -p tsconfig.coverage.json",
"compile:test": "tsc -p tsconfig.test.json",
"compile:browser": "rm -rf ./dist && mkdir ./dist && browserify ./lib/apollo.umd.js -o=./dist/index.js && npm run minify:browser",
"minify:browser": "uglifyjs --compress --mangle --screw-ie8 -o=./dist/index.min.js -- ./dist/index.js",
"minify:browser": "uglifyjs -c -m -o ./dist/index.min.js -- ./dist/index.js",
"watch": "tsc -w",
"watch:test": "tsc -p tsconfig.test.json -w",
"bundle": "rollup -c",
Expand Down Expand Up @@ -93,7 +93,8 @@
"sinon": "^2.1.0",
"source-map-support": "^0.4.0",
"tslint": "^5.1.0",
"typescript": "2.3.3",
"typescript": "2.3.4",
"uglify-js": "^3.0.3",
"uglify-js": "^2.6.2",
"webpack": "^2.1.0-beta.28",
"webpack-bundle-analyzer": "^2.4.0"
Expand Down

0 comments on commit 80a6eb9

Please sign in to comment.