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

Jump to bottom

Switch to monorepo #749

Merged
merged 1,649 commits into from
Apr 14, 2017
Merged

Switch to monorepo #749

merged 1,649 commits into from
Apr 14, 2017

Conversation

ndelangen
Copy link
Member

@ndelangen ndelangen commented Apr 5, 2017 •
edited
Loading

Issue: #742

What I did

Moved all the source for this package into a /packages/react-storybook
Merged in the monorepo master
Resolved mergeconflicts

How to test

install dependencies - this should bootstrap lerna.
run npm run test in the root

arunoda and others added 30 commits December 24, 2016 04:27
@arunoda
Update CHANGELOG.md
8451839
@afc163
Fix wrong npm package path
36f1041
Merge pull request #57 from afc163/patch-1
e60ad36 
Fix wrong npm package path
Provide storybook context to render
a58fe9a
@arunoda
Merge pull request #69 from storybooks/storybook-context
fba1264 
Provide storybook context to render
3.1.1
853c4a0
Update CHANGELOG
00d60e5
@orta
Add support for matching a story against a regex to run a story
48a10f4
@roonyh
Merge pull request #70 from orta/regex
6dd68a5 
Add support for matching a story against a regex to run a story
3.2.0
02eb940
@roonyh
Update CHANGELOG.md
7ecfff2
@roonyh
Update CHANGELOG.md
eb04f27
@michaelbiebl
Merge branch 'master' into addon-compatibility
9ea3da1
@michaelbiebl
Provide addon channel
41275c4
@roryokane @arunoda
Fix broken link in Intro to Addons (#58)
c8d527c
@colbycheeze @arunoda
Fix typo in nav (#60)
eefcd1e
@panosvoudouris
Update basic story
3e99b38
@panosvoudouris
JSX info styles
fded1e3
@panosvoudouris
Fix proptype, styling and add inline sample
59d0c54
Sorted stories by kind
f9618ba
Changed sorting behavior to be optional
aa39dc8
@arunoda
Merge pull request #68 from thzinc/master
7e6f9f8 
Sorted stories by kind
@thzinc
Updated README to include sortStoriesByKind option
1a8e17f
@arunoda
Merge pull request #13 from thzinc/master
d6ffe39 
Updated README to include sortStoriesByKind option
@roonyh
Merge pull request #72 from michaelbiebl/addon-channel
701fccb 
Provide mock Storybook Channel to Storybook Addons for compatibility with Storybook Addon Knobs
3.2.1
7325c02
Move set channel to happen before anything runs because
66fff66 
addons might init expecting the channel to exist.
@coryhouse @arunoda
Typo fix (#61)
d36054d
@insin
Fix installation of dependencies on Windows
c0048ea
@insin
Remove src/ from paths in the REACT/WEBPACK_REACT Welcome.js component
c71b0ed
@xavxyz
migrating from React.PropTypes to PropTypes from 'prop-types'
42b8eb3 
And add "prop-types" in "dependencies" as recommended
@shilman
Copy link
Member

shilman commented Apr 13, 2017

@ndelangen Here are some notes from running it on a local project. TLDR; worked for me after a few minor bumps. Looks good!

  1. When I initially installed using npm install, I saw this warning:

Lerna v2.0.0-rc.1
Encountered a cycle in the dependency graph. This may cause instability!
I don't think this is a serious issue, but I wanted to raise it in case you hadn't seen it.

  1. Got the error Error: Couldn't find preset "stage-0" relative to directory ... when I tried to replace the version of storybooks I had with the current PR. Solved by adding babel-preset-stage-0.

  2. Broke some of my private addons, but when I commented those out, everything worked fine. I'll upgrade the addons once this version has been released!

shilman
shilman approved these changes Apr 13, 2017
View reviewed changes
Copy link
Member

@shilman shilman left a comment

Choose a reason for hiding this comment

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

Looks good! See my comments above, and also I agree with @tmeasday about merging early.

@ndelangen
Copy link
Member Author

ndelangen commented Apr 13, 2017 •
edited
Loading

Encountered a cycle in the dependency graph. This may cause instability!

This message is a known issue: https://github.com/storybooks/mono/issues/19

@ndelangen ndelangen changed the title WIP: Switch to monorepo Switch to monorepo Apr 13, 2017
aaronmcadam
aaronmcadam reviewed Apr 13, 2017
View reviewed changes
.eslintrc Outdated
"printWidth": 100,
"tabWidth": 2,
"bracketSpacing": true,
# "trailingComma": "es5",
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to decide on this comma rule? I vote for all as a value

Copy link
Member Author

Choose a reason for hiding this comment

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

done

aaronmcadam
aaronmcadam reviewed Apr 13, 2017
View reviewed changes
.eslintrc Outdated
}],
"quotes": ["warn", "single"],
"arrow-parens": ["warn", "as-needed"]
# "comma-dangle": ["warn", "always"]
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to remove this line?

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@ndelangen
CHANGE listing so trailing commas are always present && FIX linting
acc053d
@ndelangen
Merge branch 'master' into switch-to-monorepo
2df4be7 
# Conflicts:
#	packages/react-storybook/src/server/config/defaults/webpack.config.js
#	packages/react-storybook/src/server/middleware.js
usulpro
usulpro approved these changes Apr 14, 2017
View reviewed changes
Copy link
Member

@usulpro usulpro left a comment

Choose a reason for hiding this comment

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

+1 for mergin

@ndelangen ndelangen merged commit 69a3b94 into master Apr 14, 2017
@ndelangen ndelangen deleted the switch-to-monorepo branch April 28, 2017 16:04
@shilman shilman added the misc label May 27, 2017
@ndelangen ndelangen added the maintenance User-facing maintenance tasks label Sep 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eliperelman eliperelman eliperelman left review comments

@usulpro usulpro usulpro approved these changes

@shilman shilman shilman approved these changes

@aaronmcadam aaronmcadam aaronmcadam approved these changes

Assignees

@ndelangen ndelangen

Labels
maintenance User-facing maintenance tasks
Projects
None yet
Milestone
v3.0.0
Development

Successfully merging this pull request may close these issues.