Skip to content

Fix bad merge that removed react-treebeard dep from lib/ui#1531

Merged
shilman merged 1 commit intorelease/3.2from
fix-3.2-package-versions
Jul 27, 2017
Merged

Fix bad merge that removed react-treebeard dep from lib/ui#1531
shilman merged 1 commit intorelease/3.2from
fix-3.2-package-versions

Conversation

@shilman
Copy link
Copy Markdown
Member

@shilman shilman commented Jul 27, 2017

Issue: N/A

What I did

Fix a bad merge, but submitting it as a PR because there are still some version issues and also I'm not comfortable with the current state on my machine. Somehow the treebeard stuff is still working on my machine in cra-kitchen-sink even when I do a clean install and I don't understand why.

What I need

@ndelangen can you review and also fix these version issues?

lerna WARN EHOIST_ROOT_VERSION The repository root depends on babel-core@^6.25.0, which differs from the more common babel-core@^6.24.1.
lerna WARN EHOIST_PKG_VERSION "@storybook/vue" package depends on babel-core@^6.24.1, which differs from the hoisted babel-core@^6.25.0.
lerna WARN EHOIST_PKG_VERSION "vue-example" package depends on babel-core@^6.24.1, which differs from the hoisted babel-core@^6.25.0.
lerna WARN EHOIST_ROOT_VERSION The repository root depends on babel-preset-env@^1.6.0, which differs from the more common babel-preset-env@^1.5.2.
lerna WARN EHOIST_PKG_VERSION "@storybook/vue" package depends on babel-preset-env@^1.5.2, which differs from the hoisted babel-preset-env@^1.6.0.
lerna WARN EHOIST_PKG_VERSION "vue-example" package depends on babel-preset-env@^1.5.2, which differs from the hoisted babel-preset-env@^1.6.0.
lerna WARN EHOIST_ROOT_VERSION The repository root depends on enzyme@^2.9.1, which differs from the more common enzyme@^2.8.2.
lerna WARN EHOIST_PKG_VERSION "@storybook/ui" package depends on enzyme@^2.8.2, which differs from the hoisted enzyme@^2.9.1.
lerna WARN EHOIST_PKG_VERSION "@storybook/vue" package depends on react@^15.5.4, which differs from the hoisted react@^15.6.1.
lerna WARN EHOIST_PKG_VERSION "@storybook/vue" package depends on react-dom@^15.5.4, which differs from the hoisted react-dom@^15.6.1.
lerna WARN EHOIST_PKG_VERSION "@storybook/vue" package depends on shelljs@^0.7.7, which differs from the hoisted shelljs@^0.7.8.
lerna WARN EHOIST_PKG_VERSION "@storybook/react" package depends on babel-plugin-react-docgen@^1.6.0, which differs from the hoisted babel-plugin-react-docgen@^1.5.0.

I propose we fix up the versions, do one last alpha release, and test it out before we pull the trigger on the 3.2 release.

@shilman shilman merged commit 79a8896 into release/3.2 Jul 27, 2017
@shilman shilman deleted the fix-3.2-package-versions branch July 27, 2017 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants