Merge branch 'development' into release

ml5js · Jun 2, 2019 · bd7a1a4 · bd7a1a4
2 parents 7664b66 + 76f1d71
commit bd7a1a4
Show file tree

Hide file tree

Showing 22 changed files with 1,877 additions and 111 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ training/lstm/data/t
 .cache
 /public
 /static
+/dist
 
 website/translated_docs
 website/build/

diff --git a/README.md b/README.md
diff --git a/assets/bird.jpg b/assets/bird.jpg
diff --git a/karma.conf.js b/karma.conf.js
@@ -38,6 +38,9 @@ module.exports = (config) => {
       optimization: {
         minimize: false,
       },
+      node: {
+        fs: "empty"
+      }
     },
     webpackMiddleware: {
       noInfo: true,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ml5",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A friendly machine learning library for the web.",
   "main": "dist/ml5.min.js",
   "directories": {
@@ -92,6 +92,8 @@
     "@tensorflow-models/knn-classifier": "1.0.0",
     "@tensorflow-models/mobilenet": "1.0.0",
     "@tensorflow-models/posenet": "1.0.0",
+    "@tensorflow-models/speech-commands": "0.3.8",
+    "@tensorflow-models/body-pix": "1.0.1",
     "@tensorflow/tfjs": "1.1.2",
     "events": "^3.0.0"
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ training/lstm/data/t @@
     .cache
     /public
     /static
+    /dist
     website/translated_docs
     website/build/
@@ Expand Down @@