diff --git a/.babelrc b/.babelrc index 675cf6c23223..9731c81d6927 100644 --- a/.babelrc +++ b/.babelrc @@ -28,6 +28,26 @@ "@babel/preset-env", "babel-preset-vue" ] + }, + { + "test": [ + "./lib/core/src/server", + "./lib/node-logger", + "./lib/codemod", + "./addons/storyshots", + "./addons/storysource/src/loader", + "./app/**/src/server/**" + ], + "presets": [ + [ + "@babel/preset-env", + { + "targets": { + "node": "8.11" + } + } + ] + ] } ] } diff --git a/ADDONS_SUPPORT.md b/ADDONS_SUPPORT.md index e367da5b116c..3fbeab75b068 100644 --- a/ADDONS_SUPPORT.md +++ b/ADDONS_SUPPORT.md @@ -2,20 +2,21 @@ | | [React](app/react)|[React Native](app/react-native)|[Vue](app/vue)|[Angular](app/angular)| [Polymer](app/polymer)| [Mithril](app/mithril)| [HTML](app/html)| [Marko](app/marko)| [Svelte](app/svelte)| [Riot](app/riot)| [Ember](app/ember)| | ----------- |:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:| -|[a11y](addons/a11y) |+| |+|+|+|+|+|+| | |+| -|[actions](addons/actions) |+|+|+|+|+|+|+|+|+|+|+| -|[backgrounds](addons/backgrounds)|+|*|+|+|+|+|+|+|+|+|+| -|[centered](addons/centered) |+| |+|+| |+|+| |+| |+| -|[events](addons/events) |+| |+|+|+|+|+|+| | |+| -|[graphql](addons/graphql) |+| | | | | | | | | | | -|[info](addons/info) |+| | | | | | | | | | | -|[jest](addons/jest) |+| | |+| | |+| | | | | -|[knobs](addons/knobs) |+|+*|+|+|+|+|+|+|+|+|+| -|[links](addons/links) |+|+|+|+|+|+|+| |+|+|+| -|[notes](addons/notes) |+|+*|+|+|+|+|+| |+|+|+| -|[options](addons/options) |+|+|+|+|+|+|+| |+|+|+| -|[storyshots](addons/storyshots) |+|+|+|+| | |+| |+|+| | -|[storysource](addons/storysource)|+| |+|+|+|+|+|+|+|+|+| -|[viewport](addons/viewport) |+| |+|+|+|+|+|+|+|+|+| +|[a11y](addons/a11y) |+| |+|+|+|+|+|+| | |+| +|[actions](addons/actions) |+|+|+|+|+|+|+|+|+|+|+| +|[backgrounds](addons/backgrounds) |+|*|+|+|+|+|+|+|+|+|+| +|[centered](addons/centered) |+| |+|+| |+|+| |+| |+| +|[events](addons/events) |+| |+|+|+|+|+|+| | |+| +|[graphql](addons/graphql) |+| | | | | | | | | | | +|[google-analytics](addons/google-analytics) |+|+|+|+|+|+|+|+|+|+|+| +|[info](addons/info) |+| | | | | | | | | | | +|[jest](addons/jest) |+| | |+| | |+| | | | | +|[knobs](addons/knobs) |+|+*|+|+|+|+|+|+|+|+|+| +|[links](addons/links) |+|+|+|+|+|+|+| |+|+|+| +|[notes](addons/notes) |+|+*|+|+|+|+|+| |+|+|+| +|[options](addons/options) |+|+|+|+|+|+|+| |+|+|+| +|[storyshots](addons/storyshots) |+|+|+|+| | |+| |+|+| | +|[storysource](addons/storysource) |+| |+|+|+|+|+|+|+|+|+| +|[viewport](addons/viewport) |+| |+|+|+|+|+|+|+|+|+| `*` - React Native on device addon (addons/onDevice-\) diff --git a/CHANGELOG.md b/CHANGELOG.md index a82a264d2e31..89a95b3d6f1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,28 @@ +# 4.0.0-rc.1 + +2018-October-18 + +#### Bug Fixes + +- Angular: expose webpackFinal extension [#4431](https://github.com/storybooks/storybook/pull/4431) +- Addon-Knobs: fix ints as values [#4465](https://github.com/storybooks/storybook/pull/4465) + +#### Maintenance + +- Add Angular 6 fixture to the sb-cli tests [#4464](https://github.com/storybooks/storybook/pull/4464) + +#### Dependency Upgrades + +- Require React 16.3 as a peer dependency [#4458](https://github.com/storybooks/storybook/pull/4458) +- Bump @ember/test-helpers from 0.7.26 to 0.7.27 [#4455](https://github.com/storybooks/storybook/pull/4455) +- Bump eslint-plugin-jest from 21.25.0 to 21.25.1 [#4456](https://github.com/storybooks/storybook/pull/4456) +- Bump autoprefixer from 9.2.0 to 9.2.1 [#4457](https://github.com/storybooks/storybook/pull/4457) +- Bump @types/node from 10.11.7 to 10.12.0 [#4434](https://github.com/storybooks/storybook/pull/4434) +- Bump ember-cli-inject-live-reload from 2.0.0 to 2.0.1 [#4435](https://github.com/storybooks/storybook/pull/4435) +- Bump gatsby-plugin-sharp from 1.6.48 to 2.0.7 in /docs [#4438](https://github.com/storybooks/storybook/pull/4438) +- Bump marked from 0.4.0 to 0.5.1 in /docs [#4437](https://github.com/storybooks/storybook/pull/4437) +- Bump highlight.js from 9.12.0 to 9.13.0 in /docs [#4440](https://github.com/storybooks/storybook/pull/4440) + # 4.0.0-rc.0 2018-October-15 diff --git a/MIGRATION.md b/MIGRATION.md index 20297ef43a17..83f89881d1d9 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -3,6 +3,7 @@ ## Table of contents - [From version 3.4.x to 4.0.x](#from-version-34x-to-40x) + - [React 16.3](#react-163) - [Keyboard shortcuts moved](#keyboard-shortcuts-moved) - [Removed addWithInfo](#removed-add-with-info) - [Removed RN packager](#removed-rn-packager) @@ -31,6 +32,32 @@ With 4.0 as our first major release in over a year, we've collected a lot of cleanup tasks. Most of the deprecations have been marked for months, so we hope that there will be no significant impact on your project. +### React 16.3+ + +Storybook uses [Emotion](https://emotion.sh/) for styling which currently requires React 16.3 and above. + +If you're using Storybook for anything other than React, you probably don't need to worry about this. + +However, if you're developing React components, this means you need to upgrade to 16.3 or higher to use Storybook 4.0. + +> **NOTE:** This is a temporary requirement, and we plan to restore 15.x compatibility in a near-term 4.x release. + +Also, here's the error you'll get if you're running an older version of React: + +``` +core.browser.esm.js:15 Uncaught TypeError: Object(...) is not a function + at Module../node_modules/@emotion/core/dist/core.browser.esm.js (core.browser.esm.js:15) + at __webpack_require__ (bootstrap:724) + at fn (bootstrap:101) + at Module../node_modules/@emotion/styled-base/dist/styled-base.browser.esm.js (styled-base.browser.esm.js:1) + at __webpack_require__ (bootstrap:724) + at fn (bootstrap:101) + at Module../node_modules/@emotion/styled/dist/styled.esm.js (styled.esm.js:1) + at __webpack_require__ (bootstrap:724) + at fn (bootstrap:101) + at Object../node_modules/@storybook/components/dist/navigation/MenuLink.js (MenuLink.js:12) +``` + ### Generic addons 4.x introduces generic addon decorators that are not tied to specific view layers [#3555](https://github.com/storybooks/storybook/pull/3555). So for example: @@ -146,7 +173,7 @@ If you're using `start-storybook` on CI, you may need to opt out of this using t We've deprecated the `getstorybook` CLI in 4.0. The new way to install storybook is `sb init`. We recommend using `npx` for convenience and to make sure you're always using the latest version of the CLI: ``` -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` ## From version 3.3.x to 3.4.x diff --git a/README.md b/README.md index d12778a5bd7d..d66a4e0f2e31 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ First install storybook: ```sh cd my-react-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` If you'd rather set up your project manually, take a look at our [Slow Start Guide](https://storybook.js.org/basics/slow-start-guide/). @@ -66,7 +66,7 @@ Once it's installed, you can `npm run storybook` and it will run the development ```sh cd my-storybook-v2-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` It runs a codemod to update all package names. Read all migration details in our [Migration Guide](MIGRATION.md) @@ -91,7 +91,7 @@ For additional help, join us [in our Slack](https://now-examples-slackin-rrirkqo | [HTML](app/html) alpha | - | [v4.0.0-alpha](https://storybooks-html.netlify.com/) | [![HTML](https://img.shields.io/npm/dt/@storybook/html.svg)](app/html) | | [Svelte](app/svelte) alpha | - | [v4.0.0-alpha](https://storybooks-svelte.netlify.com/) | [![Svelte](https://img.shields.io/npm/dt/@storybook/svelte.svg)](app/svelte) | | [Riot](app/riot) alpha | - | [v4.0.0-alpha](https://storybooks-riot.netlify.com/) | [![Riot](https://img.shields.io/npm/dt/@storybook/riot.svg)](app/riot) | -| [Ember](app/ember) | - | [v4.0.0-alpha](https://storybooks-ember.netlify.com/) | [![Ember](https://img.shields.io/npm/dt/@storybook/ember.svg)](app/ember) | +| [Ember](app/ember) alpha | - | [v4.0.0-alpha](https://storybooks-ember.netlify.com/) | [![Ember](https://img.shields.io/npm/dt/@storybook/ember.svg)](app/ember) | ### Sub Projects @@ -100,23 +100,24 @@ For additional help, join us [in our Slack](https://now-examples-slackin-rrirkqo ### Addons -| Addons | | -| ---------------------------------- | -------------------------------------------------------------------------- | -| [a11y](addons/a11y/) | Test components for user accessibility in Storybook | -| [actions](addons/actions/) | Log actions as users interact with components in the Storybook UI | -| [backgrounds](addons/backgrounds/) | Let users choose backgrounds in the Storybook UI | -| [centered](addons/centered/) | Center the alignment of your components within the Storybook UI | -| [events](addons/events/) | Interactively fire events to components that respond to EventEmitter | -| [graphql](addons/graphql/) | Query a GraphQL server within Storybook stories | -| [info](addons/info/) | Annotate stories with extra component usage information | -| [jest](addons/jest/) | View the results of components' unit tests in Storybook | -| [knobs](addons/knobs/) | Interactively edit component prop data in the Storybook UI | -| [links](addons/links/) | Create links between stories | -| [notes](addons/notes/) | Annotate Storybook stories with notes | -| [options](addons/options/) | Customize the Storybook UI in code | -| [storyshots](addons/storyshots/) | Easy snapshot testing for components in Storybook | -| [storysource](addons/storysource/) | View the code of your stories within the Storybook UI | -| [viewport](addons/viewport/) | Change display sizes and layouts for responsive components using Storybook | +| Addons | | +| ------------------------------------------- | -------------------------------------------------------------------------- | +| [a11y](addons/a11y/) | Test components for user accessibility in Storybook | +| [actions](addons/actions/) | Log actions as users interact with components in the Storybook UI | +| [backgrounds](addons/backgrounds/) | Let users choose backgrounds in the Storybook UI | +| [centered](addons/centered/) | Center the alignment of your components within the Storybook UI | +| [events](addons/events/) | Interactively fire events to components that respond to EventEmitter | +| [graphql](addons/graphql/) | Query a GraphQL server within Storybook stories | +| [google-analytics](addons/google-analytics) | Reports google analytics on stories | +| [info](addons/info/) | Annotate stories with extra component usage information | +| [jest](addons/jest/) | View the results of components' unit tests in Storybook | +| [knobs](addons/knobs/) | Interactively edit component prop data in the Storybook UI | +| [links](addons/links/) | Create links between stories | +| [notes](addons/notes/) | Annotate Storybook stories with notes | +| [options](addons/options/) | Customize the Storybook UI in code | +| [storyshots](addons/storyshots/) | Easy snapshot testing for components in Storybook | +| [storysource](addons/storysource/) | View the code of your stories within the Storybook UI | +| [viewport](addons/viewport/) | Change display sizes and layouts for responsive components using Storybook | See [Addon / Framework Support Table](ADDONS_SUPPORT.md) diff --git a/addons/a11y/package.json b/addons/a11y/package.json index c1453c6dc7c6..1209b27b46d2 100644 --- a/addons/a11y/package.json +++ b/addons/a11y/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-a11y", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "a11y addon for storybook", "keywords": [ "a11y", @@ -29,10 +29,10 @@ }, "dependencies": { "@emotion/styled": "^0.10.6", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/client-logger": "4.0.0-rc.0", - "@storybook/components": "4.0.0-rc.0", - "@storybook/core-events": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/client-logger": "4.0.0-rc.1", + "@storybook/components": "4.0.0-rc.1", + "@storybook/core-events": "4.0.0-rc.1", "axe-core": "^3.1.2", "global": "^4.3.2", "prop-types": "^15.6.2" diff --git a/addons/actions/package.json b/addons/actions/package.json index cdd5dd2feeab..289015e67e19 100644 --- a/addons/actions/package.json +++ b/addons/actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-actions", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Action Logger addon for storybook", "keywords": [ "storybook" @@ -26,9 +26,9 @@ "@emotion/core": "^0.13.1", "@emotion/provider": "^0.11.2", "@emotion/styled": "^0.10.6", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/components": "4.0.0-rc.0", - "@storybook/core-events": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/components": "4.0.0-rc.1", + "@storybook/core-events": "4.0.0-rc.1", "deep-equal": "^1.0.1", "global": "^4.3.2", "lodash": "^4.17.11", diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json index 87ee5a41970d..01782d8848d0 100644 --- a/addons/backgrounds/package.json +++ b/addons/backgrounds/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-backgrounds", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "A storybook addon to show different backgrounds for your preview", "keywords": [ "addon", @@ -28,8 +28,8 @@ }, "dependencies": { "@emotion/styled": "^0.10.6", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/core-events": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/core-events": "4.0.0-rc.1", "global": "^4.3.2", "prop-types": "^15.6.2", "util-deprecate": "^1.0.2" diff --git a/addons/centered/package.json b/addons/centered/package.json index 72812b265320..c7b16276f1eb 100644 --- a/addons/centered/package.json +++ b/addons/centered/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-centered", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook decorator to center components", "keywords": [ "addon", diff --git a/addons/events/package.json b/addons/events/package.json index 15de00882395..ef249a3b2797 100644 --- a/addons/events/package.json +++ b/addons/events/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-events", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Add events to your Storybook stories.", "keywords": [ "addon", @@ -27,8 +27,8 @@ }, "dependencies": { "@emotion/styled": "^0.10.6", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/core-events": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/core-events": "4.0.0-rc.1", "format-json": "^1.0.3", "prop-types": "^15.6.2", "react-lifecycles-compat": "^3.0.4", diff --git a/addons/google-analytics/package.json b/addons/google-analytics/package.json index 1781c9dd2dcc..e446bdffa676 100644 --- a/addons/google-analytics/package.json +++ b/addons/google-analytics/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-google-analytics", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook addon for google analytics", "keywords": [ "addon", @@ -24,7 +24,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", "global": "^4.3.2", "react-ga": "^2.5.3" } diff --git a/addons/graphql/package.json b/addons/graphql/package.json index 78edad53916d..2c76bb692960 100644 --- a/addons/graphql/package.json +++ b/addons/graphql/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-graphql", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook addon to display the GraphiQL IDE", "keywords": [ "addon", diff --git a/addons/info/package.json b/addons/info/package.json index ee87733cfafd..b523c55feeb4 100644 --- a/addons/info/package.json +++ b/addons/info/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-info", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "A Storybook addon to show additional information for your stories.", "keywords": [ "addon", @@ -25,9 +25,9 @@ }, "dependencies": { "@emotion/styled": "^0.10.6", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/client-logger": "4.0.0-rc.0", - "@storybook/components": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/client-logger": "4.0.0-rc.1", + "@storybook/components": "4.0.0-rc.1", "core-js": "2.5.7", "global": "^4.3.2", "marksy": "^6.1.0", diff --git a/addons/jest/package.json b/addons/jest/package.json index 694a51051aaa..ff87f452e6ef 100644 --- a/addons/jest/package.json +++ b/addons/jest/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-jest", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "React storybook addon that show component jest report", "keywords": [ "addon", @@ -31,8 +31,8 @@ }, "dependencies": { "@emotion/styled": "^0.10.6", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/components": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/components": "4.0.0-rc.1", "global": "^4.3.2", "prop-types": "^15.6.2", "upath": "^1.1.0", diff --git a/addons/knobs/package.json b/addons/knobs/package.json index b76080995ca3..f6f7056f8179 100644 --- a/addons/knobs/package.json +++ b/addons/knobs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-knobs", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook Addon Prop Editor Component", "keywords": [ "addon", @@ -25,9 +25,9 @@ }, "dependencies": { "@emotion/styled": "^0.10.6", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/components": "4.0.0-rc.0", - "@storybook/core-events": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/components": "4.0.0-rc.1", + "@storybook/core-events": "4.0.0-rc.1", "copy-to-clipboard": "^3.0.8", "escape-html": "^1.0.3", "fast-deep-equal": "^2.0.1", diff --git a/addons/knobs/src/components/types/Select.js b/addons/knobs/src/components/types/Select.js index ae85099fdc85..4fe654e0e2b2 100644 --- a/addons/knobs/src/components/types/Select.js +++ b/addons/knobs/src/components/types/Select.js @@ -36,7 +36,7 @@ SelectType.defaultProps = { SelectType.propTypes = { knob: PropTypes.shape({ name: PropTypes.string, - value: PropTypes.string, + value: PropTypes.any, options: PropTypes.oneOfType([PropTypes.array, PropTypes.object]), }), onChange: PropTypes.func, diff --git a/addons/links/package.json b/addons/links/package.json index 1b65d951056a..49a2788514e7 100644 --- a/addons/links/package.json +++ b/addons/links/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-links", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Story Links addon for storybook", "keywords": [ "addon", @@ -24,9 +24,9 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "4.0.0-rc.0", - "@storybook/components": "4.0.0-rc.0", - "@storybook/core-events": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/components": "4.0.0-rc.1", + "@storybook/core-events": "4.0.0-rc.1", "global": "^4.3.2", "prop-types": "^15.6.2" }, diff --git a/addons/notes/package.json b/addons/notes/package.json index f33c66aaec72..ea4bd354b671 100644 --- a/addons/notes/package.json +++ b/addons/notes/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-notes", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Write notes for your Storybook stories.", "keywords": [ "addon", @@ -26,7 +26,7 @@ }, "dependencies": { "@emotion/styled": "^0.10.6", - "@storybook/addons": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", "marked": "^0.5.1", "prop-types": "^15.6.2" }, diff --git a/addons/ondevice-backgrounds/package.json b/addons/ondevice-backgrounds/package.json index 642fe5b7d732..9187ff0a6364 100644 --- a/addons/ondevice-backgrounds/package.json +++ b/addons/ondevice-backgrounds/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-ondevice-backgrounds", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "A storybook addon to show different backgrounds for your preview", "keywords": [ "addon", @@ -26,7 +26,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", "prop-types": "^15.6.2" }, "peerDependencies": { diff --git a/addons/ondevice-knobs/package.json b/addons/ondevice-knobs/package.json index b7a29c5365ea..10faf20fcc71 100644 --- a/addons/ondevice-knobs/package.json +++ b/addons/ondevice-knobs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-ondevice-knobs", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Display storybook story knobs on your deviced.", "keywords": [ "addon", @@ -23,7 +23,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", "deep-equal": "^1.0.1", "prop-types": "^15.6.2", "react-native-color-picker": "^0.4.0", diff --git a/addons/ondevice-notes/package.json b/addons/ondevice-notes/package.json index 6cc5e3e64a09..edf133030681 100644 --- a/addons/ondevice-notes/package.json +++ b/addons/ondevice-notes/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-ondevice-notes", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Write notes for your Storybook stories.", "keywords": [ "addon", @@ -21,7 +21,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", "prop-types": "^15.6.2", "react-native-simple-markdown": "^1.1.0" }, diff --git a/addons/options/package.json b/addons/options/package.json index e019743c4aef..bf46482edca4 100644 --- a/addons/options/package.json +++ b/addons/options/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-options", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Options addon for storybook", "keywords": [ "addon", @@ -23,7 +23,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", "util-deprecate": "^1.0.2" }, "peerDependencies": { diff --git a/addons/storyshots/storyshots-core/package.json b/addons/storyshots/storyshots-core/package.json index 8ac64189a928..d44e1fff3346 100644 --- a/addons/storyshots/storyshots-core/package.json +++ b/addons/storyshots/storyshots-core/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.", "keywords": [ "addon", @@ -28,17 +28,17 @@ }, "dependencies": { "@babel/runtime": "^7.1.2", - "@storybook/addons": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", "glob": "^7.1.3", "global": "^4.3.2", "jest-specific-snapshot": "^1.0.0", "read-pkg-up": "^4.0.0" }, "devDependencies": { - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-links": "4.0.0-rc.0", + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-links": "4.0.0-rc.1", "@storybook/addons": "4.0.0-alpha.24", - "@storybook/react": "4.0.0-rc.0", + "@storybook/react": "4.0.0-rc.1", "enzyme-to-json": "^3.3.4", "react": "^16.5.2" } diff --git a/addons/storyshots/storyshots-puppeteer/package.json b/addons/storyshots/storyshots-puppeteer/package.json index 6c1d60c298db..efa9afe8b1ae 100644 --- a/addons/storyshots/storyshots-puppeteer/package.json +++ b/addons/storyshots/storyshots-puppeteer/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots-puppeteer", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Image snappshots addition to StoryShots base on puppeteer", "keywords": [ "addon", @@ -25,7 +25,7 @@ }, "dependencies": { "@babel/runtime": "^7.1.2", - "@storybook/node-logger": "4.0.0-rc.0", + "@storybook/node-logger": "4.0.0-rc.1", "jest-image-snapshot": "^2.5.0", "puppeteer": "^1.9.0" }, diff --git a/addons/storysource/package.json b/addons/storysource/package.json index eb0bb748f6c7..95ef900d7d72 100644 --- a/addons/storysource/package.json +++ b/addons/storysource/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storysource", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Stories addon for storybook", "keywords": [ "addon", @@ -25,8 +25,8 @@ }, "dependencies": { "@babel/runtime": "^7.1.2", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/components": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/components": "4.0.0-rc.1", "estraverse": "^4.2.0", "loader-utils": "^1.1.0", "prettier": "^1.14.3", diff --git a/addons/viewport/package.json b/addons/viewport/package.json index 908de76f3f2e..cfa1d3be6546 100644 --- a/addons/viewport/package.json +++ b/addons/viewport/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-viewport", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook addon to change the viewport size to mobile", "keywords": [ "addon", @@ -24,9 +24,9 @@ }, "dependencies": { "@emotion/styled": "^0.10.6", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/components": "4.0.0-rc.0", - "@storybook/core-events": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/components": "4.0.0-rc.1", + "@storybook/core-events": "4.0.0-rc.1", "global": "^4.3.2", "prop-types": "^15.6.2", "util-deprecate": "^1.0.2" diff --git a/app/angular/README.md b/app/angular/README.md index 9f3024bacade..5db499f6e51c 100644 --- a/app/angular/README.md +++ b/app/angular/README.md @@ -12,7 +12,7 @@ So you can develop UI components in isolation without worrying about app specifi ```sh cd my-angular-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` For more information visit: [storybook.js.org](https://storybook.js.org) diff --git a/app/angular/package.json b/app/angular/package.json index 0b8044dcdf0d..10fd0b173668 100644 --- a/app/angular/package.json +++ b/app/angular/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/angular", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -29,8 +29,8 @@ }, "dependencies": { "@babel/runtime": "^7.1.2", - "@storybook/core": "4.0.0-rc.0", - "@storybook/node-logger": "4.0.0-rc.0", + "@storybook/core": "4.0.0-rc.1", + "@storybook/node-logger": "4.0.0-rc.1", "angular2-template-loader": "^0.6.2", "core-js": "^2.5.7", "fork-ts-checker-webpack-plugin": "^0.4.10", diff --git a/app/angular/src/server/create-fork-ts-checker-plugin.js b/app/angular/src/server/create-fork-ts-checker-plugin.js index d5c9c60dd3ff..40c8624ffaba 100644 --- a/app/angular/src/server/create-fork-ts-checker-plugin.js +++ b/app/angular/src/server/create-fork-ts-checker-plugin.js @@ -5,6 +5,7 @@ export default function(tsLoaderOptions) { if (tsLoaderOptions && tsLoaderOptions.configFile) { return new ForkTsCheckerWebpackPlugin({ tsconfig: tsLoaderOptions.configFile, + async: false, }); } diff --git a/app/ember/README.md b/app/ember/README.md index b88152c99ff6..46fb08720f24 100644 --- a/app/ember/README.md +++ b/app/ember/README.md @@ -12,7 +12,7 @@ So you can develop UI components in isolation without worrying about app specifi ```sh cd my-ember-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` For more information visit: [storybook.js.org](https://storybook.js.org) diff --git a/app/ember/package.json b/app/ember/package.json index d77add5f1fb6..0955f42badb8 100644 --- a/app/ember/package.json +++ b/app/ember/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/ember", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.", "homepage": "https://github.com/storybooks/storybook/tree/master/app/ember", "publishConfig": { @@ -26,8 +26,8 @@ }, "dependencies": { "@babel/runtime": "^7.1.2", - "@ember/test-helpers": "^0.7.26", - "@storybook/core": "4.0.0-rc.0", + "@ember/test-helpers": "^0.7.27", + "@storybook/core": "4.0.0-rc.1", "common-tags": "^1.8.0", "global": "^4.3.2", "react": "^16.5.2", diff --git a/app/html/README.md b/app/html/README.md index 78d02b76adfe..358ab8d3ca5c 100644 --- a/app/html/README.md +++ b/app/html/README.md @@ -14,7 +14,7 @@ So you can develop UI components in isolation without worrying about app specifi ```sh cd my-app -npx -p @storybook/cli@alpha sb init -t html +npx -p @storybook/cli@rc sb init -t html ``` For more information visit: [storybook.js.org](https://storybook.js.org) diff --git a/app/html/package.json b/app/html/package.json index 2387d27be7f4..89ee832231ba 100644 --- a/app/html/package.json +++ b/app/html/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -28,7 +28,7 @@ }, "dependencies": { "@babel/runtime": "^7.1.2", - "@storybook/core": "4.0.0-rc.0", + "@storybook/core": "4.0.0-rc.1", "common-tags": "^1.8.0", "global": "^4.3.2", "html-loader": "^0.5.5", diff --git a/app/marko/README.md b/app/marko/README.md index 0194167de293..da9f6317ab06 100644 --- a/app/marko/README.md +++ b/app/marko/README.md @@ -12,7 +12,7 @@ So you can develop UI components in isolation without worrying about app specifi ```sh cd my-marko-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` For more information visit: [storybook.js.org](https://storybook.js.org) diff --git a/app/marko/package.json b/app/marko/package.json index 9b11b93baf00..80ffad98ee39 100644 --- a/app/marko/package.json +++ b/app/marko/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/marko", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook for Marko: Develop Marko Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -29,7 +29,7 @@ }, "dependencies": { "@babel/runtime": "^7.1.2", - "@storybook/core": "4.0.0-rc.0", + "@storybook/core": "4.0.0-rc.1", "common-tags": "^1.8.0", "global": "^4.3.2", "marko-loader": "^1.3.3", diff --git a/app/mithril/README.md b/app/mithril/README.md index 2c7c38a19559..80dab0607b8c 100644 --- a/app/mithril/README.md +++ b/app/mithril/README.md @@ -12,7 +12,7 @@ So you can develop UI components in isolation without worrying about app specifi ```sh cd my-mithril-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` For more information visit: [storybook.js.org](https://storybook.js.org) diff --git a/app/mithril/package.json b/app/mithril/package.json index 6b46a0e31fec..cc0f835a7052 100644 --- a/app/mithril/package.json +++ b/app/mithril/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/mithril", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook for Mithril: Develop Mithril Component in isolation.", "keywords": [ "storybook" @@ -30,7 +30,7 @@ "dependencies": { "@babel/plugin-transform-react-jsx": "^7.0.0", "@babel/runtime": "^7.1.2", - "@storybook/core": "4.0.0-rc.0", + "@storybook/core": "4.0.0-rc.1", "common-tags": "^1.8.0", "global": "^4.3.2", "react": "^16.5.2", diff --git a/app/polymer/README.md b/app/polymer/README.md index a642096f2129..50a7d232206f 100644 --- a/app/polymer/README.md +++ b/app/polymer/README.md @@ -14,7 +14,7 @@ So you can develop UI components in isolation without worrying about app specifi ```sh cd my-polymer-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` For more information visit: [storybook.js.org](https://storybook.js.org) diff --git a/app/polymer/package.json b/app/polymer/package.json index 3262790ee5b0..585bfc993659 100644 --- a/app/polymer/package.json +++ b/app/polymer/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/polymer", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook for Polymer: Develop Polymer components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -29,7 +29,7 @@ "dependencies": { "@babel/polyfill": "^7.0.0", "@babel/runtime": "^7.1.2", - "@storybook/core": "4.0.0-rc.0", + "@storybook/core": "4.0.0-rc.1", "@webcomponents/webcomponentsjs": "^1.2.0", "common-tags": "^1.8.0", "global": "^4.3.2", diff --git a/app/react-native/package.json b/app/react-native/package.json index 0b6134089379..d8752832a969 100644 --- a/app/react-native/package.json +++ b/app/react-native/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-native", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "A better way to develop React Native Components for your app", "keywords": [ "react", @@ -28,12 +28,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "4.0.0-rc.0", - "@storybook/channel-websocket": "4.0.0-rc.0", - "@storybook/channels": "4.0.0-rc.0", - "@storybook/core": "4.0.0-rc.0", - "@storybook/core-events": "4.0.0-rc.0", - "@storybook/ui": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/channel-websocket": "4.0.0-rc.1", + "@storybook/channels": "4.0.0-rc.1", + "@storybook/core": "4.0.0-rc.1", + "@storybook/core-events": "4.0.0-rc.1", + "@storybook/ui": "4.0.0-rc.1", "babel-loader": "^8.0.4", "babel-plugin-macros": "^2.4.2", "babel-plugin-syntax-async-functions": "^6.13.0", diff --git a/app/react-native/readme.md b/app/react-native/readme.md index e96857de6509..ce23ab6a46bf 100644 --- a/app/react-native/readme.md +++ b/app/react-native/readme.md @@ -12,7 +12,7 @@ The `storybook` CLI tool can be used to add Storybook to your React Native app. ```shell cd my-rn-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` The next thing you need to do is make Storybook UI visible in your app. diff --git a/app/react/README.md b/app/react/README.md index 34b07631803a..12cab706eff3 100644 --- a/app/react/README.md +++ b/app/react/README.md @@ -12,7 +12,7 @@ So you can develop UI components in isolation without worrying about app specifi ```sh cd my-react-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` For more information visit: [storybook.js.org](https://storybook.js.org) diff --git a/app/react/package.json b/app/react/package.json index f48235946c4a..09ff8eb3b30b 100644 --- a/app/react/package.json +++ b/app/react/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -32,7 +32,7 @@ "@babel/preset-react": "^7.0.0", "@babel/runtime": "^7.1.2", "@emotion/styled": "^0.10.6", - "@storybook/core": "4.0.0-rc.0", + "@storybook/core": "4.0.0-rc.1", "babel-plugin-react-docgen": "^2.0.0", "common-tags": "^1.8.0", "global": "^4.3.2", diff --git a/app/riot/README.md b/app/riot/README.md index 5a8b5da4e321..fcdbaa47d6ad 100644 --- a/app/riot/README.md +++ b/app/riot/README.md @@ -14,7 +14,7 @@ So you can develop UI components in isolation without worrying about app specifi ```sh cd my-riot-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` For more information visit: [storybook.js.org](https://storybook.js.org) diff --git a/app/riot/package.json b/app/riot/package.json index 11b52cd282ec..d9cf43222ded 100644 --- a/app/riot/package.json +++ b/app/riot/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/riot", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook for riot.js: View riot snippets in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -28,7 +28,7 @@ }, "dependencies": { "@babel/runtime": "^7.1.2", - "@storybook/core": "4.0.0-rc.0", + "@storybook/core": "4.0.0-rc.1", "common-tags": "^1.8.0", "global": "^4.3.2", "raw-loader": "^0.5.1", diff --git a/app/svelte/README.md b/app/svelte/README.md index 33fb8993c858..423919e35aee 100644 --- a/app/svelte/README.md +++ b/app/svelte/README.md @@ -12,7 +12,7 @@ So you can develop UI components in isolation without worrying about app specifi ```sh cd my-svelte-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` For more information visit: [storybook.js.org](https://storybook.js.org) diff --git a/app/svelte/package.json b/app/svelte/package.json index 39b8e3248ff4..50eb6e5ce22a 100644 --- a/app/svelte/package.json +++ b/app/svelte/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -28,7 +28,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core": "4.0.0-rc.0", + "@storybook/core": "4.0.0-rc.1", "common-tags": "^1.8.0", "global": "^4.3.2", "react": "^16.5.2", diff --git a/app/vue/README.md b/app/vue/README.md index 3db4d42fa5a4..0fdcc1faf731 100644 --- a/app/vue/README.md +++ b/app/vue/README.md @@ -12,7 +12,7 @@ So you can develop UI components in isolation without worrying about app specifi ```sh cd my-vue-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` For more information visit: [storybook.js.org](https://storybook.js.org) diff --git a/app/vue/package.json b/app/vue/package.json index 6a750292fdb5..459db6d1f768 100644 --- a/app/vue/package.json +++ b/app/vue/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -29,7 +29,7 @@ }, "dependencies": { "@babel/runtime": "^7.1.2", - "@storybook/core": "4.0.0-rc.0", + "@storybook/core": "4.0.0-rc.1", "common-tags": "^1.8.0", "global": "^4.3.2", "react": "^16.5.2", diff --git a/docs/.snyk b/docs/.snyk index 23134680c8cb..09f63ccce2c7 100644 --- a/docs/.snyk +++ b/docs/.snyk @@ -65,3 +65,8 @@ patch: 'npm:moment:20170905': - gatsby > webpack-validator > joi > moment: patched: '2018-10-12T13:09:42.105Z' + 'npm:tunnel-agent:20170305': + - gatsby-plugin-sharp > imagemin-mozjpeg > mozjpeg > bin-build > download > caw > tunnel-agent: + patched: '2018-10-16T09:11:57.220Z' + - gatsby-plugin-sharp > imagemin-mozjpeg > mozjpeg > bin-wrapper > download > caw > tunnel-agent: + patched: '2018-10-16T09:11:57.220Z' diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js index 3659ae1064e9..a5214d1f5c78 100644 --- a/docs/gatsby-config.js +++ b/docs/gatsby-config.js @@ -30,6 +30,7 @@ module.exports = { '/configurations/env-vars/', '/configurations/theming/', '/configurations/cli-options/', + '/configurations/standalone-options/', ], testing: [ '/testing/react-ui-testing/', diff --git a/docs/package.json b/docs/package.json index b588bd257d40..518774836786 100644 --- a/docs/package.json +++ b/docs/package.json @@ -17,7 +17,8 @@ "dev": "gatsby develop", "serve": "gatsby serve", "storybook": "start-storybook -p 9009 -s src/pages", - "snyk-protect": "snyk protect" + "snyk-protect": "snyk protect", + "prepare": "npm run snyk-protect" }, "dependencies": { "@storybook/addon-actions": "^3.4.11", @@ -49,7 +50,7 @@ "react-router": "^4.3.1", "react-stack-grid": "^0.7.1", "sitemap": "^2.0.1", - "snyk": "^1.103.4" + "snyk": "^1.104.0" }, "snyk": true } diff --git a/docs/src/pages/basics/quick-start-guide/index.md b/docs/src/pages/basics/quick-start-guide/index.md index 0b9ee5df51f9..f0daeae62662 100644 --- a/docs/src/pages/basics/quick-start-guide/index.md +++ b/docs/src/pages/basics/quick-start-guide/index.md @@ -10,13 +10,13 @@ Get started using the automated command line tool. This command adds a set of bo ```sh cd my-project-directory -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` The tool inspects your `package.json` to determine which view layer you're using. If you want to develop HTML snippets in storybook, we can't determine that automatically. So to install storybook for HTML, use the `--type` flag to force that the HTML project type: ``` -npx -p @storybook/cli@alpha sb init --type html +npx -p @storybook/cli@rc sb init --type html ``` To setup a project manually, take a look at the [Slow Start Guide](/basics/slow-start-guide/). diff --git a/docs/src/pages/configurations/standalone-options/index.md b/docs/src/pages/configurations/standalone-options/index.md new file mode 100644 index 000000000000..3304204dd3c1 --- /dev/null +++ b/docs/src/pages/configurations/standalone-options/index.md @@ -0,0 +1,89 @@ +--- +id: 'standalone-options' +title: 'Standalone Options' +--- + +There is also an API for running Storybook from the Node. + +```js +const storybook = require('@storybook/{APP}/standalone'); + +storybook({ + // options +}); +``` + +Where the APP is one fo the supported apps. For example: + +```js +const storybook = require('@storybook/react/standalone'); + +storybook({ + // options +}); +``` + +## Mode + +Mode is defining what Storybook mode will be applied: + + dev - run Storybook in a dev mode - similar to "start-storybook" in CLI + +```js +const storybook = require('@storybook/react/standalone'); + +storybook({ + mode: 'dev', + // other options +}); +``` + + prod - build static version of Storybook - similar to "build-storybook" in CLI + +```js +const storybook = require('@storybook/react/standalone'); + +storybook({ + mode: 'prod', + // other options +}); +``` + +Other options are similar to those in the CLI. + +## For "dev" mode: + + Options: + + port [number] Port to run Storybook + host [string] Host to run Storybook + staticDir Directory where to load static files from, array of strings + configDir [dir-name] Directory where to load Storybook configurations from + https Serve Storybook over HTTPS. Note: You must provide your own certificate information. + sslCa Provide an SSL certificate authority. (Optional with "https", required if using a self-signed certificate) + sslCert Provide an SSL certificate. (Required with "https") + sslKey Provide an SSL key. (Required with "https") + smokeTest Exit after successful start + ci CI mode (skip interactive prompts, don't open browser) + quiet Suppress verbose build output + +## For "prod" mode: + + Options: + + staticDir Directory where to load static files from, array of strings + outputDir [dir-name] Directory where to store built files + configDir [dir-name] Directory where to load Storybook configurations from + watch Enable watch mode + +Example: + +```js +const storybook = require('@storybook/angular/standalone'); + +storybook({ + mode: 'dev', + port: 9009, + configDir: './.storybook', +}); +``` \ No newline at end of file diff --git a/docs/src/pages/examples/_examples.yml b/docs/src/pages/examples/_examples.yml index 67d535f6b570..723eb9e4cb22 100644 --- a/docs/src/pages/examples/_examples.yml +++ b/docs/src/pages/examples/_examples.yml @@ -3,6 +3,12 @@ coursera: title: Coursera description: Coursera UI component library demo: https://building.coursera.org/coursera-ui/ +grommet: + thumbnail: grommet.png + title: Grommet + description: Styled components for Reactjs + demo: https://storybook.grommet.io/ + site: https://v2.grommet.io/ wix: thumbnail: wix.png title: Wix Style React diff --git a/docs/src/pages/examples/thumbnails/grommet.png b/docs/src/pages/examples/thumbnails/grommet.png new file mode 100644 index 000000000000..8e8ea928a210 Binary files /dev/null and b/docs/src/pages/examples/thumbnails/grommet.png differ diff --git a/docs/yarn.lock b/docs/yarn.lock index e38ec8f0a7c3..a32fbaba7f40 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -12551,10 +12551,10 @@ snyk-docker-plugin@1.12.0: debug "^3" tslib "^1" -snyk-go-plugin@1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.5.2.tgz#c45273a2a05ca621553b3a0c60511757f8d24e1b" - integrity sha512-XWajcSh6Ld+I+WdcyU3DGDuE2ydThQd8ORkESy0nQ2LwekygLYVYN66OBy0uxpqYfd4qoqeg+J8lb4oGzCmyGA== +snyk-go-plugin@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.6.0.tgz#4b312db52fdde6d9b2ac75fe1f9712b88563737d" + integrity sha512-E6aYw7XAXSs2wJR3fU+vGQ1lVyjAw8PHIQYQwBwMkTHByhJIWPcu6Hy/jT5LcjJHlhYXlpOuk53HeLVK+kcXrQ== dependencies: graphlib "^2.1.1" tmp "0.0.33" @@ -12624,10 +12624,10 @@ snyk-policy@1.12.0: snyk-try-require "^1.1.1" then-fs "^2.0.0" -snyk-python-plugin@1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.8.2.tgz#5cd435f7fed745265cdfef30bb09246e43e8a7f5" - integrity sha512-LBvjztnXarSHKyhivzM567icOOLOB98I7S9EEnjepuG+EZ0jiZzqOEMVRmzuYi+hRq3Cwh0hhjkwgJAQpKDz+g== +snyk-python-plugin@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.9.0.tgz#2f444f9377880181c1fdbed6ab2890687fe10c99" + integrity sha512-zlyOHoCpmyVym9AwkboeepzEGrY3gHsM7eWP/nJ85TgCnQO5H5orKm3RL57PNbWRY+BnDmoQQ+udQgjym2+3sg== dependencies: tmp "0.0.33" @@ -12682,10 +12682,10 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1: lru-cache "^4.0.0" then-fs "^2.0.0" -snyk@^1.103.4: - version "1.103.4" - resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.103.4.tgz#7a23671e5e6c649903ac88aa36fc6df1bb165385" - integrity sha512-ynLlsLDjAkzymd0qi1il6f34S4oNTfIgvFCFvkYxvqfBkedfOoDQT4TLU8gi+55MGM6iornf2iefC2FW92BwnQ== +snyk@^1.104.0: + version "1.104.1" + resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.104.1.tgz#aff4a717b99eed424f8df2b928b67ac0b77b3748" + integrity sha512-K72W1O57nnSE+XokbuxC7Q0T9tAaMF6V/CoHv6ifAQlOvOkj/0rFbA8zMNMgzRs4LfQj183Zt5D0B0cyFDrKJQ== dependencies: abbrev "^1.1.1" ansi-escapes "^3.1.0" @@ -12704,7 +12704,7 @@ snyk@^1.103.4: semver "^5.5.0" snyk-config "2.2.0" snyk-docker-plugin "1.12.0" - snyk-go-plugin "1.5.2" + snyk-go-plugin "1.6.0" snyk-gradle-plugin "2.1.0" snyk-module "1.8.2" snyk-mvn-plugin "2.0.0" @@ -12712,7 +12712,7 @@ snyk@^1.103.4: snyk-nuget-plugin "1.6.5" snyk-php-plugin "1.5.1" snyk-policy "1.12.0" - snyk-python-plugin "1.8.2" + snyk-python-plugin "1.9.0" snyk-resolve "1.0.1" snyk-resolve-deps "4.0.2" snyk-sbt-plugin "2.0.0" diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json index cd4c6fb4c0c7..890662ac1b6e 100644 --- a/examples/angular-cli/package.json +++ b/examples/angular-cli/package.json @@ -1,6 +1,6 @@ { "name": "angular-cli", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "private": true, "license": "MIT", "scripts": { @@ -54,21 +54,21 @@ "@angular-devkit/build-angular": "^0.8.5", "@angular/cli": "^6.2.5", "@angular/compiler-cli": "^6.1.10", - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-backgrounds": "4.0.0-rc.0", - "@storybook/addon-centered": "4.0.0-rc.0", - "@storybook/addon-jest": "4.0.0-rc.0", - "@storybook/addon-knobs": "4.0.0-rc.0", - "@storybook/addon-links": "4.0.0-rc.0", - "@storybook/addon-notes": "4.0.0-rc.0", - "@storybook/addon-options": "4.0.0-rc.0", - "@storybook/addon-storyshots": "4.0.0-rc.0", - "@storybook/addon-storysource": "4.0.0-rc.0", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/angular": "4.0.0-rc.0", + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-backgrounds": "4.0.0-rc.1", + "@storybook/addon-centered": "4.0.0-rc.1", + "@storybook/addon-jest": "4.0.0-rc.1", + "@storybook/addon-knobs": "4.0.0-rc.1", + "@storybook/addon-links": "4.0.0-rc.1", + "@storybook/addon-notes": "4.0.0-rc.1", + "@storybook/addon-options": "4.0.0-rc.1", + "@storybook/addon-storyshots": "4.0.0-rc.1", + "@storybook/addon-storysource": "4.0.0-rc.1", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/angular": "4.0.0-rc.1", "@types/core-js": "^2.5.0", "@types/jest": "^23.3.5", - "@types/node": "~10.11.7", + "@types/node": "~10.12.0", "@types/webpack-env": "^1.13.6", "global": "^4.3.2", "jasmine-core": "~3.2.1", diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json index 7e4ead73e7b4..dfbe3f1d8915 100644 --- a/examples/cra-kitchen-sink/package.json +++ b/examples/cra-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "cra-kitchen-sink", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "private": true, "scripts": { "build": "react-scripts build", @@ -18,21 +18,21 @@ "react-lifecycles-compat": "^3.0.4" }, "devDependencies": { - "@storybook/addon-a11y": "4.0.0-rc.0", - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-backgrounds": "4.0.0-rc.0", - "@storybook/addon-centered": "4.0.0-rc.0", - "@storybook/addon-events": "4.0.0-rc.0", - "@storybook/addon-info": "4.0.0-rc.0", - "@storybook/addon-jest": "4.0.0-rc.0", - "@storybook/addon-knobs": "4.0.0-rc.0", - "@storybook/addon-links": "4.0.0-rc.0", - "@storybook/addon-notes": "4.0.0-rc.0", - "@storybook/addon-options": "4.0.0-rc.0", - "@storybook/addon-storyshots": "4.0.0-rc.0", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/client-logger": "4.0.0-rc.0", - "@storybook/react": "4.0.0-rc.0", + "@storybook/addon-a11y": "4.0.0-rc.1", + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-backgrounds": "4.0.0-rc.1", + "@storybook/addon-centered": "4.0.0-rc.1", + "@storybook/addon-events": "4.0.0-rc.1", + "@storybook/addon-info": "4.0.0-rc.1", + "@storybook/addon-jest": "4.0.0-rc.1", + "@storybook/addon-knobs": "4.0.0-rc.1", + "@storybook/addon-links": "4.0.0-rc.1", + "@storybook/addon-notes": "4.0.0-rc.1", + "@storybook/addon-options": "4.0.0-rc.1", + "@storybook/addon-storyshots": "4.0.0-rc.1", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/client-logger": "4.0.0-rc.1", + "@storybook/react": "4.0.0-rc.1", "enzyme": "^3.7.0", "enzyme-adapter-react-16": "^1.6.0", "enzyme-to-json": "^3.3.4", diff --git a/examples/ember-cli/package.json b/examples/ember-cli/package.json index 2022dbe92792..722a069a2df2 100644 --- a/examples/ember-cli/package.json +++ b/examples/ember-cli/package.json @@ -1,6 +1,6 @@ { "name": "ember-example", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "private": true, "scripts": { "build": "ember build", @@ -10,18 +10,18 @@ }, "devDependencies": { "@babel/core": "^7.1.2", - "@storybook/addon-a11y": "4.0.0-rc.0", - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-backgrounds": "4.0.0-rc.0", - "@storybook/addon-centered": "4.0.0-rc.0", - "@storybook/addon-knobs": "4.0.0-rc.0", - "@storybook/addon-links": "4.0.0-rc.0", - "@storybook/addon-notes": "4.0.0-rc.0", - "@storybook/addon-options": "4.0.0-rc.0", - "@storybook/addon-storysource": "4.0.0-rc.0", - "@storybook/addon-viewport": "4.0.0-rc.0", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/ember": "4.0.0-rc.0", + "@storybook/addon-a11y": "4.0.0-rc.1", + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-backgrounds": "4.0.0-rc.1", + "@storybook/addon-centered": "4.0.0-rc.1", + "@storybook/addon-knobs": "4.0.0-rc.1", + "@storybook/addon-links": "4.0.0-rc.1", + "@storybook/addon-notes": "4.0.0-rc.1", + "@storybook/addon-options": "4.0.0-rc.1", + "@storybook/addon-storysource": "4.0.0-rc.1", + "@storybook/addon-viewport": "4.0.0-rc.1", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/ember": "4.0.0-rc.1", "babel-loader": "^8", "broccoli-asset-rev": "^3.0.0", "cross-env": "^5.2.0", diff --git a/examples/html-kitchen-sink/package.json b/examples/html-kitchen-sink/package.json index c4d6f105a061..a433fc30de54 100644 --- a/examples/html-kitchen-sink/package.json +++ b/examples/html-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "html-kitchen-sink", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "private": true, "description": "", "keywords": [], @@ -13,23 +13,23 @@ "storybook": "start-storybook -p 9006" }, "devDependencies": { - "@storybook/addon-a11y": "4.0.0-rc.0", - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-backgrounds": "4.0.0-rc.0", - "@storybook/addon-centered": "4.0.0-rc.0", - "@storybook/addon-events": "4.0.0-rc.0", - "@storybook/addon-jest": "4.0.0-rc.0", - "@storybook/addon-knobs": "4.0.0-rc.0", - "@storybook/addon-links": "4.0.0-rc.0", - "@storybook/addon-notes": "4.0.0-rc.0", - "@storybook/addon-options": "4.0.0-rc.0", - "@storybook/addon-storyshots": "4.0.0-rc.0", - "@storybook/addon-storysource": "4.0.0-rc.0", - "@storybook/addon-viewport": "4.0.0-rc.0", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/core": "4.0.0-rc.0", - "@storybook/core-events": "4.0.0-rc.0", - "@storybook/html": "4.0.0-rc.0", + "@storybook/addon-a11y": "4.0.0-rc.1", + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-backgrounds": "4.0.0-rc.1", + "@storybook/addon-centered": "4.0.0-rc.1", + "@storybook/addon-events": "4.0.0-rc.1", + "@storybook/addon-jest": "4.0.0-rc.1", + "@storybook/addon-knobs": "4.0.0-rc.1", + "@storybook/addon-links": "4.0.0-rc.1", + "@storybook/addon-notes": "4.0.0-rc.1", + "@storybook/addon-options": "4.0.0-rc.1", + "@storybook/addon-storyshots": "4.0.0-rc.1", + "@storybook/addon-storysource": "4.0.0-rc.1", + "@storybook/addon-viewport": "4.0.0-rc.1", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/core": "4.0.0-rc.1", + "@storybook/core-events": "4.0.0-rc.1", + "@storybook/html": "4.0.0-rc.1", "eventemitter3": "^3.1.0", "format-json": "^1.0.3", "global": "^4.3.2", diff --git a/examples/marko-cli/package.json b/examples/marko-cli/package.json index 430d714b9917..be38007f71fe 100644 --- a/examples/marko-cli/package.json +++ b/examples/marko-cli/package.json @@ -1,6 +1,6 @@ { "name": "marko-cli", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "private": true, "description": "Demo of how to build an app using marko-starter", "repository": { @@ -22,12 +22,12 @@ "marko-starter": "^2.0.4" }, "devDependencies": { - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-knobs": "4.0.0-rc.0", - "@storybook/addon-options": "4.0.0-rc.0", - "@storybook/addon-storysource": "4.0.0-rc.0", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/marko": "4.0.0-rc.0", + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-knobs": "4.0.0-rc.1", + "@storybook/addon-options": "4.0.0-rc.1", + "@storybook/addon-storysource": "4.0.0-rc.1", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/marko": "4.0.0-rc.1", "prettier": "^1.14.3", "webpack": "^4.20.2" } diff --git a/examples/mithril-kitchen-sink/package.json b/examples/mithril-kitchen-sink/package.json index 11a0dca70e97..d0e317bf1a97 100644 --- a/examples/mithril-kitchen-sink/package.json +++ b/examples/mithril-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "mithril-example", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "private": true, "scripts": { "build-storybook": "build-storybook", @@ -10,18 +10,18 @@ "mithril": "^1.1.6" }, "devDependencies": { - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-backgrounds": "4.0.0-rc.0", - "@storybook/addon-centered": "4.0.0-rc.0", - "@storybook/addon-knobs": "4.0.0-rc.0", - "@storybook/addon-links": "4.0.0-rc.0", - "@storybook/addon-notes": "4.0.0-rc.0", - "@storybook/addon-options": "4.0.0-rc.0", - "@storybook/addon-storyshots": "4.0.0-rc.0", - "@storybook/addon-storysource": "4.0.0-rc.0", - "@storybook/addon-viewport": "4.0.0-rc.0", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/mithril": "4.0.0-rc.0", + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-backgrounds": "4.0.0-rc.1", + "@storybook/addon-centered": "4.0.0-rc.1", + "@storybook/addon-knobs": "4.0.0-rc.1", + "@storybook/addon-links": "4.0.0-rc.1", + "@storybook/addon-notes": "4.0.0-rc.1", + "@storybook/addon-options": "4.0.0-rc.1", + "@storybook/addon-storyshots": "4.0.0-rc.1", + "@storybook/addon-storysource": "4.0.0-rc.1", + "@storybook/addon-viewport": "4.0.0-rc.1", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/mithril": "4.0.0-rc.1", "webpack": "^4.20.2" } } diff --git a/examples/official-storybook/package.json b/examples/official-storybook/package.json index e7905767ab2a..07ed0f2ad6b7 100644 --- a/examples/official-storybook/package.json +++ b/examples/official-storybook/package.json @@ -1,6 +1,6 @@ { "name": "official-storybook", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "private": true, "scripts": { "build-storybook": "build-storybook -c ./ -s built-storybooks", @@ -9,34 +9,35 @@ "generate-addon-jest-testresults": "jest --config=tests/addon-jest.config.json --json --outputFile=stories/addon-jest.testresults.json", "graphql": "node ./graphql-server/index.js", "image-snapshots": "yarn run build-storybook && yarn run do-image-snapshots", - "storybook": "STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011 -c ./ -s built-storybooks" + "storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011 -c ./ -s built-storybooks" }, "devDependencies": { "@emotion/core": "^0.13.1", "@emotion/provider": "^0.11.2", "@emotion/styled": "^0.10.6", - "@storybook/addon-a11y": "4.0.0-rc.0", - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-backgrounds": "4.0.0-rc.0", - "@storybook/addon-centered": "4.0.0-rc.0", - "@storybook/addon-events": "4.0.0-rc.0", - "@storybook/addon-graphql": "4.0.0-rc.0", - "@storybook/addon-info": "4.0.0-rc.0", - "@storybook/addon-jest": "4.0.0-rc.0", - "@storybook/addon-knobs": "4.0.0-rc.0", - "@storybook/addon-links": "4.0.0-rc.0", - "@storybook/addon-notes": "4.0.0-rc.0", - "@storybook/addon-options": "4.0.0-rc.0", - "@storybook/addon-storyshots": "4.0.0-rc.0", - "@storybook/addon-storyshots-puppeteer": "4.0.0-rc.0", - "@storybook/addon-storysource": "4.0.0-rc.0", - "@storybook/addon-viewport": "4.0.0-rc.0", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/components": "4.0.0-rc.0", - "@storybook/core-events": "4.0.0-rc.0", - "@storybook/node-logger": "4.0.0-rc.0", - "@storybook/react": "4.0.0-rc.0", + "@storybook/addon-a11y": "4.0.0-rc.1", + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-backgrounds": "4.0.0-rc.1", + "@storybook/addon-centered": "4.0.0-rc.1", + "@storybook/addon-events": "4.0.0-rc.1", + "@storybook/addon-graphql": "4.0.0-rc.1", + "@storybook/addon-info": "4.0.0-rc.1", + "@storybook/addon-jest": "4.0.0-rc.1", + "@storybook/addon-knobs": "4.0.0-rc.1", + "@storybook/addon-links": "4.0.0-rc.1", + "@storybook/addon-notes": "4.0.0-rc.1", + "@storybook/addon-options": "4.0.0-rc.1", + "@storybook/addon-storyshots": "4.0.0-rc.1", + "@storybook/addon-storyshots-puppeteer": "4.0.0-rc.1", + "@storybook/addon-storysource": "4.0.0-rc.1", + "@storybook/addon-viewport": "4.0.0-rc.1", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/components": "4.0.0-rc.1", + "@storybook/core-events": "4.0.0-rc.1", + "@storybook/node-logger": "4.0.0-rc.1", + "@storybook/react": "4.0.0-rc.1", "cors": "^2.8.4", + "cross-env": "^5.2.0", "enzyme-to-json": "^3.3.4", "eventemitter3": "^3.1.0", "express": "^4.16.3", diff --git a/examples/official-storybook/stories/__snapshots__/addon-knobs.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-knobs.stories.storyshot index e61bd38a3262..5b446a426bf8 100644 --- a/examples/official-storybook/stories/__snapshots__/addon-knobs.stories.storyshot +++ b/examples/official-storybook/stories/__snapshots__/addon-knobs.stories.storyshot @@ -12,6 +12,12 @@ exports[`Storyshots Addons|Knobs.withKnobs accepts story parameters 1`] = ` `; +exports[`Storyshots Addons|Knobs.withKnobs complex select 1`] = ` +
+  string
+
+`; + exports[`Storyshots Addons|Knobs.withKnobs dynamic knobs 1`] = `
diff --git a/examples/official-storybook/stories/addon-knobs.stories.js b/examples/official-storybook/stories/addon-knobs.stories.js index da8ec1f7ac67..fe6d4bfa3b4b 100644 --- a/examples/official-storybook/stories/addon-knobs.stories.js +++ b/examples/official-storybook/stories/addon-knobs.stories.js @@ -190,6 +190,20 @@ storiesOf('Addons|Knobs.withKnobs', module)
); }) + .add('complex select', () => { + const m = select( + 'complex', + { + number: 1, + string: 'string', + object: {}, + array: [], + }, + 'string' + ); + const value = m.toString(); + return 
{value}
; + }) .add('triggers actions via button', () => { button('Toggle item list state', () => { if (!injectedIsLoading && injectedItems.length === 0) { diff --git a/examples/polymer-cli/package.json b/examples/polymer-cli/package.json index 39d148ac3928..88301b58ea96 100644 --- a/examples/polymer-cli/package.json +++ b/examples/polymer-cli/package.json @@ -1,6 +1,6 @@ { "name": "polymer-cli", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "private": true, "scripts": { "build-storybook": "build-storybook", @@ -9,15 +9,15 @@ }, "dependencies": { "@polymer/polymer": "^2.6.0", - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-backgrounds": "4.0.0-rc.0", - "@storybook/addon-knobs": "4.0.0-rc.0", - "@storybook/addon-links": "4.0.0-rc.0", - "@storybook/addon-notes": "4.0.0-rc.0", - "@storybook/addon-options": "4.0.0-rc.0", - "@storybook/addon-storysource": "4.0.0-rc.0", - "@storybook/addon-viewport": "4.0.0-rc.0", - "@storybook/polymer": "4.0.0-rc.0", + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-backgrounds": "4.0.0-rc.1", + "@storybook/addon-knobs": "4.0.0-rc.1", + "@storybook/addon-links": "4.0.0-rc.1", + "@storybook/addon-notes": "4.0.0-rc.1", + "@storybook/addon-options": "4.0.0-rc.1", + "@storybook/addon-storysource": "4.0.0-rc.1", + "@storybook/addon-viewport": "4.0.0-rc.1", + "@storybook/polymer": "4.0.0-rc.1", "@webcomponents/webcomponentsjs": "^1.2.0", "global": "^4.3.2", "lit-html": "^0.12.0", diff --git a/examples/riot-kitchen-sink/package.json b/examples/riot-kitchen-sink/package.json index 4da94b67be60..7175a5e82c66 100644 --- a/examples/riot-kitchen-sink/package.json +++ b/examples/riot-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "riot-example", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "private": true, "scripts": { "build": "cross-env NODE_ENV=production webpack --progress --hide-modules", @@ -15,18 +15,18 @@ }, "devDependencies": { "@babel/core": "^7.1.2", - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-backgrounds": "4.0.0-rc.0", - "@storybook/addon-centered": "4.0.0-rc.0", - "@storybook/addon-knobs": "4.0.0-rc.0", - "@storybook/addon-links": "4.0.0-rc.0", - "@storybook/addon-notes": "4.0.0-rc.0", - "@storybook/addon-options": "4.0.0-rc.0", - "@storybook/addon-storyshots": "4.0.0-rc.0", - "@storybook/addon-storysource": "4.0.0-rc.0", - "@storybook/addon-viewport": "4.0.0-rc.0", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/riot": "4.0.0-rc.0", + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-backgrounds": "4.0.0-rc.1", + "@storybook/addon-centered": "4.0.0-rc.1", + "@storybook/addon-knobs": "4.0.0-rc.1", + "@storybook/addon-links": "4.0.0-rc.1", + "@storybook/addon-notes": "4.0.0-rc.1", + "@storybook/addon-options": "4.0.0-rc.1", + "@storybook/addon-storyshots": "4.0.0-rc.1", + "@storybook/addon-storysource": "4.0.0-rc.1", + "@storybook/addon-viewport": "4.0.0-rc.1", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/riot": "4.0.0-rc.1", "babel-loader": "^8.0.4", "cross-env": "^5.2.0", "file-loader": "^2.0.0", diff --git a/examples/svelte-kitchen-sink/package.json b/examples/svelte-kitchen-sink/package.json index 8acf8caeb0ab..a6e5050b49ec 100644 --- a/examples/svelte-kitchen-sink/package.json +++ b/examples/svelte-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "svelte-example", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "private": true, "scripts": { "build-storybook": "build-storybook -s public", @@ -10,17 +10,17 @@ "global": "^4.3.2" }, "devDependencies": { - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-backgrounds": "4.0.0-rc.0", - "@storybook/addon-centered": "4.0.0-rc.0", - "@storybook/addon-knobs": "4.0.0-rc.0", - "@storybook/addon-links": "4.0.0-rc.0", - "@storybook/addon-notes": "4.0.0-rc.0", - "@storybook/addon-options": "4.0.0-rc.0", - "@storybook/addon-storyshots": "4.0.0-rc.0", - "@storybook/addon-storysource": "4.0.0-rc.0", - "@storybook/addon-viewport": "4.0.0-rc.0", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/svelte": "4.0.0-rc.0" + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-backgrounds": "4.0.0-rc.1", + "@storybook/addon-centered": "4.0.0-rc.1", + "@storybook/addon-knobs": "4.0.0-rc.1", + "@storybook/addon-links": "4.0.0-rc.1", + "@storybook/addon-notes": "4.0.0-rc.1", + "@storybook/addon-options": "4.0.0-rc.1", + "@storybook/addon-storyshots": "4.0.0-rc.1", + "@storybook/addon-storysource": "4.0.0-rc.1", + "@storybook/addon-viewport": "4.0.0-rc.1", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/svelte": "4.0.0-rc.1" } } diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json index 63a2b2b99835..9d03e916fa52 100644 --- a/examples/vue-kitchen-sink/package.json +++ b/examples/vue-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "vue-example", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "private": true, "scripts": { "build": "cross-env NODE_ENV=production webpack --progress --hide-modules", @@ -14,18 +14,18 @@ }, "devDependencies": { "@babel/core": "^7.1.2", - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-backgrounds": "4.0.0-rc.0", - "@storybook/addon-centered": "4.0.0-rc.0", - "@storybook/addon-knobs": "4.0.0-rc.0", - "@storybook/addon-links": "4.0.0-rc.0", - "@storybook/addon-notes": "4.0.0-rc.0", - "@storybook/addon-options": "4.0.0-rc.0", - "@storybook/addon-storyshots": "4.0.0-rc.0", - "@storybook/addon-storysource": "4.0.0-rc.0", - "@storybook/addon-viewport": "4.0.0-rc.0", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/vue": "4.0.0-rc.0", + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-backgrounds": "4.0.0-rc.1", + "@storybook/addon-centered": "4.0.0-rc.1", + "@storybook/addon-knobs": "4.0.0-rc.1", + "@storybook/addon-links": "4.0.0-rc.1", + "@storybook/addon-notes": "4.0.0-rc.1", + "@storybook/addon-options": "4.0.0-rc.1", + "@storybook/addon-storyshots": "4.0.0-rc.1", + "@storybook/addon-storysource": "4.0.0-rc.1", + "@storybook/addon-viewport": "4.0.0-rc.1", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/vue": "4.0.0-rc.1", "babel-core": "^7.0.0-bridge.0", "babel-loader": "^8.0.4", "cross-env": "^5.2.0", diff --git a/lerna.json b/lerna.json index ea34e9c8d9f6..75c9c0308566 100644 --- a/lerna.json +++ b/lerna.json @@ -7,5 +7,5 @@ "npmClient": "yarn", "useWorkspaces": true, "registry": "https://registry.npmjs.org", - "version": "4.0.0-rc.0" + "version": "4.0.0-rc.1" } diff --git a/lib/addons/package.json b/lib/addons/package.json index 26283c300d13..0a342b4240d9 100644 --- a/lib/addons/package.json +++ b/lib/addons/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addons", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook addons store", "keywords": [ "storybook" @@ -23,8 +23,8 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/channels": "4.0.0-rc.0", - "@storybook/components": "4.0.0-rc.0", + "@storybook/channels": "4.0.0-rc.1", + "@storybook/components": "4.0.0-rc.1", "global": "^4.3.2", "util-deprecate": "^1.0.2" } diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json index 9d01ab87bd03..d2e8db7d2651 100644 --- a/lib/channel-postmessage/package.json +++ b/lib/channel-postmessage/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-postmessage", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "", "keywords": [ "storybook" @@ -23,7 +23,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/channels": "4.0.0-rc.0", + "@storybook/channels": "4.0.0-rc.1", "global": "^4.3.2", "json-stringify-safe": "^5.0.1" } diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json index dfa2aab37f20..e649725f8cd3 100644 --- a/lib/channel-websocket/package.json +++ b/lib/channel-websocket/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-websocket", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "", "keywords": [ "storybook" @@ -23,7 +23,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/channels": "4.0.0-rc.0", + "@storybook/channels": "4.0.0-rc.1", "global": "^4.3.2" } } diff --git a/lib/channels/package.json b/lib/channels/package.json index ec3a04275c58..ea1e9cde046f 100644 --- a/lib/channels/package.json +++ b/lib/channels/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channels", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "", "keywords": [ "storybook" diff --git a/lib/cli/README.md b/lib/cli/README.md index a01525bb8569..c1c2b06e4bd8 100644 --- a/lib/cli/README.md +++ b/lib/cli/README.md @@ -10,7 +10,7 @@ Just go to your project and run: ```sh cd my-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` That's all you've to do. @@ -24,7 +24,7 @@ The CLI supports yarn. If you have installed yarn in your system, it'll detect i If you don't want to use `yarn` always you can use the `--use-npm` option like this: ```sh -npx -p @storybook/cli@alpha sb init --use-npm +npx -p @storybook/cli@rc sb init --use-npm ``` --- @@ -34,7 +34,7 @@ npx -p @storybook/cli@alpha sb init --use-npm It also supports flow files. By default, [jscodeshift](https://github.com/facebook/jscodeshift), the tool used to transform the source files, uses babel to read the files. To be able to transform any flow annotated file, you need to use the flow parser. ```sh -npx -p @storybook/cli@alpha sb init --parser flow +npx -p @storybook/cli@rc sb init --parser flow ``` For more information visit: [storybook.js.org](https://storybook.js.org) @@ -46,7 +46,7 @@ For more information visit: [storybook.js.org](https://storybook.js.org) If the CLI cannot detect your project type, it will ask you. You can also force it to use a particular project type: ```sh -npx -p @storybook/cli@alpha sb init --type +npx -p @storybook/cli@rc sb init --type ``` Where type is one of the project types defined in [project_types.js](https://github.com/storybooks/storybook/blob/master/lib/cli/lib/project_types.js) diff --git a/lib/cli/generators/ANGULAR/template/.storybook/tsconfig.json b/lib/cli/generators/ANGULAR/template/.storybook/tsconfig.json index 15995ca772d7..30070058f9ec 100644 --- a/lib/cli/generators/ANGULAR/template/.storybook/tsconfig.json +++ b/lib/cli/generators/ANGULAR/template/.storybook/tsconfig.json @@ -1,5 +1,10 @@ { "extends": "../src/tsconfig.app.json", + "compilerOptions": { + "types": [ + "node" + ] + }, "exclude": [ "../src/test.ts", "../src/**/*.spec.ts", diff --git a/lib/cli/package.json b/lib/cli/package.json index 6c066cdbba0c..8f418ed87f94 100644 --- a/lib/cli/package.json +++ b/lib/cli/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/cli", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook's CLI - easiest method of adding storybook to your projects", "keywords": [ "cli", @@ -34,7 +34,7 @@ "@babel/preset-env": "^7.1.0", "@babel/register": "^7.0.0", "@babel/runtime": "^7.1.2", - "@storybook/codemod": "4.0.0-rc.0", + "@storybook/codemod": "4.0.0-rc.1", "chalk": "^2.4.1", "child-process-promise": "^2.2.1", "commander": "^2.19.0", @@ -48,29 +48,29 @@ "update-notifier": "^2.5.0" }, "devDependencies": { - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-centered": "4.0.0-rc.0", - "@storybook/addon-graphql": "4.0.0-rc.0", - "@storybook/addon-info": "4.0.0-rc.0", - "@storybook/addon-knobs": "4.0.0-rc.0", - "@storybook/addon-links": "4.0.0-rc.0", - "@storybook/addon-notes": "4.0.0-rc.0", - "@storybook/addon-options": "4.0.0-rc.0", - "@storybook/addon-storyshots": "4.0.0-rc.0", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/angular": "4.0.0-rc.0", - "@storybook/channel-postmessage": "4.0.0-rc.0", - "@storybook/channel-websocket": "4.0.0-rc.0", - "@storybook/channels": "4.0.0-rc.0", - "@storybook/ember": "4.0.0-rc.0", - "@storybook/html": "4.0.0-rc.0", - "@storybook/marko": "4.0.0-rc.0", - "@storybook/mithril": "4.0.0-rc.0", - "@storybook/polymer": "4.0.0-rc.0", - "@storybook/react": "4.0.0-rc.0", - "@storybook/react-native": "4.0.0-rc.0", - "@storybook/riot": "4.0.0-rc.0", - "@storybook/ui": "4.0.0-rc.0", - "@storybook/vue": "4.0.0-rc.0" + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-centered": "4.0.0-rc.1", + "@storybook/addon-graphql": "4.0.0-rc.1", + "@storybook/addon-info": "4.0.0-rc.1", + "@storybook/addon-knobs": "4.0.0-rc.1", + "@storybook/addon-links": "4.0.0-rc.1", + "@storybook/addon-notes": "4.0.0-rc.1", + "@storybook/addon-options": "4.0.0-rc.1", + "@storybook/addon-storyshots": "4.0.0-rc.1", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/angular": "4.0.0-rc.1", + "@storybook/channel-postmessage": "4.0.0-rc.1", + "@storybook/channel-websocket": "4.0.0-rc.1", + "@storybook/channels": "4.0.0-rc.1", + "@storybook/ember": "4.0.0-rc.1", + "@storybook/html": "4.0.0-rc.1", + "@storybook/marko": "4.0.0-rc.1", + "@storybook/mithril": "4.0.0-rc.1", + "@storybook/polymer": "4.0.0-rc.1", + "@storybook/react": "4.0.0-rc.1", + "@storybook/react-native": "4.0.0-rc.1", + "@storybook/riot": "4.0.0-rc.1", + "@storybook/ui": "4.0.0-rc.1", + "@storybook/vue": "4.0.0-rc.1" } } diff --git a/lib/cli/test/fixtures/angular-cli/.gitignore b/lib/cli/test/fixtures/angular-cli-v6/.gitignore similarity index 86% rename from lib/cli/test/fixtures/angular-cli/.gitignore rename to lib/cli/test/fixtures/angular-cli-v6/.gitignore index fe6f8a76b049..ee5c9d8336b7 100644 --- a/lib/cli/test/fixtures/angular-cli/.gitignore +++ b/lib/cli/test/fixtures/angular-cli-v6/.gitignore @@ -3,6 +3,7 @@ # compiled output /dist /tmp +/out-tsc # dependencies /node_modules @@ -14,6 +15,7 @@ .c9/ *.launch .settings/ +*.sublime-workspace # IDE - VSCode .vscode/* @@ -25,16 +27,13 @@ # misc /.sass-cache /connect.lock -/coverage/* +/coverage /libpeerconnection.log npm-debug.log +yarn-error.log testem.log /typings -# e2e -/e2e/*.js -/e2e/*.map - -#System Files +# System Files .DS_Store Thumbs.db diff --git a/lib/cli/test/fixtures/angular-cli-v6/README.md b/lib/cli/test/fixtures/angular-cli-v6/README.md new file mode 100644 index 000000000000..90d9dd36d9ba --- /dev/null +++ b/lib/cli/test/fixtures/angular-cli-v6/README.md @@ -0,0 +1,27 @@ +# AngularCliV6 + +This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.2.5. + +## Development server + +Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files. + +## Code scaffolding + +Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`. + +## Build + +Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build. + +## Running unit tests + +Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io). + +## Running end-to-end tests + +Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/). + +## Further help + +To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). diff --git a/lib/cli/test/fixtures/angular-cli-v6/angular.json b/lib/cli/test/fixtures/angular-cli-v6/angular.json new file mode 100644 index 000000000000..da2b173de2e1 --- /dev/null +++ b/lib/cli/test/fixtures/angular-cli-v6/angular.json @@ -0,0 +1,127 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "angular-cli-v6": { + "root": "", + "sourceRoot": "src", + "projectType": "application", + "prefix": "app", + "schematics": {}, + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist/angular-cli-v6", + "index": "src/index.html", + "main": "src/main.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/tsconfig.app.json", + "assets": [ + "src/favicon.ico", + "src/assets" + ], + "styles": [ + "src/styles.css" + ], + "scripts": [] + }, + "configurations": { + "production": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true + } + } + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "angular-cli-v6:build" + }, + "configurations": { + "production": { + "browserTarget": "angular-cli-v6:build:production" + } + } + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "angular-cli-v6:build" + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "src/test.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/tsconfig.spec.json", + "karmaConfig": "src/karma.conf.js", + "styles": [ + "src/styles.css" + ], + "scripts": [], + "assets": [ + "src/favicon.ico", + "src/assets" + ] + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "src/tsconfig.app.json", + "src/tsconfig.spec.json" + ], + "exclude": [ + "**/node_modules/**" + ] + } + } + } + }, + "angular-cli-v6-e2e": { + "root": "e2e/", + "projectType": "application", + "architect": { + "e2e": { + "builder": "@angular-devkit/build-angular:protractor", + "options": { + "protractorConfig": "e2e/protractor.conf.js", + "devServerTarget": "angular-cli-v6:serve" + }, + "configurations": { + "production": { + "devServerTarget": "angular-cli-v6:serve:production" + } + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": "e2e/tsconfig.e2e.json", + "exclude": [ + "**/node_modules/**" + ] + } + } + } + } + }, + "defaultProject": "angular-cli-v6" +} \ No newline at end of file diff --git a/lib/cli/test/fixtures/angular-cli-v6/package.json b/lib/cli/test/fixtures/angular-cli-v6/package.json new file mode 100644 index 000000000000..80ee5264a51a --- /dev/null +++ b/lib/cli/test/fixtures/angular-cli-v6/package.json @@ -0,0 +1,48 @@ +{ + "name": "angular-cli-v6", + "version": "0.0.0", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build", + "test": "ng test", + "lint": "ng lint", + "e2e": "ng e2e" + }, + "private": true, + "dependencies": { + "@angular/animations": "^6.1.0", + "@angular/common": "^6.1.0", + "@angular/compiler": "^6.1.0", + "@angular/core": "^6.1.0", + "@angular/forms": "^6.1.0", + "@angular/http": "^6.1.0", + "@angular/platform-browser": "^6.1.0", + "@angular/platform-browser-dynamic": "^6.1.0", + "@angular/router": "^6.1.0", + "core-js": "^2.5.4", + "rxjs": "~6.2.0", + "zone.js": "~0.8.26" + }, + "devDependencies": { + "@angular-devkit/build-angular": "~0.8.0", + "@angular/cli": "~6.2.5", + "@angular/compiler-cli": "^6.1.0", + "@angular/language-service": "^6.1.0", + "@types/jasmine": "~2.8.8", + "@types/jasminewd2": "~2.0.3", + "@types/node": "~8.9.4", + "codelyzer": "~4.3.0", + "jasmine-core": "~2.99.1", + "jasmine-spec-reporter": "~4.2.1", + "karma": "~3.0.0", + "karma-chrome-launcher": "~2.2.0", + "karma-coverage-istanbul-reporter": "~2.0.1", + "karma-jasmine": "~1.1.2", + "karma-jasmine-html-reporter": "^0.2.2", + "protractor": "~5.4.0", + "ts-node": "~7.0.0", + "tslint": "~5.11.0", + "typescript": "~2.9.2" + } +} diff --git a/lib/cli/test/fixtures/angular-cli/src/app/app.component.css b/lib/cli/test/fixtures/angular-cli-v6/src/app/app.component.css similarity index 100% rename from lib/cli/test/fixtures/angular-cli/src/app/app.component.css rename to lib/cli/test/fixtures/angular-cli-v6/src/app/app.component.css diff --git a/lib/cli/test/fixtures/angular-cli-v6/src/app/app.component.html b/lib/cli/test/fixtures/angular-cli-v6/src/app/app.component.html new file mode 100644 index 000000000000..fa2706a406ba --- /dev/null +++ b/lib/cli/test/fixtures/angular-cli-v6/src/app/app.component.html @@ -0,0 +1,20 @@ + +
+

+ Welcome to {{ title }}! +

+ Angular Logo +
+

Here are some links to help you start:

+ + diff --git a/lib/cli/test/fixtures/angular-cli/src/app/app.component.spec.ts b/lib/cli/test/fixtures/angular-cli-v6/src/app/app.component.spec.ts similarity index 67% rename from lib/cli/test/fixtures/angular-cli/src/app/app.component.spec.ts rename to lib/cli/test/fixtures/angular-cli-v6/src/app/app.component.spec.ts index 960622ed0f8b..1779f6eceb91 100644 --- a/lib/cli/test/fixtures/angular-cli/src/app/app.component.spec.ts +++ b/lib/cli/test/fixtures/angular-cli-v6/src/app/app.component.spec.ts @@ -1,35 +1,31 @@ -/* tslint:disable:no-unused-variable */ - import { TestBed, async } from '@angular/core/testing'; import { AppComponent } from './app.component'; -import 'jasmine'; describe('AppComponent', () => { - beforeEach(() => { + beforeEach(async(() => { TestBed.configureTestingModule({ declarations: [ AppComponent ], - }); - TestBed.compileComponents(); - }); + }).compileComponents(); + })); - it('should create the app', async(() => { + it('should create the app', () => { const fixture = TestBed.createComponent(AppComponent); const app = fixture.debugElement.componentInstance; expect(app).toBeTruthy(); - })); + }); - it(`should have as title 'app works!'`, async(() => { + it(`should have as title 'angular-cli-v6'`, () => { const fixture = TestBed.createComponent(AppComponent); const app = fixture.debugElement.componentInstance; - expect(app.title).toEqual('app works!'); - })); + expect(app.title).toEqual('angular-cli-v6'); + }); - it('should render title in a h1 tag', async(() => { + it('should render title in a h1 tag', () => { const fixture = TestBed.createComponent(AppComponent); fixture.detectChanges(); const compiled = fixture.debugElement.nativeElement; - expect(compiled.querySelector('h1').textContent).toContain('app works!'); - })); + expect(compiled.querySelector('h1').textContent).toContain('Welcome to angular-cli-v6!'); + }); }); diff --git a/lib/cli/test/fixtures/angular-cli/src/app/app.component.ts b/lib/cli/test/fixtures/angular-cli-v6/src/app/app.component.ts similarity index 87% rename from lib/cli/test/fixtures/angular-cli/src/app/app.component.ts rename to lib/cli/test/fixtures/angular-cli-v6/src/app/app.component.ts index ff63e0504887..8fc06db534ae 100644 --- a/lib/cli/test/fixtures/angular-cli/src/app/app.component.ts +++ b/lib/cli/test/fixtures/angular-cli-v6/src/app/app.component.ts @@ -6,5 +6,5 @@ import { Component } from '@angular/core'; styleUrls: ['./app.component.css'] }) export class AppComponent { - title = 'app works!'; + title = 'angular-cli-v6'; } diff --git a/lib/cli/test/fixtures/angular-cli/src/app/app.module.ts b/lib/cli/test/fixtures/angular-cli-v6/src/app/app.module.ts similarity index 67% rename from lib/cli/test/fixtures/angular-cli/src/app/app.module.ts rename to lib/cli/test/fixtures/angular-cli-v6/src/app/app.module.ts index 67ae49119baa..f65716351aa5 100644 --- a/lib/cli/test/fixtures/angular-cli/src/app/app.module.ts +++ b/lib/cli/test/fixtures/angular-cli-v6/src/app/app.module.ts @@ -1,7 +1,5 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; -import { FormsModule } from '@angular/forms'; -import { HttpModule } from '@angular/http'; import { AppComponent } from './app.component'; @@ -10,9 +8,7 @@ import { AppComponent } from './app.component'; AppComponent ], imports: [ - BrowserModule, - FormsModule, - HttpModule + BrowserModule ], providers: [], bootstrap: [AppComponent] diff --git a/lib/cli/test/fixtures/angular-cli/src/assets/.gitkeep b/lib/cli/test/fixtures/angular-cli-v6/src/assets/.gitkeep similarity index 100% rename from lib/cli/test/fixtures/angular-cli/src/assets/.gitkeep rename to lib/cli/test/fixtures/angular-cli-v6/src/assets/.gitkeep diff --git a/lib/cli/test/fixtures/angular-cli-v6/src/browserslist b/lib/cli/test/fixtures/angular-cli-v6/src/browserslist new file mode 100644 index 000000000000..37371cb04b9f --- /dev/null +++ b/lib/cli/test/fixtures/angular-cli-v6/src/browserslist @@ -0,0 +1,11 @@ +# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers +# For additional information regarding the format and rule options, please see: +# https://github.com/browserslist/browserslist#queries +# +# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed + +> 0.5% +last 2 versions +Firefox ESR +not dead +not IE 9-11 \ No newline at end of file diff --git a/lib/cli/test/fixtures/angular-cli/src/environments/environment.prod.ts b/lib/cli/test/fixtures/angular-cli-v6/src/environments/environment.prod.ts similarity index 100% rename from lib/cli/test/fixtures/angular-cli/src/environments/environment.prod.ts rename to lib/cli/test/fixtures/angular-cli-v6/src/environments/environment.prod.ts diff --git a/lib/cli/test/fixtures/angular-cli-v6/src/environments/environment.ts b/lib/cli/test/fixtures/angular-cli-v6/src/environments/environment.ts new file mode 100644 index 000000000000..7b4f817adb75 --- /dev/null +++ b/lib/cli/test/fixtures/angular-cli-v6/src/environments/environment.ts @@ -0,0 +1,16 @@ +// This file can be replaced during build by using the `fileReplacements` array. +// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`. +// The list of file replacements can be found in `angular.json`. + +export const environment = { + production: false +}; + +/* + * For easier debugging in development mode, you can import the following file + * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`. + * + * This import should be commented out in production mode because it will have a negative impact + * on performance if an error is thrown. + */ +// import 'zone.js/dist/zone-error'; // Included with Angular CLI. diff --git a/lib/cli/test/fixtures/angular-cli/src/favicon.ico b/lib/cli/test/fixtures/angular-cli-v6/src/favicon.ico similarity index 100% rename from lib/cli/test/fixtures/angular-cli/src/favicon.ico rename to lib/cli/test/fixtures/angular-cli-v6/src/favicon.ico diff --git a/lib/cli/test/fixtures/angular-cli/src/index.html b/lib/cli/test/fixtures/angular-cli-v6/src/index.html similarity index 76% rename from lib/cli/test/fixtures/angular-cli/src/index.html rename to lib/cli/test/fixtures/angular-cli-v6/src/index.html index 8ea8ff943ffb..32b6887601a6 100644 --- a/lib/cli/test/fixtures/angular-cli/src/index.html +++ b/lib/cli/test/fixtures/angular-cli-v6/src/index.html @@ -1,14 +1,14 @@ - + - Fixture + AngularCliV6 - Loading... + diff --git a/lib/cli/test/fixtures/angular-cli-v6/src/karma.conf.js b/lib/cli/test/fixtures/angular-cli-v6/src/karma.conf.js new file mode 100644 index 000000000000..b6e00421c95f --- /dev/null +++ b/lib/cli/test/fixtures/angular-cli-v6/src/karma.conf.js @@ -0,0 +1,31 @@ +// Karma configuration file, see link for more information +// https://karma-runner.github.io/1.0/config/configuration-file.html + +module.exports = function (config) { + config.set({ + basePath: '', + frameworks: ['jasmine', '@angular-devkit/build-angular'], + plugins: [ + require('karma-jasmine'), + require('karma-chrome-launcher'), + require('karma-jasmine-html-reporter'), + require('karma-coverage-istanbul-reporter'), + require('@angular-devkit/build-angular/plugins/karma') + ], + client: { + clearContext: false // leave Jasmine Spec Runner output visible in browser + }, + coverageIstanbulReporter: { + dir: require('path').join(__dirname, '../coverage'), + reports: ['html', 'lcovonly'], + fixWebpackSourcePaths: true + }, + reporters: ['progress', 'kjhtml'], + port: 9876, + colors: true, + logLevel: config.LOG_INFO, + autoWatch: true, + browsers: ['Chrome'], + singleRun: false + }); +}; \ No newline at end of file diff --git a/lib/cli/test/fixtures/angular-cli/src/main.ts b/lib/cli/test/fixtures/angular-cli-v6/src/main.ts similarity index 75% rename from lib/cli/test/fixtures/angular-cli/src/main.ts rename to lib/cli/test/fixtures/angular-cli-v6/src/main.ts index 46c1c73e209e..28bfa9e1feef 100644 --- a/lib/cli/test/fixtures/angular-cli/src/main.ts +++ b/lib/cli/test/fixtures/angular-cli-v6/src/main.ts @@ -1,10 +1,13 @@ -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { enableProdMode } from '@angular/core'; -import { environment } from './environments/environment'; +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + import { AppModule } from './app/app.module'; +import { environment } from './environments/environment'; if (environment.production) { enableProdMode(); } -platformBrowserDynamic().bootstrapModule(AppModule); +platformBrowserDynamic().bootstrapModule(AppModule) + .catch(err => console.error(err)); + diff --git a/lib/cli/test/fixtures/angular-cli-v6/src/polyfills.ts b/lib/cli/test/fixtures/angular-cli-v6/src/polyfills.ts new file mode 100644 index 000000000000..d310405a6817 --- /dev/null +++ b/lib/cli/test/fixtures/angular-cli-v6/src/polyfills.ts @@ -0,0 +1,80 @@ +/** + * This file includes polyfills needed by Angular and is loaded before the app. + * You can add your own extra polyfills to this file. + * + * This file is divided into 2 sections: + * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers. + * 2. Application imports. Files imported after ZoneJS that should be loaded before your main + * file. + * + * The current setup is for so-called "evergreen" browsers; the last versions of browsers that + * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera), + * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile. + * + * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html + */ + +/*************************************************************************************************** + * BROWSER POLYFILLS + */ + +/** IE9, IE10 and IE11 requires all of the following polyfills. **/ +// import 'core-js/es6/symbol'; +// import 'core-js/es6/object'; +// import 'core-js/es6/function'; +// import 'core-js/es6/parse-int'; +// import 'core-js/es6/parse-float'; +// import 'core-js/es6/number'; +// import 'core-js/es6/math'; +// import 'core-js/es6/string'; +// import 'core-js/es6/date'; +// import 'core-js/es6/array'; +// import 'core-js/es6/regexp'; +// import 'core-js/es6/map'; +// import 'core-js/es6/weak-map'; +// import 'core-js/es6/set'; + +/** IE10 and IE11 requires the following for NgClass support on SVG elements */ +// import 'classlist.js'; // Run `npm install --save classlist.js`. + +/** IE10 and IE11 requires the following for the Reflect API. */ +// import 'core-js/es6/reflect'; + + +/** Evergreen browsers require these. **/ +// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove. +import 'core-js/es7/reflect'; + + +/** + * Web Animations `@angular/platform-browser/animations` + * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari. + * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0). + **/ +// import 'web-animations-js'; // Run `npm install --save web-animations-js`. + +/** + * By default, zone.js will patch all possible macroTask and DomEvents + * user can disable parts of macroTask/DomEvents patch by setting following flags + */ + + // (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame + // (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick + // (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames + + /* + * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js + * with the following flag, it will bypass `zone.js` patch for IE/Edge + */ +// (window as any).__Zone_enable_cross_context_check = true; + +/*************************************************************************************************** + * Zone JS is required by default for Angular itself. + */ +import 'zone.js/dist/zone'; // Included with Angular CLI. + + + +/*************************************************************************************************** + * APPLICATION IMPORTS + */ diff --git a/lib/cli/test/fixtures/angular-cli/src/styles.css b/lib/cli/test/fixtures/angular-cli-v6/src/styles.css similarity index 100% rename from lib/cli/test/fixtures/angular-cli/src/styles.css rename to lib/cli/test/fixtures/angular-cli-v6/src/styles.css diff --git a/lib/cli/test/fixtures/angular-cli/src/test.ts b/lib/cli/test/fixtures/angular-cli-v6/src/test.ts similarity index 53% rename from lib/cli/test/fixtures/angular-cli/src/test.ts rename to lib/cli/test/fixtures/angular-cli-v6/src/test.ts index 9bf72267e9b1..16317897b1c5 100644 --- a/lib/cli/test/fixtures/angular-cli/src/test.ts +++ b/lib/cli/test/fixtures/angular-cli-v6/src/test.ts @@ -1,23 +1,13 @@ // This file is required by karma.conf.js and loads recursively all the .spec and framework files -import 'zone.js/dist/long-stack-trace-zone'; -import 'zone.js/dist/proxy.js'; -import 'zone.js/dist/sync-test'; -import 'zone.js/dist/jasmine-patch'; -import 'zone.js/dist/async-test'; -import 'zone.js/dist/fake-async-test'; +import 'zone.js/dist/zone-testing'; import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; -// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any. -declare var __karma__: any; -declare var require: any; - -// Prevent Karma from running prematurely. -__karma__.loaded = function () {}; +declare const require: any; // First, initialize the Angular testing environment. getTestBed().initTestEnvironment( @@ -28,5 +18,3 @@ getTestBed().initTestEnvironment( const context = require.context('./', true, /\.spec\.ts$/); // And load the modules. context.keys().map(context); -// Finally, start Karma to run the tests. -__karma__.start(); diff --git a/lib/cli/test/fixtures/angular-cli/src/tsconfig.app.json b/lib/cli/test/fixtures/angular-cli-v6/src/tsconfig.app.json similarity index 78% rename from lib/cli/test/fixtures/angular-cli/src/tsconfig.app.json rename to lib/cli/test/fixtures/angular-cli-v6/src/tsconfig.app.json index 39ba8dbacbbe..190fd300b601 100644 --- a/lib/cli/test/fixtures/angular-cli/src/tsconfig.app.json +++ b/lib/cli/test/fixtures/angular-cli-v6/src/tsconfig.app.json @@ -2,8 +2,6 @@ "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/app", - "baseUrl": "./", - "module": "es2015", "types": [] }, "exclude": [ diff --git a/lib/cli/test/fixtures/angular-cli-v6/src/tsconfig.spec.json b/lib/cli/test/fixtures/angular-cli-v6/src/tsconfig.spec.json new file mode 100644 index 000000000000..de7733630eb2 --- /dev/null +++ b/lib/cli/test/fixtures/angular-cli-v6/src/tsconfig.spec.json @@ -0,0 +1,18 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/spec", + "types": [ + "jasmine", + "node" + ] + }, + "files": [ + "test.ts", + "polyfills.ts" + ], + "include": [ + "**/*.spec.ts", + "**/*.d.ts" + ] +} diff --git a/lib/cli/test/fixtures/angular-cli-v6/src/tslint.json b/lib/cli/test/fixtures/angular-cli-v6/src/tslint.json new file mode 100644 index 000000000000..52e2c1a5a74c --- /dev/null +++ b/lib/cli/test/fixtures/angular-cli-v6/src/tslint.json @@ -0,0 +1,17 @@ +{ + "extends": "../tslint.json", + "rules": { + "directive-selector": [ + true, + "attribute", + "app", + "camelCase" + ], + "component-selector": [ + true, + "element", + "app", + "kebab-case" + ] + } +} diff --git a/lib/cli/test/fixtures/angular-cli/tsconfig.json b/lib/cli/test/fixtures/angular-cli-v6/tsconfig.json similarity index 88% rename from lib/cli/test/fixtures/angular-cli/tsconfig.json rename to lib/cli/test/fixtures/angular-cli-v6/tsconfig.json index a6c016bf38ad..916247e4cb29 100644 --- a/lib/cli/test/fixtures/angular-cli/tsconfig.json +++ b/lib/cli/test/fixtures/angular-cli-v6/tsconfig.json @@ -1,9 +1,11 @@ { "compileOnSave": false, "compilerOptions": { + "baseUrl": "./", "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, + "module": "es2015", "moduleResolution": "node", "emitDecoratorMetadata": true, "experimentalDecorators": true, diff --git a/lib/cli/test/fixtures/angular-cli/tslint.json b/lib/cli/test/fixtures/angular-cli-v6/tslint.json similarity index 78% rename from lib/cli/test/fixtures/angular-cli/tslint.json rename to lib/cli/test/fixtures/angular-cli-v6/tslint.json index 86bc1841f39a..6ddb6b293151 100644 --- a/lib/cli/test/fixtures/angular-cli/tslint.json +++ b/lib/cli/test/fixtures/angular-cli-v6/tslint.json @@ -3,6 +3,7 @@ "node_modules/codelyzer" ], "rules": { + "arrow-return-shorthand": true, "callable-types": true, "class-name": true, "comment-format": [ @@ -10,9 +11,15 @@ "check-space" ], "curly": true, + "deprecation": { + "severity": "warn" + }, "eofline": true, "forin": true, - "import-blacklist": [true, "rxjs"], + "import-blacklist": [ + true, + "rxjs/Rx" + ], "import-spacing": true, "indent": [ true, @@ -27,8 +34,14 @@ "member-access": false, "member-ordering": [ true, - "static-before-instance", - "variables-before-functions" + { + "order": [ + "static-field", + "instance-field", + "static-method", + "instance-method" + ] + } ], "no-arg": true, "no-bitwise": true, @@ -42,16 +55,23 @@ ], "no-construct": true, "no-debugger": true, - "no-duplicate-variable": true, + "no-duplicate-super": true, "no-empty": false, "no-empty-interface": true, "no-eval": true, - "no-inferrable-types": true, + "no-inferrable-types": [ + true, + "ignore-params" + ], + "no-misused-new": true, + "no-non-null-assertion": true, + "no-redundant-jsdoc": true, "no-shadowed-variable": true, "no-string-literal": false, "no-string-throw": true, "no-switch-case-fall-through": true, "no-trailing-whitespace": true, + "no-unnecessary-initializer": true, "no-unused-expression": true, "no-use-before-declare": true, "no-var-keyword": true, @@ -70,6 +90,7 @@ ], "radix": true, "semicolon": [ + true, "always" ], "triple-equals": [ @@ -86,7 +107,6 @@ "variable-declaration": "nospace" } ], - "typeof-compare": true, "unified-signatures": true, "variable-name": false, "whitespace": [ @@ -97,9 +117,7 @@ "check-separator", "check-type" ], - - "directive-selector": [true, "attribute", "app", "camelCase"], - "component-selector": [true, "element", "app", "kebab-case"], + "no-output-on-prefix": true, "use-input-property-decorator": true, "use-output-property-decorator": true, "use-host-property-decorator": true, @@ -108,9 +126,6 @@ "use-life-cycle-interface": true, "use-pipe-transform-interface": true, "component-class-suffix": true, - "directive-class-suffix": true, - "no-access-missing-member": true, - "templates-use-public": true, - "invoke-injectable": true + "directive-class-suffix": true } } diff --git a/lib/cli/test/fixtures/angular-cli/.editorconfig b/lib/cli/test/fixtures/angular-cli/.editorconfig deleted file mode 100644 index 6e87a003da89..000000000000 --- a/lib/cli/test/fixtures/angular-cli/.editorconfig +++ /dev/null @@ -1,13 +0,0 @@ -# Editor configuration, see http://editorconfig.org -root = true - -[*] -charset = utf-8 -indent_style = space -indent_size = 2 -insert_final_newline = true -trim_trailing_whitespace = true - -[*.md] -max_line_length = off -trim_trailing_whitespace = false diff --git a/lib/cli/test/fixtures/angular-cli/README.md b/lib/cli/test/fixtures/angular-cli/README.md deleted file mode 100644 index 6fac6823c7f2..000000000000 --- a/lib/cli/test/fixtures/angular-cli/README.md +++ /dev/null @@ -1,32 +0,0 @@ -# Fixture - -This project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.28.3. - -## Development server - -Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files. - -## Code scaffolding - -Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive/pipe/service/class/module`. - -## Build - -Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build. - -## Running unit tests - -Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io). - -## Running end-to-end tests - -Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/). -Before running the tests make sure you are serving the app via `ng serve`. - -## Deploying to GitHub Pages - -Run `ng github-pages:deploy` to deploy to GitHub Pages. - -## Further help - -To get more help on the `angular-cli` use `ng help` or go check out the [Angular-CLI README](https://github.com/angular/angular-cli/blob/master/README.md). diff --git a/lib/cli/test/fixtures/angular-cli/angular-cli.json b/lib/cli/test/fixtures/angular-cli/angular-cli.json deleted file mode 100644 index 1f27f27e71e2..000000000000 --- a/lib/cli/test/fixtures/angular-cli/angular-cli.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "project": { - "version": "1.0.0-beta.28.3", - "name": "fixture" - }, - "apps": [ - { - "root": "src", - "outDir": "dist", - "assets": [ - "assets", - "favicon.ico" - ], - "index": "index.html", - "main": "main.ts", - "polyfills": "polyfills.ts", - "test": "test.ts", - "tsconfig": "tsconfig.json", - "prefix": "app", - "styles": [ - "styles.css" - ], - "scripts": [], - "environments": { - "source": "environments/environment.ts", - "dev": "environments/environment.ts", - "prod": "environments/environment.prod.ts" - } - } - ], - "e2e": { - "protractor": { - "config": "./protractor.conf.js" - } - }, - "lint": [ - { - "files": "src/**/*.ts", - "project": "src/tsconfig.json" - }, - { - "files": "e2e/**/*.ts", - "project": "e2e/tsconfig.json" - } - ], - "test": { - "karma": { - "config": "./karma.conf.js" - } - }, - "defaults": { - "styleExt": "css", - "prefixInterfaces": false, - "inline": { - "style": false, - "template": false - }, - "spec": { - "class": false, - "component": true, - "directive": true, - "module": false, - "pipe": true, - "service": true - } - } -} diff --git a/lib/cli/test/fixtures/angular-cli/e2e/app.e2e-spec.ts b/lib/cli/test/fixtures/angular-cli/e2e/app.e2e-spec.ts deleted file mode 100644 index 6793d0584d9c..000000000000 --- a/lib/cli/test/fixtures/angular-cli/e2e/app.e2e-spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { FixturePage } from './app.po'; -import 'jasmine'; - -describe('fixture App', function() { - let page: FixturePage; - - beforeEach(() => { - page = new FixturePage(); - }); - - it('should display message saying app works', () => { - page.navigateTo(); - expect(page.getParagraphText()).toEqual('app works!'); - }); -}); diff --git a/lib/cli/test/fixtures/angular-cli/e2e/app.po.ts b/lib/cli/test/fixtures/angular-cli/e2e/app.po.ts deleted file mode 100644 index a06ac1a971de..000000000000 --- a/lib/cli/test/fixtures/angular-cli/e2e/app.po.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { browser, element, by } from 'protractor'; - -export class FixturePage { - navigateTo() { - return browser.get('/'); - } - - getParagraphText() { - return element(by.css('app-root h1')).getText(); - } -} diff --git a/lib/cli/test/fixtures/angular-cli/e2e/tsconfig.json b/lib/cli/test/fixtures/angular-cli/e2e/tsconfig.json deleted file mode 100644 index 656bdb14ff14..000000000000 --- a/lib/cli/test/fixtures/angular-cli/e2e/tsconfig.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "compileOnSave": false, - "compilerOptions": { - "declaration": false, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "module": "commonjs", - "moduleResolution": "node", - "outDir": "../dist/out-tsc-e2e", - "sourceMap": true, - "target": "es5", - "typeRoots": [ - "../node_modules/@types" - ] - } -} diff --git a/lib/cli/test/fixtures/angular-cli/karma.conf.js b/lib/cli/test/fixtures/angular-cli/karma.conf.js deleted file mode 100644 index 1f2613a34697..000000000000 --- a/lib/cli/test/fixtures/angular-cli/karma.conf.js +++ /dev/null @@ -1,43 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/0.13/config/configuration-file.html - -module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', 'angular-cli'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-remap-istanbul'), - require('angular-cli/plugins/karma') - ], - files: [ - { pattern: './src/test.ts', watched: false } - ], - preprocessors: { - './src/test.ts': ['angular-cli'] - }, - mime: { - 'text/x-typescript': ['ts','tsx'] - }, - remapIstanbulReporter: { - reports: { - html: 'coverage', - lcovonly: './coverage/coverage.lcov' - } - }, - angularCli: { - config: './angular-cli.json', - environment: 'dev' - }, - reporters: config.angularCli && config.angularCli.codeCoverage - ? ['progress', 'karma-remap-istanbul'] - : ['progress'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false - }); -}; diff --git a/lib/cli/test/fixtures/angular-cli/package.json b/lib/cli/test/fixtures/angular-cli/package.json deleted file mode 100644 index 7731ac6e5738..000000000000 --- a/lib/cli/test/fixtures/angular-cli/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "ng-fixture", - "version": "0.0.0", - "private": true, - "license": "MIT", - "scripts": { - "pree2e": "webdriver-manager update --standalone false --gecko false", - "e2e": "protractor", - "ng": "ng", - "start": "ng serve", - "test": "ng test" - }, - "dependencies": { - "@angular/common": "4.0.0", - "@angular/compiler": "4.0.0", - "@angular/core": "4.0.0", - "@angular/forms": "4.0.0", - "@angular/http": "4.0.0", - "@angular/platform-browser": "4.0.0", - "@angular/platform-browser-dynamic": "4.0.0", - "@angular/router": "4.0.0", - "core-js": "^2.4.1", - "rxjs": "^5.0.1", - "ts-helpers": "^1.1.1", - "zone.js": "^0.7.2" - }, - "devDependencies": { - "@angular/compiler-cli": "4.0.0", - "@types/jasmine": "2.5.38", - "@types/node": "^6.0.42", - "angular-cli": "1.0.0-beta.28.3", - "codelyzer": "~2.0.0-beta.1", - "jasmine-core": "2.5.2", - "jasmine-spec-reporter": "2.5.0", - "karma": "1.2.0", - "karma-chrome-launcher": "^2.0.0", - "karma-cli": "^1.0.1", - "karma-jasmine": "^1.0.2", - "karma-remap-istanbul": "^0.2.1", - "protractor": "~5.1.0", - "ts-node": "1.2.1", - "tslint": "^4.3.0", - "typescript": "~2.4.0" - }, - "angular-cli": {} -} diff --git a/lib/cli/test/fixtures/angular-cli/protractor.conf.js b/lib/cli/test/fixtures/angular-cli/protractor.conf.js deleted file mode 100644 index ffded70180a2..000000000000 --- a/lib/cli/test/fixtures/angular-cli/protractor.conf.js +++ /dev/null @@ -1,32 +0,0 @@ -// Protractor configuration file, see link for more information -// https://github.com/angular/protractor/blob/master/lib/config.ts - -/*global jasmine */ -var SpecReporter = require('jasmine-spec-reporter'); - -exports.config = { - allScriptsTimeout: 11000, - specs: [ - './e2e/**/*.e2e-spec.ts' - ], - capabilities: { - 'browserName': 'chrome' - }, - directConnect: true, - baseUrl: 'http://localhost:4200/', - framework: 'jasmine', - jasmineNodeOpts: { - showColors: true, - defaultTimeoutInterval: 30000, - print: function() {} - }, - useAllAngular2AppRoots: true, - beforeLaunch: function() { - require('ts-node').register({ - project: 'e2e' - }); - }, - onPrepare: function() { - jasmine.getEnv().addReporter(new SpecReporter()); - } -}; diff --git a/lib/cli/test/fixtures/angular-cli/src/app/app.component.html b/lib/cli/test/fixtures/angular-cli/src/app/app.component.html deleted file mode 100644 index b6931b538a2c..000000000000 --- a/lib/cli/test/fixtures/angular-cli/src/app/app.component.html +++ /dev/null @@ -1,3 +0,0 @@ -

- {{title}} -

diff --git a/lib/cli/test/fixtures/angular-cli/src/environments/environment.ts b/lib/cli/test/fixtures/angular-cli/src/environments/environment.ts deleted file mode 100644 index 00313f16648e..000000000000 --- a/lib/cli/test/fixtures/angular-cli/src/environments/environment.ts +++ /dev/null @@ -1,8 +0,0 @@ -// The file contents for the current environment will overwrite these during build. -// The build system defaults to the dev environment which uses `environment.ts`, but if you do -// `ng build --env=prod` then `environment.prod.ts` will be used instead. -// The list of which env maps to which file can be found in `angular-cli.json`. - -export const environment = { - production: false -}; diff --git a/lib/cli/test/fixtures/angular-cli/src/polyfills.ts b/lib/cli/test/fixtures/angular-cli/src/polyfills.ts deleted file mode 100644 index 1bdd4d3c6ef2..000000000000 --- a/lib/cli/test/fixtures/angular-cli/src/polyfills.ts +++ /dev/null @@ -1,38 +0,0 @@ -// This file includes polyfills needed by Angular and is loaded before the app. -// You can add your own extra polyfills to this file. -import 'core-js/es6/symbol'; -import 'core-js/es6/object'; -import 'core-js/es6/function'; -import 'core-js/es6/parse-int'; -import 'core-js/es6/parse-float'; -import 'core-js/es6/number'; -import 'core-js/es6/math'; -import 'core-js/es6/string'; -import 'core-js/es6/date'; -import 'core-js/es6/array'; -import 'core-js/es6/regexp'; -import 'core-js/es6/map'; -import 'core-js/es6/set'; -import 'core-js/es6/reflect'; - -import 'core-js/es7/reflect'; -import 'zone.js/dist/zone'; - -// If you need to support the browsers/features below, uncomment the import -// and run `npm install import-name-here'; -// Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html - -// Needed for: IE9 -// import 'classlist.js'; - -// Animations -// Needed for: All but Chrome and Firefox, Not supported in IE9 -// import 'web-animations-js'; - -// Date, currency, decimal and percent pipes -// Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10 -// import 'intl'; - -// NgClass on SVG elements -// Needed for: IE10, IE11 -// import 'classlist.js'; diff --git a/lib/cli/test/fixtures/react_scripts/README.md b/lib/cli/test/fixtures/react_scripts/README.md index 96a9ab7ec522..fc581cdb2da9 100644 --- a/lib/cli/test/fixtures/react_scripts/README.md +++ b/lib/cli/test/fixtures/react_scripts/README.md @@ -1509,7 +1509,7 @@ Then, run the following command inside your app’s directory: ```sh cd my-react-app -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` After that, follow the instructions on the screen. diff --git a/lib/cli/test/fixtures/update_package_organisations/README.md b/lib/cli/test/fixtures/update_package_organisations/README.md index 51636f4c7f76..223649db1626 100644 --- a/lib/cli/test/fixtures/update_package_organisations/README.md +++ b/lib/cli/test/fixtures/update_package_organisations/README.md @@ -1178,7 +1178,7 @@ You can also deploy your Storybook as a static app. This way, everyone in your t Then, run the following command inside your app’s directory: ```sh -npx -p @storybook/cli@alpha sb init +npx -p @storybook/cli@rc sb init ``` After that, follow the instructions on the screen. diff --git a/lib/client-logger/package.json b/lib/client-logger/package.json index 9d84fba203ab..4e5f5301fba4 100644 --- a/lib/client-logger/package.json +++ b/lib/client-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-logger", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "", "keywords": [ "storybook" diff --git a/lib/codemod/package.json b/lib/codemod/package.json index e7da22b630d1..fe73c5899b57 100644 --- a/lib/codemod/package.json +++ b/lib/codemod/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/codemod", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "A collection of codemod scripts written with JSCodeshift", "keywords": [ "storybook" diff --git a/lib/components/package.json b/lib/components/package.json index 5bb3d5a42591..33e2184b6e19 100644 --- a/lib/components/package.json +++ b/lib/components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/components", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Core Storybook Components", "keywords": [ "storybook" @@ -37,9 +37,9 @@ "render-fragment": "^0.1.1" }, "devDependencies": { - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/addon-knobs": "4.0.0-rc.0", - "@storybook/react": "4.0.0-rc.0" + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/addon-knobs": "4.0.0-rc.1", + "@storybook/react": "4.0.0-rc.1" }, "peerDependencies": { "react": "*", diff --git a/lib/core-events/package.json b/lib/core-events/package.json index edbe3ab30f08..2ed21cb2ad9c 100644 --- a/lib/core-events/package.json +++ b/lib/core-events/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-events", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Event names used in storybook core", "keywords": [ "storybook" diff --git a/lib/core/package.json b/lib/core/package.json index 901b86aa66e7..4b0810aefe14 100644 --- a/lib/core/package.json +++ b/lib/core/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -30,19 +30,20 @@ "@emotion/core": "^0.13.1", "@emotion/provider": "^0.11.2", "@emotion/styled": "^0.10.6", - "@storybook/addons": "4.0.0-rc.0", - "@storybook/channel-postmessage": "4.0.0-rc.0", - "@storybook/client-logger": "4.0.0-rc.0", - "@storybook/core-events": "4.0.0-rc.0", - "@storybook/node-logger": "4.0.0-rc.0", - "@storybook/ui": "4.0.0-rc.0", + "@storybook/addons": "4.0.0-rc.1", + "@storybook/channel-postmessage": "4.0.0-rc.1", + "@storybook/client-logger": "4.0.0-rc.1", + "@storybook/core-events": "4.0.0-rc.1", + "@storybook/node-logger": "4.0.0-rc.1", + "@storybook/ui": "4.0.0-rc.1", "airbnb-js-shims": "^1 || ^2", - "autoprefixer": "^9.2.0", + "autoprefixer": "^9.2.1", "babel-plugin-macros": "^2.4.2", "babel-preset-minify": "^0.5.0", "boxen": "^2.0.0", "case-sensitive-paths-webpack-plugin": "^2.1.2", "chalk": "^2.4.1", + "cli-table3": "0.5.1", "commander": "^2.19.0", "common-tags": "^1.8.0", "core-js": "^2.5.7", @@ -76,7 +77,6 @@ "shelljs": "^0.8.2", "style-loader": "^0.23.1", "svg-url-loader": "^2.3.2", - "tty-table": "^2.6.9", "url-loader": "^1.1.2", "webpack": "^4.20.2", "webpack-dev-middleware": "^3.4.0", @@ -87,7 +87,7 @@ }, "peerDependencies": { "babel-loader": "^7.0.0 || ^8.0.0", - "react": ">=15.0.0", - "react-dom": ">=15.0.0" + "react": ">=16.3.0", + "react-dom": ">=16.3.0" } } diff --git a/lib/core/src/server/build-dev.js b/lib/core/src/server/build-dev.js index 708677d12f31..6f68efb96ce5 100644 --- a/lib/core/src/server/build-dev.js +++ b/lib/core/src/server/build-dev.js @@ -12,7 +12,7 @@ import opn from 'opn'; import boxen from 'boxen'; import semver from 'semver'; import { stripIndents } from 'common-tags'; -import Table from 'tty-table'; +import Table from 'cli-table3'; import storybook, { webpackValid } from './middleware'; import { getDevCli } from './cli'; @@ -162,15 +162,33 @@ export async function buildDevStandalone(options) { updateMessage = ''; } - const serveMessage = stripIndents( - Table([['Local', chalk.cyan(address)], ['On your network', chalk.cyan(networkAddress)]], { - borderStyle: 0, - paddingLeft: 0, - compact: true, - paddingBottom: 0, - align: 'left', - color: 'white', - }).render() + const serveMessage = new Table({ + chars: { + top: '', + 'top-mid': '', + 'top-left': '', + 'top-right': '', + bottom: '', + 'bottom-mid': '', + 'bottom-left': '', + 'bottom-right': '', + left: '', + 'left-mid': '', + mid: '', + 'mid-mid': '', + right: '', + 'right-mid': '', + middle: '', + }, + paddingLeft: 0, + paddingRight: 0, + paddingTop: 0, + paddingBottom: 0, + }); + + serveMessage.push( + ['Local', chalk.cyan(address)], + ['On your network', chalk.cyan(networkAddress)] ); // eslint-disable-next-line no-console @@ -179,7 +197,7 @@ export async function buildDevStandalone(options) { stripIndents` ${chalk.hex('#A2E05E')(`Storybook ${chalk.bold(options.packageJson.version)} started`)} - ${serveMessage}${updateMessage ? `\n\n${updateMessage}` : ''} + ${serveMessage.toString()}${updateMessage ? `\n\n${updateMessage}` : ''} `, { borderStyle: 'round', padding: 1, borderColor: '#F1618C' } ) diff --git a/lib/core/src/server/config/webpack.config.dev.js b/lib/core/src/server/config/webpack.config.dev.js index 97a94ba3d6ad..0bb728d4a17f 100644 --- a/lib/core/src/server/config/webpack.config.dev.js +++ b/lib/core/src/server/config/webpack.config.dev.js @@ -71,7 +71,7 @@ export default ({ configDir, quiet, babelOptions, entries }) => { module: { rules: [ { - test: /\.jsx?$/, + test: /\.(mjs|jsx?)$/, use: [ { loader: 'babel-loader', @@ -94,7 +94,7 @@ export default ({ configDir, quiet, babelOptions, entries }) => { resolve: { // Since we ship with json-loader always, it's better to move extensions to here // from the default config. - extensions: ['.js', '.jsx', '.json'], + extensions: ['.js', '.jsx', '.json', '.mjs'], // 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), diff --git a/lib/core/src/server/config/webpack.config.prod.js b/lib/core/src/server/config/webpack.config.prod.js index eee8e5aa1792..ea0f98f76edc 100644 --- a/lib/core/src/server/config/webpack.config.prod.js +++ b/lib/core/src/server/config/webpack.config.prod.js @@ -57,7 +57,7 @@ export default ({ configDir, babelOptions, entries }) => { module: { rules: [ { - test: /\.jsx?$/, + test: /\.(mjs|jsx?)$/, use: [ { loader: 'babel-loader', @@ -80,7 +80,7 @@ export default ({ configDir, babelOptions, entries }) => { resolve: { // Since we ship with json-loader always, it's better to move extensions to here // from the default config. - extensions: ['.js', '.jsx', '.json'], + extensions: ['.js', '.jsx', '.json', '.mjs'], // 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), diff --git a/lib/core/src/server/standalone.js b/lib/core/src/server/standalone.js index b4dccae05e8c..c7ae111bd752 100644 --- a/lib/core/src/server/standalone.js +++ b/lib/core/src/server/standalone.js @@ -7,7 +7,10 @@ async function build(options = {}, frameworkOptions = {}) { const commonOptions = { ...options, ...frameworkOptions, - frameworkPresets: [...options.frameworkPresets, ...(frameworkOptions.frameworkPresets || [])], + frameworkPresets: [ + ...(options.frameworkPresets || []), + ...(frameworkOptions.frameworkPresets || []), + ], }; if (mode === 'dev') { diff --git a/lib/node-logger/package.json b/lib/node-logger/package.json index 6bb9ba8c4a89..a6815e476710 100644 --- a/lib/node-logger/package.json +++ b/lib/node-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/node-logger", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "", "keywords": [ "storybook" diff --git a/lib/ui/package.json b/lib/ui/package.json index 23c401aaa2f8..c8ea886305b1 100644 --- a/lib/ui/package.json +++ b/lib/ui/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/ui", - "version": "4.0.0-rc.0", + "version": "4.0.0-rc.1", "description": "Core Storybook UI", "keywords": [ "storybook" @@ -28,8 +28,8 @@ "@emotion/core": "^0.13.1", "@emotion/provider": "^0.11.2", "@emotion/styled": "^0.10.6", - "@storybook/components": "4.0.0-rc.0", - "@storybook/core-events": "4.0.0-rc.0", + "@storybook/components": "4.0.0-rc.1", + "@storybook/core-events": "4.0.0-rc.1", "@storybook/mantra-core": "^1.7.2", "@storybook/podda": "^1.2.3", "@storybook/react-komposer": "^2.0.4", @@ -47,8 +47,8 @@ "react-treebeard": "^3.1.0" }, "devDependencies": { - "@storybook/addon-actions": "4.0.0-rc.0", - "@storybook/react": "4.0.0-rc.0" + "@storybook/addon-actions": "4.0.0-rc.1", + "@storybook/react": "4.0.0-rc.1" }, "peerDependencies": { "react": "*", diff --git a/package.json b/package.json index 304677b2767e..92a387fb47e7 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "eslint-config-airbnb": "^17.0.0", "eslint-config-prettier": "^3.1.0", "eslint-plugin-import": "^2.13.0", - "eslint-plugin-jest": "^21.25.0", + "eslint-plugin-jest": "^21.25.1", "eslint-plugin-json": "^1.2.1", "eslint-plugin-jsx-a11y": "^6.1.2", "eslint-plugin-prettier": "^3.0.0", diff --git a/yarn.lock b/yarn.lock index c59e89b932e7..46f635523bd0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1067,10 +1067,10 @@ resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== -"@ember/test-helpers@^0.7.26": - version "0.7.26" - resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-0.7.26.tgz#ae11cbde9cce2c872abbea6edcd849a31dd7bd1e" - integrity sha512-5HxPYmdeinI4f0lF2tKHyiNGTcNY3O5rw89AC6Z6hb9yEL3ktF8eaU7rZfvSTFEF3d3TlhR5Qidl27QzLGkUeA== +"@ember/test-helpers@^0.7.27": + version "0.7.27" + resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-0.7.27.tgz#c622cabd0cbb95b34efc1e1b6274ab5a14edc138" + integrity sha512-AQESk0FTFxRY6GyZ8PharR4SC7Fju0rXqNkfNYIntAjzefZ8xEqEM4iXDj5h7gAvfx/8dA69AQ9+p7ubc+KvJg== dependencies: broccoli-funnel "^2.0.1" ember-assign-polyfill "~2.4.0" @@ -1978,10 +1978,10 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= -"@types/node@*", "@types/node@~10.11.7": - version "10.11.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.11.7.tgz#0e75ca9357d646ca754016ca1d68a127ad7e7300" - integrity sha512-yOxFfkN9xUFLyvWaeYj90mlqTJ41CsQzWKS3gXdOMOyPVacUsymejKxJ4/pMW7exouubuEeZLJawGgcNGYlTeg== +"@types/node@*", "@types/node@~10.12.0": + version "10.12.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.0.tgz#ea6dcbddbc5b584c83f06c60e82736d8fbb0c235" + integrity sha512-3TUHC3jsBAB7qVRGxT6lWyYo2v96BMmD2PTcl47H25Lu7UXtFH/2qqmKiVrnel6Ne//0TFYf6uvNX+HW2FRkLQ== "@types/node@^6.0.0", "@types/node@^6.0.46": version "6.14.0" @@ -2624,11 +2624,6 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9" - integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w== - ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -3079,13 +3074,13 @@ autoprefixer@^8.4.1: postcss "^6.0.23" postcss-value-parser "^3.2.3" -autoprefixer@^9.1.5, autoprefixer@^9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.2.0.tgz#e46f893882b19a160370e7bcd3ec6bbeaace4d10" - integrity sha512-OuxUyTvzRe9EvKyouPqfr8QUkQ0pH400NOFzI1LFINO8zwgJr7ZTybLql03P//LjR0iWile2lCoy2vRTRSFpMw== +autoprefixer@^9.1.5, autoprefixer@^9.2.1: + version "9.2.1" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.2.1.tgz#1f2f1179ceed4711b7ab064dbd5c3f9e83d9dc62" + integrity sha512-qlK4GnZk8OXLK+8kBn9ttfzu2PkhRe8kVYoWcc9HsrZEMWiBkQuRYdXyJg9cIIKxfMzhh6UbvlJ1CsstMIzxwA== dependencies: browserslist "^4.2.1" - caniuse-lite "^1.0.30000890" + caniuse-lite "^1.0.30000892" normalize-range "^0.1.2" num2fraction "^1.2.2" postcss "^7.0.5" @@ -3140,7 +3135,7 @@ babel-core@7.0.0-bridge.0, babel-core@^7.0.0-bridge.0: resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg== -babel-core@^6.0.0, babel-core@^6.23.1, babel-core@^6.24.1, babel-core@^6.26.0, babel-core@^6.26.3, babel-core@^6.7.2: +babel-core@^6.0.0, babel-core@^6.23.1, babel-core@^6.24.1, babel-core@^6.26.0, babel-core@^6.7.2: version "6.26.3" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA== @@ -4840,13 +4835,6 @@ braces@^2.3.0, braces@^2.3.1: split-string "^3.0.2" to-regex "^3.0.1" -breakword@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/breakword/-/breakword-1.0.3.tgz#71e091bbb78bb4ef003cf3ed2b2e062c6927f7dd" - integrity sha1-ceCRu7eLtO8APPPtKy4GLGkn990= - dependencies: - wcwidth "^1.0.1" - broccoli-amd-funnel@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/broccoli-amd-funnel/-/broccoli-amd-funnel-2.0.1.tgz#dbdbfd28841731342d538126567c25bea3f15310" @@ -5770,6 +5758,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, can resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000890.tgz#86a18ffcc65d79ec6a437e985761b8bf1c4efeaf" integrity sha512-4NI3s4Y6ROm+SgZN5sLUG4k7nVWQnedis3c/RWkynV5G6cHSY7+a8fwFyn2yoBDE3E6VswhTNNwR3PvzGqlTkg== +caniuse-lite@^1.0.30000892: + version "1.0.30000892" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000892.tgz#344d2b51ee3ff5977537da4aa449c90eec40b759" + integrity sha512-X9rxMaWZNbJB5qjkDqPtNv/yfViTeUL6ILk0QJNxLV3OhKC5Acn5vxsuUvllR6B48mog8lmS+whwHq/QIYSL9w== + capture-exit@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f" @@ -6065,6 +6058,16 @@ cli-spinners@^1.1.0: resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a" integrity sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg== +cli-table3@0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202" + integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw== + dependencies: + object-assign "^4.1.0" + string-width "^2.1.1" + optionalDependencies: + colors "^1.1.2" + cli-table@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23" @@ -7239,33 +7242,6 @@ csurf@~1.8.3: csrf "~3.0.0" http-errors "~1.3.1" -csv-generate@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/csv-generate/-/csv-generate-2.2.2.tgz#c37808c5f3ead2deec940794073dd32d492adfd1" - integrity sha512-ETG8JGG0xOt2f1JzxrAcQONVc4+7srUdXeyLnow60ntBr+qiNCFTqi+ME6g0vZ4hMCbrwNrDPJPOYVznAeDDHQ== - -csv-parse@^3.1.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-3.1.3.tgz#b96227e85e308f685133cdb2b79ec9a03fde3c1c" - integrity sha512-fs+nzn0lU+e7uZHkY/SvEYiRT3PCvb746csfl238iUXh1D+gzzN4crzgZ7gkVDutoPWYwfrFSQaSAulSeynTlg== - -csv-stringify@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-4.3.1.tgz#7bee36f746ef555dd481a735a9e2938965f8478b" - integrity sha512-VRjPYIUzex5kfbsOY7LaJcNE2qMWGQQAanb3/Vv85WbOgA+dAfDNfwntRvv335icJgGYrnTX403WxJxRVpLDFA== - dependencies: - lodash.get "~4.4.2" - -csv@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/csv/-/csv-4.0.0.tgz#c7de44b9a0fd47f7a10db24064519f642a7ce92d" - integrity sha512-rj3+HMMIKskeiipg0VkFSx7o8FhrNSfIb1nLT6AkJ0gx7mdGU5JsJGv4tmk0vl1jV/h/TfWJOwh1tpbbhVqNKA== - dependencies: - csv-generate "^2.2.2" - csv-parse "^3.1.2" - csv-stringify "^4.3.1" - stream-transform "^1.0.7" - cuint@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b" @@ -8756,10 +8732,10 @@ eslint-plugin-import@2.14.0, eslint-plugin-import@^2.13.0: read-pkg-up "^2.0.0" resolve "^1.6.0" -eslint-plugin-jest@^21.25.0: - version "21.25.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.25.0.tgz#b798c6616a2ad444ea25636d877ca3d3bc881348" - integrity sha512-x1B7986tOhSR6TDmW7oA7zf8bpturx5NXhv4ZY0U6HLh2BLk3Z5rRsfZxrcWT8Caq30k/NHji2K3IPC1pPa/QQ== +eslint-plugin-jest@^21.25.1: + version "21.25.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.25.1.tgz#166c6b9d33bd7bc5b8ece62cff878ba207600bb6" + integrity sha512-mmphmAD/WihjFGq1IUHLSZWQPcd8U9w/SeFCHf3p0V3Q3MBxmj1ZKnh41hID44guIACLuwos/LhVWIr4phN4yg== eslint-plugin-json@^1.2.1: version "1.2.1" @@ -14009,11 +13985,6 @@ lodash.forown@~2.3.0: lodash._objecttypes "~2.3.0" lodash.keys "~2.3.0" -lodash.get@~4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= - lodash.identity@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/lodash.identity/-/lodash.identity-2.3.0.tgz#6b01a210c9485355c2a913b48b6711219a173ded" @@ -20218,16 +20189,6 @@ smart-buffer@^4.0.1: resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3" integrity sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg== -smartwrap@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/smartwrap/-/smartwrap-1.0.9.tgz#7001aa8331482b6fc5021574d68ef04460bb21ca" - integrity sha1-cAGqgzFIK2/FAhV01o7wRGC7Ico= - dependencies: - breakword "^1.0.3" - merge "^1.2.0" - wcwidth "^1.0.1" - yargs "^8.0.1" - snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -20758,11 +20719,6 @@ stream-splicer@^2.0.0: inherits "^2.0.1" readable-stream "^2.0.2" -stream-transform@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/stream-transform/-/stream-transform-1.0.7.tgz#5135dd6c29941a1179212da6083be2cacdebc15a" - integrity sha512-bp27sM5lf75yOZAM0HfKgN7jub2FApKmXUVYnN/zuw4raqtinM3muxzd+ny262opnKvAg5PnMO66N4Eq928ayw== - string-argv@^0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736" @@ -20897,13 +20853,6 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1: dependencies: ansi-regex "^2.0.0" -strip-ansi@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f" - integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow== - dependencies: - ansi-regex "^4.0.0" - strip-ansi@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991" @@ -21751,20 +21700,6 @@ tty-browserify@0.0.1: resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" integrity sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw== -tty-table@^2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/tty-table/-/tty-table-2.6.9.tgz#dd7960a158324b44ef114843a8ab529ebe395042" - integrity sha512-tO/PFBfELM6AciYPcQm10rqvw95Q0nkSQtcSIQOTcIdEAyLUsi8iN9nZDuCfWTJdD6bvCU0n4oIumGGbJ76hww== - dependencies: - babel-core "^6.26.3" - chalk "^2.4.1" - csv "^4.0.0" - merge "^1.2.0" - smartwrap "^1.0.9" - strip-ansi "^5.0.0" - wcwidth "^1.0.1" - yargs "^12.0.2" - tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" @@ -23442,25 +23377,6 @@ yargs@^7.0.0: y18n "^3.2.1" yargs-parser "^5.0.0" -yargs@^8.0.1: - version "8.0.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" - integrity sha1-YpmpBVsc78lp/355wdkY3Osiw2A= - dependencies: - camelcase "^4.1.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - read-pkg-up "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^7.0.0" - yargs@^9.0.0: version "9.0.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"