diff --git a/lib/ui/package.json b/lib/ui/package.json index 639c6048b33..cf2f9753c80 100644 --- a/lib/ui/package.json +++ b/lib/ui/package.json @@ -26,13 +26,13 @@ "lodash.debounce": "^4.0.8", "lodash.pick": "^4.4.0", "lodash.sortby": "^4.7.0", - "mantra-core": "^1.7.0", + "@storybook/mantra-core": "^1.7.0", "podda": "^1.2.2", "prop-types": "^15.6.0", "qs": "^6.5.1", "react-icons": "^2.2.7", "react-inspector": "^2.2.1", - "react-komposer": "^2.0.0", + "@storybook/react-komposer": "^2.0.0", "react-modal": "^3.1.2", "react-split-pane": "^0.1.68", "react-treebeard": "^2.0.3", diff --git a/lib/ui/src/compose.js b/lib/ui/src/compose.js index 8b6f28352a0..a66523c999b 100644 --- a/lib/ui/src/compose.js +++ b/lib/ui/src/compose.js @@ -1,4 +1,4 @@ -import { setDefaults } from 'react-komposer'; +import { setDefaults } from '@storybook/react-komposer'; let context; let actions; diff --git a/lib/ui/src/index.js b/lib/ui/src/index.js index 7ce871295f5..1ed59a680ab 100644 --- a/lib/ui/src/index.js +++ b/lib/ui/src/index.js @@ -1,4 +1,4 @@ -import { createApp } from 'mantra-core'; +import { createApp } from '@storybook/mantra-core'; import Podda from 'podda'; import buildContext from './context'; diff --git a/yarn.lock b/yarn.lock index 346ea98cb7e..2e128225d0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -73,6 +73,14 @@ git-url-parse "^6.0.2" shelljs "^0.7.0" +"@storybook/mantra-core@^1.7.0": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@storybook/mantra-core/-/mantra-core-1.7.1.tgz#d2776b82cff9ef0589fa9b04b40352b0a148cd70" + dependencies: + "@storybook/react-komposer" "^2.0.1" + "@storybook/react-simple-di" "^1.2.1" + babel-runtime "6.x.x" + "@storybook/react-fuzzy@^0.4.3": version "0.4.3" resolved "https://registry.yarnpkg.com/@storybook/react-fuzzy/-/react-fuzzy-0.4.3.tgz#36f7536ba97bf08b03cb57f47c58ae2cca330aec" @@ -82,6 +90,29 @@ fuse.js "^3.0.1" prop-types "^15.5.9" +"@storybook/react-komposer@^2.0.0", "@storybook/react-komposer@^2.0.1": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@storybook/react-komposer/-/react-komposer-2.0.2.tgz#ae51627a996a7114d7820ea2bb598fb543dce9e1" + dependencies: + "@storybook/react-stubber" "^1.0.0" + babel-runtime "^6.11.6" + hoist-non-react-statics "^1.2.0" + lodash.pick "^4.4.0" + shallowequal "^0.2.2" + +"@storybook/react-simple-di@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@storybook/react-simple-di/-/react-simple-di-1.2.1.tgz#fe4b29a32459e168da3aae8e6fcd8631861210c9" + dependencies: + babel-runtime "6.x.x" + hoist-non-react-statics "1.x.x" + +"@storybook/react-stubber@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@storybook/react-stubber/-/react-stubber-1.0.1.tgz#8c312c2658b9eeafce470e1c39e4193f0b5bf9b1" + dependencies: + babel-runtime "^6.5.0" + "@types/inline-style-prefixer@^3.0.0": version "3.0.1" resolved "https://registry.yarnpkg.com/@types/inline-style-prefixer/-/inline-style-prefixer-3.0.1.tgz#8541e636b029124b747952e9a28848286d2b5bf6" @@ -5797,7 +5828,7 @@ interpret@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0" -invariant@2.x.x, invariant@^2.2.0, invariant@^2.2.2: +invariant@^2.2.0, invariant@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" dependencies: @@ -7475,14 +7506,6 @@ makeerror@1.0.x: dependencies: tmpl "1.0.x" -mantra-core@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/mantra-core/-/mantra-core-1.7.0.tgz#a8c83e8cee83ef6a7383131519fe8031ad546386" - dependencies: - babel-runtime "6.x.x" - react-komposer "^1.9.0" - react-simple-di "^1.2.0" - map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" @@ -7793,10 +7816,6 @@ mkdirp@0.5.0: dependencies: minimist "0.0.8" -mobx@^2.3.4: - version "2.7.0" - resolved "https://registry.yarnpkg.com/mobx/-/mobx-2.7.0.tgz#cf3d82d18c0ca7f458d8f2a240817b3dc7e54a01" - modify-values@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2" @@ -9357,26 +9376,6 @@ react-inspector@^2.2.1: babel-runtime "^6.26.0" is-dom "^1.0.9" -react-komposer@^1.9.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/react-komposer/-/react-komposer-1.13.1.tgz#4b8ac4bcc71323bd7413dcab95c831197f50eed0" - dependencies: - babel-runtime "6.x.x" - hoist-non-react-statics "1.x.x" - invariant "2.x.x" - mobx "^2.3.4" - shallowequal "0.2.x" - -react-komposer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/react-komposer/-/react-komposer-2.0.0.tgz#b964738014a9b4aee494a83c0b5b833d66072a90" - dependencies: - babel-runtime "^6.11.6" - hoist-non-react-statics "^1.2.0" - lodash.pick "^4.4.0" - react-stubber "^1.0.0" - shallowequal "^0.2.2" - react-modal@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.2.tgz#6e1fd656315d6fc62a1edda2b5aecc9752ac6bca" @@ -9512,13 +9511,6 @@ react-scripts@1.0.17: optionalDependencies: fsevents "1.1.2" -react-simple-di@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/react-simple-di/-/react-simple-di-1.2.0.tgz#dde0e5bf689f391ef2ab02c9043b213fe239c6d0" - dependencies: - babel-runtime "6.x.x" - hoist-non-react-statics "1.x.x" - react-split-pane@^0.1.68: version "0.1.70" resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.70.tgz#0dcf3d8de17d54db6f6b7141386ec69a0cf45f48" @@ -9529,12 +9521,6 @@ react-split-pane@^0.1.68: prop-types "^15.5.10" react-style-proptype "^3.0.0" -react-stubber@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/react-stubber/-/react-stubber-1.0.0.tgz#41ee2cac72d4d4fd70a63896da98e13739b84628" - dependencies: - babel-runtime "^6.5.0" - react-style-proptype@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/react-style-proptype/-/react-style-proptype-3.1.0.tgz#c8912fc13460f5b0c1ec1114c729d535b52b8073" @@ -10600,7 +10586,7 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shallowequal@0.2.x, shallowequal@^0.2.2: +shallowequal@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-0.2.2.tgz#1e32fd5bcab6ad688a4812cb0cc04efc75c7014e" dependencies: