GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-09 00:19:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dd/proptypes

Browse Source
This commit is contained in:
Filipp Riabchun 2017-08-18 01:26:07 +03:00 committed by GitHub
commit 6d91176e18
28 changed files with 80 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cli/generators/METEOR/index.js
View File

@ -7,6 +7,8 @@ const latestVersion = require('latest-version');
module.exports = Promise.all([
latestVersion('@storybook/react'),
latestVersion('@storybook/addon-actions'),
latestVersion('@storybook/addon-links'),
latestVersion('react'),
latestVersion('react-dom'),
latestVersion('babel-preset-env'),
@ -17,6 +19,8 @@ module.exports = Promise.all([
(
[
storybookVersion,
actionsVersion,
linksVersion,
reactVersion,
reactDomVersion,
presetEnvVersion,
@ -59,6 +63,8 @@ module.exports = Promise.all([
// write the new package.json.
packageJson.devDependencies['@storybook/react'] = `^${storybookVersion}`;
packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
packageJson.scripts.storybook = 'start-storybook -p 6006';
packageJson.scripts['build-storybook'] = 'build-storybook';

2
lib/cli/generators/METEOR/template/.stories/index.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import React from 'react';

2
lib/cli/generators/METEOR/template/.storybook/addons.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import '@storybook/addon-actions/register';
import '@storybook/addon-links/register';

2
lib/cli/generators/METEOR/template/.storybook/config.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import { configure } from '@storybook/react';

10
lib/cli/generators/REACT/index.js
View File

@ -3,13 +3,19 @@ const helpers = require('../../lib/helpers');
const path = require('path');
const latestVersion = require('latest-version');
module.exports = latestVersion('@storybook/react').then(version => {
module.exports = Promise.all([
latestVersion('@storybook/react'),
latestVersion('@storybook/addon-actions'),
latestVersion('@storybook/addon-links'),
]).then(([storybookVersion, actionsVersion, linksVersion]) => {
mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
const packageJson = helpers.getPackageJson();
packageJson.devDependencies = packageJson.devDependencies || {};
packageJson.devDependencies['@storybook/react'] = `^${version}`;
packageJson.devDependencies['@storybook/react'] = `^${storybookVersion}`;
packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
packageJson.scripts = packageJson.scripts || {};
packageJson.scripts.storybook = 'start-storybook -p 6006';

2
lib/cli/generators/REACT/template/.storybook/addons.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import '@storybook/addon-actions/register';
import '@storybook/addon-links/register';

2
lib/cli/generators/REACT/template/.storybook/config.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import { configure } from '@storybook/react';

10
lib/cli/generators/REACT_NATIVE/index.js
View File

@ -5,7 +5,11 @@ const latestVersion = require('latest-version');
const chalk = require('chalk');
const helpers = require('../../lib/helpers');
module.exports = latestVersion('@storybook/react-native').then(version => {
module.exports = Promise.all([
latestVersion('@storybook/react'),
latestVersion('@storybook/addon-actions'),
latestVersion('@storybook/addon-links'),
]).then(([storybookVersion, actionsVersion, linksVersion]) => {
// copy all files from the template directory to project directory
mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
@ -28,7 +32,9 @@ module.exports = latestVersion('@storybook/react-native').then(version => {
packageJson.dependencies = packageJson.dependencies || {};
packageJson.devDependencies = packageJson.devDependencies || {};
packageJson.devDependencies['@storybook/react-native'] = `^${version}`;
packageJson.devDependencies['@storybook/react'] = `^${storybookVersion}`;
packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
if (!packageJson.dependencies['react-dom'] && !packageJson.devDependencies['react-dom']) {
const reactVersion = packageJson.dependencies.react;

2
lib/cli/generators/REACT_NATIVE/template/storybook/addons.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import '@storybook/addon-actions/register';
import '@storybook/addon-links/register';

2
lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.android.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import React, { PropTypes } from 'react';
import { TouchableNativeFeedback } from 'react-native';

2
lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.ios.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import React, { PropTypes } from 'react';
import { TouchableHighlight } from 'react-native';

2
lib/cli/generators/REACT_NATIVE/template/storybook/stories/CenterView/index.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import React, { PropTypes } from 'react';
import { View } from 'react-native';

2
lib/cli/generators/REACT_NATIVE/template/storybook/stories/Welcome/index.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import React, { PropTypes } from 'react';
import { View, Text } from 'react-native';

2
lib/cli/generators/REACT_NATIVE/template/storybook/stories/index.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import React from 'react';
import { Text } from 'react-native';

2
lib/cli/generators/REACT_NATIVE/template/storybook/storybook.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions, global-require */
/* eslint-disable import/extensions, global-require */
import { AppRegistry } from 'react-native';
import { getStorybookUI, configure } from '@storybook/react-native';

10
lib/cli/generators/REACT_NATIVE_SCRIPTS/index.js
View File

@ -3,7 +3,11 @@ const helpers = require('../../lib/helpers');
const path = require('path');
const latestVersion = require('latest-version');
module.exports = latestVersion('@storybook/react-native').then(version => {
module.exports = Promise.all([
latestVersion('@storybook/react'),
latestVersion('@storybook/addon-actions'),
latestVersion('@storybook/addon-links'),
]).then(([storybookVersion, actionsVersion, linksVersion]) => {
// copy all files from the template directory to project directory
mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
@ -12,7 +16,9 @@ module.exports = latestVersion('@storybook/react-native').then(version => {
packageJson.dependencies = packageJson.dependencies || {};
packageJson.devDependencies = packageJson.devDependencies || {};
packageJson.devDependencies['@storybook/react-native'] = `^${version}`;
packageJson.devDependencies['@storybook/react'] = `^${storybookVersion}`;
packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
if (!packageJson.dependencies['react-dom'] && !packageJson.devDependencies['react-dom']) {
const reactVersion = packageJson.dependencies.react;

10
lib/cli/generators/REACT_SCRIPTS/index.js
View File

@ -4,12 +4,18 @@ const path = require('path');
const fs = require('fs');
const latestVersion = require('latest-version');
module.exports = latestVersion('@storybook/react').then(version => {
module.exports = Promise.all([
latestVersion('@storybook/react'),
latestVersion('@storybook/addon-actions'),
latestVersion('@storybook/addon-links'),
]).then(([storybookVersion, actionsVersion, linksVersion]) => {
mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
const packageJson = helpers.getPackageJson();
packageJson.devDependencies['@storybook/react'] = `^${version}`;
packageJson.devDependencies['@storybook/react'] = `^${storybookVersion}`;
packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
packageJson.scripts.storybook = 'start-storybook -p 9009';
packageJson.scripts['build-storybook'] = 'build-storybook';

2
lib/cli/generators/REACT_SCRIPTS/template/.storybook/addons.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import '@storybook/addon-actions/register';
import '@storybook/addon-links/register';

2
lib/cli/generators/REACT_SCRIPTS/template/.storybook/config.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import { configure } from '@storybook/react';

10
lib/cli/generators/SFC_VUE/index.js
View File

@ -3,13 +3,19 @@ const helpers = require('../../lib/helpers');
const path = require('path');
const latestVersion = require('latest-version');
module.exports = latestVersion('@storybook/vue').then(version => {
module.exports = Promise.all([
latestVersion('@storybook/vue'),
latestVersion('@storybook/addon-actions'),
latestVersion('@storybook/addon-links'),
]).then(([storybookVersion, actionsVersion, linksVersion]) => {
mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
const packageJson = helpers.getPackageJson();
packageJson.devDependencies = packageJson.devDependencies || {};
packageJson.devDependencies['@storybook/vue'] = `^${version}`;
packageJson.devDependencies['@storybook/vue'] = `^${storybookVersion}`;
packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
packageJson.scripts = packageJson.scripts || {};
packageJson.scripts.storybook = 'start-storybook -p 6006';

2
lib/cli/generators/SFC_VUE/template/.storybook/addons.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import '@storybook/addon-actions/register'
import '@storybook/addon-links/register'

2
lib/cli/generators/SFC_VUE/template/src/stories/index.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import { storiesOf } from '@storybook/vue';
import { action } from '@storybook/addon-actions';

10
lib/cli/generators/VUE/index.js
View File

@ -3,13 +3,19 @@ const helpers = require('../../lib/helpers');
const path = require('path');
const latestVersion = require('latest-version');
module.exports = latestVersion('@storybook/vue').then(version => {
Promise.all([
latestVersion('@storybook/vue'),
latestVersion('@storybook/addon-actions'),
latestVersion('@storybook/addon-links'),
]).then(([storybookVersion, actionsVersion, linksVersion]) => {
mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
const packageJson = helpers.getPackageJson();
packageJson.devDependencies = packageJson.devDependencies || {};
packageJson.devDependencies['@storybook/vue'] = `^${version}`;
packageJson.devDependencies['@storybook/vue'] = `^${storybookVersion}`;
packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
packageJson.scripts = packageJson.scripts || {};
packageJson.scripts.storybook = 'start-storybook -p 6006';

2
lib/cli/generators/VUE/template/.storybook/addons.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import '@storybook/addon-actions/register'
import '@storybook/addon-links/register'

2
lib/cli/generators/VUE/template/.storybook/config.js
View File

@ -1,4 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
/* eslint-disable import/extensions */
import { configure } from '@storybook/vue'

2
lib/cli/generators/VUE/template/stories/MyButton.js
View File

@ -1,5 +1,3 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
export default {
name: 'my-button',

2
lib/cli/generators/VUE/template/stories/Welcome.js
View File

@ -1,5 +1,3 @@
/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
const log = () => console.log('Welcome to storybook!')
export default {

10
lib/cli/generators/WEBPACK_REACT/index.js
View File

@ -3,13 +3,19 @@ const helpers = require('../../lib/helpers');
const path = require('path');
const latestVersion = require('latest-version');
module.exports = latestVersion('@storybook/react').then(version => {
Promise.all([
latestVersion('@storybook/react'),
latestVersion('@storybook/addon-actions'),
latestVersion('@storybook/addon-links'),
]).then(([storybookVersion, actionsVersion, linksVersion]) => {
mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
const packageJson = helpers.getPackageJson();
packageJson.devDependencies = packageJson.devDependencies || {};
packageJson.devDependencies['@storybook/react'] = `^${version}`;
packageJson.devDependencies['@storybook/react'] = `^${storybookVersion}`;
packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
packageJson.scripts = packageJson.scripts || {};
packageJson.scripts.storybook = 'start-storybook -p 6006';