chore(scripts/publish): get dist-tag from package.json

petebacondarwin · petebacondarwin · commit 40e9bcd1b4c9 · 2015-09-14T21:45:20.000+01:00
Closes angular#12722
diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "angularjs",
   "branchVersion": "1.3.*",
+  "distTag": "previous_1_3",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular.js.git"
diff --git a/scripts/bower/publish.sh b/scripts/bower/publish.sh
@@ -110,19 +110,10 @@ function publish {
 
     # don't publish every build to npm
     if [ "${NEW_VERSION/+sha}" = "$NEW_VERSION" ] ; then
-      if [ "${NEW_VERSION/-}" = "$NEW_VERSION" ] ; then
-        if [[ $NEW_VERSION =~ ^1\.2\.[0-9]+$ ]] ; then
-          # publish 1.2.x releases with the appropriate tag
-          # this ensures that `npm install` by default will not grab `1.2.x` releases
-          npm publish --tag=old
-        else
-          # publish releases as "latest"
-          npm publish
-        fi
-      else
-        # publish prerelease builds with the beta tag
-        npm publish --tag=beta
-      fi
+      # get the npm dist-tag from a custom property (distTag) in package.json
+      DIST_TAG=$(readJsonProp "package.json" "distTag")
+      echo "-- Publishing to npm as $DIST_TAG"
+      npm publish --tag=$DIST_TAG
     fi
 
     cd $SCRIPT_DIR

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angularjs",`
`3`	`3`	`"branchVersion": "1.3.*",`
	`4`	`+ "distTag": "previous_1_3",`
`4`	`5`	`"repository": {`
`5`	`6`	`"type": "git",`
`6`	`7`	`"url": "https://github.com/angular/angular.js.git"`