Skip to content

Commit

Permalink
Merge branch 'main' into alexey-notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexeyOplachko committed Mar 18, 2022
2 parents 4eec612 + 5b5cfd8 commit 8654439
Show file tree
Hide file tree
Showing 7 changed files with 7,092 additions and 3,854 deletions.
10,379 changes: 6,693 additions & 3,686 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 16 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
"url": "git+ssh://[email protected]/metrico/cloki-view.git"
},
"author": "[email protected]",
"version": "0.9.0",
"version": "0.9.1",
"private": false,
"dependencies": {
"@emotion/css": "^11.7.1",
"@emotion/react": "^11.7.1",
"@emotion/styled": "^11.6.0",
"@mui/icons-material": "^5.3.1",
Expand All @@ -26,14 +27,16 @@
"lodash": "^4.17.21",
"moment": "^2.29.1",
"nanoid": "^3.3.1",
"prismjs": "^1.27.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-flot": "^1.3.0",
"react-lowlight": "^3.0.0",
"react-redux": "^7.2.6",
"react-router-dom": "^6.2.1",
"react-scripts": "^5.0.0",
"redux-thunk": "^2.4.1"
"redux-thunk": "^2.4.1",
"slate": "^0.73.1",
"slate-history": "^0.66.0",
"slate-react": "^0.74.2"
},
"scripts": {
"webpack": "webpack",
Expand Down Expand Up @@ -65,6 +68,14 @@
"last 1 safari version"
]
},
"overrides": {
"immer": "9.0.7",
"ansi-html": "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
"ansi-regex": "5.0.1",
"nth-check": "2.0.1",
"glob-parent": "6.0.1",
"browserslist": "4.18.1"
},
"devDependencies": {
"@babel/core": "^7.16.12",
"@babel/plugin-proposal-class-properties": "^7.16.7",
Expand All @@ -84,6 +95,7 @@
"html-webpack-plugin": "^5.5.0",
"mini-css-extract-plugin": "^2.5.3",
"react-hot-loader": "^4.13.0",
"react-scripts": "^5.0.0",
"sass": "^1.49.0",
"sass-loader": "^12.4.0",
"style-loader": "^3.3.1",
Expand Down
Loading

0 comments on commit 8654439

Please sign in to comment.