871 Commits

Author SHA1 Message Date
Chad Fawcett
f42fb81ebc Remove unnecessary concat 2018-10-21 16:06:24 -07:00
Chad Fawcett
e2cf993e4b Describe getStyleRules better 2018-10-21 15:52:57 -07:00
Chad Fawcett
5f00d843ee Remove module state for imports 2018-10-21 15:41:36 -07:00
Chad Fawcett
6297d48b88 Add webpack as dependency to app/react 2018-10-19 11:05:21 -07:00
Chad Fawcett
cf34baa5cf Extract getCraWebpackConfig 2018-10-19 10:14:14 -07:00
igor-dv
950e2a62e5 Merge remote-tracking branch 'origin/master' into css-modules 2018-10-19 15:12:31 +03:00
Chad Fawcett
b2f9e6617c Only load react-scripts config newer than v2 2018-10-18 23:38:58 -07:00
Chad Fawcett
e1b73c7b94 Check for react-scripts before calling merge 2018-10-18 18:54:08 -07:00
Chad Fawcett
41826b661b Add suport for production config 2018-10-18 18:40:36 -07:00
Chad Fawcett
53004c408a CRA webpack style preset 2018-10-18 17:48:00 -07:00
Michael Shilman
ac807f3075 Move storybook to rc (release canddiate) 2018-10-18 15:39:43 +08:00
Michael Shilman
46d89b3e61 v4.0.0-rc.1 2018-10-18 09:54:01 +08:00
Michael Shilman
76b3c817a1 v4.0.0-rc.0 2018-10-15 23:39:49 +08:00
dependabot[bot]
89612227c6
Bump react-dev-utils from 6.0.4 to 6.0.5 (#4416) 2018-10-15 12:28:12 +00:00
Norbert de Langen
3f85893e6d
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	ADDONS_SUPPORT.md
#	CHANGELOG.md
#	MIGRATION.md
#	README.md
#	addons/a11y/package.json
#	addons/a11y/src/components/Panel.js
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/centered/package.json
#	addons/events/package.json
#	addons/graphql/package.json
#	addons/info/package.json
#	addons/jest/package.json
#	addons/jest/src/index.js
#	addons/jest/src/register.js
#	addons/knobs/package.json
#	addons/knobs/src/components/types/Array.js
#	addons/links/package.json
#	addons/notes/package.json
#	addons/notes/src/index.js
#	addons/options/package.json
#	addons/storyshots/storyshots-core/package.json
#	addons/storyshots/storyshots-puppeteer/package.json
#	addons/storysource/package.json
#	addons/viewport/package.json
#	app/angular/package.json
#	app/angular/src/server/angular-cli_config.js
#	app/ember/README.md
#	app/ember/package.json
#	app/ember/src/server/index.js
#	app/html/package.json
#	app/marko/package.json
#	app/mithril/package.json
#	app/polymer/package.json
#	app/react-native/package.json
#	app/react-native/readme.md
#	app/react-native/src/bin/storybook-start.js
#	app/react/package.json
#	app/riot/package.json
#	app/svelte/package.json
#	app/vue/package.json
#	docs/src/pages/basics/guide-angular/index.md
#	docs/src/pages/basics/guide-ember/index.md
#	docs/src/pages/basics/quick-start-guide/index.md
#	docs/yarn.lock
#	examples/angular-cli/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/ember-cli/package.json
#	examples/html-kitchen-sink/package.json
#	examples/marko-cli/package.json
#	examples/mithril-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	examples/polymer-cli/package.json
#	examples/riot-kitchen-sink/package.json
#	examples/svelte-kitchen-sink/package.json
#	examples/vue-kitchen-sink/package.json
#	lerna.json
#	lib/addons/package.json
#	lib/channel-postmessage/package.json
#	lib/channel-websocket/package.json
#	lib/channels/package.json
#	lib/cli/generators/EMBER/index.js
#	lib/cli/lib/detect.js
#	lib/cli/lib/initiate.js
#	lib/cli/package.json
#	lib/client-logger/package.json
#	lib/codemod/package.json
#	lib/components/package.json
#	lib/components/src/layout/desktop.js
#	lib/core-events/package.json
#	lib/core/package.json
#	lib/core/src/server/templates/index.html.ejs
#	lib/node-logger/package.json
#	lib/ui/package.json
#	lib/ui/src/modules/api/actions/api.js
#	lib/ui/src/modules/shortcuts/actions/shortcuts.js
#	lib/ui/src/modules/ui/components/stories_panel/index.js
#	lib/ui/src/modules/ui/components/stories_panel/text_filter.js
#	lib/ui/src/modules/ui/components/stories_panel/text_filter.test.js
#	lib/ui/src/modules/ui/containers/header.js
#	lib/ui/src/modules/ui/containers/layout.js
#	lib/ui/src/modules/ui/libs/filters.js
#	yarn.lock
2018-10-13 16:34:21 +02:00
Michael Shilman
155afad695 v4.0.0-alpha.25 2018-10-13 17:36:43 +08:00
Michael Shilman
b66c4dc9d6 Update CLI docs with rename 2018-10-13 16:05:06 +08:00
Norbert de Langen
95d954e2f0
Merge pull request #4344 from storybooks/core/extract-cli-out-of-the-build
CLI-less api for node
2018-10-11 10:10:23 +00:00
Norbert de Langen
fef21c26a7
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/jest/src/register.js
#	addons/knobs/src/components/types/Array.js
#	addons/notes/package.json
#	addons/notes/src/index.js
#	addons/storyshots/storyshots-core/package.json
#	lib/channel-websocket/package.json
#	lib/components/package.json
#	lib/components/src/layout/desktop.js
#	lib/ui/package.json
#	lib/ui/src/modules/api/actions/api.js
#	lib/ui/src/modules/shortcuts/actions/shortcuts.js
#	lib/ui/src/modules/ui/components/stories_panel/index.js
#	lib/ui/src/modules/ui/components/stories_panel/text_filter.js
#	lib/ui/src/modules/ui/components/stories_panel/text_filter.test.js
#	lib/ui/src/modules/ui/containers/header.js
#	lib/ui/src/modules/ui/containers/layout.js
#	lib/ui/src/modules/ui/libs/filters.js
#	yarn.lock
2018-10-11 11:21:31 +02:00
Norbert de Langen
41483e2160
UPGRADES 2018-10-10 22:23:35 +02:00
igor-dv
2e11d18a87 Put standalone.js to every app 2018-10-10 18:29:11 +03:00
Steph Meslin-Weber
34420234fe chore(deps): #4267 upgrade lodash to latest 2018-10-04 15:22:18 +01:00
Michael Shilman
bdc8120ab9 v4.0.0-alpha.24 2018-10-04 01:24:20 -07:00
Norbert de Langen
444a06bf1b
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/notes/package.json
#	lib/channel-websocket/package.json
#	lib/components/package.json
#	lib/core/package.json
#	lib/ui/package.json
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/index.js
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/tree_decorators.js
#	package.json
#	yarn.lock
2018-09-27 15:23:54 +02:00
Michael Shilman
2ca9c34c4c v4.0.0-alpha.23 2018-09-25 15:40:49 -07:00
Pavan Kumar Sunkara
8c34f168cf Upgrade deps dealing with license issues 2018-09-25 23:08:33 +02:00
Norbert de Langen
b8e1859b11
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/notes/package.json
#	lib/channel-websocket/package.json
#	lib/core/src/server/templates/base-manager-head.html
#	lib/core/src/server/templates/base-preview-head.html
#	lib/ui/package.json
#	lib/ui/src/modules/ui/components/search_box.js
#	lib/ui/src/modules/ui/components/shortcuts_help.js
#	yarn.lock
2018-09-22 00:53:51 +02:00
Michael Shilman
5112b52004 v4.0.0-alpha.22 2018-09-19 14:00:53 -07:00
Pavan Kumar Sunkara
d4e65cc7ed Completely move to emotion 10 2018-09-19 19:36:33 +02:00
Pavan Kumar Sunkara
84fd7939f7 Added publishConfig.access = public to all packages we are publishing 2018-09-19 18:24:32 +02:00
Norbert de Langen
3786a99bb4
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	lib/core/package.json
2018-09-18 21:08:19 +02:00
igor-dv
2269029ca9 remove 8.0.0-beta.6 2018-09-18 11:08:37 +03:00
Keraito
e09dec60d7 Update getstorybook occurences in docs 2018-09-12 00:38:05 +02:00
Norbert de Langen
fd8fc2ba2e
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	addons/actions/package.json
#	addons/options/README.md
#	lib/components/package.json
#	lib/core/package.json
#	lib/ui/package.json
#	lib/ui/src/modules/api/actions/api.js
#	lib/ui/src/modules/api/actions/api.test.js
#	lib/ui/src/modules/api/index.js
#	lib/ui/src/modules/shortcuts/actions/shortcuts.js
#	lib/ui/src/modules/shortcuts/actions/shortcuts.test.js
#	lib/ui/src/modules/shortcuts/index.js
#	yarn.lock
2018-09-11 16:53:05 +02:00
igor-dv
979dee0e49 Oops 2018-09-10 22:24:43 +03:00
igor-dv
dace0581c8 We don't need babel-merge now 2018-09-10 22:11:55 +03:00
igor-dv
4711980793 Add babelDefault to presets method 2018-09-10 21:59:07 +03:00
Michael Shilman
729607334c v4.0.0-alpha.21 2018-09-07 10:17:06 -07:00
Norbert de Langen
c2aa537195
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	lib/core/package.json
2018-09-06 22:07:53 +02:00
Norbert de Langen
4d8f00c299
FIX send context to story 2018-09-04 13:42:52 +02:00
igor-dv
6c89676e70 Simplify presets API 2018-09-03 19:27:00 +03:00
Norbert de Langen
46df3ea9f6
Merge commit 'a2a2a914275296f5776b92cd36d45811a5b377d3' into tech/overhaul-ui
# Conflicts:
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/actions/src/components/ActionLogger/index.js
#	addons/backgrounds/package.json
#	addons/events/package.json
#	addons/events/src/components/Event.js
#	addons/info/package.json
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/notes/package.json
#	addons/viewport/package.json
#	app/react/package.json
#	docs/src/pages/addons/writing-addons/index.md
#	examples/official-storybook/package.json
#	lib/components/package.json
#	lib/components/src/explorer/__tests__/tree_header.test.js
#	lib/components/src/explorer/search_box.js
#	lib/components/src/explorer/tree.js
#	lib/components/src/form/field.js
#	lib/components/src/layout/desktop.js
#	lib/components/src/layout/dimensions.js
#	lib/components/src/layout/index.js
#	lib/components/src/layout/mobile.js
#	lib/components/src/tabs/tabs.js
#	lib/core/package.json
#	lib/core/src/client/manager/preview.js
#	lib/ui/package.json
#	lib/ui/src/components/stories_panel/index.js
#	lib/ui/src/modules/ui/components/shortcuts_help.js
#	package.json
#	yarn.lock
2018-09-03 17:27:52 +02:00
Norbert de Langen
b98a594365
REFACTOR redux 2018-09-03 15:39:16 +02:00
igor-dv
7fb145d49a Merge remote-tracking branch 'origin/core/framework-core-presets' into core/presets-merge-babel-configs
# Conflicts:
#	lib/core/package.json
#	lib/core/src/server/core-preset-dev.js
#	lib/core/src/server/core-preset-prod.js
#	yarn.lock
2018-09-02 14:31:37 +03:00
igor-dv
05e6438342 Merge remote-tracking branch 'origin/core/presets' into core/framework-core-presets
# Conflicts:
#	app/angular/src/server/wrapInitialConfig.js
#	app/polymer/src/server/framework-preset-polymer.js
#	lib/core/src/server/loadCustomBabelConfig.js
2018-09-02 14:24:34 +03:00
Michael Shilman
620dc75db0 v4.0.0-alpha.20 2018-08-31 15:58:57 -07:00
Michael Shilman
caaf1aa090 v4.0.0-alpha.19 2018-08-31 14:46:16 -07:00
Norbert de Langen
c1c5eed80d
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	addons/backgrounds/src/BackgroundPanel.js
#	lib/core/package.json
#	yarn.lock
2018-08-31 15:45:36 +02:00
Norbert de Langen
cc4a921cbe
UPGRADE babel to latest 2018-08-31 15:28:13 +02:00
Norbert de Langen
8583e73251
UPGRADE to latest && FIX snapshots && FIX tests 2018-08-31 14:18:59 +02:00