Skip to content
This repository has been archived by the owner on Jan 16, 2025. It is now read-only.

Commit

Permalink
fix deps conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
JSReds committed May 10, 2022
1 parent 0b0b34c commit 4b3a484
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 35 deletions.
18 changes: 9 additions & 9 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin')
// const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin')
module.exports = {
'stories': [
'../src/**/*.stories.mdx',
Expand All @@ -8,13 +8,13 @@ module.exports = {
'@storybook/addon-links',
'@storybook/addon-essentials'
],
webpackFinal: async (config, { configType }) => {
config.plugins.push(
new MonacoWebpackPlugin({
languages: ['json']
})
)
// webpackFinal: async (config, { configType }) => {
// config.plugins.push(
// new MonacoWebpackPlugin({
// languages: ['json']
// })
// )

return config;
},
// return config;
// },
}
48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,39 +44,37 @@
},
"devDependencies": {
"@balena/lint": "^6.1.1",
"@storybook/addon-actions": "~6.3.12",
"@storybook/addon-essentials": "~6.3.12",
"@storybook/addon-links": "~6.3.12",
"@storybook/addon-storyshots": "~6.3.12",
"@storybook/react": "~6.3.12",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "^12.1.2",
"@storybook/addon-actions": "~6.5.0-alpha.59",
"@storybook/addon-essentials": "^6.5.0-beta.7",
"@storybook/addon-links": "~6.5.0-alpha.59",
"@storybook/addon-storyshots": "^6.5.0-beta.7",
"@storybook/react": "^6.5.0-beta.7",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.2.0",
"@types/enzyme": "^3.10.8",
"@types/googlemaps": "^3.39.7",
"@types/highlightjs": "^9.12.0",
"@types/jest": "^26.0.21",
"@types/react": "^17.0.2",
"@types/react-dom": "^17.0.11",
"@types/react-google-recaptcha": "^1.1.2",
"@types/react-router-dom": "^5.1.8",
"@types/react": "^18.0.9",
"@types/react-dom": "^18.0.3",
"@types/react-google-recaptcha": "^2.1.5",
"@types/react-router-dom": "^5.3.3",
"@types/sinon": "^9.0.8",
"@types/unist": "^2.0.3",
"catch-uncommitted": "^2.0.0",
"core-js": "^3.18.3",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.6",
"husky": "^0.14.3",
"jest": "^26.6.3",
"jest-styled-components": "^7.0.8",
"jest-transform-stub": "^2.0.0",
"jsdom": "^11.12.0",
"lint-staged": "^4.3.0",
"match-media-mock": "^0.1.1",
"monaco-editor-webpack-plugin": "^4.2.0",
"monaco-editor-webpack-plugin": "^7.0.1",
"prettier": "^2.4.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-monaco-editor": "^0.45.0",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"rimraf": "^3.0.2",
"sinon": "^4.5.0",
"strip-css-comments": "^3.0.0",
Expand All @@ -91,7 +89,8 @@
"@fortawesome/free-solid-svg-icons": "^6.1.1",
"@fortawesome/react-fontawesome": "^0.1.18",
"@mapbox/rehype-prism": "^0.8.0",
"@react-google-maps/api": "^1.13.0",
"@monaco-editor/react": "^4.4.4",
"@react-google-maps/api": "^2.10.2",
"@rjsf/core": "^2.5.1",
"@types/ajv-keywords": "^3.4.0",
"@types/color": "^3.0.0",
Expand All @@ -106,29 +105,30 @@
"@types/styled-components": "^5.1.9",
"@types/styled-system": "^4.0.0",
"@types/uuid": "^3.4.3",
"@zarconontol/enzyme-adapter-react-18": "^0.7.3",
"ajv": "^6.12.6",
"ajv-keywords": "^3.5.2",
"color": "^3.2.1",
"color-hash": "^1.1.1",
"copy-to-clipboard": "^3.3.1",
"date-fns": "^2.27.0",
"easymde": "~2.10.1",
"grommet": "~2.18.0",
"easymde": "^2.10.1",
"grommet": "~2.23.0",
"hast-util-sanitize": "^3.0.2",
"json-e": "^4.4.3",
"lodash": "^4.17.21",
"memoizee": "^0.4.15",
"mermaid": "^8.13.9",
"mermaid": "^8.14.0",
"pinejs-client-fetch": "^0.2.2",
"prismjs": "^1.25.0",
"prop-types": "^15.7.2",
"qs": "^6.10.3",
"react-google-recaptcha": "^2.1.0",
"react-helmet": "^6.1.0",
"react-notifications-component": "^2.4.1",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-simplemde-editor": "^4.1.5",
"react-notifications-component": "^4.0.0",
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
"react-simplemde-editor": "^5.0.2",
"regex-parser": "^2.2.11",
"regexp-match-indices": "^1.0.2",
"rehype-autolink-headings": "^5.1.0",
Expand Down
4 changes: 2 additions & 2 deletions src/components/Renderer/RendererPlayground/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ const RendererPlaygroundBase = ({
</Flex>
</Flex>
<EditCard flex={1} {...commonCardProps}>
<JsonEditor
{/* <JsonEditor
title="Data"
value={valueStr}
onChange={onValueStrChange}
Expand All @@ -201,7 +201,7 @@ const RendererPlaygroundBase = ({
onChange={onUiSchemaStrChange}
schema={uiSchemaMetaSchema}
isValid={isUiSchemaJsonValid}
/>
/> */}
</EditCard>
</Flex>
<Flex flex="1 1 50%" minWidth={0} flexDirection="column" pl={2}>
Expand Down

0 comments on commit 4b3a484

Please sign in to comment.