Clean up deps (#18)

I just cloned the repo to get myself familiar with the new setup. Noticed a few small `package.json` issues that I fixed.
PAIR-code · Jul 16, 2018 · b18977d · b18977d
1 parent 5f014a7
commit b18977d
Show file tree

Hide file tree

Showing 23 changed files with 244 additions and 318 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,10 @@
-node_modules/
+**/node_modules/
 scripts/**/*.js
 coverage/
 npm-debug.log
 yarn-error.log
 .DS_Store
-dist/
-dist-es6/
+**/dist/
 .idea/
 *.tgz
 **/*.pyc

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,10 +15,11 @@
   "[typescript]": {
     "editor.formatOnSave": true
   },
+  "editor.rulers": [80],
   "clang-format.style": "Google",
   "files.insertFinalNewline": true,
   "editor.detectIndentation": false,
   "editor.wrappingIndent": "none",
-  "typescript.tsdk": "src/server/node_modules/typescript/lib",
-  "clang-format.executable": "${workspaceRoot}/src/server/node_modules/.bin/clang-format"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "clang-format.executable": "node_modules/.bin/clang-format"
 }
diff --git a/demo/audio/client/build.sh b/demo/audio/client/build.sh
diff --git a/demo/audio/client/package.json b/demo/audio/client/package.json
@@ -9,14 +9,14 @@
     "node": ">=8.9.0"
   },
   "dependencies": {
-    "@tensorflow/tfjs": "~0.11.7",
-    "federated-learning-client": "file:../../../src/client",
-    "msr": "~1.3.4",
-    "socket.io-client": "~2.1.1"
+    "@tensorflow/tfjs": "~0.12",
+    "federated-learning-client": "link:../../../src/client",
+    "msr": "~1.3.4"
   },
   "scripts": {
-    "watch": "./watch.sh",
-    "build": "./build.sh"
+    "postinstall": "./postinstall.sh",
+    "watch": "yarn postinstall && cross-env NODE_ENV=development parcel index.html --no-hmr --open",
+    "build": "yarn postinstall && cross-env NODE_ENV=production parcel build index.html --no-minify --public-url ./"
   },
   "devDependencies": {
     "babel-plugin-transform-runtime": "^6.23.0",

diff --git a/demo/emoji_hunt/client/watch.sh → demo/audio/client/postinstall.sh b/demo/emoji_hunt/client/watch.sh → demo/audio/client/postinstall.sh
@@ -18,5 +18,4 @@ whereami=`pwd`
 cd ../../../src/client
 yarn publish-local
 cd $whereami
-yarn run yalc link federated-learning-client
-yarn run parcel index.html --no-hmr --hmr-hostname 0.0.0.0
+yalc link federated-learning-client
diff --git a/demo/audio/client/yarn.lock b/demo/audio/client/yarn.lock
@@ -45,31 +45,31 @@
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
 
-"@tensorflow/tfjs-converter@0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-0.4.3.tgz#c77414a4cc3563a221c9ae2644fb132c68a1cc05"
+"@tensorflow/tfjs-converter@0.5.1":
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-0.5.1.tgz#8cf093b39bb56022eaa2a7930166d12b40965e62"
   dependencies:
     "@types/long" "~3.0.32"
     protobufjs "~6.8.6"
-    url "^0.11.0"
+    url "~0.11.0"
 
-"@tensorflow/tfjs-core@0.11.9":
-  version "0.11.9"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-0.11.9.tgz#b684255359941162c64b397d515c310bd1027fe8"
+"@tensorflow/tfjs-core@0.12.4":
+  version "0.12.4"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-0.12.4.tgz#39e6239617856fce82b41936f711f78190aa71bd"
   dependencies:
     seedrandom "~2.4.3"
 
-"@tensorflow/tfjs-layers@0.6.7":
-  version "0.6.7"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-0.6.7.tgz#aa4f994c4104a8cf3f93b5e13ab051685c092c80"
+"@tensorflow/tfjs-layers@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-0.7.0.tgz#6bee18a220ece102a56be785cd1c67028f968a63"
 
-"@tensorflow/tfjs@0.11.7", "@tensorflow/tfjs@~0.11.7":
-  version "0.11.7"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-0.11.7.tgz#5b5fe7b17bca2d2088fdd01aea0660517364b752"
+"@tensorflow/tfjs@~0.12":
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-0.12.2.tgz#fb48543f7afca7f3ee2d449d62e6145f42438ea3"
   dependencies:
-    "@tensorflow/tfjs-converter" "0.4.3"
-    "@tensorflow/tfjs-core" "0.11.9"
-    "@tensorflow/tfjs-layers" "0.6.7"
+    "@tensorflow/tfjs-converter" "0.5.1"
+    "@tensorflow/tfjs-core" "0.12.4"
+    "@tensorflow/tfjs-layers" "0.7.0"
 
 "@types/long@^3.0.32", "@types/long@~3.0.32":
   version "3.0.32"
@@ -1760,12 +1760,9 @@ fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
-"federated-learning-client@file:../../../src/client":
-  version "0.0.1"
-  dependencies:
-    "@tensorflow/tfjs" "0.11.7"
-    "@types/socket.io-client" "^1.4.32"
-    socket.io-client "^2.1.1"
+"federated-learning-client@link:../../../src/client":
+  version "0.0.0"
+  uid ""
 
 filesize@^3.6.0:
   version "3.6.1"
@@ -3727,7 +3724,7 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socket.io-client@^2.1.1, socket.io-client@~2.1.1:
+socket.io-client@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
   dependencies:
@@ -4122,7 +4119,7 @@ urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
-url@^0.11.0:
+url@^0.11.0, url@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
   dependencies:

diff --git a/demo/audio/server/package.json b/demo/audio/server/package.json
@@ -9,13 +9,18 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "dev": "./dev.sh",
+    "postinstall": "./postinstall.sh",
+    "dev": "yarn postinstall && ts-node server.ts",
     "lint": "tslint -p . -t verbose"
   },
   "dependencies": {
-    "@tensorflow/tfjs": "0.11.7",
-    "@tensorflow/tfjs-node": "^0.1.7",
-    "federated-learning-server": "file:../../../src/server"
+    "@tensorflow/tfjs": "~0.12",
+    "@tensorflow/tfjs-node": "^0.1.9",
+    "express": "^4.16.3",
+    "express-fileupload": "^0.4.0",
+    "federated-learning-server": "link:../../../src/server",
+    "socket.io": "^2.1.1",
+    "uuid": "^3.3.2"
   },
   "devDependencies": {
     "ts-node": "^6.1.0",

diff --git a/demo/audio/server/dev.sh → demo/audio/server/postinstall.sh b/demo/audio/server/dev.sh → demo/audio/server/postinstall.sh
@@ -18,5 +18,4 @@ whereami=`pwd`
 cd ../../../src/server
 yarn publish-local
 cd $whereami
-yarn run yalc link federated-learning-client
-yarn run ts-node server.ts
+yalc link federated-learning-server
diff --git a/demo/audio/server/server.ts b/demo/audio/server/server.ts
@@ -23,7 +23,6 @@ import * as http from 'http';
 import * as path from 'path';
 import * as io from 'socket.io';
 import * as uuid from 'uuid/v4';
-
 import {labelNames, loadAudioTransferLearningModel} from './model';
 
 const dataDir = path.resolve(__dirname + '/data');

diff --git a/demo/audio/server/yarn.lock b/demo/audio/server/yarn.lock
@@ -45,43 +45,37 @@
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
 
-"@tensorflow/tfjs-converter@0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-0.4.3.tgz#c77414a4cc3563a221c9ae2644fb132c68a1cc05"
+"@tensorflow/tfjs-converter@0.5.1":
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-0.5.1.tgz#8cf093b39bb56022eaa2a7930166d12b40965e62"
   dependencies:
     "@types/long" "~3.0.32"
     protobufjs "~6.8.6"
-    url "^0.11.0"
+    url "~0.11.0"
 
-"@tensorflow/tfjs-core@0.11.9":
-  version "0.11.9"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-0.11.9.tgz#b684255359941162c64b397d515c310bd1027fe8"
+"@tensorflow/tfjs-core@0.12.4":
+  version "0.12.4"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-0.12.4.tgz#39e6239617856fce82b41936f711f78190aa71bd"
   dependencies:
     seedrandom "~2.4.3"
 
-"@tensorflow/tfjs-layers@0.6.7":
-  version "0.6.7"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-0.6.7.tgz#aa4f994c4104a8cf3f93b5e13ab051685c092c80"
+"@tensorflow/tfjs-layers@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-0.7.0.tgz#6bee18a220ece102a56be785cd1c67028f968a63"
 
-"@tensorflow/tfjs-node-gpu@^0.1.7":
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-node-gpu/-/tfjs-node-gpu-0.1.7.tgz#acc04e334c956e860b0b958fe20f915857b7ceb7"
+"@tensorflow/tfjs-node@^0.1.9":
+  version "0.1.9"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-node/-/tfjs-node-0.1.9.tgz#0cb5b3da2c11f2b8a2a6c087d2fead9006fe23aa"
   dependencies:
     bindings "~1.3.0"
 
-"@tensorflow/tfjs-node@^0.1.7":
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-node/-/tfjs-node-0.1.7.tgz#76b827c32504efed9cbd9b1b1394e4ec53e45fe5"
+"@tensorflow/tfjs@~0.12":
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-0.12.2.tgz#fb48543f7afca7f3ee2d449d62e6145f42438ea3"
   dependencies:
-    bindings "~1.3.0"
-
-"@tensorflow/tfjs@0.11.7":
-  version "0.11.7"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-0.11.7.tgz#5b5fe7b17bca2d2088fdd01aea0660517364b752"
-  dependencies:
-    "@tensorflow/tfjs-converter" "0.4.3"
-    "@tensorflow/tfjs-core" "0.11.9"
-    "@tensorflow/tfjs-layers" "0.6.7"
+    "@tensorflow/tfjs-converter" "0.5.1"
+    "@tensorflow/tfjs-core" "0.12.4"
+    "@tensorflow/tfjs-layers" "0.7.0"
 
 "@types/body-parser@*":
   version "1.17.0"
@@ -310,12 +304,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-bswap@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/bswap/-/bswap-1.2.0.tgz#82075529fe78cb27c41a678bdd2cffac4cb8608c"
-  dependencies:
-    nan "^2.4.0"
-
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
@@ -626,10 +614,6 @@ error-ex@^1.2.0:
   dependencies:
     is-arrayish "^0.2.1"
 
-es6-promise@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
-
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -698,27 +682,9 @@ fast-future@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/fast-future/-/fast-future-1.0.2.tgz#8435a9aaa02d79248d17d704e76259301d99280a"
 
-"federated-learning-server@file:../../../src/server":
-  version "0.0.1"
-  dependencies:
-    "@tensorflow/tfjs" "0.11.7"
-    "@tensorflow/tfjs-node" "^0.1.7"
-    "@tensorflow/tfjs-node-gpu" "^0.1.7"
-    "@types/express" "^4.16.0"
-    "@types/express-fileupload" "^0.1.1"
-    "@types/node-fetch" "^2.1.1"
-    "@types/socket.io" "^1.4.34"
-    "@types/uuid" "^3.4.3"
-    bswap "^1.2.0"
-    encoding-down "^5.0.3"
-    es6-promise "^4.2.4"
-    express "^4.16.3"
-    express-fileupload "^0.4.0"
-    leveldown "^4.0.1"
-    levelup "^3.0.1"
-    node-fetch "^2.1.2"
-    socket.io "^2.1.1"
-    uuid "^3.2.1"
+"federated-learning-server@link:../../../src/server":
+  version "0.0.0"
+  uid ""
 
 finalhandler@1.1.1:
   version "1.1.1"
@@ -1116,7 +1082,7 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
-nan@^2.4.0, nan@~2.10.0:
+nan@~2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
@@ -1757,7 +1723,7 @@ unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
-url@^0.11.0:
+url@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
   dependencies:
@@ -1778,7 +1744,7 @@ utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
 
-uuid@^3.2.1:
+uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
 

diff --git a/demo/emoji_hunt/client/package.json b/demo/emoji_hunt/client/package.json
@@ -4,9 +4,13 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@tensorflow/tfjs": "^0.12.0",
+    "@tensorflow/tfjs": "~0.12",
     "@tensorflow/tfjs-converter": "^0.5.2",
-    "federated-learning-client": "file:.yalc/federated-learning-client"
+    "federated-learning-client": "link:../../../src/client"
+  },
+  "scripts": {
+    "postinstall": "./postinstall.sh",
+    "watch": "yarn postinstall && parcel index.html --no-hmr --hmr-hostname 0.0.0.0"
   },
   "devDependencies": {
     "babel-plugin-transform-runtime": "^6.23.0",

diff --git a/demo/audio/client/watch.sh → demo/emoji_hunt/client/postinstall.sh b/demo/audio/client/watch.sh → demo/emoji_hunt/client/postinstall.sh
@@ -18,5 +18,4 @@ whereami=`pwd`
 cd ../../../src/client
 yarn publish-local
 cd $whereami
-yarn run yalc link federated-learning-client
-yarn run cross-env NODE_ENV=development parcel index.html --no-hmr --open
+yalc link federated-learning-client
diff --git a/demo/emoji_hunt/client/yarn.lock b/demo/emoji_hunt/client/yarn.lock
@@ -82,7 +82,7 @@
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-0.7.0.tgz#6bee18a220ece102a56be785cd1c67028f968a63"
 
-"@tensorflow/tfjs@^0.12.0":
+"@tensorflow/tfjs@~0.12":
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-0.12.2.tgz#fb48543f7afca7f3ee2d449d62e6145f42438ea3"
   dependencies:
@@ -1871,12 +1871,9 @@ fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
-"federated-learning-client@file:.yalc/federated-learning-client":
-  version "0.0.1-b9258724"
-  dependencies:
-    "@tensorflow/tfjs" "^0.12.0"
-    "@types/socket.io-client" "^1.4.32"
-    socket.io-client "^2.1.1"
+"federated-learning-client@link:../../../src/client":
+  version "0.0.0"
+  uid ""
 
 filesize@^3.6.0:
   version "3.6.1"