Skip to content

Commit

Permalink
Merge branch 'next' into feat/react-component-story
Browse files Browse the repository at this point in the history
  • Loading branch information
shilman committed May 10, 2021
2 parents 51aec15 + 6fe7f9c commit 99ddea0
Show file tree
Hide file tree
Showing 306 changed files with 15,315 additions and 8,801 deletions.
124 changes: 47 additions & 77 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -1,113 +1,83 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base",
"group:allNonMajor"
],
"prHourlyLimit": 1,
"prConcurrentLimit": 1,
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
extends: ['config:base', 'group:allNonMajor'],
prHourlyLimit: 1,
prConcurrentLimit: 1,
// Custom ignore paths to include our `examples/` directory
"ignorePaths": [
"**/node_modules/**",
"**/bower_components/**",
"**/vendor/**",
"**/__tests__/**",
"**/test/**",
"**/tests/**",
"**/__fixtures__/**"
],
"enabledManagers": [
"npm"
ignorePaths: [
'**/node_modules/**',
'**/bower_components/**',
'**/vendor/**',
'**/__tests__/**',
'**/test/**',
'**/tests/**',
'**/__fixtures__/**',
],
enabledManagers: ['npm'],
// Ignore release notes for non-breaking changes
"fetchReleaseNotes": false,
fetchReleaseNotes: false,
// Always bump minor/patch to latest
"rangeStrategy": "bump",
"major": {
rangeStrategy: 'bump',
major: {
// Replace ranges when there is a major
"rangeStrategy": "replace",
rangeStrategy: 'replace',
// Get us the release notes for breaking changes
"fetchReleaseNotes": true
fetchReleaseNotes: true,
},
"packageRules": [
packageRules: [
// Leave peerDependencies and engines alone
{
"depTypeList": [
"peerDependencies",
"engines"
],
"enabled": false
depTypeList: ['peerDependencies', 'engines'],
enabled: false,
},
// Handle patch updates under 0.1.0 as potentially breaking
// Workaround for https://github.com/renovatebot/renovate/issues/3588
{
"managers": [
"npm"
],
"matchCurrentVersion": "<0.1.0",
"rangeStrategy": "replace",
"groupName": "maybe breaking patch updates",
"groupSlug": "maybe-breaking-patch",
managers: ['npm'],
matchCurrentVersion: '<0.1.0',
rangeStrategy: 'replace',
groupName: 'maybe breaking patch updates',
groupSlug: 'maybe-breaking-patch',
// Get us the release notes for potentially breaking changes
"fetchReleaseNotes": true
fetchReleaseNotes: true,
},
// Handle minor updates under 1.0.0 as potentially breaking
// Workaround for https://github.com/renovatebot/renovate/issues/3588
{
"managers": [
"npm"
],
"matchCurrentVersion": "<1.0.0 >=0.1.0",
"minor": {
"rangeStrategy": "replace",
"groupName": "maybe breaking minor updates",
"groupSlug": "maybe-breaking-minor",
managers: ['npm'],
matchCurrentVersion: '<1.0.0 >=0.1.0',
minor: {
// FIXME: "rangeStrategy": "replace",
groupName: 'maybe breaking minor updates',
groupSlug: 'maybe-breaking-minor',
// Get us the release notes for potentially breaking changes
"fetchReleaseNotes": true
}
fetchReleaseNotes: true,
},
},
// Group Storybook's linter configs together
{
"packageNames": [
"@storybook/eslint-config-storybook",
"@storybook/linter-config"
],
"groupName": "storybook linting"
packageNames: ['@storybook/eslint-config-storybook', '@storybook/linter-config'],
groupName: 'storybook linting',
},
// Group Puppeteer packages together
{
"packagePatterns": [
"^puppeteer",
"^@types/puppeteer"
],
"groupName": "puppeteer"
packagePatterns: ['^puppeteer', '^@types/puppeteer'],
groupName: 'puppeteer',
},
// Group Acorn packages together
{
"packagePatterns": [
"^acorn"
],
"groupName": "acorn"
packagePatterns: ['^acorn'],
groupName: 'acorn',
},
// Group React packages together
{
"packageNames": [
"react",
"@types/react",
"react-dom",
"@types/react-dom"
],
"groupName": "react"
}
packageNames: ['react', '@types/react', 'react-dom', '@types/react-dom'],
groupName: 'react',
},
],
// Simplifies the PR body
"prBodyTemplate": "{{{table}}}{{{notes}}}{{{changelogs}}}",
"prBodyColumns": [
"Package",
"Change"
],
prBodyTemplate: '{{{table}}}{{{notes}}}{{{changelogs}}}',
prBodyColumns: ['Package', 'Change'],
// https://docs.renovatebot.com/merge-confidence/#enabling-and-disabling
"ignorePresets": [
"github>whitesource/merge-confidence:beta"
]
ignorePresets: ['github>whitesource/merge-confidence:beta'],
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ examples/angular-cli/addon-jest.testresults.json
!/.yarn/plugins
!/.yarn/sdks
!/.yarn/versions
/.pnp.*
.pnp.*
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Documentation can be found [Storybook's docs site](https://storybook.js.org/docs

Here are some featured examples that you can reference to see how Storybook works: <https://storybook.js.org/docs/react/get-started/examples>

Storybook comes with a lot of [addons](https://storybook.js.org/docs/react/configure/storybook-addons) for component design, documentation, testing, interactivity, and so on. Storybook's API makes it possible to configure and extend in various ways. It has even been extended to support React Native development for mobile.
Storybook comes with a lot of [addons](https://storybook.js.org/docs/react/configure/storybook-addons) for component design, documentation, testing, interactivity, and so on. Storybook's API makes it possible to configure and extend in various ways. It has even been extended to support React Native, Android, iOS, and Flutter development for mobile.

### Community

Expand All @@ -108,6 +108,7 @@ For additional help, join us in the [Storybook Discord](https://discord.gg/story
| [Marko](app/marko) | [v6.2.x](https://storybookjs.netlify.com/marko-cli/) | [![Marko](https://img.shields.io/npm/dm/@storybook/marko.svg)](app/marko) |
| [Riot](app/riot) | [v6.2.x](https://storybookjs.netlify.com/riot-kitchen-sink/) | [![Riot](https://img.shields.io/npm/dm/@storybook/riot.svg)](app/riot) |
| [Rax](app/rax) | [v6.2.x](https://storybookjs.netlify.com/rax-kitchen-sink/) | [![Rax](https://img.shields.io/npm/dm/@storybook/rax.svg)](app/rax) |
| [Android, iOS, Flutter](https://github.com/storybookjs/native) | [v6.2.x](https://storybookjs.github.io/native/@storybook/native-flutter-example/index.html) | [![Rax](https://img.shields.io/npm/dm/@storybook/native.svg)](https://github.com/storybookjs/native) |

### Sub Projects

Expand Down
2 changes: 1 addition & 1 deletion addons/actions/src/register.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ addons.register(ADDON_ID, (api) => {
addons.addPanel(PANEL_ID, {
title() {
const [actionsCount, setActionsCount] = useState(0);
const onEvent = () => setActionsCount(previous => previous + 1);
const onEvent = () => setActionsCount((previous) => previous + 1);
const onChange = () => setActionsCount(0);

useEffect(() => {
Expand Down
50 changes: 0 additions & 50 deletions addons/cssresources/README.md

This file was deleted.

Binary file removed addons/cssresources/docs/demo.gif
Binary file not shown.
81 changes: 0 additions & 81 deletions addons/cssresources/package.json

This file was deleted.

5 changes: 0 additions & 5 deletions addons/cssresources/preset.js

This file was deleted.

1 change: 0 additions & 1 deletion addons/cssresources/register.js

This file was deleted.

6 changes: 0 additions & 6 deletions addons/cssresources/src/CssResource.ts

This file was deleted.

8 changes: 0 additions & 8 deletions addons/cssresources/src/constants.ts

This file was deleted.

Loading

0 comments on commit 99ddea0

Please sign in to comment.