projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16719: Merge branch 'master' into 16719-collection-version-basic-ui
[arvados.git]
/
package.json
diff --git
a/package.json
b/package.json
index 098b7849a411174a8f0c0bcdd470df8673666447..346d4910c19bb51899bf6e71f5626ae5e05aeb5b 100644
(file)
--- a/
package.json
+++ b/
package.json
@@
-3,7
+3,10
@@
"version": "0.1.0",
"private": true,
"dependencies": {
"version": "0.1.0",
"private": true,
"dependencies": {
- "@material-ui/core": "3.3.2",
+ "@fortawesome/fontawesome-svg-core": "1.2.28",
+ "@fortawesome/free-solid-svg-icons": "5.13.0",
+ "@fortawesome/react-fontawesome": "0.1.9",
+ "@material-ui/core": "3.9.3",
"@material-ui/icons": "3.0.1",
"@types/debounce": "3.0.0",
"@types/file-saver": "2.0.0",
"@material-ui/icons": "3.0.1",
"@types/debounce": "3.0.0",
"@types/file-saver": "2.0.0",
@@
-12,29
+15,40
@@
"@types/jszip": "3.1.5",
"@types/lodash": "4.14.116",
"@types/react-copy-to-clipboard": "4.2.6",
"@types/jszip": "3.1.5",
"@types/lodash": "4.14.116",
"@types/react-copy-to-clipboard": "4.2.6",
- "@types/react-dnd": "3.0.2",
"@types/react-dropzone": "4.2.2",
"@types/react-highlight-words": "0.12.0",
"@types/react-dropzone": "4.2.2",
"@types/react-highlight-words": "0.12.0",
+ "@types/react-virtualized-auto-sizer": "1.0.0",
+ "@types/react-window": "1.8.2",
"@types/redux-form": "7.4.12",
"@types/redux-form": "7.4.12",
- "@types/reselect": "2.2.0",
"@types/shell-quote": "1.6.0",
"@types/shell-quote": "1.6.0",
- "axios": "0.18.0",
+ "axios": "0.18.1",
+ "babel-core": "6.26.3",
+ "babel-runtime": "6.26.0",
"classnames": "2.2.6",
"cwlts": "1.15.29",
"debounce": "1.2.0",
"file-saver": "2.0.1",
"classnames": "2.2.6",
"cwlts": "1.15.29",
"debounce": "1.2.0",
"file-saver": "2.0.1",
+ "fstream": "1.0.12",
"is-image": "2.0.0",
"is-image": "2.0.0",
- "js-yaml": "3.1
2.0
",
+ "js-yaml": "3.1
3.1
",
"jssha": "2.3.1",
"jszip": "3.1.5",
"jssha": "2.3.1",
"jszip": "3.1.5",
- "lodash": "4.17.11",
- "react": "16.5.2",
+ "lodash": "4.17.13",
+ "lodash-es": "4.17.14",
+ "lodash.mergewith": "4.6.2",
+ "lodash.template": "4.5.0",
+ "mem": "4.0.0",
+ "parse-duration": "0.4.4",
+ "prop-types": "15.7.2",
+ "query-string": "6.9.0",
+ "react": "16.8.6",
"react-copy-to-clipboard": "5.0.1",
"react-dnd": "5.0.0",
"react-dnd-html5-backend": "5.0.1",
"react-copy-to-clipboard": "5.0.1",
"react-dnd": "5.0.0",
"react-dnd-html5-backend": "5.0.1",
- "react-dom": "16.
5.2
",
+ "react-dom": "16.
8.6
",
"react-dropzone": "5.1.1",
"react-highlight-words": "0.14.0",
"react-dropzone": "5.1.1",
"react-highlight-words": "0.14.0",
+ "react-idle-timer": "4.3.6",
"react-redux": "5.0.7",
"react-router": "4.3.1",
"react-router-dom": "4.3.1",
"react-redux": "5.0.7",
"react-router": "4.3.1",
"react-router-dom": "4.3.1",
@@
-43,19
+57,28
@@
"react-scripts-ts": "3.1.0",
"react-splitter-layout": "3.0.1",
"react-transition-group": "2.5.0",
"react-scripts-ts": "3.1.0",
"react-splitter-layout": "3.0.1",
"react-transition-group": "2.5.0",
- "redux": "4.0.0",
+ "react-virtualized-auto-sizer": "1.0.2",
+ "react-window": "1.8.5",
+ "redux": "4.0.3",
"redux-form": "7.4.2",
"redux-thunk": "2.3.0",
"reselect": "4.0.0",
"redux-form": "7.4.2",
"redux-thunk": "2.3.0",
"reselect": "4.0.0",
+ "set-value": "2.0.1",
"shell-quote": "1.6.1",
"shell-quote": "1.6.1",
+ "sinon": "7.3",
+ "ts-mock-imports": "1.2.6",
+ "tslint": "5.20.0",
+ "tslint-etc": "1.6.0",
"unionize": "2.1.2",
"unionize": "2.1.2",
- "uuid": "3.3.2"
+ "uuid": "3.3.2",
+ "webpack": "4.41.2",
+ "webpack-dev-server": "3.9.0"
},
"scripts": {
"start": "react-scripts-ts start",
},
"scripts": {
"start": "react-scripts-ts start",
- "build": "REACT_APP_BUILD_NUMBER=$BUILD_NUMBER REACT_APP_GIT_COMMIT=$GIT_COMMIT react-scripts-ts build",
+ "build": "REACT_APP_
VERSION=$VERSION REACT_APP_
BUILD_NUMBER=$BUILD_NUMBER REACT_APP_GIT_COMMIT=$GIT_COMMIT react-scripts-ts build",
"build-local": "react-scripts-ts build",
"build-local": "react-scripts-ts build",
- "test": "react-scripts-ts test --env=jsdom",
+ "test": "
CI=true
react-scripts-ts test --env=jsdom",
"test-local": "react-scripts-ts test --env=jsdom",
"eject": "react-scripts-ts eject",
"lint": "tslint src/** -t verbose",
"test-local": "react-scripts-ts test --env=jsdom",
"eject": "react-scripts-ts eject",
"lint": "tslint src/** -t verbose",
@@
-74,19
+97,30
@@
"@types/react-router-dom": "4.3.1",
"@types/react-router-redux": "5.0.16",
"@types/redux-devtools": "3.0.44",
"@types/react-router-dom": "4.3.1",
"@types/react-router-redux": "5.0.16",
"@types/redux-devtools": "3.0.44",
+ "@types/sinon": "7.5",
"@types/uuid": "3.4.4",
"@types/uuid": "3.4.4",
- "axios-mock-adapter": "1.15.0",
+ "axios-mock-adapter": "1.17.0",
+ "cypress": "4.0.2",
"enzyme": "3.6.0",
"enzyme-adapter-react-16": "1.5.0",
"jest-localstorage-mock": "2.2.0",
"node-sass": "4.9.4",
"node-sass-chokidar": "1.3.4",
"redux-devtools": "3.4.1",
"enzyme": "3.6.0",
"enzyme-adapter-react-16": "1.5.0",
"jest-localstorage-mock": "2.2.0",
"node-sass": "4.9.4",
"node-sass-chokidar": "1.3.4",
"redux-devtools": "3.4.1",
- "typescript": "3.1.1"
+ "typescript": "3.1.1",
+ "wait-on": "4.0.2",
+ "yamljs": "0.3.0"
},
"jest": {
"moduleNameMapper": {
"^~/(.*)$": "<rootDir>/src/$1"
}
},
"jest": {
"moduleNameMapper": {
"^~/(.*)$": "<rootDir>/src/$1"
}
+ },
+ "resolutions": {
+ "react-scripts-ts/webpack-dev-server": "^2.11.4",
+ "react-scripts-ts/**/**/**/**/js-yaml": "^3.13.1",
+ "react-scripts-ts/uglifyjs-webpack-plugin/serialize-javascript": "^2.1.1",
+ "webpack/terser-webpack-plugin/serialize-javascript": "^2.1.1",
+ "cypress/minimist": "1.2.5"
}
}
}
}