follow-up commit

Author: SamVerschueren

gulpfile.js

@@ -1,7 +1,6 @@
 'use strict';
 const path = require('path');
 const gulp = require('gulp');
-const merge = require('merge2');
 const Builder = require('systemjs-builder');
 
 const ANGULAR2_POLYFILL_BUNDLE_CONFIG = [
@@ -16,7 +15,7 @@ const NG2_POLYFILL_BUNDLE_CONTENT = ANGULAR2_POLYFILL_BUNDLE_CONFIG.join(' + ');
 const bundleConfig = {
 	paths: {
 		'dot-prop': path.join(__dirname, '/node_modules/dot-prop/index.js'),
-        'camelcase': path.join(__dirname, '/node_modules/camelcase/index.js'),
+		'camelcase': path.join(__dirname, '/node_modules/camelcase/index.js'),
 		'is-obj': path.join(__dirname, '/node_modules/is-obj/index.js'),
 		'*': '*.js'
 	}

package.json

@@ -12,11 +12,11 @@
   },
   "scripts": {
     "postinstall": "npm run typings install",
-    "prepublish": "npm run compile && gulp bundle && npm run tsd-gen",
+    "prepublish": "npm run compile && npm run tsd-gen && gulp bundle",
     "compile": "tsc -p ./angular2-polyfill",
     "watch": "tsc -watch -p ./angular2-polyfill",
     "typings": "cd angular2-polyfill && typings",
-    "link": "../node_modules/.bin/jspm link npm:angular2-polyfill@dev -y",
+    "link": "jspm link npm:angular2-polyfill@dev -y",
     "tsd-gen": "tsc -p angular2-polyfill --outFile angular2-polyfill/bundles/angular2-polyfill.js --module system -d --moduleResolution classic --rootDir \"./\""
   },
   "dependencies": {
@@ -25,7 +25,6 @@
   },
   "devDependencies": {
     "gulp": "^3.9.1",
-    "merge2": "^1.0.1",
     "systemjs-builder": "^0.15.12",
     "typescript": "^1.8.7",
     "typings": "^0.7.9"