12 Commits

Author SHA1 Message Date
Norbert de Langen
f9abc6a986
Merge branch 'next' into tech/remove-deprecations-6
# Conflicts:
#	addons/events/src/deprecated.js
#	addons/options/src/register.ts
#	examples/official-storybook/stories/core/decorators.stories.js
#	examples/official-storybook/stories/deprecated/addon-events.stories.js
#	lib/addons/src/make-decorator.test.ts
#	lib/api/src/modules/layout.ts
#	lib/cli/src/generate.js
#	lib/core/package.json
2020-03-31 09:40:58 +02:00
Norbert de Langen
341fc2d90d
FIX linting 2020-03-27 20:04:50 +01:00
Norbert de Langen
fc2a72442c
REMOVE usage of addon-options 2020-03-26 10:38:05 +01:00
Norbert de Langen
924e403786
REMOVE addon-info & addon-notes
They have been MOVED to https://github.com/storybookjs/deprecated-addons
2020-01-29 17:15:27 +01:00
Norbert de Langen
5ba16515e3
Merge branch 'next' into next-6.0.0
# Conflicts:
#	addons/cssresources/package.json
#	docs/src/pages/configurations/options-parameter/index.md
#	examples/dev-kits/package.json
#	examples/rax-kitchen-sink/package.json
#	lib/api/src/index.tsx
#	lib/core-events/src/index.ts
#	yarn.lock
2020-01-13 15:27:35 +01:00
Norbert de Langen
9c0d0f240f
CHANGE docs & examples to prefer webpackFinal over webpack property https://github.com/storybookjs/storybook/issues/9396 2020-01-13 12:23:15 +01:00
Norbert de Langen
819235c7ff
Merge branch 'next-6.0.0' into pr/SoloJiang/9220
# Conflicts:
#	examples/rax-kitchen-sink/.storybook/main.js
#	examples/rax-kitchen-sink/package.json
#	yarn.lock
2020-01-07 18:09:46 +01:00
Michael Shilman
d768b53770 Main.js: Combine addons/presets in examples 2019-12-31 14:38:00 +08:00
fushen
b23ba56999 fix: test 2019-12-31 11:03:34 +08:00
fushen
7374baea4a test: fix test 2019-12-24 01:21:06 +08:00
fushen
01e2675d49 chore(rax): supplement related to rax 2019-12-23 00:40:50 +08:00
Norbert de Langen
8f84c3a5a3 MIGRATE rax-example 2019-11-25 15:05:18 +01:00