Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Fix various dependency issues #17317

Merged
merged 4 commits into from
Sep 5, 2019
Merged

[core] Fix various dependency issues #17317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d2e20f
[docs] Add undeclared dependencies
eps1lon Sep 4, 2019
f3051b2
Remove peer dependencies of root worktree
eps1lon Sep 4, 2019
baec985
Add undeclared dependencies to root worktree
eps1lon Sep 4, 2019
4210a02
Bump emtion to fix missing peer warning
eps1lon Sep 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@
"typescript:transpile:dev": "node scripts/formattedTSDemos --watch"
},
"dependencies": {
"@babel/core": "^7.5.5",
"@babel/plugin-transform-object-assign": "^7.2.0",
"@date-io/core": "^1.3.9",
"@date-io/date-fns": "^1.3.8",
"@emotion/core": "^10.0.17",
"@emotion/styled": "^10.0.14",
"@emotion/styled": "^10.0.17",
"@material-ui/core": "^4.1.2",
"@material-ui/docs": "^4.0.0-beta.0",
"@material-ui/icons": "^4.2.1",
Expand All @@ -45,33 +48,51 @@
"ast-types": "^0.13.2",
"autoprefixer": "^9.6.1",
"autosuggest-highlight": "^3.1.1",
"babel-plugin-module-resolver": "^3.2.0",
"babel-plugin-optimize-clsx": "^2.4.1",
"babel-plugin-preval": "^2.0.0",
"babel-plugin-react-remove-properties": "^0.3.0",
"babel-plugin-transform-dev-warning": "^0.1.1",
"babel-plugin-transform-react-constant-elements": "^6.23.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"clean-css": "^4.1.11",
"clipboard-copy": "^3.0.0",
"clsx": "^1.0.2",
"core-js": "^2.6.5",
"cross-env": "^5.1.1",
"css-loader": "^3.1.0",
"css-mediaquery": "^0.1.2",
"date-fns": "^2.0.1",
"deepmerge": "^4.0.0",
"doctrine": "^3.0.0",
"downshift": "^3.0.0",
"emotion-theming": "^10.0.14",
"express": "^4.16.3",
"fg-loadcss": "^2.0.1",
"final-form": "^4.18.5",
"flexsearch": "^0.6.30",
"isomorphic-fetch": "^2.2.1",
"json2mq": "^0.2.0",
"jss": "10.0.0-alpha.24",
"jss-plugin-template": "^10.0.0-alpha.23",
"jss-rtl": "^0.2.3",
"lodash": "^4.17.15",
"lz-string": "^1.4.4",
"markdown-to-jsx": "^6.10.2",
"marked": "^0.7.0",
"material-table": "^1.50.0",
"material-ui-popup-state": "^1.4.0",
"next": "8.1.0",
"notistack": "^0.8.9",
"nprogress": "^0.2.0",
"postcss": "^7.0.0",
"prismjs": "^1.17.1",
"prop-types": "^15.7.2",
"raw-loader": "^1.0.0",
"react": "^16.9.0",
"react-autosuggest": "^9.4.3",
"react-docgen": "^5.0.0-beta.1",
"react-dom": "^16.8.5",
"react-dom": "^16.9.0",
"react-draggable": "^3.0.5",
"react-final-form": "^6.3.0",
"react-frame-component": "^4.1.1",
Expand All @@ -91,10 +112,14 @@
"recharts": "^1.6.2",
"redux": "^4.0.4",
"redux-logger": "^3.0.6",
"rimraf": "^3.0.0",
"styled-components": "^4.3.2",
"typescript-to-proptypes": "^1.2.3",
"url-loader": "^2.1.0",
"webfontloader": "^1.6.28"
"warning": "^4.0.3",
"webfontloader": "^1.6.28",
"webpack": "^4.39.2",
"webpack-bundle-analyzer": "^3.4.1"
},
"devDependencies": {
"@babel/preset-typescript": "^7.1.0",
Expand Down
6 changes: 1 addition & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@
"test:watch": "yarn test:unit --watch",
"typescript": "lerna run typescript --parallel"
},
"peerDependencies": {
"react": "*",
"react-dom": "*"
},
"devDependencies": {
"@babel/cli": "^7.5.5",
"@babel/core": "^7.5.5",
Expand Down Expand Up @@ -73,7 +69,6 @@
"babel-plugin-istanbul": "^5.2.0",
"babel-plugin-module-resolver": "^3.0.0",
"babel-plugin-optimize-clsx": "^2.3.0",
"babel-plugin-preval": "^2.0.0",
"babel-plugin-react-remove-properties": "^0.3.0",
"babel-plugin-tester": "^7.0.1",
"babel-plugin-transform-dev-warning": "^0.1.0",
Expand Down Expand Up @@ -132,6 +127,7 @@
"tslint": "5.14.0",
"typescript": "3.2.4",
"vrtest": "^0.2.0",
"warning": "^4.0.3",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Required in top level modules.

"webpack": "^4.39.3",
"webpack-bundle-analyzer": "^3.0.0",
"webpack-cli": "^3.3.7",
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-benchmark/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"license": "MIT",
"dependencies": {
"@emotion/core": "^10.0.17",
"@emotion/styled": "^10.0.14",
"@emotion/styled": "^10.0.17",
"benchmark": "^2.1.4",
"emotion": "^10.0.14",
"emotion": "^10.0.17",
"emotion-server": "^10.0.17",
"nodemod": "^1.5.19",
"react": "^16.3.0",
Expand Down
62 changes: 31 additions & 31 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@
resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.2.tgz#7f4c71b7654068dfcccad29553520f984cc66b30"
integrity sha512-hnHhwQzvPCW1QjBWFyBtsETdllOM92BfrKWbUTmh9aeOlcVOiXvlPsK4104xH8NsaKfg86PTFsWkueQeUfMA/w==

"@emotion/serialize@^0.11.10", "@emotion/serialize@^0.11.8", "@emotion/serialize@^0.11.9":
"@emotion/serialize@^0.11.10", "@emotion/serialize@^0.11.8":
version "0.11.10"
resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.10.tgz#53207dba7e28bd96928fc2a37e20b31b712bf9a2"
integrity sha512-04AB+wU00vv9jLgkWn13c/GJg2yXp3w7ZR3Q1O6mBSE6mbUmYeNX3OpBhfp//6r47lFyY0hBJJue+bA30iokHQ==
Expand All @@ -957,23 +957,23 @@
resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.3.tgz#689f135ecf87d3c650ed0c4f5ddcbe579883564a"
integrity sha512-c3Q6V7Df7jfwSq5AzQWbXHa5soeE4F5cbqi40xn0CzXxWW9/6Mxq48WJEtqfWzbZtW9odZdnRAkwCQwN12ob4A==

"@emotion/styled-base@^10.0.15":
version "10.0.15"
resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.15.tgz#481dbfa5496259c8c64923fa24dfc9f456d83218"
integrity sha512-u1mtdoEip9uf0Wa/CrgLNFiu5pP6annTHyZGGinBisk/dRGyfq3NB7suum8HeMu26xXk7b5/qseDlrsoHq75KQ==
"@emotion/styled-base@^10.0.17":
version "10.0.17"
resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.17.tgz#701af0cd256be2977db8d67c33630f542e460b85"
integrity sha512-vqQvxluZZKPByAB4zYZys0Qo/kVDP/03hAeg1K+TYpnZRwTi7WteOodc+/5669RPVNcfb93fphQpM5BYJnI1/g==
dependencies:
"@babel/runtime" "^7.4.3"
"@babel/runtime" "^7.5.5"
"@emotion/is-prop-valid" "0.8.2"
"@emotion/serialize" "^0.11.9"
"@emotion/serialize" "^0.11.10"
"@emotion/utils" "0.11.2"

"@emotion/styled@^10.0.14":
version "10.0.15"
resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.15.tgz#bc99b968bdbf491db7bc474bb90c8fcdbe0f2f87"
integrity sha512-vIKDo/hG741PNRpMnrJ6R8NnnjYfOBw3d6cb3yNckpjcp0NNq3ugE8/EjcYBU1Ke44nx2p00h5uzE396xOLJIg==
"@emotion/styled@^10.0.17":
version "10.0.17"
resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.17.tgz#0cd38b8b36259541f2c6717fc22607a120623654"
integrity sha512-zHMgWjHDMNjD+ux64POtDnjLAObniu3znxFBLSdV/RiEhSLjHIowfvSbbd/C33/3uwtI6Uzs2KXnRZtka/PpAQ==
dependencies:
"@emotion/styled-base" "^10.0.15"
babel-plugin-emotion "^10.0.15"
"@emotion/styled-base" "^10.0.17"
babel-plugin-emotion "^10.0.17"

"@emotion/[email protected]":
version "0.8.4"
Expand Down Expand Up @@ -3323,15 +3323,15 @@ babel-plugin-dynamic-import-node@^2.3.0:
dependencies:
object.assign "^4.1.0"

babel-plugin-emotion@^10.0.14, babel-plugin-emotion@^10.0.15:
version "10.0.15"
resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.15.tgz#2ce5bea191331ef65b3b9ae212a8f0e46ff97616"
integrity sha512-E3W68Zk8EcKpRUDW2tsFKi4gsavapMRjfr2/KKgG3l7l2zZpiKk0BxB59Ul9C0w0ekv6my/ylGOk2WroaqKXPw==
babel-plugin-emotion@^10.0.14, babel-plugin-emotion@^10.0.17:
version "10.0.17"
resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.17.tgz#5673fbed7b1ed61b4b98d5530f33c8a4d1b08484"
integrity sha512-KNuBadotqYWpQexHhHOu7M9EV1j2c+Oh/JJqBfEQDusD6mnORsCZKHkl+xYwK82CPQ/23wRrsBIEYnKjtbMQJw==
dependencies:
"@babel/helper-module-imports" "^7.0.0"
"@emotion/hash" "0.7.2"
"@emotion/memoize" "0.7.2"
"@emotion/serialize" "^0.11.9"
"@emotion/serialize" "^0.11.10"
babel-plugin-macros "^2.0.0"
babel-plugin-syntax-jsx "^6.18.0"
convert-source-map "^1.5.0"
Expand All @@ -3358,7 +3358,7 @@ babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.2.2:
cosmiconfig "^5.2.0"
resolve "^1.10.0"

babel-plugin-module-resolver@^3.0.0:
babel-plugin-module-resolver@^3.0.0, babel-plugin-module-resolver@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7"
integrity sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==
Expand All @@ -3369,7 +3369,7 @@ babel-plugin-module-resolver@^3.0.0:
reselect "^3.0.1"
resolve "^1.4.0"

babel-plugin-optimize-clsx@^2.3.0:
babel-plugin-optimize-clsx@^2.3.0, babel-plugin-optimize-clsx@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/babel-plugin-optimize-clsx/-/babel-plugin-optimize-clsx-2.4.1.tgz#d0e0c0accdc3f0bc8d5ce48634a0591623a15c90"
integrity sha512-lhZPi+oiHIqsQSGTkBGyyv3ysiDFcn1Md6bfnOKbiDcFlH+Kvev0nPbnNmKgwQtMggd9s9Hq0nY20HJ5Wg9xDQ==
Expand Down Expand Up @@ -3428,7 +3428,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-promises/-/babel-plugin-transform-async-to-promises-0.8.9.tgz#a214630248c349b2390930d03588b57958fedcfc"
integrity sha512-m5wjgvuaycQjDDo1gIywcPyF2IMwgk+c/Ks3ZSyjo2+n2QWbzMT+CoJAvLYHn6wb9of6iSFbsR7UAjDCTvWoQA==

babel-plugin-transform-dev-warning@^0.1.0:
babel-plugin-transform-dev-warning@^0.1.0, babel-plugin-transform-dev-warning@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-dev-warning/-/babel-plugin-transform-dev-warning-0.1.1.tgz#9e3cca7c22b27a667486fda11bbce29c0c59e76e"
integrity sha512-3n6ptKAU1KqhfzmrQuI4Blyvt0T6vHCeaOpULKjAbU+5+JSePSeVorB+24SHe58/zxXsP4sm1q3crsDFD+UHYQ==
Expand All @@ -3445,7 +3445,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.15.tgz#7ba830e77276a0e788cd58ea527b5f70396e12a7"
integrity sha512-bFxxYdkZBwTjTgtZEPTLqu9g8Ajz8x8uEP/O1iVuaZIz2RuxJ2gtx0EXDJRonC++KGsgsW/4Hqvk4KViEtE2nw==

babel-plugin-transform-react-remove-prop-types@^0.4.21:
babel-plugin-transform-react-remove-prop-types@^0.4.21, babel-plugin-transform-react-remove-prop-types@^0.4.24:
version "0.4.24"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"
integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==
Expand Down Expand Up @@ -5822,12 +5822,12 @@ emotion-theming@^10.0.14:
"@emotion/weak-memoize" "0.2.3"
hoist-non-react-statics "^3.3.0"

emotion@^10.0.14:
version "10.0.14"
resolved "https://registry.yarnpkg.com/emotion/-/emotion-10.0.14.tgz#d7702a6147de6e8ce863dacde98418a467c5fed4"
integrity sha512-6cTWfwqVGy9UinGSZQKRGyuRsRGkzlT0MaeH2pF4BvL7u6PnyTZeyHj4INwzpaXBLwA9C0JaFqS31J62RWUNNw==
emotion@^10.0.17:
version "10.0.17"
resolved "https://registry.yarnpkg.com/emotion/-/emotion-10.0.17.tgz#d71e99d2b01204dda109c13d069af4b191e70445"
integrity sha512-nShD/a7PKZ77hr517KfzKkHo1v26uPJBImRiYrl8IwIA4KRmI3vxVEA5pzw1TQTXD1iZl6YQtWhjOiiE+QPmTQ==
dependencies:
babel-plugin-emotion "^10.0.14"
babel-plugin-emotion "^10.0.17"
create-emotion "^10.0.14"

encodeurl@~1.0.1, encodeurl@~1.0.2:
Expand Down Expand Up @@ -11960,7 +11960,7 @@ react-docgen@^5.0.0-beta.1:
node-dir "^0.1.10"
strip-indent "^2.0.0"

react-dom@^16.8.5:
react-dom@^16.8.5, react-dom@^16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
integrity sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==
Expand Down Expand Up @@ -12254,7 +12254,7 @@ react-window@^1.8.5:
"@babel/runtime" "^7.0.0"
memoize-one ">=3.1.1 <6"

react@^16.3.0, react@^16.8.5:
react@^16.3.0, react@^16.8.5, react@^16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"
integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==
Expand Down Expand Up @@ -14850,7 +14850,7 @@ webidl-conversions@^4.0.2:
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==

webpack-bundle-analyzer@^3.0.0, webpack-bundle-analyzer@^3.0.3:
webpack-bundle-analyzer@^3.0.0, webpack-bundle-analyzer@^3.0.3, webpack-bundle-analyzer@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.4.1.tgz#430544c7ba1631baccf673475ca8300cb74a3c47"
integrity sha512-Bs8D/1zF+17lhqj2OYmzi7HEVYqEVxu7lCO9Ff8BwajenOU0vAwEoV8e4ICCPNZAcqR1PCR/7o2SkW+cnCmF0A==
Expand Down Expand Up @@ -14977,7 +14977,7 @@ [email protected]:
watchpack "^1.5.0"
webpack-sources "^1.3.0"

webpack@^4.28.2, webpack@^4.28.4, webpack@^4.39.3:
webpack@^4.28.2, webpack@^4.28.4, webpack@^4.39.2, webpack@^4.39.3:
version "4.39.3"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.39.3.tgz#a02179d1032156b713b6ec2da7e0df9d037def50"
integrity sha512-BXSI9M211JyCVc3JxHWDpze85CvjC842EvpRsVTc/d15YJGlox7GIDd38kJgWrb3ZluyvIjgenbLDMBQPDcxYQ==
Expand Down