Skip to content

Commit 10be56c

Browse files
author
Kevin Scott
committed
Upgrade tfjs to 15.3
1 parent 9810ccb commit 10be56c

File tree

5 files changed

+7
-130
lines changed

5 files changed

+7
-130
lines changed

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ml-classifier-ui",
33
"repository": "https://github.com/thekevinscott/ml-classifier-ui",
4-
"version": "0.4.4",
4+
"version": "0.5.0",
55
"homepage": "https://thekevinscott.github.io/ml-classifier-ui/",
66
"description": "A package for creating image-based machine learning models",
77
"main": "dist/index.js",
@@ -57,11 +57,9 @@
5757
]
5858
},
5959
"peerDependencies": {
60-
"@tensorflow/tfjs": "^0.12.2",
6160
"react": "^16.4.1"
6261
},
6362
"devDependencies": {
64-
"@tensorflow/tfjs": "^0.12.2",
6563
"@babel/core": "^7.0.0-beta.51",
6664
"@babel/plugin-proposal-decorators": "^7.0.0-beta.51",
6765
"@babel/plugin-transform-classes": "^7.0.0-beta.51",
@@ -108,6 +106,6 @@
108106
"uglify-es": "^3.3.9"
109107
},
110108
"dependencies": {
111-
"ml-classifier": "0.4.3"
109+
"ml-classifier": "0.5.0"
112110
}
113111
}

rollup.config.js

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ import path from 'path';
33
import sass from 'node-sass';
44
import typescript from 'rollup-plugin-typescript2';
55
import replace from 'rollup-plugin-replace';
6-
import commonjs from 'rollup-plugin-commonjs';
76
import postcss from 'rollup-plugin-postcss-modules';
87
import image from 'rollup-plugin-image';
9-
import resolve from 'rollup-plugin-node-resolve';
108
import autoprefixer from 'autoprefixer';
119

1210
export default {
@@ -16,28 +14,14 @@ export default {
1614
name: 'MLClassifierUI',
1715
file: './dist/index.js',
1816
format: 'es',
19-
external: [
20-
'@tensorflow/tfjs',
21-
],
2217
},
2318
plugins: [
24-
// resolve({
25-
// jsnext: true,
26-
// main: true,
27-
// extensions: [ '.ts', '.tsx', '.js', '.json' ],
28-
// only: [
29-
// 'ml-classifier',
30-
// ],
31-
// }),
3219
typescript({
3320
typescript: require("typescript"),
3421
}),
3522
replace({
3623
'process.env.NODE_ENV': JSON.stringify('production'),
3724
}),
38-
// commonjs({
39-
// ignoreGlobal: false, // Default: false
40-
// }),
4125
postcss({
4226
preprocessor: (content, id) => new Promise(resolve => {
4327
const result = sass.renderSync({ file: id });

rollup.config.js.umd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export default {
2121
globals: {
2222
'react': 'React',
2323
'react-dom': 'ReactDOM',
24-
'@tensorflow/tfjs': 'tf',
2524
},
2625
name: 'MLClassifierUI',
2726
file: './dist/index.js',

src/App/index.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import * as React from 'react';
33
import Dropzone from '../Dropzone';
44
import {
55
getFilesAsImageArray,
6-
// loadImage,
7-
// IImageData,
86
IFileData,
97
splitImagesFromLabels,
108
} from 'utils/getFilesAsImages';

yarn.lock

Lines changed: 5 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -775,49 +775,6 @@
775775
lodash "^4.17.5"
776776
to-fast-properties "^2.0.0"
777777

778-
"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
779-
version "1.1.2"
780-
resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
781-
782-
"@protobufjs/base64@^1.1.2":
783-
version "1.1.2"
784-
resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
785-
786-
"@protobufjs/codegen@^2.0.4":
787-
version "2.0.4"
788-
resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
789-
790-
"@protobufjs/eventemitter@^1.1.0":
791-
version "1.1.0"
792-
resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
793-
794-
"@protobufjs/fetch@^1.1.0":
795-
version "1.1.0"
796-
resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
797-
dependencies:
798-
"@protobufjs/aspromise" "^1.1.1"
799-
"@protobufjs/inquire" "^1.1.0"
800-
801-
"@protobufjs/float@^1.0.2":
802-
version "1.0.2"
803-
resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
804-
805-
"@protobufjs/inquire@^1.1.0":
806-
version "1.1.0"
807-
resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
808-
809-
"@protobufjs/path@^1.1.2":
810-
version "1.1.2"
811-
resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
812-
813-
"@protobufjs/pool@^1.1.0":
814-
version "1.1.0"
815-
resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
816-
817-
"@protobufjs/utf8@^1.1.0":
818-
version "1.1.0"
819-
resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
820-
821778
"@storybook/addon-actions@3.4.8", "@storybook/addon-actions@^3.4.8":
822779
version "3.4.8"
823780
resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.4.8.tgz#557bae7c7cc60be9d5199ff972b028de8b574f92"
@@ -1018,32 +975,6 @@
1018975
react-split-pane "^0.1.77"
1019976
react-treebeard "^2.1.0"
1020977

1021-
"@tensorflow/tfjs-converter@0.5.1":
1022-
version "0.5.1"
1023-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-0.5.1.tgz#8cf093b39bb56022eaa2a7930166d12b40965e62"
1024-
dependencies:
1025-
"@types/long" "~3.0.32"
1026-
protobufjs "~6.8.6"
1027-
url "~0.11.0"
1028-
1029-
"@tensorflow/tfjs-core@0.12.4":
1030-
version "0.12.4"
1031-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-0.12.4.tgz#39e6239617856fce82b41936f711f78190aa71bd"
1032-
dependencies:
1033-
seedrandom "~2.4.3"
1034-
1035-
"@tensorflow/tfjs-layers@0.7.0":
1036-
version "0.7.0"
1037-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-0.7.0.tgz#6bee18a220ece102a56be785cd1c67028f968a63"
1038-
1039-
"@tensorflow/tfjs@^0.12.2":
1040-
version "0.12.2"
1041-
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-0.12.2.tgz#fb48543f7afca7f3ee2d449d62e6145f42438ea3"
1042-
dependencies:
1043-
"@tensorflow/tfjs-converter" "0.5.1"
1044-
"@tensorflow/tfjs-core" "0.12.4"
1045-
"@tensorflow/tfjs-layers" "0.7.0"
1046-
1047978
"@types/estree@0.0.39":
1048979
version "0.0.39"
1049980
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
@@ -1052,10 +983,6 @@
1052983
version "23.1.4"
1053984
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.1.4.tgz#71e1e2d08b1db742f479ee2795536ebc999a2419"
1054985

1055-
"@types/long@^3.0.32", "@types/long@~3.0.32":
1056-
version "3.0.32"
1057-
resolved "https://registry.yarnpkg.com/@types/long/-/long-3.0.32.tgz#f4e5af31e9e9b196d8e5fca8a5e2e20aa3d60b69"
1058-
1059986
"@types/node@*":
1060987
version "10.5.2"
1061988
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.2.tgz#f19f05314d5421fe37e74153254201a7bf00a707"
@@ -1064,10 +991,6 @@
1064991
version "10.5.1"
1065992
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.1.tgz#d578446f4abff5c0b49ade9b4e5274f6badaadfc"
1066993

1067-
"@types/node@^8.9.4":
1068-
version "8.10.21"
1069-
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.21.tgz#12b3f2359b27aa05a45d886c8ba1eb8d1a77e285"
1070-
1071994
"@types/react-dom@^16.0.6":
1072995
version "16.0.6"
1073996
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.6.tgz#f1a65a4e7be8ed5d123f8b3b9eacc913e35a1a3c"
@@ -5909,10 +5832,6 @@ lodash@~2.4.1:
59095832
version "2.4.2"
59105833
resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"
59115834

5912-
long@^4.0.0:
5913-
version "4.0.0"
5914-
resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
5915-
59165835
longest@^1.0.1:
59175836
version "1.0.1"
59185837
resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -6230,9 +6149,10 @@ mixin-object@^2.0.1:
62306149
dependencies:
62316150
minimist "0.0.8"
62326151

6233-
ml-classifier@0.4.3:
6234-
version "0.4.3"
6235-
resolved "https://registry.yarnpkg.com/ml-classifier/-/ml-classifier-0.4.3.tgz#3cb2adacbb020cb709e9e199b6b8cc31fc5c0e73"
6152+
ml-classifier@0.5.0:
6153+
version "0.5.0"
6154+
resolved "https://registry.yarnpkg.com/ml-classifier/-/ml-classifier-0.5.0.tgz#08380e7c984c63dd5601e44a3e6d553e34608fcb"
6155+
integrity sha512-prkDPpUvjMQPamnW40iub7mjUGHBygpU7tBT5rqT5+QzpCjOU8JG/rSzJQpaGEqxg4uAatmXG5+eBRKsE0gjOA==
62366156

62376157
move-concurrently@^1.0.1:
62386158
version "1.0.1"
@@ -7230,24 +7150,6 @@ prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.5.9,
72307150
loose-envify "^1.3.1"
72317151
object-assign "^4.1.1"
72327152

7233-
protobufjs@~6.8.6:
7234-
version "6.8.6"
7235-
resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.6.tgz#ce3cf4fff9625b62966c455fc4c15e4331a11ca2"
7236-
dependencies:
7237-
"@protobufjs/aspromise" "^1.1.2"
7238-
"@protobufjs/base64" "^1.1.2"
7239-
"@protobufjs/codegen" "^2.0.4"
7240-
"@protobufjs/eventemitter" "^1.1.0"
7241-
"@protobufjs/fetch" "^1.1.0"
7242-
"@protobufjs/float" "^1.0.2"
7243-
"@protobufjs/inquire" "^1.1.0"
7244-
"@protobufjs/path" "^1.1.2"
7245-
"@protobufjs/pool" "^1.1.0"
7246-
"@protobufjs/utf8" "^1.1.0"
7247-
"@types/long" "^3.0.32"
7248-
"@types/node" "^8.9.4"
7249-
long "^4.0.0"
7250-
72517153
proxy-addr@~2.0.3:
72527154
version "2.0.3"
72537155
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341"
@@ -8149,10 +8051,6 @@ scss-tokenizer@^0.2.3:
81498051
js-base64 "^2.1.8"
81508052
source-map "^0.4.2"
81518053

8152-
seedrandom@~2.4.3:
8153-
version "2.4.3"
8154-
resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.3.tgz#2438504dad33917314bff18ac4d794f16d6aaecc"
8155-
81568054
"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
81578055
version "5.5.0"
81588056
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
@@ -9122,7 +9020,7 @@ url-parse@^1.1.8, url-parse@~1.4.0:
91229020
querystringify "^2.0.0"
91239021
requires-port "^1.0.0"
91249022

9125-
url@^0.11.0, url@~0.11.0:
9023+
url@^0.11.0:
91269024
version "0.11.0"
91279025
resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
91289026
dependencies:

0 commit comments

Comments
 (0)