diff --git a/lib/ui/package.json b/lib/ui/package.json index 639c6048b335..cf2f9753c80e 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 8b6f28352a0e..a66523c999bc 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 7ce871295f5f..1ed59a680ab3 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 346ea98cb7e0..53f926aff4c8 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.2" + resolved "https://registry.yarnpkg.com/@storybook/mantra-core/-/mantra-core-1.7.2.tgz#e10c7faca29769e97131e0e0308ef7cfb655b70c" + 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.3" + resolved "https://registry.yarnpkg.com/@storybook/react-komposer/-/react-komposer-2.0.3.tgz#f9e12a9586b2ce95c24c137eabb8b71527ddb369" + 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" @@ -93,12 +124,12 @@ "@types/node" "*" "@types/node@*", "@types/node@^8.0.0", "@types/node@^8.0.51": - version "8.0.51" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb" + version "8.0.52" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.52.tgz#8e7f47747868e7687f2cd4922966e2d6af78d22d" "@types/react@^16.0.18", "@types/react@^16.0.20", "@types/react@^16.0.22": - version "16.0.22" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.22.tgz#19ad106e124aceebd2b4d430a278d55413ee8759" + version "16.0.23" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.23.tgz#f0f713b07912c6fd8e10c9ccc539443ceb06dbca" JSONStream@^1.0.4: version "1.3.1" @@ -2277,12 +2308,12 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000760" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000760.tgz#3ea29473eb78a6ccb09f2eb73ac9e1debfec528d" + version "1.0.30000764" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000764.tgz#d73ab11ae62f6a9e2f69867d6d9c23ae3f2e5d8d" caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000760: - version "1.0.30000760" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000760.tgz#ec720395742f1c7ec8947fd6dd2604e77a8f98ff" + version "1.0.30000764" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000764.tgz#97ea7472f9d3e691eede34f21983cfc219ac7842" capture-stack-trace@^1.0.0: version "1.0.0" @@ -3716,8 +3747,8 @@ entities@^1.1.1, entities@~1.1.1: resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" envinfo@^3.0.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-3.9.0.tgz#eea5c3d5bce44ee9fc9a345ab9f44a616f45552a" + version "3.9.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-3.9.1.tgz#78d5ccbea17ca2daefd8541561d1273813b96c4c" dependencies: copy-paste "^1.3.0" glob "^7.1.2" @@ -3726,8 +3757,8 @@ envinfo@^3.0.0: which "^1.2.14" enzyme-adapter-react-16@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.4.tgz#67f898cc053452f5c786424e395fe0c63a0607fe" + version "1.1.0" + resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.0.tgz#86c5db7c10f0be6ec25d54ca41b59f2abb397cf4" dependencies: enzyme-adapter-utils "^1.1.0" lodash "^4.17.4" @@ -3757,18 +3788,19 @@ enzyme-to-json@^3.0.0: lodash "^4.17.4" enzyme@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.1.1.tgz#c6948dfccd055d75fbd8627ad1c96a024d0e247b" + version "3.2.0" + resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.2.0.tgz#998bdcda0fc71b8764a0017f7cc692c943f54a7a" dependencies: cheerio "^1.0.0-rc.2" function.prototype.name "^1.0.3" + has "^1.0.1" is-subset "^0.1.1" lodash "^4.17.4" object-is "^1.0.1" object.assign "^4.0.4" object.entries "^1.0.4" object.values "^1.0.4" - raf "^3.3.2" + raf "^3.4.0" rst-selector-parser "^2.2.3" errno@^0.1.3, errno@^0.1.4: @@ -5797,7 +5829,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: @@ -7416,8 +7448,8 @@ log-update@^1.0.2: cli-cursor "^1.0.2" loglevel@^1.4.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.5.1.tgz#189078c94ab9053ee215a0acdbf24244ea0f6502" + version "1.6.0" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.0.tgz#ae0caa561111498c5ba13723d6fb631d24003934" longest-streak@^2.0.1: version "2.0.2" @@ -7475,14 +7507,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 +7817,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" @@ -7868,8 +7888,8 @@ mz@^2.4.0: thenify-all "^1.0.0" nan@^2.3.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" + version "2.8.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" natural-compare@^1.4.0: version "1.4.0" @@ -9161,7 +9181,7 @@ radium@^0.19.0: inline-style-prefixer "^2.0.5" prop-types "^15.5.8" -raf@3.4.0, raf@^3.3.2, raf@^3.4.0: +raf@3.4.0, raf@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575" dependencies: @@ -9357,26 +9377,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,16 +9512,9 @@ 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" + version "0.1.71" + resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.71.tgz#19b1b30638655e655f9f5fe57b1ae7cc6c151829" dependencies: "@types/inline-style-prefixer" "^3.0.0" "@types/react" "^16.0.18" @@ -9529,12 +9522,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 +10587,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: @@ -11884,8 +11871,8 @@ vm2@patriksimek/vm2#custom_files: resolved "https://codeload.github.com/patriksimek/vm2/tar.gz/7e82f90ac705fc44fad044147cb0df09b4c79a57" voca@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/voca/-/voca-1.3.0.tgz#02751ac839bf0c92e2cfe88e49c393c94dd50ac3" + version "1.3.1" + resolved "https://registry.yarnpkg.com/voca/-/voca-1.3.1.tgz#60c911dd41841785192b4d35971ec2b36f8ef779" vue-hot-reload-api@^2.2.0, vue-hot-reload-api@^2.2.3: version "2.2.3"