Merge branch 'master' into cli-explicit-deps

This commit is contained in:
Filipp Riabchun 2017-08-17 23:54:06 +03:00 committed by GitHub
commit ef3a8746d0
22 changed files with 150 additions and 120 deletions

View File

@ -1,3 +1,22 @@
# 3.2.5
2017-August-16
#### Features
- Add codemod for deprecated addon-info API [#1582](https://github.com/storybooks/storybook/pull/1582)
#### Bug Fixes
- Fixed addon-knobs for RN [#1635](https://github.com/storybooks/storybook/pull/1635)
- Make links navigate in the parent window [#1650](https://github.com/storybooks/storybook/pull/1650)
- Dont render leftpanel stories tree if stories are empty [#1664](https://github.com/storybooks/storybook/pull/1664)
- Remove double styling for inline stories [#1651](https://github.com/storybooks/storybook/pull/1651)
#### Dependency Upgrades
- Upgrade react-modal to v2.2.4 [#1666](https://github.com/storybooks/storybook/pull/1666)
# 3.2.4
2017-August-12

View File

@ -1,6 +1,6 @@
{
"name": "@storybook/addon-info",
"version": "3.2.4",
"version": "3.2.5",
"description": "A Storybook addon to show additional information for your stories.",
"license": "MIT",
"main": "dist/index.js",

View File

@ -1,6 +1,6 @@
{
"name": "@storybook/addon-knobs",
"version": "3.2.0",
"version": "3.2.5",
"description": "Storybook Addon Prop Editor Component",
"license": "MIT",
"main": "dist/index.js",

View File

@ -1,6 +1,6 @@
{
"name": "@storybook/addon-storyshots",
"version": "3.2.4",
"version": "3.2.5",
"description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
"license": "MIT",
"main": "dist/index.js",
@ -22,10 +22,10 @@
"devDependencies": {
"@storybook/addons": "^3.2.0",
"@storybook/channels": "^3.2.0",
"@storybook/react": "^3.2.4",
"@storybook/react": "^3.2.5",
"babel-cli": "^6.24.1",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-env": "^1.6.0",
"babel-preset-react": "^6.24.1",
"react": "^15.6.1",
"react-dom": "^15.6.1"
@ -33,7 +33,7 @@
"peerDependencies": {
"@storybook/addons": "^3.2.0",
"@storybook/channels": "^3.2.0",
"@storybook/react": "^3.2.4",
"@storybook/react": "^3.2.5",
"babel-core": "^6.25.0",
"react": "*",
"react-test-renderer": "*"

View File

@ -1,6 +1,6 @@
{
"name": "@storybook/react-native",
"version": "3.2.4",
"version": "3.2.5",
"description": "A better way to develop React Native Components for your app",
"keywords": [
"react",
@ -28,7 +28,7 @@
"@storybook/addon-links": "^3.2.0",
"@storybook/addons": "^3.2.0",
"@storybook/channel-websocket": "^3.2.0",
"@storybook/ui": "^3.2.4",
"@storybook/ui": "^3.2.5",
"autoprefixer": "^7.1.1",
"babel-core": "^6.25.0",
"babel-loader": "^7.0.0",
@ -40,8 +40,8 @@
"babel-plugin-transform-regenerator": "^6.24.1",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.23.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-es2016": "^6.24.1",
"babel-preset-env": "^1.6.0",
"babel-preset-minify": "^0.2.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"babel-runtime": "^6.23.0",

View File

@ -1,33 +1,20 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
module.exports = {
// Don't try to find .babelrc because we want to force this configuration.
babelrc: false,
presets: [
// let, const, destructuring, classes, modules
require.resolve('babel-preset-es2015'),
// exponentiation
require.resolve('babel-preset-es2016'),
// JSX, Flow
[
require.resolve('babel-preset-env'),
{
modules: false,
},
],
require.resolve('babel-preset-react'),
],
plugins: [
// function x(a, b, c,) { }
require.resolve('babel-plugin-syntax-trailing-function-commas'),
// await fetch()
require.resolve('babel-plugin-syntax-async-functions'),
// class { handleClick = () => { } }
require.resolve('babel-plugin-transform-class-properties'),
// { ...todo, completed: true }
require.resolve('babel-plugin-transform-object-rest-spread'),
// function* () { yield 42; yield 43; }
require.resolve('babel-plugin-transform-regenerator'),
// Polyfills the runtime needed for async/await and generators
[

View File

@ -1,33 +1,21 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
module.exports = {
// Don't try to find .babelrc because we want to force this configuration.
babelrc: false,
presets: [
// let, const, destructuring, classes, modules
require.resolve('babel-preset-es2015'),
// exponentiation
require.resolve('babel-preset-es2016'),
// JSX, Flow
[
require.resolve('babel-preset-env'),
{
modules: false,
},
],
require.resolve('babel-preset-react'),
require.resolve('babel-preset-minify'),
],
plugins: [
// function x(a, b, c,) { }
require.resolve('babel-plugin-syntax-trailing-function-commas'),
// await fetch()
require.resolve('babel-plugin-syntax-async-functions'),
// class { handleClick = () => { } }
require.resolve('babel-plugin-transform-class-properties'),
// { ...todo, completed: true }
require.resolve('babel-plugin-transform-object-rest-spread'),
// function* () { yield 42; yield 43; }
require.resolve('babel-plugin-transform-regenerator'),
// Polyfills the runtime needed for async/await and generators
[
@ -38,7 +26,5 @@ module.exports = {
regenerator: true,
},
],
// Optimization: hoist JSX that never changes out of render()
require.resolve('babel-plugin-transform-react-constant-elements'),
],
};

View File

@ -1,6 +1,6 @@
{
"name": "@storybook/react",
"version": "3.2.4",
"version": "3.2.5",
"description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
"homepage": "https://github.com/storybooks/storybook/tree/master/apps/react",
"bugs": {
@ -26,14 +26,14 @@
"@storybook/addon-links": "^3.2.0",
"@storybook/addons": "^3.2.0",
"@storybook/channel-postmessage": "^3.2.0",
"@storybook/ui": "^3.2.4",
"@storybook/ui": "^3.2.5",
"airbnb-js-shims": "^1.1.1",
"autoprefixer": "^7.1.1",
"babel-core": "^6.25.0",
"babel-loader": "^7.0.0",
"babel-plugin-react-docgen": "^1.6.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-es2016": "^6.24.1",
"babel-preset-env": "^1.6.0",
"babel-preset-minify": "^0.2.0",
"babel-preset-react": "^6.24.1",
"babel-preset-react-app": "^3.0.0",
"babel-preset-stage-0": "^6.24.1",

View File

@ -12,7 +12,7 @@ describe('babel_config', () => {
mock({
'.babelrc': `{
"presets": [
"es2015",
"env",
"foo-preset"
],
"plugins": [
@ -41,7 +41,7 @@ describe('babel_config', () => {
mock({
'.babelrc': `{
"presets": [
"es2015",
"env",
"foo-preset"
],
"plugins": "bar-plugin"
@ -68,7 +68,7 @@ describe('babel_config', () => {
mock({
'.babelrc': `{
"presets": [
"es2015",
"env",
"foo-preset"
]
}`,

View File

@ -1,19 +1,31 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
const findCacheDir = require('find-cache-dir');
module.exports = {
// Don't try to find .babelrc because we want to force this configuration.
babelrc: false,
cacheDirectory: findCacheDir({ name: 'react-storybook' }),
presets: [
require.resolve('babel-preset-es2015'),
require.resolve('babel-preset-es2016'),
[
require.resolve('babel-preset-env'),
{
targets: {
browsers: ['last 2 versions', 'safari >= 7'],
},
modules: false,
},
],
require.resolve('babel-preset-stage-0'),
require.resolve('babel-preset-react'),
],
plugins: [
require.resolve('babel-plugin-transform-regenerator'),
[
require.resolve('babel-plugin-transform-runtime'),
{
helpers: true,
polyfill: true,
regenerator: true,
},
],
],
};

View File

@ -1,19 +1,29 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
module.exports = {
// Don't try to find .babelrc because we want to force this configuration.
babelrc: false,
presets: [
require.resolve('babel-preset-es2015'),
require.resolve('babel-preset-es2016'),
[
require.resolve('babel-preset-env'),
{
targets: {
browsers: ['last 2 versions', 'safari >= 7'],
},
modules: false,
},
],
require.resolve('babel-preset-stage-0'),
require.resolve('babel-preset-react'),
require.resolve('babel-preset-minify'),
],
plugins: [
require.resolve('babel-plugin-transform-regenerator'),
[
require.resolve('babel-plugin-transform-runtime'),
{
helpers: true,
polyfill: true,
regenerator: true,
},
],
],
};

View File

@ -1,6 +1,6 @@
{
"name": "@storybook/vue",
"version": "3.2.4",
"version": "3.2.5",
"description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.",
"homepage": "https://github.com/storybooks/storybook/tree/master/apps/vue",
"bugs": {
@ -26,13 +26,14 @@
"@storybook/addon-links": "^3.2.0",
"@storybook/addons": "^3.2.0",
"@storybook/channel-postmessage": "^3.2.0",
"@storybook/ui": "^3.2.4",
"@storybook/ui": "^3.2.5",
"airbnb-js-shims": "^1.1.1",
"autoprefixer": "^7.1.1",
"babel-core": "^6.25.0",
"babel-loader": "^7.0.0",
"babel-plugin-react-docgen": "^1.6.0",
"babel-preset-env": "^1.6.0",
"babel-preset-minify": "^0.2.0",
"babel-preset-react": "^6.24.1",
"babel-preset-react-app": "^3.0.0",
"babel-preset-stage-0": "^6.24.1",

View File

@ -12,7 +12,7 @@ describe('babel_config', () => {
mock({
'.babelrc': `{
"presets": [
"es2015",
"env",
"foo-preset"
],
"plugins": [
@ -41,7 +41,7 @@ describe('babel_config', () => {
mock({
'.babelrc': `{
"presets": [
"es2015",
"env",
"foo-preset"
],
"plugins": "bar-plugin"
@ -68,7 +68,7 @@ describe('babel_config', () => {
mock({
'.babelrc': `{
"presets": [
"es2015",
"env",
"foo-preset"
]
}`,

View File

@ -1,24 +1,31 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
const findCacheDir = require('find-cache-dir');
module.exports = {
// Don't try to find .babelrc because we want to force this configuration.
babelrc: false,
// This is a feature of `babel-loader` for webpack (not Babel itself).
// It enables a cache directory for faster-rebuilds
// `find-cache-dir` will create the cache directory under the node_modules directory.
cacheDirectory: findCacheDir({ name: 'react-storybook' }),
presets: [
require.resolve('babel-preset-env'),
[
require.resolve('babel-preset-env'),
{
targets: {
browsers: ['last 2 versions', 'safari >= 7'],
},
modules: false,
},
],
require.resolve('babel-preset-stage-0'),
require.resolve('babel-preset-react'),
],
plugins: [
require.resolve('babel-plugin-transform-regenerator'),
[
require.resolve('babel-plugin-transform-runtime'),
{
helpers: true,
polyfill: true,
regenerator: true,
},
],
],
};

View File

@ -1,18 +1,29 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
module.exports = {
// Don't try to find .babelrc because we want to force this configuration.
babelrc: false,
presets: [
require.resolve('babel-preset-env'),
[
require.resolve('babel-preset-env'),
{
targets: {
browsers: ['last 2 versions', 'safari >= 7'],
},
modules: false,
},
],
require.resolve('babel-preset-stage-0'),
require.resolve('babel-preset-react'),
require.resolve('babel-preset-minify'),
],
plugins: [
require.resolve('babel-plugin-transform-regenerator'),
[
require.resolve('babel-plugin-transform-runtime'),
{
helpers: true,
polyfill: true,
regenerator: true,
},
],
],
};

View File

@ -26,5 +26,5 @@
"examples/*"
],
"concurrency": 1,
"version": "3.2.4"
"version": "3.2.5"
}

View File

@ -11,8 +11,7 @@ module.exports = Promise.all([
latestVersion('@storybook/addon-links'),
latestVersion('react'),
latestVersion('react-dom'),
latestVersion('babel-preset-es2015'),
latestVersion('babel-preset-es2016'),
latestVersion('babel-preset-env'),
latestVersion('babel-preset-react'),
latestVersion('babel-preset-stage-1'),
latestVersion('babel-root-slash-import'),
@ -24,8 +23,7 @@ module.exports = Promise.all([
linksVersion,
reactVersion,
reactDomVersion,
presetEs2015Version,
presetEs2016Version,
presetEnvVersion,
presetReactVersion,
presetStage1Version,
rootSlashImportVersion,
@ -51,12 +49,11 @@ module.exports = Promise.all([
}
} else {
babelrc = {
presets: ['es2015', 'es2016', 'react', 'stage-1'],
presets: ['env', 'react', 'stage-1'],
plugins: ['babel-root-slash-import'],
};
packageJson.devDependencies['babel-preset-es2015'] = `^${presetEs2015Version}`;
packageJson.devDependencies['babel-preset-es2016'] = `^${presetEs2016Version}`;
packageJson.devDependencies['babel-preset-env'] = `^${presetEnvVersion}`;
packageJson.devDependencies['babel-preset-react'] = `^${presetReactVersion}`;
packageJson.devDependencies['babel-preset-stage-1'] = `^${presetStage1Version}`;
packageJson.devDependencies['babel-root-slash-import'] = `^${rootSlashImportVersion}`;

View File

@ -1,6 +1,6 @@
{
"name": "@storybook/cli",
"version": "3.2.4",
"version": "3.2.5",
"description": "Storybook's CLI - easiest method of adding storybook to your projects",
"keywords": [
"cli",
@ -24,7 +24,7 @@
"postinstall": "opencollective postinstall --collective=storybook"
},
"dependencies": {
"@storybook/codemod": "^3.2.0",
"@storybook/codemod": "^3.2.5",
"chalk": "^2.0.1",
"child-process-promise": "^2.2.1",
"commander": "^2.9.0",

View File

@ -1,6 +1,6 @@
{
"name": "@storybook/codemod",
"version": "3.2.0",
"version": "3.2.5",
"description": "A collection of codemod scripts written with JSCodeshift",
"license": "MIT",
"main": "dist/index.js",

View File

@ -9,7 +9,7 @@
"babel-core": "^6.25.0",
"babel-eslint": "^7.2.2",
"babel-loader": "^7.0.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-env": "^1.6.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"eslint": "^3.19.0",

View File

@ -18,7 +18,7 @@ module.exports = {
{
test: /\.js$/,
loader: require.resolve('babel-loader'),
query: { presets: ['react', 'es2015', 'stage-0'] },
query: { presets: ['react', 'env', 'stage-0'] },
include: [path.join(__dirname, 'client'), path.resolve(__dirname, '../src')],
},
],

View File

@ -1,6 +1,6 @@
{
"name": "@storybook/ui",
"version": "3.2.4",
"version": "3.2.5",
"description": "Core Storybook UI",
"license": "MIT",
"main": "dist/index.js",