Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit cf9e281

Browse files
authoredNov 6, 2018
Merge branch 'next' into dependabot/npm_and_yarn/examples-native/crna-kitchen-sink/whatwg-fetch-tw-3.0.0
2 parents ab35509 + 253a667 commit cf9e281

File tree

57 files changed

+433
-336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+433
-336
lines changed
 

‎CHANGELOG.md

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,98 @@
1+
# 4.1.0-alpha.1
2+
3+
2018-November-06
4+
5+
#### Features
6+
7+
- Core: add cursor images to webpack loader [#4498](https://github.com/storybooks/storybook/pull/4498)
8+
- Storyshots-puppeteer: Allow specifying an existing browser [#4721](https://github.com/storybooks/storybook/pull/4721)
9+
10+
#### Dependency Upgrades
11+
12+
- Bump @angular/compiler from 7.0.1 to 7.0.2 [#4677](https://github.com/storybooks/storybook/pull/4677)
13+
- Bump @types/jest from 23.3.8 to 23.3.9 [#4658](https://github.com/storybooks/storybook/pull/4658)
14+
- Bump copy-webpack-plugin from 4.5.4 to 4.6.0 [#4674](https://github.com/storybooks/storybook/pull/4674)
15+
- Bump @ngrx/store from 6.1.1 to 6.1.2 [#4678](https://github.com/storybooks/storybook/pull/4678)
16+
- [Security] Bump merge from 1.2.0 to 1.2.1 [#4686](https://github.com/storybooks/storybook/pull/4686)
17+
18+
# 4.1.0-alpha.0
19+
20+
Publish failed
21+
22+
# 4.0.4
23+
24+
2018-November-06
25+
26+
#### Bug Fixes
27+
28+
- Core: Change extensions ordering in webpack config [#4708](https://github.com/storybooks/storybook/pull/4708)
29+
- Addon-Knobs: Fix PropTypes in NumberType [#4669](https://github.com/storybooks/storybook/pull/4669)
30+
- Addon-Viewport: Fix "defaultViewport" configuration [#4683](https://github.com/storybooks/storybook/pull/4683)
31+
- Addon-Jest: Fix test matching [#4689](https://github.com/storybooks/storybook/pull/4689)
32+
- Fix tests in node 11 by using `Array#sort` correctly [#4720](https://github.com/storybooks/storybook/pull/4720)
33+
34+
#### Dependency Upgrades
35+
36+
- Bump react-syntax-highlighter from 9.0.1 to 10.0.0 [#4654](https://github.com/storybooks/storybook/pull/4654)
37+
- Remove SB deps from cli tests [#4705](https://github.com/storybooks/storybook/pull/4705)
38+
39+
# 4.0.3
40+
41+
2018-November-06
42+
43+
#### Bug Fixes
44+
45+
- React: Fix css relative asset urls [#4695](https://github.com/storybooks/storybook/pull/4695)
46+
- Core: Fix a bug with buildStaticStandalone resolving too early [#4649](https://github.com/storybooks/storybook/pull/4649)
47+
- Angular: Fixes component imports from dist [#4682](https://github.com/storybooks/storybook/pull/4682)
48+
- Addon-info: Improve accessibility with contrast [#4698](https://github.com/storybooks/storybook/pull/4698)
49+
- Ember: update ergonomics to not require any manual setup [#4594](https://github.com/storybooks/storybook/pull/4594)
50+
51+
#### Maintenance
52+
53+
- Update release process and `master` becomes the stable branch [#4719](https://github.com/storybooks/storybook/pull/4719)
54+
- Report CLI tests to teamcity [#4671](https://github.com/storybooks/storybook/pull/4671)
55+
56+
#### Dependency Upgrades
57+
58+
<details>
59+
<summary>
60+
30 PRs
61+
</summary>
62+
63+
- Bump @angular/core from 7.0.1 to 7.0.2 [#4675](https://github.com/storybooks/storybook/pull/4675)
64+
- [Security] Bump merge from 1.2.0 to 1.2.1 in /docs [#4687](https://github.com/storybooks/storybook/pull/4687)
65+
- Bump typescript from 3.1.4 to 3.1.6 [#4699](https://github.com/storybooks/storybook/pull/4699)
66+
- Set zone.js as a peer and dev dependency [#4663](https://github.com/storybooks/storybook/pull/4663)
67+
- chore(core): update css-loader to latest [#4619](https://github.com/storybooks/storybook/pull/4619)
68+
- Bump css-loader from 1.0.0 to 1.0.1 [#4655](https://github.com/storybooks/storybook/pull/4655)
69+
- Bump @ngrx/store from 6.1.0 to 6.1.1 [#4653](https://github.com/storybooks/storybook/pull/4653)
70+
- Allow for angular-devkit/core version aligned with Angular v7 [#4652](https://github.com/storybooks/storybook/pull/4652)
71+
- Bump ember-load-initializers from 1.1.0 to 2.0.0 [#4634](https://github.com/storybooks/storybook/pull/4634)
72+
- Bump @ember/test-helpers from 0.7.27 to 1.0.0 [#4630](https://github.com/storybooks/storybook/pull/4630)
73+
- Bump @storybook/addon-actions from 3.4.11 to 4.0.0 in /docs [#4626](https://github.com/storybooks/storybook/pull/4626)
74+
- Bump gatsby-plugin-sharp from 2.0.7 to 2.0.10 in /docs [#4627](https://github.com/storybooks/storybook/pull/4627)
75+
- Bump typescript from 3.1.3 to 3.1.4 [#4629](https://github.com/storybooks/storybook/pull/4629)
76+
- Bump react-scripts from 2.0.5 to 2.1.0 [#4631](https://github.com/storybooks/storybook/pull/4631)
77+
- Bump ember-source from 3.5.0 to 3.5.1 [#4633](https://github.com/storybooks/storybook/pull/4633)
78+
- Bump @types/node from 10.12.0 to 10.12.1 [#4635](https://github.com/storybooks/storybook/pull/4635)
79+
- Bump react-dev-utils from 6.0.5 to 6.1.0 [#4636](https://github.com/storybooks/storybook/pull/4636)
80+
- Bump eslint from 5.7.0 to 5.8.0 [#4613](https://github.com/storybooks/storybook/pull/4613)
81+
- Bump express-graphql from 0.6.12 to 0.7.1 [#4610](https://github.com/storybooks/storybook/pull/4610)
82+
- Bump tslint-plugin-prettier from 2.0.0 to 2.0.1 [#4609](https://github.com/storybooks/storybook/pull/4609)
83+
- Bump eslint-plugin-jest from 21.26.1 to 21.26.2 [#4606](https://github.com/storybooks/storybook/pull/4606)
84+
- Bump @types/jest from 23.3.7 to 23.3.8 [#4611](https://github.com/storybooks/storybook/pull/4611)
85+
- Bump fork-ts-checker-webpack-plugin from 0.4.10 to 0.4.14 [#4607](https://github.com/storybooks/storybook/pull/4607)
86+
- Bump autoprefixer from 9.2.1 to 9.3.1 [#4605](https://github.com/storybooks/storybook/pull/4605)
87+
- Bump jasmine-core from 3.2.1 to 3.3.0 [#4581](https://github.com/storybooks/storybook/pull/4581)
88+
- Bump react-dom from 16.5.2 to 16.6.0 [#4580](https://github.com/storybooks/storybook/pull/4580)
89+
- Bump eslint-plugin-jest from 21.25.1 to 21.26.1 [#4583](https://github.com/storybooks/storybook/pull/4583)
90+
- Bump react from 16.5.2 to 16.6.0 [#4584](https://github.com/storybooks/storybook/pull/4584)
91+
- Bump react-syntax-highlighter from 9.0.0 to 9.0.1 [#4585](https://github.com/storybooks/storybook/pull/4585)
92+
- Bump remark-cli from 5.0.0 to 6.0.0 [#4551](https://github.com/storybooks/storybook/pull/4551)
93+
94+
</details>
95+
196
# 4.0.2
297

398
2018-October-31

‎CONTRIBUTING.md

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ This repo uses yarn workspaces, so you should install `yarn@1.3.2` or higher as
1010

1111
No software is bug-free. So, if you got an issue, follow these steps:
1212

13-
- Search the [issue list](https://github.com/storybooks/storybook/issues?utf8=%E2%9C%93&q=) for current and old issues.
14-
- If you find an existing issue, please UPVOTE the issue by adding a "thumbs-up reaction". We use this to help prioritize issues!
15-
- If none of that is helping, create an issue with the following information:
16-
- Clear title (shorter is better).
17-
- Describe the issue in clear language.
18-
- Share error logs, screenshots and etc.
19-
- To speed up the issue fixing process, send us a sample repo with the issue you faced:
13+
- Search the [issue list](https://github.com/storybooks/storybook/issues?utf8=%E2%9C%93&q=) for current and old issues.
14+
- If you find an existing issue, please UPVOTE the issue by adding a "thumbs-up reaction". We use this to help prioritize issues!
15+
- If none of that is helping, create an issue with the following information:
16+
- Clear title (shorter is better).
17+
- Describe the issue in clear language.
18+
- Share error logs, screenshots and etc.
19+
- To speed up the issue fixing process, send us a sample repo with the issue you faced:
2020

2121
### Testing against `master`
2222

@@ -47,11 +47,11 @@ This command will list all the suites and options for running tests.
4747
yarn test
4848
```
4949

50-
The options for running tests can be selected from the cli or be passed to `yarn test` with specific parameters. Available modes include `--watch`, `--coverage`, and `--runInBand`, which will respectively run tests in watch mode, output code coverage, and run selected test suites serially in the current process.
50+
The options for running tests can be selected from the cli or be passed to `yarn test` with specific parameters. Available modes include `--watch`, `--coverage`, and `--runInBand`, which will respectively run tests in watch mode, output code coverage, and run selected test suites serially in the current process.
5151

5252
You can use the `--update` flag to update snapshots or screenshots as needed.
5353

54-
You can also pick suites from CLI. Suites available are listed below.
54+
You can also pick suites from CLI. Suites available are listed below.
5555

5656
##### Core & Examples Tests
5757

@@ -147,15 +147,14 @@ When creating new unit test files, the tests should adhere to a particular folde
147147
| +-- [filename].test.js
148148
```
149149

150-
151150
## Pull Requests (PRs)
152151

153152
We welcome your contributions. There are many ways you can help us. This is few of those ways:
154153

155-
- Fix typos and add more [documentation](https://github.com/storybooks/storybook/labels/needs%20docs).
156-
- Try to fix some [bugs](https://github.com/storybooks/storybook/labels/bug).
157-
- Work on [API](https://github.com/storybooks/storybook/labels/enhancement%3A%20api), [Addons](https://github.com/storybooks/storybook/labels/enhancement%3A%20addons), [UI](https://github.com/storybooks/storybook/labels/enhancement%3A%20ui) or [Webpack](https://github.com/storybooks/storybook/labels/enhancement%3A%20webpack) use enhancements and new [features](https://github.com/storybooks/storybook/labels/feature%20request).
158-
- Add more [tests](https://codecov.io/gh/storybooks/storybook/tree/master/packages) (specially for the [UI](https://codecov.io/gh/storybooks/storybook/tree/master/packages/storybook-ui/src)).
154+
- Fix typos and add more [documentation](https://github.com/storybooks/storybook/labels/needs%20docs).
155+
- Try to fix some [bugs](https://github.com/storybooks/storybook/labels/bug).
156+
- Work on [API](https://github.com/storybooks/storybook/labels/enhancement%3A%20api), [Addons](https://github.com/storybooks/storybook/labels/enhancement%3A%20addons), [UI](https://github.com/storybooks/storybook/labels/enhancement%3A%20ui) or [Webpack](https://github.com/storybooks/storybook/labels/enhancement%3A%20webpack) use enhancements and new [features](https://github.com/storybooks/storybook/labels/feature%20request).
157+
- Add more [tests](https://codecov.io/gh/storybooks/storybook/tree/master/packages) (specially for the [UI](https://codecov.io/gh/storybooks/storybook/tree/master/packages/storybook-ui/src)).
159158

160159
Before you submit a new PR, make sure you run `yarn test`. Do not submit a PR if tests are failing. If you need any help, create an issue and ask.
161160

@@ -179,9 +178,9 @@ Once you've helped out on a few issues, if you'd like triage access you can help
179178

180179
We use the following label scheme to categorize issues:
181180

182-
- **type** - `bug`, `feature`, `question / support`, `discussion`, `dependencies`, `maintenance`.
183-
- **area** - `addon: x`, `addons-api`, `stories-api`, `ui`, etc.
184-
- **status** - `needs reproduction`, `needs PR`, `in progress`, etc.
181+
- **type** - `bug`, `feature`, `question / support`, `discussion`, `dependencies`, `maintenance`.
182+
- **area** - `addon: x`, `addons-api`, `stories-api`, `ui`, etc.
183+
- **status** - `needs reproduction`, `needs PR`, `in progress`, etc.
185184

186185
All issues should have a `type` label. `bug`/`feature`/`question`/`discussion` are self-explanatory. `dependencies` is for keeping package dependencies up to date. `maintenance` is a catch-all for any kind of cleanup or refactoring.
187186

@@ -193,15 +192,15 @@ If an issue is a `bug`, and it doesn't have a clear reproduction that you have p
193192

194193
### Closing issues
195194

196-
- Duplicate issues should be closed with a link to the original.
197-
- Unreproducible issues should be closed if it's not possible to reproduce them (if the reporter drops offline,
198-
it is reasonable to wait 2 weeks before closing).
199-
- `bug`s should be labelled `merged` when merged, and be closed when the issue is fixed and released.
200-
- `feature`s, `maintenance`s, `greenkeeper`s should be labelled `merged` when merged,
201-
and closed when released or if the feature is deemed not appropriate.
202-
- `question / support`s should be closed when the question has been answered.
203-
If the questioner drops offline, a reasonable period to wait is two weeks.
204-
- `discussion`s should be closed at a maintainer's discretion.
195+
- Duplicate issues should be closed with a link to the original.
196+
- Unreproducible issues should be closed if it's not possible to reproduce them (if the reporter drops offline,
197+
it is reasonable to wait 2 weeks before closing).
198+
- `bug`s should be labelled `merged` when merged, and be closed when the issue is fixed and released.
199+
- `feature`s, `maintenance`s, `greenkeeper`s should be labelled `merged` when merged,
200+
and closed when released or if the feature is deemed not appropriate.
201+
- `question / support`s should be closed when the question has been answered.
202+
If the questioner drops offline, a reasonable period to wait is two weeks.
203+
- `discussion`s should be closed at a maintainer's discretion.
205204

206205
## Development Guide
207206

@@ -211,8 +210,8 @@ If an issue is a `bug`, and it doesn't have a clear reproduction that you have p
211210

212211
Please have the **_latest_** stable versions of the following on your machine
213212

214-
- node
215-
- yarn
213+
- node
214+
- yarn
216215

217216
### Initial Setup
218217

@@ -295,15 +294,15 @@ If you don't see the changes rerun `yarn storybook` again in your sandbox app
295294

296295
This section is for Storybook maintainers who will be creating releases. It assumes:
297296

298-
- yarn >= 1.3.2
299-
- you've yarn linked `pr-log` from <https://github.com/storybooks/pr-log/pull/2>
297+
- yarn >= 1.3.2
298+
- you've yarn linked `pr-log` from <https://github.com/storybooks/pr-log/pull/2>
300299

301300
The current manual release sequence is as follows:
302301

303-
- Generate a changelog and verify the release by hand
304-
- Push the changelog to master or the release branch
305-
- Clean, build and publish the release
306-
- Cut and paste the changelog to the github release page, and mark it as a (pre-) release
302+
- Generate a changelog and verify the release by hand
303+
- Push the changelog to master or the release branch
304+
- Clean, build and publish the release
305+
- Cut and paste the changelog to the github release page, and mark it as a (pre-) release
307306

308307
**NOTE:** The very first time you publish a scoped package (`@storybook/x`) you need to make sure that it's package.json contains the following
309308

@@ -320,22 +319,22 @@ This sequence applies to both releases and pre-releases, but differs slightly be
320319
#### Prerelease:
321320

322321
```sh
323-
# make sure you current with origin/master.
324-
git checkout release/X.Y
322+
# make sure you current with origin/next.
323+
git checkout next
325324
git status
326325

327326
# generate changelog and edit as appropriate
328327
# generates a Next section
329-
yarn changelog Next
328+
yarn changelog x.y.z-alpha.a
330329

331330
# Edit the changelog/PRs as needed, then commit
332-
git commit -m "Updated changelog for vX.Y"
331+
git commit -m "x.y.z-alpha.a changelog"
333332

334333
# clean build
335334
yarn bootstrap --reset --core
336335

337336
# publish and tag the release
338-
npm run publish:alpha
337+
yarn run publish:next
339338

340339
# update the release page
341340
open https://github.com/storybooks/storybook/releases
@@ -350,16 +349,16 @@ git status
350349

351350
# generate changelog and edit as appropriate
352351
# generates a vNext section
353-
yarn changelog X.Y
352+
yarn changelog x.y.z
354353

355354
# Edit the changelog/PRs as needed, then commit
356-
git commit -m "Changelog for vX.Y"
355+
git commit -m "x.y.z changelog"
357356

358357
# clean build
359358
yarn bootstrap --reset --core
360359

361360
# publish and tag the release
362-
npm run publish
361+
yarn run publish
363362

364363
# update the release page
365364
open https://github.com/storybooks/storybook/releases

0 commit comments

Comments
 (0)
Please sign in to comment.