Merge with master
Showing
... | ... | @@ -65,7 +65,7 @@ |
"html-loader": "^0.5.1", | ||
"html-webpack-harddisk-plugin": "^0.2.0", | ||
"html-webpack-plugin": "^3.2.0", | ||
"husky": "^0.14.3", | ||
"husky": "^1.3.1", | ||
"jest": "^23.6.0", | ||
"jest-date-mock": "^1.0.6", | ||
"lint-staged": "^8.1.3", | ||
... | ... | @@ -120,7 +120,6 @@ |
"typecheck": "tsc --noEmit", | ||
"jest": "jest --notify --watch", | ||
"api-tests": "jest --notify --watch --config=tests/api/jest.js", | ||
"precommit": "grunt precommit", | ||
"storybook": "cd packages/grafana-ui && yarn storybook" | ||
}, | ||
"husky": { | ||
... | ... | @@ -151,6 +150,7 @@ |
"dependencies": { | ||
"@babel/polyfill": "^7.0.0", | ||
"@torkelo/react-select": "2.1.1", | ||
"@types/reselect": "^2.2.0", | ||
"angular": "1.6.6", | ||
"angular-bindonce": "0.3.1", | ||
"angular-native-dragdrop": "1.2.2", | ||
... | ... | @@ -187,6 +187,7 @@ |
"redux-logger": "^3.0.6", | ||
"redux-thunk": "^2.3.0", | ||
"remarkable": "^1.7.1", | ||
"reselect": "^4.0.0", | ||
"rst2html": "github:thoward/rst2html#990cb89", | ||
"rxjs": "^6.3.3", | ||
"slate": "^0.33.4", | ||
... | ... |
public/app/core/utils/reselect.ts
0 → 100644
Please
register
or
sign in
to comment