Merge pull request #56 from valor-software/develop

sync master with development
valor-software · Mar 4, 2017 · baed746 · baed746
2 parents 33b56e5 + fadd8de
commit baed746
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -46,12 +46,11 @@
     "test": "npm run flow.clean && karma start karma.conf.js",
     "e2e": "protractor protractor.conf.js",
     "test:cover": "COVERAGE=enabled npm run test",
-    "postinstall": "webdriver-manager update",
     "changelog": "conventional-changelog -i CHANGELOG.md -s -p angular",
     "github-release": "conventional-github-releaser -p angular",
     "preversion": "npm run flow.lint && npm test && npm run e2e",
     "version": "npm run changelog && git add CHANGELOG.md",
-    "postversion": "PUBLISH_ON_NPM=true git push origin master && git push --tags && npm run github-release && node publish.js"
+    "postversion": "git push origin master && git push --tags && npm run github-release && node publish.js"
   },
   "devDependencies": {
     "@angular/common": "2.4.5",

diff --git a/publish.js b/publish.js
@@ -8,7 +8,6 @@ const pkg = require('./package.json');
 shell.exec('npm run pre:publish');
 fs.writeFileSync('dist/package.json', JSON.stringify(_.omit(pkg, ['private']), null, 2), {encoding: 'utf-8'});
 
-if (process.env.PUBLISH_ON_NPM) {
-  shell.exec('npm publish dist');
-  shell.exec('npm run post:publish');
-}
+shell.exec('npm publish dist');
+shell.exec('npm run post:publish');
+