Merge remote-tracking branch 'origin/master' into peer-deps-wildcard

# Conflicts:
#	app/vue/package.json
This commit is contained in:
Hypnosphi 2018-02-25 18:37:36 +03:00
commit 8c5633868b
95 changed files with 209 additions and 792 deletions

View File

@ -5,13 +5,13 @@ const ignore = 0;
module.exports = {
root: true,
extends: [
'eslint-config-airbnb',
'airbnb',
'plugin:jest/recommended',
'plugin:import/react-native',
'prettier',
'prettier/react',
],
plugins: ['prettier', 'jest', 'react', 'json'],
plugins: ['prettier', 'jest', 'import', 'react', 'jsx-a11y', 'json'],
parser: 'babel-eslint',
parserOptions: {
sourceType: 'module',

View File

@ -208,7 +208,7 @@
- Addon Storysource improvements [#3040](https://github.com/storybooks/storybook/pull/3040)
- #3029 use @storybook/podda to fix npm engine version in podda [#3033](https://github.com/storybooks/storybook/pull/3033)
- Add moduleMetdata decorator for supplying common Angular metadata [#2959](https://github.com/storybooks/storybook/pull/2959)
- [Addon Storysource] Add auto scrolling to the selected story [#3025](https://github.com/storybooks/storybook/pull/3025)
- `Addon Storysource` Add auto scrolling to the selected story [#3025](https://github.com/storybooks/storybook/pull/3025)
- add GitHub flavored markdown notes [#2946](https://github.com/storybooks/storybook/pull/2946)
- Added beforeScreenshot config option to addons/storyshots, to allow testing of components with mounting animations [#2972](https://github.com/storybooks/storybook/pull/2972)
- Enable groupId option for knobs to be organized into sub panels. [#2661](https://github.com/storybooks/storybook/pull/2661)

View File

@ -27,6 +27,8 @@
"dependencies": {
"@storybook/components": "^3.4.0-alpha.9",
"axe-core": "^2.6.1",
"babel-runtime": "^6.26.0",
"glamor": "^2.20.40",
"glamorous": "^4.11.6",
"prop-types": "^15.6.0"
},

View File

@ -21,7 +21,9 @@
},
"dependencies": {
"@storybook/components": "^3.4.0-alpha.9",
"babel-runtime": "^6.26.0",
"deep-equal": "^1.0.1",
"glamor": "^2.20.40",
"glamorous": "^4.11.6",
"global": "^4.3.2",
"make-error": "^1.3.4",

View File

@ -3,13 +3,13 @@
[![Build Status on CircleCI](https://circleci.com/gh/storybooks/storybook.svg?style=shield)](https://circleci.com/gh/storybooks/storybook)
[![CodeFactor](https://www.codefactor.io/repository/github/storybooks/storybook/badge)](https://www.codefactor.io/repository/github/storybooks/storybook)
[![Known Vulnerabilities](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847/badge.svg)](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847)
[![BCH compliance](https://bettercodehub.com/edge/badge/storybooks/storybook)](https://bettercodehub.com/results/storybooks/storybook) [![codecov](https://codecov.io/gh/storybooks/storybook/branch/master/graph/badge.svg)](https://codecov.io/gh/storybooks/storybook)
[![BCH compliance](https://bettercodehub.com/edge/badge/storybooks/storybook)](https://bettercodehub.com/results/storybooks/storybook) [![codecov](https://codecov.io/gh/storybooks/storybook/branch/master/graph/badge.svg)](https://codecov.io/gh/storybooks/storybook)
[![Storybook Slack](https://now-examples-slackin-rrirkqohko.now.sh/badge.svg)](https://now-examples-slackin-rrirkqohko.now.sh/)
[![Backers on Open Collective](https://opencollective.com/storybook/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/storybook/sponsors/badge.svg)](#sponsors)
* * *
Storybook Centered Decorator can be used to center components inside the preview in [Storybook](https://storybook.js.org).
Storybook Background Addon can be used to change background colors inside the preview in [Storybook](https://storybook.js.org).
[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
@ -18,7 +18,7 @@ Storybook Centered Decorator can be used to center components inside the preview
## Installation
```sh
npm i --save @storybook/addon-backgrounds
npm i -D @storybook/addon-backgrounds
```
## Configuration

View File

@ -24,6 +24,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"babel-runtime": "^6.26.0",
"global": "^4.3.2",
"prop-types": "^15.6.0"
},

View File

@ -10,6 +10,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"babel-runtime": "^6.26.0",
"global": "^4.3.2"
},
"devDependencies": {

Binary file not shown.

View File

@ -24,8 +24,7 @@
"babel-runtime": "^6.26.0",
"format-json": "^1.0.3",
"prop-types": "^15.6.0",
"react-textarea-autosize": "^5.2.1",
"uuid": "^3.2.1"
"react-textarea-autosize": "^5.2.1"
},
"peerDependencies": {
"@storybook/addons": "^3.3.0",

View File

@ -22,6 +22,7 @@
"storybook": "start-storybook -p 9001"
},
"dependencies": {
"babel-runtime": "^6.26.0",
"global": "^4.3.2",
"graphiql": "^0.11.11",
"graphql": "^0.13.1",

View File

@ -18,6 +18,7 @@
"@storybook/client-logger": "^3.4.0-alpha.9",
"@storybook/components": "^3.4.0-alpha.9",
"babel-runtime": "^6.26.0",
"glamor": "^2.20.40",
"glamorous": "^4.11.6",
"global": "^4.3.2",
"marksy": "^6.0.3",

View File

@ -158,9 +158,7 @@ containing **bold**, *cursive* text, \`code\` and [a link](https://github.com)"
>
<div>
<h1>
function func(x) {
return x + 1;
}
function func(x) {return x + 1;}
</h1>
<h2>
[object Object]

View File

@ -26,6 +26,7 @@
},
"dependencies": {
"@storybook/components": "^3.4.0-alpha.9",
"babel-runtime": "^6.26.0",
"glamor": "^2.20.40",
"glamorous": "^4.11.6",
"global": "^4.3.2",

View File

@ -23,6 +23,7 @@
},
"dependencies": {
"@storybook/components": "^3.4.0-alpha.9",
"babel-runtime": "^6.26.0",
"global": "^4.3.2",
"prop-types": "^15.5.10"
},
@ -30,8 +31,7 @@
"@storybook/react": "^3.4.0-alpha.9",
"enzyme": "^3.3.0",
"react": "^16.1.0",
"react-dom": "^16.1.0",
"shelljs": "^0.8.1"
"react-dom": "^16.1.0"
},
"peerDependencies": {
"@storybook/addons": "^3.3.0",

View File

@ -19,6 +19,9 @@
"prepare": "node ../../scripts/prepare.js",
"storybook": "start-storybook -p 9001"
},
"dependencies": {
"babel-runtime": "^6.26.0"
},
"devDependencies": {
"@storybook/react": "^3.4.0-alpha.9"
},

View File

@ -1,6 +0,0 @@
{
"presets": ["env", "stage-0", "react"],
"plugins": [
"transform-runtime"
]
}

View File

@ -23,23 +23,15 @@
"global": "^4.3.2",
"jest-image-snapshot": "^2.3.0",
"jest-specific-snapshot": "^0.3.0",
"prop-types": "^15.6.0",
"puppeteer": "^1.1.1",
"read-pkg-up": "^3.0.0"
},
"devDependencies": {
"@storybook/addon-actions": "^3.4.0-alpha.9",
"@storybook/addon-links": "^3.4.0-alpha.9",
"@storybook/addons": "^3.4.0-alpha.9",
"@storybook/react": "^3.4.0-alpha.9",
"babel-cli": "^6.26.0",
"babel-jest": "^22.4.1",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"enzyme-to-json": "^3.3.1",
"jest": "^22.4.2",
"jest-cli": "^22.4.2",
"react": "^16.1.0",
"react-dom": "^16.1.0"
},

View File

@ -1,7 +1,7 @@
import React from 'react';
import { storiesOf } from '@storybook/react'; // eslint-disable-line
import { linkTo } from '@storybook/addon-links'; // eslint-disable-line
import { storiesOf } from '@storybook/react';
import { linkTo } from '@storybook/addon-links';
import { Welcome } from '@storybook/react/demo';
storiesOf('Welcome', module).add('to Storybook', () => <Welcome showApp={linkTo('Button')} />);

View File

@ -24,6 +24,7 @@
"acorn-es7": "^0.1.0",
"acorn-jsx": "^4.1.1",
"acorn-stage3": "^0.5.0",
"babel-runtime": "^6.26.0",
"estraverse": "^4.2.0",
"loader-utils": "^1.1.0",
"prettier": "^1.10.2",

View File

@ -12,6 +12,7 @@
},
"dependencies": {
"@storybook/components": "^3.4.0-alpha.9",
"babel-runtime": "^6.26.0",
"global": "^4.3.2",
"prop-types": "^15.5.10"
},

View File

@ -1,3 +0,0 @@
{
"presets": ["env", "stage-0", "react"]
}

View File

@ -23,8 +23,6 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addon-actions": "^3.4.0-alpha.9",
"@storybook/addon-links": "^3.4.0-alpha.9",
"@storybook/addons": "^3.4.0-alpha.9",
"@storybook/channel-postmessage": "^3.4.0-alpha.9",
"@storybook/core": "^3.4.0-alpha.9",
@ -32,69 +30,43 @@
"@storybook/ui": "^3.4.0-alpha.9",
"airbnb-js-shims": "^1.4.1",
"angular2-template-loader": "^0.6.2",
"autoprefixer": "^7.2.6",
"babel-core": "^6.26.0",
"babel-loader": "^7.0.0",
"babel-plugin-macros": "^2.1.0",
"babel-plugin-react-docgen": "^1.8.2",
"babel-preset-env": "^1.6.0",
"babel-preset-react": "^6.24.1",
"babel-preset-react-app": "^3.1.1",
"babel-preset-stage-0": "^6.24.1",
"babel-runtime": "^6.23.0",
"case-sensitive-paths-webpack-plugin": "^2.0.0",
"common-tags": "^1.7.2",
"configstore": "^3.1.0",
"core-js": "^2.4.1",
"cross-env": "^5.1.1",
"css-loader": "^0.28.10",
"dotenv-webpack": "^1.5.4",
"express": "^4.15.3",
"file-loader": "^1.1.9",
"find-cache-dir": "^1.0.0",
"global": "^4.3.2",
"html-loader": "^0.5.5",
"html-webpack-plugin": "^2.30.1",
"json-loader": "^0.5.4",
"json-stringify-safe": "^5.0.1",
"json5": "^0.5.1",
"lodash.pick": "^4.4.0",
"markdown-loader": "^2.0.2",
"node-sass": "^4.7.2",
"postcss-flexbugs-fixes": "^3.3.0",
"postcss-loader": "^2.1.0",
"prop-types": "^15.5.10",
"qs": "^6.5.1",
"raw-loader": "^0.5.1",
"react": "^16.0.0",
"react-dev-utils": "^5.0.0",
"react-dom": "^16.0.0",
"react-modal": "^3.3.1",
"redux": "^3.6.0",
"request": "^2.81.0",
"rxjs": "^5.4.2",
"sass-loader": "^6.0.6",
"style-loader": "^0.20.2",
"ts-loader": "^3.5.0",
"uglifyjs-webpack-plugin": "^1.2.2",
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"webpack": "^3.11.0",
"webpack-hot-middleware": "^2.21.0",
"zone.js": "^0.8.20"
},
"devDependencies": {
"babel-cli": "^6.26.0",
"babel-plugin-transform-decorators": "^6.24.1",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"codelyzer": "^4.1.0",
"mock-fs": "^4.3.0",
"nodemon": "^1.15.1",
"typescript": "^2.7.2"
"nodemon": "^1.15.1"
},
"peerDependencies": {
"@angular/common": ">=4.0.0",
"@angular/compiler": ">=4.0.0",
"@angular/core": ">=4.0.0",
"@angular/forms": ">=4.0.0",
"@angular/platform-browser": ">=4.0.0",
"@angular/platform-browser-dynamic": ">=4.0.0"
}

View File

View File

@ -63,12 +63,5 @@ export default function(configDir) {
}
}
const finalConfig = babelConfig || defaultConfig;
// Ensure plugins are defined or fallback to an array to avoid empty values.
const babelConfigPlugins = finalConfig.plugins || [];
// If `babelConfigPlugins` is not an `Array`, calling `concat` will inject it
// as a single value, if it is an `Array` it will be spreaded.
finalConfig.plugins = [].concat(babelConfigPlugins);
return finalConfig;
return babelConfig || defaultConfig;
}

View File

@ -1,89 +0,0 @@
import loadBabelConfig from './babel_config';
// eslint-disable-next-line global-require
jest.mock('fs', () => require('../../../../__mocks__/fs'));
jest.mock('path', () => ({
resolve: () => '.babelrc',
parse: require.requireActual('path').parse,
join: require.requireActual('path').join,
dirname: require.requireActual('path').dirname,
}));
const setup = ({ files }) => {
// eslint-disable-next-line no-underscore-dangle, global-require
require('fs').__setMockFiles(files);
};
describe('babel_config', () => {
// As the 'fs' is going to be mocked, let's call require.resolve
// so the require.cache has the correct route to the file.
// In fact let's use it in the tests :)
it('should return the config with the extra plugins when `plugins` is an array.', () => {
setup({
files: {
'.babelrc': `{
"presets": [
"env",
"foo-preset"
],
"plugins": [
"foo-plugin"
]
}`,
},
});
const config = loadBabelConfig('.foo');
expect(config).toEqual({
babelrc: false,
plugins: ['foo-plugin'],
presets: ['env', 'foo-preset'],
});
});
it('should return the config with the extra plugins when `plugins` is not an array.', () => {
setup({
files: {
'.babelrc': `{
"presets": [
"env",
"foo-preset"
],
"plugins": "bar-plugin"
}`,
},
});
const config = loadBabelConfig('.bar');
expect(config).toEqual({
babelrc: false,
plugins: ['bar-plugin'],
presets: ['env', 'foo-preset'],
});
});
it('should return the config only with the extra plugins when `plugins` is not present.', () => {
// Mock a `.babelrc` config file with no plugins key.
setup({
files: {
'.babelrc': `{
"presets": [
"env",
"foo-preset"
]
}`,
},
});
const config = loadBabelConfig('.biz');
expect(config).toEqual({
babelrc: false,
plugins: [],
presets: ['env', 'foo-preset'],
});
});
});

View File

@ -33,13 +33,10 @@ export default function(configType, baseConfig, configDir) {
// Check whether addons.js file exists inside the storybook.
// Load the default addons.js file if it's missing.
const storybookDefaultAddonsPath = path.resolve(__dirname, 'addons.js');
const storybookCustomAddonsPath = path.resolve(configDir, 'addons.js');
if (fs.existsSync(storybookCustomAddonsPath)) {
logger.info('=> Loading custom addons config.');
config.entry.manager.unshift(storybookCustomAddonsPath);
} else {
config.entry.manager.unshift(storybookDefaultAddonsPath);
}
// Check whether project has Angular CLI configuration file

View File

@ -12,18 +12,6 @@ module.exports = {
},
],
require.resolve('babel-preset-stage-0'),
require.resolve('babel-preset-react'),
],
plugins: [
require.resolve('babel-plugin-macros'),
require.resolve('babel-plugin-transform-regenerator'),
[
require.resolve('babel-plugin-transform-runtime'),
{
helpers: true,
polyfill: true,
regenerator: true,
},
],
],
plugins: [require.resolve('babel-plugin-macros')],
};

View File

@ -11,8 +11,15 @@ 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'),
],
};

View File

@ -88,10 +88,10 @@ export default function(configDir) {
test: /\.md$/,
use: [
{
loader: 'html-loader',
loader: require.resolve('html-loader'),
},
{
loader: 'markdown-loader',
loader: require.resolve('markdown-loader'),
},
],
},

View File

@ -101,10 +101,10 @@ export default function(configDir) {
test: /\.md$/,
use: [
{
loader: 'html-loader',
loader: require.resolve('html-loader'),
},
{
loader: 'markdown-loader',
loader: require.resolve('markdown-loader'),
},
],
},

View File

@ -5,11 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta content="IE=edge" http-equiv="X-UA-Compatible" />
<base target="_parent">
<script>
if (window.parent !== window) {
window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = window.parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
}
</script>
<title>Storybook</title>
<%= htmlWebpackPlugin.options.data.previewHead %>
</head>

View File

@ -1,3 +0,0 @@
{
"presets": ["env", "stage-0", "react"]
}

View File

@ -30,55 +30,39 @@
"@storybook/ui": "^3.4.0-alpha.9",
"@webcomponents/webcomponentsjs": "^1.1.0",
"airbnb-js-shims": "^1.4.1",
"autoprefixer": "^7.2.6",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-plugin-macros": "^2.1.0",
"babel-plugin-react-docgen": "^1.8.2",
"babel-plugin-transform-regenerator": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.0",
"babel-preset-minify": "^0.3.0",
"babel-preset-react": "^6.24.1",
"babel-preset-react-app": "^3.1.1",
"babel-preset-stage-0": "^6.24.1",
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"common-tags": "^1.4.0",
"configstore": "^3.1.1",
"copy-webpack-plugin": "^4.4.2",
"core-js": "^2.5.1",
"css-loader": "^0.28.10",
"dotenv-webpack": "^1.5.4",
"express": "^4.16.2",
"file-loader": "^1.1.9",
"find-cache-dir": "^1.0.0",
"global": "^4.3.2",
"html-webpack-plugin": "^2.30.1",
"json-loader": "^0.5.7",
"json-stringify-safe": "^5.0.1",
"json5": "^0.5.1",
"lodash.pick": "^4.4.0",
"polymer-webpack-loader": "2.0.1",
"postcss-flexbugs-fixes": "^3.3.0",
"postcss-loader": "^2.1.0",
"prop-types": "^15.6.0",
"qs": "^6.5.1",
"react": "^16.0.0",
"react-dev-utils": "^5.0.0",
"react-dom": "^16.0.0",
"react-modal": "^3.3.1",
"redux": "^3.7.2",
"request": "^2.83.0",
"style-loader": "^0.20.2",
"uglifyjs-webpack-plugin": "^1.2.2",
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"webpack": "^3.11.0"
"webpack": "^3.11.0",
"webpack-hot-middleware": "^2.21.0"
},
"devDependencies": {
"babel-cli": "^6.26.0",
"nodemon": "^1.15.1"
},
"peerDependencies": {
"babel-core": "^6.26.0 || ^7.0.0-0",
"babel-runtime": ">=6.0.0"
}
}

View File

@ -1,2 +0,0 @@
// import '@storybook/addon-actions/register';
// import '@storybook/addon-links/register';

View File

@ -63,20 +63,5 @@ export default function(configDir) {
}
}
const finalConfig = babelConfig || defaultConfig;
// Ensure plugins are defined or fallback to an array to avoid empty values.
const babelConfigPlugins = finalConfig.plugins || [];
const extraPlugins = [
[
require.resolve('babel-plugin-react-docgen'),
{
DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES',
},
],
];
// If `babelConfigPlugins` is not an `Array`, calling `concat` will inject it
// as a single value, if it is an `Array` it will be spreaded.
finalConfig.plugins = [].concat(babelConfigPlugins, extraPlugins);
return finalConfig;
return babelConfig || defaultConfig;
}

View File

@ -1,110 +0,0 @@
import loadBabelConfig from './babel_config';
// eslint-disable-next-line global-require
jest.mock('fs', () => require('../../../../__mocks__/fs'));
jest.mock('path', () => ({
resolve: () => '.babelrc',
}));
const setup = ({ files }) => {
// eslint-disable-next-line no-underscore-dangle, global-require
require('fs').__setMockFiles(files);
};
describe('babel_config', () => {
// As the 'fs' is going to be mocked, let's call require.resolve
// so the require.cache has the correct route to the file.
// In fact let's use it in the tests :)
const babelPluginReactDocgenPath = require.resolve('babel-plugin-react-docgen');
it('should return the config with the extra plugins when `plugins` is an array.', () => {
setup({
files: {
'.babelrc': `{
"presets": [
"env",
"foo-preset"
],
"plugins": [
"foo-plugin"
]
}`,
},
});
const config = loadBabelConfig('.foo');
expect(config).toEqual({
babelrc: false,
plugins: [
'foo-plugin',
[
babelPluginReactDocgenPath,
{
DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES',
},
],
],
presets: ['env', 'foo-preset'],
});
});
it('should return the config with the extra plugins when `plugins` is not an array.', () => {
setup({
files: {
'.babelrc': `{
"presets": [
"env",
"foo-preset"
],
"plugins": "bar-plugin"
}`,
},
});
const config = loadBabelConfig('.bar');
expect(config).toEqual({
babelrc: false,
plugins: [
'bar-plugin',
[
babelPluginReactDocgenPath,
{
DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES',
},
],
],
presets: ['env', 'foo-preset'],
});
});
it('should return the config only with the extra plugins when `plugins` is not present.', () => {
// Mock a `.babelrc` config file with no plugins key.
setup({
files: {
'.babelrc': `{
"presets": [
"env",
"foo-preset"
]
}`,
},
});
const config = loadBabelConfig('.biz');
expect(config).toEqual({
babelrc: false,
plugins: [
[
babelPluginReactDocgenPath,
{
DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES',
},
],
],
presets: ['env', 'foo-preset'],
});
});
});

View File

@ -33,13 +33,10 @@ export default function(configType, baseConfig, configDir) {
// Check whether addons.js file exists inside the storybook.
// Load the default addons.js file if it's missing.
// Insert it after polyfills.js, but before client/manager.
const storybookDefaultAddonsPath = path.resolve(__dirname, 'addons.js');
const storybookCustomAddonsPath = path.resolve(configDir, 'addons.js');
if (fs.existsSync(storybookCustomAddonsPath)) {
logger.info('=> Loading custom addons config.');
config.entry.manager.splice(1, 0, storybookCustomAddonsPath);
} else {
config.entry.manager.splice(1, 0, storybookDefaultAddonsPath);
}
const defaultConfig = createDefaultWebpackConfig(config);

View File

@ -12,7 +12,6 @@ module.exports = {
},
],
require.resolve('babel-preset-stage-0'),
require.resolve('babel-preset-react'),
],
plugins: [
require.resolve('babel-plugin-macros'),

View File

@ -12,7 +12,6 @@ module.exports = {
},
],
require.resolve('babel-preset-stage-0'),
require.resolve('babel-preset-react'),
[
require.resolve('babel-preset-minify'),
{

View File

@ -89,10 +89,6 @@ export default function(configDir) {
// Add support to NODE_PATH. With this we could avoid relative path imports.
// Based on this CRA feature: https://github.com/facebookincubator/create-react-app/issues/253
modules: ['node_modules'].concat(nodePaths),
alias: {
react$: require.resolve('react'),
'react-dom$': require.resolve('react-dom'),
},
},
performance: {
hints: false,

View File

@ -100,10 +100,6 @@ export default function(configDir) {
// Add support to NODE_PATH. With this we could avoid relative path imports.
// Based on this CRA feature: https://github.com/facebookincubator/create-react-app/issues/253
modules: ['node_modules'].concat(nodePaths),
alias: {
react$: require.resolve('react'),
'react-dom$': require.resolve('react-dom'),
},
},
};

View File

@ -1,3 +0,0 @@
{
"presets": ["env", "stage-0", "react"]
}

View File

@ -31,40 +31,32 @@
"@storybook/channel-websocket": "^3.4.0-alpha.9",
"@storybook/core": "^3.4.0-alpha.9",
"@storybook/ui": "^3.4.0-alpha.9",
"autoprefixer": "^7.2.6",
"babel-loader": "^7.1.2",
"babel-plugin-macros": "^2.1.0",
"babel-plugin-syntax-async-functions": "^6.13.0",
"babel-plugin-syntax-trailing-function-commas": "^6.22.0",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "^6.23.0",
"babel-plugin-transform-react-constant-elements": "^6.23.0",
"babel-plugin-transform-regenerator": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.1",
"babel-preset-minify": "^0.3.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"commander": "^2.14.1",
"css-loader": "^0.28.10",
"express": "^4.16.2",
"file-loader": "^1.1.9",
"find-cache-dir": "^1.0.0",
"global": "^4.3.2",
"html-loader": "^0.5.5",
"html-webpack-plugin": "^2.30.1",
"json-loader": "^0.5.7",
"json5": "^0.5.1",
"postcss-loader": "^2.1.0",
"markdown-loader": "^2.0.2",
"prop-types": "^15.6.0",
"react-native-compat": "^1.0.0",
"react-native-iphone-x-helper": "^1.0.2",
"shelljs": "^0.8.1",
"style-loader": "^0.20.2",
"uglifyjs-webpack-plugin": "^1.2.2",
"url-loader": "^0.6.2",
"url-parse": "^1.1.9",
"util-deprecate": "^1.0.2",
"uuid": "^3.2.1",
@ -78,6 +70,7 @@
},
"peerDependencies": {
"babel-core": "^6.26.0 || ^7.0.0-0",
"babel-runtime": ">=6.0.0",
"react": "*",
"react-native": ">=0.51.0"
}

View File

@ -39,10 +39,10 @@ const getConfig = options => ({
test: /\.md$/,
use: [
{
loader: 'html-loader',
loader: require.resolve('html-loader'),
},
{
loader: 'markdown-loader',
loader: require.resolve('markdown-loader'),
},
],
},

View File

@ -59,10 +59,10 @@ const getConfig = options => {
test: /\.md$/,
use: [
{
loader: 'html-loader',
loader: require.resolve('html-loader'),
},
{
loader: 'markdown-loader',
loader: require.resolve('markdown-loader'),
},
],
},

View File

@ -1,3 +0,0 @@
{
"presets": ["env", "stage-0", "react"]
}

View File

@ -32,7 +32,6 @@
"@storybook/node-logger": "^3.4.0-alpha.9",
"@storybook/ui": "^3.4.0-alpha.9",
"airbnb-js-shims": "^1.4.1",
"autoprefixer": "^7.2.6",
"babel-loader": "^7.1.2",
"babel-plugin-macros": "^2.1.0",
"babel-plugin-react-docgen": "^1.8.2",
@ -41,47 +40,35 @@
"babel-preset-env": "^1.6.1",
"babel-preset-minify": "^0.3.0",
"babel-preset-react": "^6.24.1",
"babel-preset-react-app": "^3.1.1",
"babel-preset-stage-0": "^6.24.1",
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"common-tags": "^1.7.2",
"configstore": "^3.1.1",
"core-js": "^2.5.3",
"css-loader": "^0.28.10",
"dotenv-webpack": "^1.5.4",
"express": "^4.16.2",
"file-loader": "^1.1.9",
"find-cache-dir": "^1.0.0",
"glamor": "^2.20.40",
"glamorous": "^4.11.6",
"global": "^4.3.2",
"html-loader": "^0.5.5",
"html-webpack-plugin": "^2.30.1",
"json-loader": "^0.5.7",
"json-stringify-safe": "^5.0.1",
"json5": "^0.5.1",
"lodash.flattendeep": "^4.4.0",
"markdown-loader": "^2.0.2",
"npmlog": "^4.1.2",
"postcss-flexbugs-fixes": "^3.3.0",
"postcss-loader": "^2.1.0",
"prop-types": "^15.6.0",
"qs": "^6.5.1",
"react-dev-utils": "^5.0.0",
"redux": "^3.7.2",
"request": "^2.83.0",
"style-loader": "^0.20.2",
"uglifyjs-webpack-plugin": "^1.2.2",
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"webpack": "^3.11.0"
"webpack": "^3.11.0",
"webpack-hot-middleware": "^2.21.0"
},
"devDependencies": {
"nodemon": "^1.15.1"
},
"peerDependencies": {
"babel-core": "^6.26.0 || ^7.0.0-0",
"babel-runtime": ">=6.0.0",
"react": ">=15.0.0 || ^16.0.0",
"react-dom": ">=15.0.0 || ^16.0.0"
}

View File

@ -66,10 +66,10 @@ export default function(configDir) {
test: /\.md$/,
use: [
{
loader: 'html-loader',
loader: require.resolve('html-loader'),
},
{
loader: 'markdown-loader',
loader: require.resolve('markdown-loader'),
},
],
},

View File

@ -77,10 +77,10 @@ export default function(configDir) {
test: /\.md$/,
use: [
{
loader: 'html-loader',
loader: require.resolve('html-loader'),
},
{
loader: 'markdown-loader',
loader: require.resolve('markdown-loader'),
},
],
},

View File

@ -1,3 +0,0 @@
{
"presets": ["env", "stage-0", "react"]
}

View File

@ -23,57 +23,37 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addon-actions": "^3.4.0-alpha.9",
"@storybook/addon-links": "^3.4.0-alpha.9",
"@storybook/addons": "^3.4.0-alpha.9",
"@storybook/channel-postmessage": "^3.4.0-alpha.9",
"@storybook/core": "^3.4.0-alpha.9",
"@storybook/ui": "^3.4.0-alpha.9",
"airbnb-js-shims": "^1.4.1",
"autoprefixer": "^7.2.6",
"babel-loader": "^7.1.2",
"babel-plugin-macros": "^2.1.0",
"babel-plugin-react-docgen": "^1.8.2",
"babel-plugin-transform-regenerator": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.0",
"babel-preset-minify": "^0.3.0",
"babel-preset-react": "^6.24.1",
"babel-preset-react-app": "^3.1.1",
"babel-preset-stage-0": "^6.24.1",
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"common-tags": "^1.7.2",
"configstore": "^3.1.1",
"core-js": "^2.5.3",
"css-loader": "^0.28.10",
"dotenv-webpack": "^1.5.4",
"express": "^4.16.2",
"file-loader": "^1.1.9",
"find-cache-dir": "^1.0.0",
"global": "^4.3.2",
"html-loader": "^0.5.5",
"html-webpack-plugin": "^2.30.1",
"json-loader": "^0.5.7",
"json-stringify-safe": "^5.0.1",
"json5": "^0.5.1",
"markdown-loader": "^2.0.2",
"postcss-flexbugs-fixes": "^3.3.0",
"postcss-loader": "^2.1.0",
"prop-types": "^15.6.0",
"qs": "^6.5.1",
"react": "^16.2.0",
"react-dev-utils": "^5.0.0",
"react-dom": "^16.2.0",
"redux": "^3.7.2",
"request": "^2.83.0",
"style-loader": "^0.20.2",
"uglifyjs-webpack-plugin": "^1.2.2",
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"vue-hot-reload-api": "^2.3.0",
"vue-style-loader": "^3.1.2",
"webpack": "^3.11.0"
"webpack": "^3.11.0",
"webpack-hot-middleware": "^2.21.0"
},
"devDependencies": {
"nodemon": "^1.15.1",
@ -83,6 +63,7 @@
},
"peerDependencies": {
"babel-core": "^6.26.0 || ^7.0.0-0",
"babel-runtime": ">=6.0.0",
"vue": ">=2.0.0",
"vue-loader": ">=13.0.0",
"vue-template-compiler": ">=2.0.0"

View File

@ -1,2 +0,0 @@
// import '@storybook/addon-actions/register';
// import '@storybook/addon-links/register';

View File

@ -65,20 +65,5 @@ export default function(configDir) {
}
}
const finalConfig = babelConfig || defaultConfig;
// Ensure plugins are defined or fallback to an array to avoid empty values.
const babelConfigPlugins = finalConfig.plugins || [];
const extraPlugins = [
[
require.resolve('babel-plugin-react-docgen'),
{
DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES',
},
],
];
// If `babelConfigPlugins` is not an `Array`, calling `concat` will inject it
// as a single value, if it is an `Array` it will be spreaded.
finalConfig.plugins = [].concat(babelConfigPlugins, extraPlugins);
return finalConfig;
return babelConfig || defaultConfig;
}

View File

@ -1,110 +0,0 @@
import loadBabelConfig from './babel_config';
// eslint-disable-next-line global-require
jest.mock('fs', () => require('../../../../__mocks__/fs'));
jest.mock('path', () => ({
resolve: () => '.babelrc',
}));
const setup = ({ files }) => {
// eslint-disable-next-line no-underscore-dangle, global-require
require('fs').__setMockFiles(files);
};
describe('babel_config', () => {
// As the 'fs' is going to be mocked, let's call require.resolve
// so the require.cache has the correct route to the file.
// In fact let's use it in the tests :)
const babelPluginReactDocgenPath = require.resolve('babel-plugin-react-docgen');
it('should return the config with the extra plugins when `plugins` is an array.', () => {
setup({
files: {
'.babelrc': `{
"presets": [
"env",
"foo-preset"
],
"plugins": [
"foo-plugin"
]
}`,
},
});
const config = loadBabelConfig('.foo');
expect(config).toEqual({
babelrc: false,
plugins: [
'foo-plugin',
[
babelPluginReactDocgenPath,
{
DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES',
},
],
],
presets: ['env', 'foo-preset'],
});
});
it('should return the config with the extra plugins when `plugins` is not an array.', () => {
setup({
files: {
'.babelrc': `{
"presets": [
"env",
"foo-preset"
],
"plugins": "bar-plugin"
}`,
},
});
const config = loadBabelConfig('.bar');
expect(config).toEqual({
babelrc: false,
plugins: [
'bar-plugin',
[
babelPluginReactDocgenPath,
{
DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES',
},
],
],
presets: ['env', 'foo-preset'],
});
});
it('should return the config only with the extra plugins when `plugins` is not present.', () => {
// Mock a `.babelrc` config file with no plugins key.
setup({
files: {
'.babelrc': `{
"presets": [
"env",
"foo-preset"
]
}`,
},
});
const config = loadBabelConfig('.biz');
expect(config).toEqual({
babelrc: false,
plugins: [
[
babelPluginReactDocgenPath,
{
DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES',
},
],
],
presets: ['env', 'foo-preset'],
});
});
});

View File

@ -35,13 +35,10 @@ export default function(configType, baseConfig, configDir) {
// Check whether addons.js file exists inside the storybook.
// Load the default addons.js file if it's missing.
// Insert it after polyfills.js, but before client/manager.
const storybookDefaultAddonsPath = path.resolve(__dirname, 'addons.js');
const storybookCustomAddonsPath = path.resolve(configDir, 'addons.js');
if (fs.existsSync(storybookCustomAddonsPath)) {
logger.info('=> Loading custom addons config.');
config.entry.manager.splice(1, 0, storybookCustomAddonsPath);
} else {
config.entry.manager.splice(1, 0, storybookDefaultAddonsPath);
}
const defaultConfig = createDefaultWebpackConfig(config);

View File

@ -12,7 +12,6 @@ module.exports = {
},
],
require.resolve('babel-preset-stage-0'),
require.resolve('babel-preset-react'),
],
plugins: [
require.resolve('babel-plugin-macros'),

View File

@ -12,7 +12,6 @@ module.exports = {
},
],
require.resolve('babel-preset-stage-0'),
require.resolve('babel-preset-react'),
require.resolve('babel-preset-minify'),
],
plugins: [

View File

@ -71,10 +71,10 @@ export default function(configDir) {
test: /\.md$/,
use: [
{
loader: 'html-loader',
loader: require.resolve('html-loader'),
},
{
loader: 'markdown-loader',
loader: require.resolve('markdown-loader'),
},
],
},
@ -89,8 +89,6 @@ export default function(configDir) {
modules: ['node_modules'].concat(nodePaths),
alias: {
vue$: require.resolve('vue/dist/vue.esm.js'),
react$: require.resolve('react'),
'react-dom$': require.resolve('react-dom'),
},
},
performance: {

View File

@ -82,10 +82,10 @@ export default function(configDir) {
test: /\.md$/,
use: [
{
loader: 'html-loader',
loader: require.resolve('html-loader'),
},
{
loader: 'markdown-loader',
loader: require.resolve('markdown-loader'),
},
],
},
@ -100,8 +100,6 @@ export default function(configDir) {
modules: ['node_modules'].concat(nodePaths),
alias: {
vue$: require.resolve('vue/dist/vue.esm.js'),
react$: require.resolve('react'),
'react-dom$': require.resolve('react-dom'),
},
},
};

View File

@ -22,23 +22,16 @@
"@storybook/addon-links": "^3.3.14",
"@storybook/addons": "^3.3.14",
"@storybook/react": "^3.3.14",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-loader": "^6.4.1",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"bootstrap": "^3.3.7",
"gatsby": "^1.9.209",
"gatsby": "^1.9.212",
"gatsby-link": "^1.6.37",
"gatsby-plugin-sharp": "^1.6.33",
"gatsby-plugin-sharp": "^1.6.34",
"gatsby-remark-autolink-headers": "^1.4.12",
"gatsby-remark-copy-linked-files": "^1.5.28",
"gatsby-remark-images": "^1.5.49",
"gatsby-remark-images": "^1.5.50",
"gatsby-remark-smartypants": "^1.4.11",
"gatsby-source-filesystem": "^1.5.22",
"gatsby-source-filesystem": "^1.5.23",
"gatsby-transformer-remark": "^1.7.33",
"gh-pages": "^1.1.0",
"global": "^4.3.2",

View File

@ -4410,9 +4410,9 @@ gatsby-module-loader@^1.0.10:
babel-runtime "^6.26.0"
loader-utils "^0.2.16"
gatsby-plugin-sharp@^1.6.33:
version "1.6.33"
resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-1.6.33.tgz#05044062f59232567bd8a3f8e8d5e199d210409d"
gatsby-plugin-sharp@^1.6.34:
version "1.6.34"
resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-1.6.34.tgz#11cd60af3d3a9c8e77772476ba200830f7e71eb6"
dependencies:
async "^2.1.2"
babel-runtime "^6.26.0"
@ -4457,13 +4457,13 @@ gatsby-remark-copy-linked-files@^1.5.28:
probe-image-size "^3.2.0"
unist-util-visit "^1.1.1"
gatsby-remark-images@^1.5.49:
version "1.5.49"
resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-1.5.49.tgz#05dd1d17ea268cd043b5d0ee17ca5a286a4ef43d"
gatsby-remark-images@^1.5.50:
version "1.5.50"
resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-1.5.50.tgz#695022db8f84385782afbb57bc57c36572367469"
dependencies:
babel-runtime "^6.26.0"
cheerio "^1.0.0-rc.2"
gatsby-plugin-sharp "^1.6.33"
gatsby-plugin-sharp "^1.6.34"
is-relative-url "^2.0.0"
lodash "^4.17.4"
slash "^1.0.0"
@ -4478,9 +4478,9 @@ gatsby-remark-smartypants@^1.4.11:
retext-smartypants "^2.0.0"
unist-util-visit "^1.1.1"
gatsby-source-filesystem@^1.5.22:
version "1.5.22"
resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-1.5.22.tgz#5017b2c8714301a04ae30be700c0f71be8661451"
gatsby-source-filesystem@^1.5.23:
version "1.5.23"
resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-1.5.23.tgz#a48432f6db6c2c702f06cb87d720e8d281c4a73b"
dependencies:
babel-cli "^6.26.0"
babel-runtime "^6.26.0"
@ -4519,9 +4519,9 @@ gatsby-transformer-remark@^1.7.33:
unist-util-select "^1.5.0"
unist-util-visit "^1.1.1"
gatsby@^1.9.209:
version "1.9.209"
resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.209.tgz#c9b60e41dbf637533ca215e9c32f3354c2603d8f"
gatsby@^1.9.212:
version "1.9.212"
resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.212.tgz#b3b42bb2ebc75ba2d90c86a39f1a090e2f05ecec"
dependencies:
async "^2.1.2"
babel-code-frame "^6.22.0"

View File

@ -6,6 +6,6 @@ export class AppPage {
}
getParagraphText() {
return element(by.css('app-root h1')).getText();
return element(by.css('storybook-app-root h1')).getText();
}
}

View File

@ -30,5 +30,6 @@ module.exports = function(config) {
autoWatch: true,
browsers: ['Chrome'],
singleRun: false,
webpack: { node: { fs: 'empty', } },
});
};

View File

@ -13,15 +13,12 @@
"test": "ng test"
},
"dependencies": {
"@angular/animations": "^5.2.6",
"@angular/common": "^5.2.6",
"@angular/compiler": "^5.2.6",
"@angular/core": "^5.2.6",
"@angular/forms": "^5.2.6",
"@angular/http": "^5.2.6",
"@angular/platform-browser": "^5.2.6",
"@angular/platform-browser-dynamic": "^5.2.6",
"@angular/router": "^5.2.6",
"core-js": "^2.4.1",
"rxjs": "^5.4.2",
"zone.js": "^0.8.20"
@ -29,7 +26,6 @@
"devDependencies": {
"@angular/cli": "1.7.1",
"@angular/compiler-cli": "^5.2.6",
"@angular/language-service": "^5.2.6",
"@storybook/addon-actions": "^3.4.0-alpha.9",
"@storybook/addon-knobs": "^3.4.0-alpha.9",
"@storybook/addon-links": "^3.4.0-alpha.9",

View File

@ -9,6 +9,6 @@
<link rel="icon" type="image/x-icon" href="favicon.ico">
</head>
<body>
<app-root></app-root>
<storybook-app-root></storybook-app-root>
</body>
</html>

View File

@ -4,7 +4,9 @@
"outDir": "../out-tsc/app",
"baseUrl": "./",
"module": "es2015",
"types": []
"types": [
"node"
]
},
"exclude": [
"test.ts",

View File

@ -11,8 +11,6 @@
"test": "react-scripts test --env=jsdom"
},
"dependencies": {
"glamor": "^2.20.40",
"glamorous": "^4.11.6",
"global": "^4.3.2",
"prop-types": "^15.6.0",
"react": "^16.2.0",
@ -31,16 +29,14 @@
"@storybook/addon-notes": "^3.4.0-alpha.9",
"@storybook/addon-options": "^3.4.0-alpha.9",
"@storybook/addon-storyshots": "^3.4.0-alpha.9",
"@storybook/addon-viewport": "^3.4.0-alpha.9",
"@storybook/addons": "^3.4.0-alpha.9",
"@storybook/client-logger": "^3.4.0-alpha.9",
"@storybook/components": "^3.4.0-alpha.9",
"@storybook/react": "^3.4.0-alpha.9",
"babel-jest": "^22.4.1",
"babel-runtime": "^6.26.0",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.0",
"enzyme-to-json": "^3.3.1",
"jest": "^22.4.2",
"jest": "^20.0.4",
"react-scripts": "^1.1.1",
"webpack": "^3.11.0"
}

View File

@ -1,9 +1,12 @@
import initStoryshots, { multiSnapshotWithOptions } from '@storybook/addon-storyshots';
import path from 'path';
import { render as renderer } from 'enzyme';
import { render as renderer, configure } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import serializer from 'enzyme-to-json';
configure({ adapter: new Adapter() });
initStoryshots({
framework: 'react',
configPath: path.join(__dirname, '..', '.storybook'),

View File

@ -7,14 +7,17 @@
"@storybook/addon-knobs": "file:../../packs/storybook-addon-knobs.tgz",
"@storybook/addon-links": "file:../../packs/storybook-addon-links.tgz",
"@storybook/addon-options": "file:../../packs/storybook-addon-options.tgz",
"@storybook/addon-storyshots": "file:../../packs/storybook-addon-storyshots.tgz",
"@storybook/addons": "file:../../packs/storybook-addons.tgz",
"@storybook/channel-postmessage": "file:../../packs/storybook-channel-postmessage.tgz",
"@storybook/channel-websocket": "file:../../packs/storybook-channel-websocket.tgz",
"@storybook/channels": "file:../../packs/storybook-channels.tgz",
"@storybook/client-logger": "file:../../packs/storybook-client-logger.tgz",
"@storybook/components": "file:../../packs/storybook-components.tgz",
"@storybook/core": "file:../../packs/storybook-core.tgz",
"@storybook/node-logger": "file:../../packs/storybook-node-logger.tgz",
"@storybook/react-native": "file:../../packs/storybook-react-native.tgz",
"@storybook/ui": "file:../../packs/storybook-ui.tgz",
"babel-runtime": "^6.26.0",
"jest-expo": "^24.0.0",
"react-native-scripts": "^1.8.1",
"react-test-renderer": "~16.2.0",

View File

@ -13,7 +13,6 @@
"@storybook/addon-a11y": "^3.4.0-alpha.9",
"@storybook/addon-actions": "^3.4.0-alpha.9",
"@storybook/addon-backgrounds": "^3.4.0-alpha.9",
"@storybook/addon-centered": "^3.4.0-alpha.9",
"@storybook/addon-events": "^3.4.0-alpha.9",
"@storybook/addon-info": "^3.4.0-alpha.9",
"@storybook/addon-jest": "^3.4.0-alpha.9",
@ -25,17 +24,13 @@
"@storybook/addon-storysource": "^3.4.0-alpha.9",
"@storybook/addon-viewport": "^3.4.0-alpha.9",
"@storybook/addons": "^3.4.0-alpha.9",
"@storybook/components": "^3.4.0-alpha.9",
"@storybook/node-logger": "^3.4.0-alpha.9",
"@storybook/react": "^3.4.0-alpha.9",
"babel-jest": "^22.4.1",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.0",
"babel-runtime": "^6.26.0",
"enzyme-to-json": "^3.3.1",
"eventemitter3": "^3.0.1",
"format-json": "^1.0.3",
"global": "^4.3.2",
"jest": "^22.4.2",
"paths.macro": "^2.0.2",
"prop-types": "^15.6.0",
"react": "^16.2.0",

View File

@ -3,6 +3,7 @@
"version": "3.4.0-alpha.9",
"private": true,
"scripts": {
"build-storybook": "build-storybook",
"start": "webpack-dev-server",
"storybook": "start-storybook -p 9001 -c .storybook"
},
@ -21,11 +22,9 @@
"webpack": "^3.11.0"
},
"devDependencies": {
"babel": "^6.23.0",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-preset-env": "^1.6.1",
"babel-preset-stage-2": "^6.24.1",
"babel-runtime": "^6.26.0",
"copy-webpack-plugin": "^4.4.2",
"html-webpack-plugin": "^2.30.1",
"webpack-dev-server": "^2.11.1"

View File

@ -13,8 +13,8 @@
"react-native": "^0.51.0"
},
"devDependencies": {
"babel-jest": "^22.0.4",
"babel-preset-react-native": "^4.0.0",
"babel-runtime": "^6.26.0",
"jest": "^22.0.4",
"react-test-renderer": "^16.2.0",
"@storybook/addon-actions": "file:../../packs/storybook-addon-actions.tgz",
@ -24,9 +24,12 @@
"@storybook/addon-storyshots": "file:../../packs/storybook-addon-storyshots.tgz",
"@storybook/addons": "file:../../packs/storybook-addons.tgz",
"@storybook/channels": "file:../../packs/storybook-channels.tgz",
"@storybook/client-logger": "file:../../packs/storybook-client-logger.tgz",
"@storybook/channel-postmessage": "file:../../packs/storybook-channel-postmessage.tgz",
"@storybook/channel-websocket": "file:../../packs/storybook-channel-websocket.tgz",
"@storybook/components": "file:../../packs/storybook-components.tgz",
"@storybook/core": "file:../../packs/storybook-core.tgz",
"@storybook/node-logger": "file:../../packs/storybook-node-logger.tgz",
"@storybook/react-native": "file:../../packs/storybook-react-native.tgz",
"@storybook/ui": "file:../../packs/storybook-ui.tgz",
"react-dom": "^16.2.0"

View File

@ -29,12 +29,8 @@
"babel-preset-env": "^1.6.0",
"babel-preset-vue": "^2.0.1",
"cross-env": "^5.1.3",
"css-loader": "^0.28.10",
"file-loader": "^1.1.9",
"vue-hot-reload-api": "^2.3.0",
"vue-loader": "^13.7.1",
"vue-style-loader": "^3.1.2",
"vue-template-compiler": "^2.5.13",
"webpack": "^3.11.0",
"webpack-dev-server": "^2.11.1"
}

View File

@ -9,14 +9,12 @@ export default async () => {
actionsVersion,
linksVersion,
addonsVersion,
babelCoreVersion,
] = await getVersions(
'@storybook/angular',
'@storybook/addon-notes',
'@storybook/addon-actions',
'@storybook/addon-links',
'@storybook/addons',
'babel-core'
'@storybook/addons'
);
mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
@ -30,10 +28,6 @@ export default async () => {
packageJson.devDependencies['@storybook/addon-links'] = linksVersion;
packageJson.devDependencies['@storybook/addons'] = addonsVersion;
if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
packageJson.devDependencies['babel-core'] = babelCoreVersion;
}
packageJson.scripts = packageJson.scripts || {};
packageJson.scripts.storybook = 'start-storybook -p 6006';
packageJson.scripts['build-storybook'] = 'build-storybook';

View File

@ -1,15 +1,27 @@
import mergeDirs from 'merge-dirs';
import path from 'path';
import { getVersion, getPackageJson, writePackageJson } from '../../lib/helpers';
import { getVersions, getPackageJson, writePackageJson } from '../../lib/helpers';
export default async () => {
const version = await getVersion('@storybook/polymer');
const [storybookVersion, babelCoreVersion, babelRuntimeVersion] = await getVersions(
'@storybook/polymer',
'babel-core',
'babel-runtime'
);
mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
const packageJson = getPackageJson() || {}; // Maybe we are in a bower only project, still we need a package json
packageJson.dependencies = packageJson.dependencies || {};
packageJson.devDependencies = packageJson.devDependencies || {};
packageJson.devDependencies['@storybook/polymer'] = version;
packageJson.devDependencies['@storybook/polymer'] = storybookVersion;
if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
packageJson.devDependencies['babel-core'] = babelCoreVersion;
}
if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
}
packageJson.scripts = packageJson.scripts || {};
packageJson.scripts.storybook = 'start-storybook -p 6006';

View File

@ -9,12 +9,14 @@ export default async () => {
linksVersion,
addonsVersion,
babelCoreVersion,
babelRuntimeVersion,
] = await getVersions(
'@storybook/react',
'@storybook/addon-actions',
'@storybook/addon-links',
'@storybook/addons',
'babel-core'
'babel-core',
'babel-runtime'
);
mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
@ -31,6 +33,9 @@ export default async () => {
if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
packageJson.devDependencies['babel-core'] = babelCoreVersion;
}
if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
}
packageJson.scripts = packageJson.scripts || {};
packageJson.scripts.storybook = 'start-storybook -p 6006';

View File

@ -11,6 +11,7 @@ export default async () => {
linksVersion,
addonsVersion,
babelCoreVersion,
babelRuntimeVersion,
propTypesVersion,
] = await getVersions(
'@storybook/react-native',
@ -18,6 +19,7 @@ export default async () => {
'@storybook/addon-links',
'@storybook/addons',
'babel-core',
'babel-runtime',
'prop-types'
);
@ -51,6 +53,9 @@ export default async () => {
if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
packageJson.devDependencies['babel-core'] = babelCoreVersion;
}
if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
}
if (!packageJson.dependencies['react-dom'] && !packageJson.devDependencies['react-dom']) {
const reactVersion = packageJson.dependencies.react;

View File

@ -9,6 +9,7 @@ export default async () => {
linksVersion,
addonsVersion,
babelCoreVersion,
babelRuntimeVersion,
propTypesVersion,
] = await getVersions(
'@storybook/react-native',
@ -16,6 +17,7 @@ export default async () => {
'@storybook/addon-links',
'@storybook/addons',
'babel-core',
'babel-runtime',
'prop-types'
);
@ -35,6 +37,9 @@ export default async () => {
if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
packageJson.devDependencies['babel-core'] = babelCoreVersion;
}
if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
}
if (!packageJson.dependencies['react-dom'] && !packageJson.devDependencies['react-dom']) {
const reactVersion = packageJson.dependencies.react;

View File

@ -10,12 +10,14 @@ export default async () => {
linksVersion,
addonsVersion,
babelCoreVersion,
babelRuntimeVersion,
] = await getVersions(
'@storybook/react',
'@storybook/addon-actions',
'@storybook/addon-links',
'@storybook/addons',
'babel-core'
'babel-core',
'babel-runtime'
);
mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
@ -33,6 +35,9 @@ export default async () => {
if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
packageJson.devDependencies['babel-core'] = babelCoreVersion;
}
if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
}
packageJson.scripts.storybook = 'start-storybook -p 9009';
packageJson.scripts['build-storybook'] = 'build-storybook';

View File

@ -12,7 +12,11 @@ async function updatePackage(devDependencies, oldName, newName) {
}
async function addPeerDependencies(packageJson) {
const [addonsVersion, babelCoreVersion] = await getVersions('@storybook/addons', 'babel-core');
const [addonsVersion, babelCoreVersion, babelRuntimeVersion] = await getVersions(
'@storybook/addons',
'babel-core',
'babel-runtime'
);
packageJson.dependencies = packageJson.dependencies || {};
@ -21,6 +25,9 @@ async function addPeerDependencies(packageJson) {
if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
packageJson.devDependencies['babel-core'] = babelCoreVersion;
}
if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
}
}
async function updatePackageJson() {

View File

@ -9,12 +9,14 @@ export default async () => {
linksVersion,
addonsVersion,
babelCoreVersion,
babelRuntimeVersion,
] = await getVersions(
'@storybook/react',
'@storybook/addon-actions',
'@storybook/addon-links',
'@storybook/addons',
'babel-core'
'babel-core',
'babel-runtime'
);
mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
@ -31,6 +33,9 @@ export default async () => {
if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
packageJson.devDependencies['babel-core'] = babelCoreVersion;
}
if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
}
packageJson.scripts = packageJson.scripts || {};
packageJson.scripts.storybook = 'start-storybook -p 6006';

View File

@ -48,7 +48,6 @@
"@storybook/addon-notes": "^3.4.0-alpha.9",
"@storybook/addon-actions": "^3.4.0-alpha.9",
"@storybook/addon-links": "^3.4.0-alpha.9",
"@storybook/addons": "^3.4.0-alpha.9",
"babel-core": "^6.26.0"
"@storybook/addons": "^3.4.0-alpha.9"
}
}

View File

@ -12,6 +12,8 @@
"@polymer/polymer": "^2.2.0"
},
"devDependencies": {
"@storybook/polymer": "^3.4.0-alpha.9"
"@storybook/polymer": "^3.4.0-alpha.9",
"babel-core": "^6.26.0",
"babel-runtime": "^6.26.0"
}
}

View File

@ -24,6 +24,7 @@
"@storybook/addon-actions": "^3.4.0-alpha.9",
"@storybook/addon-links": "^3.4.0-alpha.9",
"@storybook/addons": "^3.4.0-alpha.9",
"babel-core": "^6.26.0"
"babel-core": "^6.26.0",
"babel-runtime": "^6.26.0"
}
}

View File

@ -21,6 +21,7 @@
"@storybook/addon-links": "^3.4.0-alpha.9",
"@storybook/addons": "^3.4.0-alpha.9",
"babel-core": "^6.26.0",
"babel-runtime": "^6.26.0",
"react-dom": "16.0.0-alpha.12",
"prop-types": "^15.6.0"
},

View File

@ -11,6 +11,7 @@
"@storybook/addon-links": "^3.4.0-alpha.9",
"@storybook/addons": "^3.4.0-alpha.9",
"babel-core": "^6.26.0",
"babel-runtime": "^6.26.0",
"react-dom": "16.0.0-alpha.12",
"prop-types": "^15.6.0"
},

View File

@ -17,7 +17,8 @@
"@storybook/addon-actions": "^3.4.0-alpha.9",
"@storybook/addon-links": "^3.4.0-alpha.9",
"@storybook/addons": "^3.4.0-alpha.9",
"babel-core": "^6.26.0"
"babel-core": "^6.26.0",
"babel-runtime": "^6.26.0"
},
"peerDependencies": {
"react": "*",

View File

@ -20,6 +20,7 @@
"@storybook/addon-actions": "^3.4.0-alpha.9",
"@storybook/addon-links": "^3.4.0-alpha.9",
"@storybook/addons": "^3.4.0-alpha.9",
"babel-core": "^6.26.0"
"babel-core": "^6.26.0",
"babel-runtime": "^6.26.0"
}
}

View File

@ -10,7 +10,8 @@
"devDependencies": {
"@storybook/react": "^3.4.0-alpha.9",
"@storybook/addons": "^3.4.0-alpha.9",
"babel-core": "^6.26.0"
"babel-core": "^6.26.0",
"babel-runtime": "^6.26.0"
},
"scripts": {
"start": "react-scripts start",

View File

@ -20,6 +20,7 @@
"@storybook/react": "^3.4.0-alpha.9",
"@storybook/addon-actions": "^3.4.0-alpha.9",
"@storybook/addon-links": "^3.4.0-alpha.9",
"@storybook/addons": "^3.4.0-alpha.9"
"@storybook/addons": "^3.4.0-alpha.9",
"babel-runtime": "^6.26.0"
}
}

View File

@ -46,8 +46,5 @@
"webpack": "^3.11.0",
"webpack-dev-middleware": "^1.12.2",
"webpack-hot-middleware": "^2.21.0"
},
"devDependencies": {
"babel-cli": "^6.26.0"
}
}

View File

@ -9,7 +9,6 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"chalk": "^2.3.1",
"npmlog": "^4.1.2"
}
}

View File

@ -24,7 +24,6 @@
"events": "^1.1.1",
"fuse.js": "^3.2.0",
"global": "^4.3.2",
"json-stringify-safe": "^5.0.1",
"keycode": "^2.1.9",
"lodash.debounce": "^4.0.8",
"lodash.pick": "^4.4.0",
@ -33,11 +32,9 @@
"qs": "^6.5.1",
"react-fuzzy": "^0.5.2",
"react-icons": "^2.2.7",
"react-inspector": "^2.2.2",
"react-modal": "^3.3.1",
"react-split-pane": "^0.1.77",
"react-treebeard": "^2.1.0",
"redux": "^3.7.2"
"react-treebeard": "^2.1.0"
},
"peerDependencies": {
"react": "*",

View File

@ -45,11 +45,9 @@
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-eslint": "^8.2.2",
"babel-plugin-transform-md-import-to-string": "^1.0.6",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.1",
"babel-plugin-macros": "^2.1.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"chalk": "^2.3.1",
@ -70,7 +68,6 @@
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-prettier": "^2.6.0",
"eslint-plugin-react": "^7.7.0",
"gh-pages": "^1.1.0",
"github-release-from-changelog": "^1.3.1",
"glob": "^7.1.2",
"husky": "^0.14.3",
@ -88,10 +85,8 @@
"lerna": "2.5.1",
"lint-staged": "^6.1.1",
"lodash": "^4.17.5",
"nodemon": "^1.15.1",
"npmlog": "^4.1.2",
"prettier": "^1.10.2",
"puppeteer": "^1.1.1",
"raf": "^3.4.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
@ -99,9 +94,7 @@
"remark-cli": "^5.0.0",
"remark-lint": "^6.0.1",
"remark-preset-lint-recommended": "^3.0.1",
"symlink-dir": "^1.1.2",
"shelljs": "^0.8.1",
"ts-jest": "^22.0.4",
"tslint": "~5.9.1",
"tslint-config-prettier": "^1.8.0",
"tslint-plugin-prettier": "^1.3.0",

164
yarn.lock
View File

@ -27,12 +27,6 @@
"@ngtools/json-schema" "^1.1.0"
rxjs "^5.5.6"
"@angular/animations@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.2.6.tgz#433aace8929ce362762dcccdb5044c3945a194bd"
dependencies:
tslib "^1.7.1"
"@angular/cli@1.7.1":
version "1.7.1"
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.7.1.tgz#3a9d0b8314d4c54226f941beeb53071385c294e0"
@ -131,16 +125,6 @@
dependencies:
tslib "^1.7.1"
"@angular/http@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.2.6.tgz#4fa92e61b9848f8571c61ae9ad32af27cd71b043"
dependencies:
tslib "^1.7.1"
"@angular/language-service@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-5.2.6.tgz#f88f49f54a82e95b05af50ded22f4ebbb344df1f"
"@angular/platform-browser-dynamic@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.6.tgz#8795cca57306b7bdc2bc166d3928bc8eb145125c"
@ -153,12 +137,6 @@
dependencies:
tslib "^1.7.1"
"@angular/router@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.2.6.tgz#513b555d5cc4b206833646468ffb47fa8f5c1c0b"
dependencies:
tslib "^1.7.1"
"@babel/code-frame@7.0.0-beta.40", "@babel/code-frame@^7.0.0-beta.40":
version "7.0.0-beta.40"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.40.tgz#37e2b0cf7c56026b4b21d3927cadf81adec32ac6"
@ -346,13 +324,7 @@
version "4.14.92"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.92.tgz#6e3cb0b71a1e12180a47a42a744e856c3ae99a57"
"@types/mz@0.0.32":
version "0.0.32"
resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.32.tgz#e8248b4e41424c052edc1725dd33650c313a3659"
dependencies:
"@types/node" "*"
"@types/node@*", "@types/node@^9.3.0":
"@types/node@*":
version "9.3.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.3.0.tgz#3a129cda7c4e5df2409702626892cb4b96546dd5"
@ -764,10 +736,6 @@ any-observable@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242"
any-promise@^1.0.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
anymatch@^1.3.0:
version "1.3.2"
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@ -1024,16 +992,16 @@ async-limiter@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
async@2.6.0, async@^2.1.2, async@^2.1.4, async@^2.1.5, async@^2.4.0, async@^2.4.1:
async@^1.4.0, async@^1.5.0, async@^1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
async@^2.1.2, async@^2.1.4, async@^2.1.5, async@^2.4.0, async@^2.4.1:
version "2.6.0"
resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
dependencies:
lodash "^4.14.0"
async@^1.4.0, async@^1.5.0, async@^1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
async@~2.1.2:
version "2.1.5"
resolved "https://registry.yarnpkg.com/async/-/async-2.1.5.tgz#e587c68580994ac67fc56ff86d3ac56bdbe810bc"
@ -1552,7 +1520,7 @@ babel-plugin-syntax-class-properties@^6.5.0, babel-plugin-syntax-class-propertie
version "6.13.0"
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
babel-plugin-syntax-decorators@^6.1.18, babel-plugin-syntax-decorators@^6.13.0:
babel-plugin-syntax-decorators@^6.13.0:
version "6.13.0"
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
@ -1633,14 +1601,6 @@ babel-plugin-transform-class-properties@6.24.1, babel-plugin-transform-class-pro
babel-runtime "^6.22.0"
babel-template "^6.24.1"
babel-plugin-transform-decorators-legacy@^1.3.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.4.tgz#741b58f6c5bce9e6027e0882d9c994f04f366925"
dependencies:
babel-plugin-syntax-decorators "^6.1.18"
babel-runtime "^6.2.0"
babel-template "^6.3.0"
babel-plugin-transform-decorators@^6.24.1:
version "6.24.1"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d"
@ -1871,10 +1831,6 @@ babel-plugin-transform-inline-consecutive-adds@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.3.0.tgz#f07d93689c0002ed2b2b62969bdd99f734e03f57"
babel-plugin-transform-md-import-to-string@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-md-import-to-string/-/babel-plugin-transform-md-import-to-string-1.0.6.tgz#f57bf84bb14988cd2a9b8d8262114fa021587e70"
babel-plugin-transform-member-expression-literals@^6.9.0:
version "6.9.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.0.tgz#ab07ad52a11ff7d2528c71388e8f901a4499c2b2"
@ -1906,7 +1862,7 @@ babel-plugin-transform-property-literals@^6.9.0:
dependencies:
esutils "^2.0.2"
babel-plugin-transform-react-constant-elements@6.23.0, babel-plugin-transform-react-constant-elements@^6.23.0:
babel-plugin-transform-react-constant-elements@6.23.0:
version "6.23.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-constant-elements/-/babel-plugin-transform-react-constant-elements-6.23.0.tgz#2f119bf4d2cdd45eb9baaae574053c604f6147dd"
dependencies:
@ -2286,7 +2242,7 @@ babel-register@^6.24.1, babel-register@^6.26.0, babel-register@^6.9.0:
mkdirp "^0.5.1"
source-map-support "^0.4.15"
babel-runtime@6.26.0, babel-runtime@6.x.x, babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.5.0, babel-runtime@^6.9.2:
babel-runtime@6.26.0, babel-runtime@6.x.x, babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.5.0, babel-runtime@^6.9.2:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
dependencies:
@ -2297,7 +2253,7 @@ babel-standalone@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-standalone/-/babel-standalone-6.26.0.tgz#15fb3d35f2c456695815ebf1ed96fe7f015b6886"
babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
dependencies:
@ -2330,10 +2286,6 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24
lodash "^4.17.4"
to-fast-properties "^1.0.3"
babel@^6.23.0:
version "6.23.0"
resolved "https://registry.yarnpkg.com/babel/-/babel-6.23.0.tgz#d0d1e7d803e974765beea3232d4e153c0efb90f4"
babylon@7.0.0-beta.40, babylon@^7.0.0-beta.40:
version "7.0.0-beta.40"
resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.40.tgz#91fc8cd56d5eb98b28e6fde41045f2957779940a"
@ -2386,10 +2338,6 @@ base64id@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
base64url@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb"
base@^0.11.1:
version "0.11.2"
resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
@ -3521,10 +3469,6 @@ command-join@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
commander@2.11.0:
version "2.11.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
commander@2.12.x, commander@~2.12.1:
version "2.12.2"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
@ -3653,7 +3597,7 @@ configstore@^2.0.0:
write-file-atomic "^1.1.2"
xdg-basedir "^2.0.0"
configstore@^3.0.0, configstore@^3.1.0, configstore@^3.1.1:
configstore@^3.0.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
dependencies:
@ -5722,7 +5666,7 @@ express-session@~1.11.3:
uid-safe "~2.0.0"
utils-merge "1.0.0"
express@^4.13.3, express@^4.15.3, express@^4.16.2:
express@^4.13.3, express@^4.16.2:
version "4.16.2"
resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
dependencies:
@ -6243,7 +6187,7 @@ fs-extra@3.0.1:
jsonfile "^3.0.0"
universalify "^0.1.0"
fs-extra@4.0.3, fs-extra@^4.0.0, fs-extra@^4.0.1, fs-extra@^4.0.2:
fs-extra@4.0.3, fs-extra@^4.0.0, fs-extra@^4.0.1:
version "4.0.3"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
dependencies:
@ -6450,18 +6394,6 @@ getpass@^0.1.1:
dependencies:
assert-plus "^1.0.0"
gh-pages@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-1.1.0.tgz#738134d8e35e5323b39892cda28b8904e85f24b2"
dependencies:
async "2.6.0"
base64url "^2.0.0"
commander "2.11.0"
fs-extra "^4.0.2"
globby "^6.1.0"
graceful-fs "4.1.11"
rimraf "^2.6.2"
git-config-path@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/git-config-path/-/git-config-path-1.0.1.tgz#6d33f7ed63db0d0e118131503bab3aca47d54664"
@ -6740,7 +6672,7 @@ got@^6.7.1:
unzip-response "^2.0.1"
url-parse-lax "^1.0.0"
graceful-fs@4.1.11, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~4.1.11:
graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~4.1.11:
version "4.1.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
@ -8864,7 +8796,7 @@ jest-zone-patch@^0.0.8:
version "0.0.8"
resolved "https://registry.yarnpkg.com/jest-zone-patch/-/jest-zone-patch-0.0.8.tgz#90fa3b5b60e95ad3e624dd2c3eb59bb1dcabd371"
jest@20.0.4:
jest@20.0.4, jest@^20.0.4:
version "20.0.4"
resolved "https://registry.yarnpkg.com/jest/-/jest-20.0.4.tgz#3dd260c2989d6dad678b1e9cc4d91944f6d602ac"
dependencies:
@ -10401,24 +10333,18 @@ mixin-object@^2.0.1:
for-in "^0.1.3"
is-extendable "^0.1.1"
mkdirp-promise@^5.0.0:
version "5.0.1"
resolved "https://registry.yarnpkg.com/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"
dependencies:
mkdirp "*"
mkdirp@*, mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
dependencies:
minimist "0.0.8"
mkdirp@0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
dependencies:
minimist "0.0.8"
mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
dependencies:
minimist "0.0.8"
mock-fs@^4.3.0:
version "4.4.2"
resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.4.2.tgz#09dec5313f97095a450be6aa2ad8ab6738d63d6b"
@ -10520,14 +10446,6 @@ mute-stream@0.0.7, mute-stream@~0.0.4:
version "0.0.7"
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
mz@^2.4.0:
version "2.7.0"
resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
dependencies:
any-promise "^1.0.0"
object-assign "^4.0.1"
thenify-all "^1.0.0"
nan@^2.3.0, nan@^2.3.2:
version "2.8.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
@ -11869,7 +11787,7 @@ postcss-flexbugs-fixes@3.2.0:
dependencies:
postcss "^6.0.1"
postcss-flexbugs-fixes@^3.2.0, postcss-flexbugs-fixes@^3.3.0:
postcss-flexbugs-fixes@^3.2.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-3.3.0.tgz#e00849b536063749da50a0d410ba5d9ee65e27b8"
dependencies:
@ -13601,7 +13519,7 @@ request-promise-native@^1.0.3:
stealthy-require "^1.1.0"
tough-cookie ">=2.3.3"
request@2, request@^2.0.0, request@^2.74.0, request@^2.78.0, request@^2.79.0, request@^2.81.0, request@^2.83.0:
request@2, request@^2.0.0, request@^2.74.0, request@^2.78.0, request@^2.79.0, request@^2.83.0:
version "2.83.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
dependencies:
@ -15102,17 +15020,6 @@ symbol-tree@^3.2.1:
version "3.2.2"
resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
symlink-dir@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/symlink-dir/-/symlink-dir-1.1.2.tgz#eb367da33401e9c6e95b1ca87efd921cef369852"
dependencies:
"@types/mz" "0.0.32"
"@types/node" "^9.3.0"
graceful-fs "^4.1.11"
is-windows "^1.0.0"
mkdirp-promise "^5.0.0"
mz "^2.4.0"
sync-exec@~0.6.x:
version "0.6.2"
resolved "https://registry.yarnpkg.com/sync-exec/-/sync-exec-0.6.2.tgz#717d22cc53f0ce1def5594362f3a89a2ebb91105"
@ -15230,18 +15137,6 @@ text-table@0.2.0, text-table@^0.2.0, text-table@~0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
thenify-all@^1.0.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
dependencies:
thenify ">= 3.1.0 < 4"
"thenify@>= 3.1.0 < 4":
version "3.3.0"
resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
dependencies:
any-promise "^1.0.0"
throat@^3.0.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/throat/-/throat-3.2.0.tgz#50cb0670edbc40237b9e347d7e1f88e4620af836"
@ -15437,7 +15332,7 @@ try-catch@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/try-catch/-/try-catch-1.0.0.tgz#3797dab39a266775f4d0da5cbf42aca3f03608e6"
ts-jest@^22.0.1, ts-jest@^22.0.4:
ts-jest@^22.0.1:
version "22.0.4"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-22.0.4.tgz#be5e8d7d2cf3f3ef97d877a6a0562508c3f64515"
dependencies:
@ -16196,10 +16091,6 @@ vue-hot-reload-api@^2.2.0:
version "2.2.4"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz#683bd1d026c0d3b3c937d5875679e9a87ec6cd8f"
vue-hot-reload-api@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz#97976142405d13d8efae154749e88c4e358cf926"
vue-loader@^13.7.1:
version "13.7.1"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.7.1.tgz#d9009d0abd392b4efe8b8fb1f542f6723b02dd3a"
@ -16232,13 +16123,6 @@ vue-style-loader@^3.0.0:
hash-sum "^1.0.2"
loader-utils "^1.0.2"
vue-style-loader@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.1.2.tgz#6b66ad34998fc9520c2f1e4d5fa4091641c1597a"
dependencies:
hash-sum "^1.0.2"
loader-utils "^1.0.2"
vue-template-compiler@^2.5.13:
version "2.5.13"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.13.tgz#12a2aa0ecd6158ac5e5f14d294b0993f399c3d38"