Skip to content

Commit

Permalink
Merge branch 'master' into svelte-support
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
  • Loading branch information
ndelangen committed Aug 6, 2018
2 parents 0b9f38a + b2b275b commit 70b4dd1
Show file tree
Hide file tree
Showing 279 changed files with 4,820 additions and 3,981 deletions.
2 changes: 2 additions & 0 deletions .bettercodehub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ languages:
- .*\.test\.js
- .*\/__test__\/.*\.js
- .*\/__mock__\/.*\.js
- .*\.stories\.js
test:
include:
- .*\.test\.js
- .*\/__test__\/.*\.js
- .*\.storyshot
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ module.exports = {
plugins: ['prettier', 'jest', 'import', 'react', 'jsx-a11y', 'json'],
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 8,
sourceType: 'module',
},
env: {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
package OpenSourceProjects_Storybook.patches.projects

import jetbrains.buildServer.configs.kotlin.v2017_2.*
import jetbrains.buildServer.configs.kotlin.v2017_2.Project
import jetbrains.buildServer.configs.kotlin.v2017_2.ProjectFeature
import jetbrains.buildServer.configs.kotlin.v2017_2.ui.*

/*
This patch script was generated by TeamCity on settings change in UI.
To apply the patch, change the project with uuid = '69382d9b-7791-418a-9ff6-1c83b86ed6b5' (id = 'OpenSourceProjects_Storybook')
accordingly, and delete the patch script.
*/
changeProject("69382d9b-7791-418a-9ff6-1c83b86ed6b5") {
features {
val feature1 = find<ProjectFeature> {
feature {
type = "project-graphs"
id = "PROJECT_EXT_306"
param("format", "duration")
param("series", """
[
{
"type": "valueType",
"title": "Build Duration (all stages)",
"sourceBuildTypeId": "OpenSourceProjects_Storybook_Build_2",
"key": "BuildDuration"
}
]
""".trimIndent())
param("seriesTitle", "Serie")
param("title", "New chart title")
}
}
feature1.apply {
param("hideFilters", "")
param("title", "Build Duration (all stages)")
param("defaultFilters", "")
}
val feature2 = find<ProjectFeature> {
feature {
type = "project-graphs"
id = "PROJECT_EXT_307"
param("defaultFilters", "")
param("format", "percent")
param("hideFilters", "")
param("series", """
[
{
"type": "valueType",
"title": "Covered Percentage of JS Lines",
"sourceBuildTypeId": "OpenSourceProjects_Storybook_Test",
"key": "Covered Percentage of JS Lines"
}
]
""".trimIndent())
param("seriesTitle", "Serie")
param("title", "New chart title")
}
}
feature2.apply {
param("title", "Covered Percentage of JS Lines")
}
val feature3 = find<ProjectFeature> {
feature {
type = "project-graphs"
id = "PROJECT_EXT_308"
param("format", "integer")
param("series", """
[
{
"type": "valueType",
"title": "Total Number of JS Statements",
"sourceBuildTypeId": "OpenSourceProjects_Storybook_Test",
"key": "Total Number of JS Statements"
}
]
""".trimIndent())
param("seriesTitle", "Serie")
param("title", "New chart title")
}
}
feature3.apply {
param("hideFilters", "")
param("title", "Total Number of JS Statements")
param("defaultFilters", "")
}
add {
feature {
type = "project-graphs"
id = "PROJECT_EXT_117"
param("series", """
[
{
"type": "valueType",
"title": "Total Artifacts Size",
"sourceBuildTypeId": "OpenSourceProjects_Storybook_CliTestLatestCra",
"key": "ArtifactsSize"
}
]
""".trimIndent())
param("format", "text")
param("title", "Total Artifacts Size")
param("seriesTitle", "Serie")
}
}
}
}
68 changes: 67 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,67 @@
# 4.0.0-alpha.16

2018-August-06

#### Features

- Make addon-options work with story parameters [#3958](https://github.com/storybooks/storybook/pull/3958)

#### Bug Fixes

- [BUG FIX] Use fixed version of react-dev-utils [#3959](https://github.com/storybooks/storybook/pull/3959)
- Inline emotion css calls that require theme to avoid using state [#3950](https://github.com/storybooks/storybook/pull/3950)

#### Dependency Upgrades

- Upgrade even more dependencies [#3964](https://github.com/storybooks/storybook/pull/3964)
- More dependency upgrades (major version bumps) [#3957](https://github.com/storybooks/storybook/pull/3957)
- UPGRADE all minor dependencies [#3954](https://github.com/storybooks/storybook/pull/3954)

# 4.0.0-alpha.15

2018-August-03

#### Breaking Changes

- dependencies(vue): Update vue-loader to 15.x.x [#3911](https://github.com/storybooks/storybook/pull/3911)

#### Features

- Horizontal display for addon-knobs radios UI [#3922](https://github.com/storybooks/storybook/pull/3922)
- Add customizePage method to imageSnapshot [#3930](https://github.com/storybooks/storybook/pull/3930)
- Add additional device options to addon-viewport [#3918](https://github.com/storybooks/storybook/pull/3918)
- Support different extensions for "config" and "addons" files [#3913](https://github.com/storybooks/storybook/pull/3913)
- Add radio buttons knob type #3872 [#3894](https://github.com/storybooks/storybook/pull/3894)
- Added arrow to a11y addon HeaderBar [#3788](https://github.com/storybooks/storybook/pull/3788)
- Fix addons panel when using preact [#3882](https://github.com/storybooks/storybook/pull/3882)

#### Bug Fixes

- Fix typo in addon-viewport [#3942](https://github.com/storybooks/storybook/pull/3942)
- Fix knobs for React < 16.3 [#3866](https://github.com/storybooks/storybook/pull/3866)

#### Maintenance

- Improve BettercodeHub [#3941](https://github.com/storybooks/storybook/pull/3941)
- REFACTOR layout and REMOVE usplit component [#3914](https://github.com/storybooks/storybook/pull/3914)
- Group deprecated stories [#3846](https://github.com/storybooks/storybook/pull/3846)
- MOVE ui into it's own group [#3884](https://github.com/storybooks/storybook/pull/3884)

#### Dependency Upgrades

- Use react-dev-utils@next [#3852](https://github.com/storybooks/storybook/pull/3852)

# 3.4.10

2018-August-03

NOTE: `3.4.9` publish failed

#### Bug Fixes

- addons-jest: bug with the jest parameter [#3923](https://github.com/storybooks/storybook/pull/3923)
- addon-info: fix copy button styling [#3896](https://github.com/storybooks/storybook/pull/3896)

# 4.0.0-alpha.14

2018-July-11
Expand Down Expand Up @@ -302,17 +366,19 @@

2018-May-17

NOTE: As part of the generic addon decorators, we've reversed the order of addon-knob's `select` knob keys/values, which had been called `selectV2` prior to this breaking change.

#### Breaking Changes

- Support webpack4 modules format [#3576](https://github.com/storybooks/storybook/pull/3576)
- Generic addon decorators [#3555](https://github.com/storybooks/storybook/pull/3555)

#### Features

- Addon-centered for Angular [#3573](https://github.com/storybooks/storybook/pull/3573)

#### Maintenance

- Generic addon decorators [#3555](https://github.com/storybooks/storybook/pull/3555)
- Refactor transitional decorator from addon-notes [#3559](https://github.com/storybooks/storybook/pull/3559)

# 3.4.5
Expand Down
Loading

0 comments on commit 70b4dd1

Please sign in to comment.