Update tfjs to 0.0.5, which depends on tfjs-core 0.0.2 (tensorflow#12)

dsmilkov · web-flow · commit e68a66a0734d · 2018-03-20T16:19:01.000-04:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tensorflow/tfjs",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "An open-source machine learning framework.",
   "private": false,
   "main": "dist/index",
@@ -24,7 +24,7 @@
     "build-npm": "./scripts/build-npm.sh"
   },
   "dependencies": {
-    "@tensorflow/tfjs-core": "0.0.1",
+    "@tensorflow/tfjs-core": "0.0.2",
     "@tensorflow/tfjs-layers": "0.0.5"
   }
 }
diff --git a/scripts/publish-npm.sh b/scripts/publish-npm.sh
@@ -17,13 +17,28 @@
 # Before you run this script, do this:
 # 1) Update the version in package.json
 # 2) Run ./scripts/make-version from the base dir of the project.
-# 3) Commit to the master branch.
+# 3) Run `yarn` to update `yarn.lock`, in case you updated dependencies
+# 4) Commit to the master branch.
 
 # Then:
-# 4) Run this script as `./scripts/publish-npm.sh` from the project base dir.
+# 5) Checkout the master branch of this repo.
+# 6) Run this script as `./scripts/publish-npm.sh` from the project base dir.
 
 set -e
 
+BRANCH=`git rev-parse --abbrev-ref HEAD`
+ORIGIN=`git config --get remote.origin.url`
+
+if [ "$BRANCH" != "master" ]; then
+  echo "Error: Switch to the master branch before publishing."
+  exit
+fi
+
+if [ "$ORIGIN" != "https://github.com/tensorflow/tfjs.git" ]; then
+  echo "Error: Switch to the main repo (tensorflow/tfjs) before publishing."
+  exit
+fi
+
 yarn build-npm
 ./scripts/make-version # This is for safety in case you forgot to do 2).
 npm publish
diff --git a/src/version.ts b/src/version.ts
@@ -1,5 +1,5 @@
 /** @license See the LICENSE file. */
 
 // This code is auto-generated, do not modify this file!
-const version = '0.0.4';
+const version = '0.0.5';
 export {version};
diff --git a/yarn.lock b/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@tensorflow/tfjs-core@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-0.0.1.tgz#087be00020ed2e581c9e35dea2ca8dd2be537707"
+"@tensorflow/tfjs-core@0.0.2":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-0.0.2.tgz#3275ec114db4cc89ca729ffad67a25849236aa61"
   dependencies:
     seedrandom "~2.4.3"
     utf8 "~2.1.2"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@tensorflow/tfjs",`
`3`		`- "version": "0.0.4",`
	`3`	`+ "version": "0.0.5",`
`4`	`4`	`"description": "An open-source machine learning framework.",`
`5`	`5`	`"private": false,`
`6`	`6`	`"main": "dist/index",`
`@@ -24,7 +24,7 @@`
`24`	`24`	`"build-npm": "./scripts/build-npm.sh"`
`25`	`25`	`},`
`26`	`26`	`"dependencies": {`
`27`		`- "@tensorflow/tfjs-core": "0.0.1",`
	`27`	`+ "@tensorflow/tfjs-core": "0.0.2",`
`28`	`28`	`"@tensorflow/tfjs-layers": "0.0.5"`
`29`	`29`	`}`
`30`	`30`	`}`