mirror of
https://github.com/storybookjs/storybook.git
synced 2025-04-05 01:31:06 +08:00
Merge branch 'next' into fix/syntaxthighlighter-themes
# Conflicts: # lib/components/package.json # yarn.lock
This commit is contained in:
Norbert de Langen
commit
17bc702790
@ -30,14 +30,14 @@
|
||||
"fast-deep-equal": "^2.0.1",
|
||||
"global": "^4.3.2",
|
||||
"lodash": "^4.17.11",
|
||||
"polished": "^3.0.0",
|
||||
"polished": "^3.3.1",
|
||||
"prop-types": "^15.7.2",
|
||||
"react": "^16.8.4",
|
||||
"react-inspector": "^3.0.2",
|
||||
"uuid": "^3.3.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/lodash": "^4.14.123",
|
||||
"@types/lodash": "^4.14.129",
|
||||
"@types/uuid": "^3.4.4"
|
||||
},
|
||||
"publishConfig": {
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
"glob": "^7.1.3",
|
||||
"global": "^4.3.2",
|
||||
"jest-specific-snapshot": "^2.0.0",
|
||||
"read-pkg-up": "^5.0.0",
|
||||
"read-pkg-up": "^6.0.0",
|
||||
"regenerator-runtime": "^0.12.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
"@storybook/node-logger": "5.1.0-beta.1",
|
||||
"@storybook/router": "5.1.0-beta.1",
|
||||
"core-js": "^3.0.1",
|
||||
"jest-image-snapshot": "^2.8.1",
|
||||
"jest-image-snapshot": "^2.8.2",
|
||||
"puppeteer": "^1.12.2",
|
||||
"regenerator-runtime": "^0.12.1"
|
||||
},
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
"@storybook/node-logger": "5.1.0-beta.1",
|
||||
"angular2-template-loader": "^0.6.2",
|
||||
"core-js": "^3.0.1",
|
||||
"fork-ts-checker-webpack-plugin": "^1.2.0",
|
||||
"fork-ts-checker-webpack-plugin": "^1.3.3",
|
||||
"global": "^4.3.2",
|
||||
"regenerator-runtime": "^0.12.1",
|
||||
"sass-loader": "^7.1.0",
|
||||
@ -55,7 +55,7 @@
|
||||
"zone.js": "^0.8.29"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.0.0"
|
||||
"node": ">=8.0.0"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
|
||||
@ -12,14 +12,14 @@ export default function renderMain({
|
||||
showError,
|
||||
forceRender,
|
||||
}) {
|
||||
const { html = {} } = parameters;
|
||||
const element = storyFn();
|
||||
|
||||
showMain();
|
||||
if (typeof element === 'string') {
|
||||
rootElement.innerHTML = element;
|
||||
} else if (element instanceof Node) {
|
||||
if (html.preventForcedRender === true && forceRender === true) {
|
||||
// Don't re-mount the element if it didn't change and neither did the story
|
||||
if (rootElement.firstChild === element && forceRender === true) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
"rn-host-detect": "^1.1.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/react-native": "^0.57.42",
|
||||
"@types/react-native": "^0.57.57",
|
||||
"react-native": "^0.57.8"
|
||||
},
|
||||
"peerDependencies": {
|
||||
@ -40,7 +40,7 @@
|
||||
"react-native": ">=0.57.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.0.0"
|
||||
"node": ">=8.0.0"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
"@svgr/webpack": "^4.0.3",
|
||||
"babel-plugin-named-asset-import": "^0.3.1",
|
||||
"babel-plugin-react-docgen": "^3.0.0",
|
||||
"babel-preset-react-app": "^8.0.0",
|
||||
"babel-preset-react-app": "^9.0.0",
|
||||
"common-tags": "^1.8.0",
|
||||
"core-js": "^3.0.1",
|
||||
"global": "^4.3.2",
|
||||
@ -52,7 +52,7 @@
|
||||
"react-dom": "*"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.0.0"
|
||||
"node": ">=8.0.0"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
|
||||
@ -33,8 +33,8 @@
|
||||
"regenerator-runtime": "^0.12.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"svelte": "^3.1.0",
|
||||
"svelte-loader": "^2.13.3"
|
||||
"svelte": "^3.4.1",
|
||||
"svelte-loader": "^2.13.4"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"babel-loader": "^7.0.0 || ^8.0.0",
|
||||
@ -42,7 +42,7 @@
|
||||
"svelte-loader": "^2.9.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.0.0"
|
||||
"node": ">=8.0.0"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
|
||||
@ -145,6 +145,10 @@ Wrap the story in a function call to setup state management. The story can modif
|
||||
state properties with the provided store. The addon provides a panel to view and
|
||||
reset state.
|
||||
|
||||
### [State](https://github.com/adierkens/storybook-addon-state)
|
||||
|
||||
Store/retrieve arbitrary data. Similar to knobs this doesn't add any additional React wrappers to the story, so any other addons used (prop-types, jsx) aren't effected. Has a React hooks like API.
|
||||
|
||||
### [story2sketch](https://github.com/chrisvxd/story2sketch)
|
||||
|
||||
Convert stories into Sketch 💎 symbols.
|
||||
@ -168,3 +172,15 @@ Provides live react story editing and preview.
|
||||
### [copy-code-block](https://www.npmjs.com/package/@pickra/copy-code-block)
|
||||
|
||||
Display code and copy it to the clipboard. It also has options to customize colors and syntax highlighting for any language. There is similar functionality via [@storybook/addon-info](https://www.npmjs.com/package/@storybook/addon-info) but addon-info doesn't currently work when using [@storybook/html](https://www.npmjs.com/package/@storybook/html).
|
||||
|
||||
### [storybook-addon-react-docgen](https://github.com/hipstersmoothie/storybook-addon-react-docgen/)
|
||||
|
||||
Display react docgen info. This addon is a drop in replacement for the [@storybook/addon-info](https://www.npmjs.com/package/@storybook/addon-info)'s prop table functionality. Rather than rendering with the component it renders in the addons panel. Works with typescript too!
|
||||
|
||||
### [storybook-dark-mode](https://github.com/hipstersmoothie/storybook-dark-mode)
|
||||
|
||||
Let your users toggle between a dark and light mode.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
"dependencies": {
|
||||
"expo": "^32.0.6",
|
||||
"prop-types": "^15.6.2",
|
||||
"react": "16.5.1",
|
||||
"react": "16.8.6",
|
||||
"react-native": "https://github.com/expo/react-native/archive/sdk-32.0.0.tar.gz",
|
||||
"whatwg-fetch": "^3.0.0"
|
||||
},
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
"@storybook/angular": "5.1.0-beta.1",
|
||||
"@types/core-js": "^2.5.0",
|
||||
"@types/jest": "^24.0.11",
|
||||
"@types/node": "~12.0.0",
|
||||
"@types/node": "~12.0.2",
|
||||
"@types/webpack-env": "^1.13.7",
|
||||
"babel-plugin-require-context-hook": "^1.0.0",
|
||||
"global": "^4.3.2",
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
{
|
||||
"presets": ["env", "react"]
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
"version": "5.1.0-beta.1",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"babel-loader": "7",
|
||||
"babel-loader": "8.0.6",
|
||||
"global": "^4.3.2",
|
||||
"react": "^15.4.2",
|
||||
"react-dom": "^15.4.2",
|
||||
|
||||
@ -26,9 +26,9 @@
|
||||
"enzyme": "^3.9.0",
|
||||
"enzyme-adapter-react-16": "^1.9.1",
|
||||
"enzyme-to-json": "^3.3.5",
|
||||
"fork-ts-checker-webpack-plugin": "^0.5.2",
|
||||
"fork-ts-checker-webpack-plugin": "^1.3.3",
|
||||
"react-docgen-typescript-loader": "^3.0.1",
|
||||
"react-scripts": "^2.1.8",
|
||||
"react-scripts": "^3.0.1",
|
||||
"tslint": "^5.14.0",
|
||||
"tslint-config-airbnb": "^5.11.1",
|
||||
"typescript": "^3.4.1"
|
||||
|
||||
@ -11,9 +11,6 @@ addParameters({
|
||||
restoreScroll: true,
|
||||
},
|
||||
},
|
||||
html: {
|
||||
preventForcedRender: false, // default
|
||||
},
|
||||
options: {
|
||||
hierarchyRootSeparator: /\|/,
|
||||
},
|
||||
|
||||
@ -47,6 +47,14 @@ exports[`Storyshots Addons|Knobs All knobs 1`] = `
|
||||
</div>
|
||||
`;
|
||||
|
||||
exports[`Storyshots Addons|Knobs CSS transitions 1`] = `
|
||||
<p
|
||||
style="transition: color 0.5s ease-out; color: orangered;"
|
||||
>
|
||||
John Doe
|
||||
</p>
|
||||
`;
|
||||
|
||||
exports[`Storyshots Addons|Knobs DOM 1`] = `
|
||||
<p>
|
||||
John Doe
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
import { storiesOf } from '@storybook/html';
|
||||
import { action } from '@storybook/addon-actions';
|
||||
import { document } from 'global';
|
||||
|
||||
import {
|
||||
array,
|
||||
@ -13,6 +14,7 @@ import {
|
||||
number,
|
||||
} from '@storybook/addon-knobs';
|
||||
|
||||
const cachedContainer = document.createElement('p');
|
||||
storiesOf('Addons|Knobs', module)
|
||||
.addDecorator(withKnobs)
|
||||
.add('Simple', () => {
|
||||
@ -24,11 +26,18 @@ storiesOf('Addons|Knobs', module)
|
||||
})
|
||||
.add('DOM', () => {
|
||||
const name = text('Name', 'John Doe');
|
||||
// eslint-disable-next-line
|
||||
const container = document.createElement('p');
|
||||
container.textContent = name;
|
||||
return container;
|
||||
})
|
||||
.add('CSS transitions', () => {
|
||||
const name = text('Name', 'John Doe');
|
||||
const textColor = color('Text color', 'orangered');
|
||||
cachedContainer.textContent = name;
|
||||
cachedContainer.style.transition = 'color 0.5s ease-out';
|
||||
cachedContainer.style.color = textColor;
|
||||
return cachedContainer;
|
||||
})
|
||||
.add('All knobs', () => {
|
||||
const name = text('Name', 'Jane');
|
||||
const stock = number('Stock', 20, {
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
"test": "npm run lint"
|
||||
},
|
||||
"dependencies": {
|
||||
"marko": "^4.16.2",
|
||||
"marko": "^4.16.15",
|
||||
"marko-starter": "^2.0.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@ -41,8 +41,8 @@
|
||||
"cross-env": "^5.2.0",
|
||||
"enzyme-to-json": "^3.3.5",
|
||||
"eventemitter3": "^3.1.0",
|
||||
"express": "^4.16.4",
|
||||
"express-graphql": "^0.7.1",
|
||||
"express": "^4.17.0",
|
||||
"express-graphql": "^0.8.0",
|
||||
"format-json": "^1.0.3",
|
||||
"global": "^4.3.2",
|
||||
"graphql": "^14.1.1",
|
||||
@ -52,7 +52,7 @@
|
||||
"react": "^16.8.4",
|
||||
"react-dom": "^16.8.4",
|
||||
"storybook-chromatic": "^1.3.3",
|
||||
"ts-loader": "^5.3.3",
|
||||
"ts-loader": "^6.0.0",
|
||||
"uuid": "^3.3.2",
|
||||
"webpack": "^4.28.0"
|
||||
}
|
||||
|
||||
@ -29,6 +29,6 @@
|
||||
"devDependencies": {
|
||||
"copy-webpack-plugin": "^5.0.0",
|
||||
"html-webpack-plugin": "^4.0.0-beta.2",
|
||||
"webpack-dev-server": "^3.2.0"
|
||||
"webpack-dev-server": "^3.4.1"
|
||||
}
|
||||
}
|
||||
|
||||
@ -37,6 +37,6 @@
|
||||
"raw-loader": "^2.0.0",
|
||||
"svg-url-loader": "^2.3.2",
|
||||
"webpack": "^4.28.0",
|
||||
"webpack-dev-server": "^3.2.1"
|
||||
"webpack-dev-server": "^3.4.1"
|
||||
}
|
||||
}
|
||||
|
||||
@ -36,6 +36,6 @@
|
||||
"riot-tag-loader": "^2.1.0",
|
||||
"svg-url-loader": "^2.3.2",
|
||||
"webpack": "^4.28.0",
|
||||
"webpack-dev-server": "^3.2.0"
|
||||
"webpack-dev-server": "^3.4.1"
|
||||
}
|
||||
}
|
||||
|
||||
@ -36,6 +36,6 @@
|
||||
"svg-url-loader": "^2.3.2",
|
||||
"vue-loader": "^15.7.0",
|
||||
"webpack": "^4.28.0",
|
||||
"webpack-dev-server": "^3.2.0"
|
||||
"webpack-dev-server": "^3.4.1"
|
||||
}
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
"core-js": "^3.0.1",
|
||||
"eventemitter3": "^3.1.0",
|
||||
"global": "^4.3.2",
|
||||
"is-plain-object": "^2.0.4",
|
||||
"is-plain-object": "^3.0.0",
|
||||
"lodash.debounce": "^4.0.8",
|
||||
"lodash.isequal": "^4.5.0",
|
||||
"lodash.mergewith": "^4.6.1",
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
"global": "^4.3.2",
|
||||
"markdown-to-jsx": "^6.9.1",
|
||||
"memoizerific": "^1.11.3",
|
||||
"polished": "^3.0.0",
|
||||
"polished": "^3.3.1",
|
||||
"popper.js": "^1.14.7",
|
||||
"prop-types": "^15.7.2",
|
||||
"react": "^16.8.4",
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
"detect-port": "^1.3.0",
|
||||
"dotenv-webpack": "^1.7.0",
|
||||
"ejs": "^2.6.1",
|
||||
"express": "^4.16.4",
|
||||
"express": "^4.17.0",
|
||||
"file-loader": "^3.0.1",
|
||||
"file-system-cache": "^1.0.5",
|
||||
"find-cache-dir": "^3.0.0",
|
||||
@ -63,7 +63,7 @@
|
||||
"ip": "^1.1.5",
|
||||
"json5": "^2.1.0",
|
||||
"lazy-universal-dotenv": "^2.0.0",
|
||||
"node-fetch": "^2.3.0",
|
||||
"node-fetch": "^2.6.0",
|
||||
"open": "^6.1.0",
|
||||
"postcss-flexbugs-fixes": "^4.1.0",
|
||||
"postcss-loader": "^3.0.0",
|
||||
@ -72,18 +72,18 @@
|
||||
"raw-loader": "^2.0.0",
|
||||
"react-dev-utils": "^9.0.0",
|
||||
"regenerator-runtime": "^0.12.1",
|
||||
"resolve": "^1.10.0",
|
||||
"resolve": "^1.11.0",
|
||||
"resolve-from": "^5.0.0",
|
||||
"semver": "^6.0.0",
|
||||
"serve-favicon": "^2.5.0",
|
||||
"shelljs": "^0.8.3",
|
||||
"style-loader": "^0.23.1",
|
||||
"terser-webpack-plugin": "^1.2.2",
|
||||
"terser-webpack-plugin": "^1.2.4",
|
||||
"url-loader": "^1.1.2",
|
||||
"util-deprecate": "^1.0.2",
|
||||
"webpack": "^4.28.0",
|
||||
"webpack-dev-middleware": "^3.6.0",
|
||||
"webpack-hot-middleware": "^2.24.3"
|
||||
"webpack-dev-middleware": "^3.7.0",
|
||||
"webpack-hot-middleware": "^2.25.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"mock-fs": "^4.8.0"
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
"lodash.isequal": "^4.5.0",
|
||||
"lodash.mergewith": "^4.6.1",
|
||||
"memoizerific": "^1.11.3",
|
||||
"polished": "^3.0.0",
|
||||
"polished": "^3.3.1",
|
||||
"prop-types": "^15.7.2",
|
||||
"react-inspector": "^3.0.2"
|
||||
},
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
"lodash.pick": "^4.4.0",
|
||||
"markdown-to-jsx": "^6.9.3",
|
||||
"memoizerific": "^1.11.3",
|
||||
"polished": "^3.0.0",
|
||||
"polished": "^3.3.1",
|
||||
"prop-types": "^15.7.2",
|
||||
"qs": "^6.6.0",
|
||||
"react": "^16.8.4",
|
||||
@ -57,7 +57,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"flush-promises": "^1.0.2",
|
||||
"terser-webpack-plugin": "^1.2.2",
|
||||
"terser-webpack-plugin": "^1.2.4",
|
||||
"webpack": "^4.28.0"
|
||||
},
|
||||
"publishConfig": {
|
||||
|
||||
24
package.json
24
package.json
@ -123,8 +123,8 @@
|
||||
"@emotion/snapshot-serializer": "^0.8.2",
|
||||
"@types/common-tags": "^1.8.0",
|
||||
"@types/jest": "^24.0.11",
|
||||
"@types/lodash": "^4.14.123",
|
||||
"@types/node": "~12.0.0",
|
||||
"@types/lodash": "^4.14.129",
|
||||
"@types/node": "~12.0.2",
|
||||
"@types/react": "^16.8.14",
|
||||
"@types/webpack": "^4.4.25",
|
||||
"@types/webpack-env": "^1.13.7",
|
||||
@ -139,7 +139,7 @@
|
||||
"babel-plugin-require-context-hook": "^1.0.0",
|
||||
"babel-preset-vue": "^2.0.2",
|
||||
"chalk": "^2.4.2",
|
||||
"codecov": "^3.1.0",
|
||||
"codecov": "^3.5.0",
|
||||
"codelyzer": "^5.0.0",
|
||||
"commander": "^2.19.0",
|
||||
"concurrently": "^4.0.1",
|
||||
@ -150,7 +150,7 @@
|
||||
"enzyme-adapter-react-16": "^1.9.1",
|
||||
"eslint": "^5.14.1",
|
||||
"eslint-config-airbnb": "^17.0.0",
|
||||
"eslint-config-prettier": "^4.0.0",
|
||||
"eslint-config-prettier": "^4.3.0",
|
||||
"eslint-plugin-import": "^2.16.0",
|
||||
"eslint-plugin-jest": "^22.4.1",
|
||||
"eslint-plugin-json": "^1.4.0",
|
||||
@ -158,10 +158,10 @@
|
||||
"eslint-plugin-prettier": "^3.0.1",
|
||||
"eslint-plugin-react": "^7.12.4",
|
||||
"eslint-teamcity": "^2.1.0",
|
||||
"esm": "^3.2.6",
|
||||
"esm": "^3.2.25",
|
||||
"github-release-from-changelog": "^1.3.2",
|
||||
"glob": "^7.1.3",
|
||||
"husky": "^2.1.0",
|
||||
"husky": "^2.3.0",
|
||||
"inquirer": "^6.2.0",
|
||||
"jest": "^24.7.1",
|
||||
"jest-cli": "^24.7.1",
|
||||
@ -171,17 +171,17 @@
|
||||
"jest-environment-jsdom": "^24.7.1",
|
||||
"jest-environment-jsdom-thirteen": "^1.0.1",
|
||||
"jest-enzyme": "^7.0.2",
|
||||
"jest-image-snapshot": "^2.8.1",
|
||||
"jest-image-snapshot": "^2.8.2",
|
||||
"jest-jasmine2": "^24.7.1",
|
||||
"jest-preset-angular": "^6.0.1",
|
||||
"jest-raw-loader": "^1.0.1",
|
||||
"jest-teamcity-reporter": "^0.9.0",
|
||||
"jest-vue-preprocessor": "^1.5.0",
|
||||
"jest-watch-typeahead": "^0.3.0",
|
||||
"lerna": "^3.13.3",
|
||||
"lint-staged": "^8.1.4",
|
||||
"lerna": "^3.14.1",
|
||||
"lint-staged": "^8.1.7",
|
||||
"lodash": "^4.17.11",
|
||||
"node-fetch": "^2.3.0",
|
||||
"node-fetch": "^2.6.0",
|
||||
"npmlog": "^4.1.2",
|
||||
"prettier": "^1.16.4",
|
||||
"raf": "^3.4.0",
|
||||
@ -192,10 +192,10 @@
|
||||
"remark-cli": "^6.0.1",
|
||||
"remark-lint": "^6.0.4",
|
||||
"remark-preset-lint-recommended": "^3.0.2",
|
||||
"riot-jest-transformer": "^1.0.10",
|
||||
"riot-jest-transformer": "^2.0.0",
|
||||
"shelljs": "^0.8.3",
|
||||
"sort-package-json": "^1.21.0",
|
||||
"svelte": "^3.0.1",
|
||||
"svelte": "^3.4.1",
|
||||
"svelte-jest": "^0.2.0",
|
||||
"ts-jest": "^24.0.2",
|
||||
"typescript": "^3.4.1",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user