Skip to content

Merge docs repo into this repo: add /docs#1131

Merged
shilman merged 164 commits intomasterfrom
ndelangen/dev
May 27, 2017
Merged

Merge docs repo into this repo: add /docs#1131
shilman merged 164 commits intomasterfrom
ndelangen/dev

Conversation

@ndelangen
Copy link
Copy Markdown
Member

@ndelangen ndelangen commented May 25, 2017 •
edited
Loading

Issue:

What I did

  • I merged the 3.0.0#source branch for docs into a /docs folder in this repo.
  • More updates to reflect 3.0.0
  • Linting for markdown on this entire repo

How to test

It's already deployed to http://storybook.js.org

thani-sh and others added 30 commits April 15, 2017 16:24
@thani-sh
Initial commit
2e39f45
@thani-sh
Create CNAME
fbe55ba
@shilman
Monorepo/storybooks.js.org doc update
83294fe 
- point references to appropriate monorepo sub packages
- update storybook / react-scripts versions
- remove storybook hub links
@shilman
Test index.html
a4c7299
@shilman
Remove CNAME temporarily
2b25359
@thani-sh
Merge pull request #1 from shilman/925-monorepo-doc-update
5dee115 
Monorepo/storybooks.js.org doc update
@thani-sh
Add CNAME file
c01484b
@thani-sh
Add publish script
cc6a3f9
@shilman
Merge pull request #2 from storybooks/setup-publish-script
da6bf45 
Setup publish npm script
@shilman
Clean up monorepo links
c0e42aa
@shilman
Merge pull request #4 from storybooks/3-cleanup-repo-links
c03303a 
Clean up monorepo links
@shilman
Fix SPA deep-linking problem
66f049e
@arunoda
Merge pull request #6 from storybooks/912-fix-deep-links
f0117ff 
Fix SPA deep-linking problem
@danny-andrews
Add note about webpack version
b8aa19a
@gvaldambrini
Add StoryRouter to the addon gallery
8812e78
@shilman
Update linkTo documentation
010257e 
Links used to be an add-on, but are now supported natively in
storybook. Updated the docs to reflect that.
@shilman
Merge pull request #9 from gvaldambrini/storyrouter
16cb95e 
Add StoryRouter to the addon gallery
Fix line break
b8521df
@shilman
Fixed typos and add function example
dd80a30
@shilman
Merge pull request #11 from storybooks/10-update-linkto-documentation
717d6ee 
Update linkTo documentation
@shilman
Added PR template similar to storybook repo
c459ab9
@shilman
Fix edit this page link
600ce1f 
When we moved to github pages, we moved the doc source to `source`
branch, and the `npm run publish` script force pushes the built site to
the `master` branch.
@shilman
New, static site starting from Gatsby starter kit
34de975 
Work in progress: ported storybooks content

Still needs:
- two-level nav hierarchy
- styling improvements
- stories ;-)
@xavxyz
Merge pull request #8 from danny-andrews/patch-1
beb1b0d 
Add note about webpack version
@xavxyz
Merge pull request #13 from storybooks/7-edit-this-page-link
0fbcef0 
Fix edit this page link
@shilman
Merge pull request #12 from storybooks/pr-template
7cd1f3d 
Added PR template similar to storybook repo
@shilman
Add edit-this-page link
da08abd
@shilman
Rename doc.md to doc/index.md
0e969e4 
Use index.md so that images show properly in github, e.g.:

```md
![Login Form](../static/login_form.png)
```
@shilman
Global styling
8774f7c
@shilman
Remove auto-generated files and fix deprecation errors
1443d41
@ndelangen ndelangen modified the milestones: v3.0.0, v3.0.1 May 26, 2017
@ndelangen ndelangen requested review from mthuret, shilman and thani-sh May 26, 2017 17:33
@ndelangen
Copy link
Copy Markdown
Member Author

ndelangen commented May 26, 2017

@mnmtanish @shilman @mthuret Would you like to review this?

@ndelangen ndelangen changed the title merge docs to this repo 3.0.0 3.0.0 docs by merging docs repo into this repo May 26, 2017
shilman
shilman approved these changes May 27, 2017
View reviewed changes
Copy link
Copy Markdown
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.

LGTM! Fingers crossed!

Comment thread addons/actions/package.json
},
"homepage": "https://github.com/storybooks/storybook/tree/master/addons/actions",
"devDependencies": {
"@storybook/addons": "^3.0.0-rc.0",
Copy link
Copy Markdown
Member

@shilman shilman May 27, 2017

Choose a reason for hiding this comment

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

Unrelated to docs, but we'll let it slide 😉

Copy link
Copy Markdown
Member

@Hypnosphi Hypnosphi Nov 17, 2017

Choose a reason for hiding this comment

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

@ndelangen Is there a chance that you can remember why was it needed to move @storybook/addons frop peerDeps to direct deps?

Copy link
Copy Markdown
Member Author

@ndelangen ndelangen Nov 20, 2017

Choose a reason for hiding this comment

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

Absolutely 0 chance of me remembering, sorry.

Though I think it makes sense, and without lock-files would work great.
Having these lockfiles really messes up the singleton module method, which lib/addons depends on to function.

Copy link
Copy Markdown
Member

@Hypnosphi Hypnosphi Nov 20, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

without lock-files would work great

But it's probably the only reason users have to use the same patch version for all the @storybook dependencies (regardless of whether do they use lockfile)

@shilman shilman merged commit 360fb0b into master May 27, 2017
@ndelangen ndelangen deleted the ndelangen/dev branch May 27, 2017 00:27
@ndelangen
Copy link
Copy Markdown
Member Author

ndelangen commented May 27, 2017

It would appear like a deploy to gh-pages wasn't succesful, can you look into it @shilman

@shilman shilman mentioned this pull request May 27, 2017
Merged
@ndelangen ndelangen changed the title 3.0.0 docs by merging docs repo into this repo Merge docs repo into this repo: add /docs May 27, 2017
@ndelangen ndelangen changed the title Merge docs repo into this repo: add /docs Merge docs repo into this repo: add /docs May 27, 2017
@snyk-bot snyk-bot mentioned this pull request Nov 5, 2022
Open
This was referenced Nov 5, 2022
Open
Open
@adrukh adrukh mentioned this pull request Nov 5, 2022
Open
@snyk-bot snyk-bot mentioned this pull request Nov 5, 2022
Open
@adrianblynch adrianblynch mentioned this pull request Nov 5, 2022
Open
@Bhanditz Bhanditz mentioned this pull request Nov 5, 2022
Open
This was referenced Dec 25, 2022
Open
Open
This was referenced Dec 25, 2022
Open
Open
@adrukh adrukh mentioned this pull request Dec 26, 2022
Open
@adrianblynch adrianblynch mentioned this pull request Dec 26, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@shilman shilman shilman approved these changes

@thani-sh thani-sh Awaiting requested review from thani-sh

@mthuret mthuret Awaiting requested review from mthuret

+1 more reviewer

@Hypnosphi Hypnosphi Hypnosphi left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@ndelangen ndelangen

Labels

documentation maintenance User-facing maintenance tasks

Projects

None yet

Milestone

v3.0.0

Development

Successfully merging this pull request may close these issues.