417 Commits

Author SHA1 Message Date
Norbert de Langen
183f7da4a3 Merge branch 'next' into dependabot/npm_and_yarn/jest-cli-24.0.0
# Conflicts:
#	examples/cra-kitchen-sink/package.json
2019-04-04 21:42:19 +02:00
Norbert de Langen
43c7efa56c FIX a test to be more pure (can't have mocks with out of scope variables) 2019-04-04 21:34:07 +02:00
Michael Shilman
99c262545d v5.1.0-alpha.21 2019-04-04 23:31:16 +08:00
Michael Shilman
a57917a19c v5.1.0-alpha.20 2019-03-29 10:02:06 +08:00
Michael Shilman
c628022f9c v5.1.0-alpha.19 2019-03-28 11:19:25 +08:00
Michael Shilman
34a24f0f51
Merge pull request #6197 from zewish/next
[bug] Fix "lib/addons" default export for react-native.
2019-03-28 09:53:30 +08:00
Michael Shilman
8941e4449a v5.1.0-alpha.18 2019-03-27 07:33:25 +08:00
Michael Shilman
9937954243 v5.1.0-alpha.17 2019-03-26 20:59:42 +08:00
Michael Shilman
988679f4b2 v5.1.0-alpha.16 2019-03-26 18:39:53 +08:00
Michael Shilman
7550a437a2 v5.1.0-alpha.15 2019-03-26 11:06:15 +08:00
Michael Shilman
8f95620be5 v5.1.0-alpha.14 2019-03-25 23:29:31 +08:00
Michael Shilman
15871945e2 v5.1.0-alpha.13 2019-03-23 13:19:10 +08:00
Michael Shilman
2c1fae398f v5.1.0-alpha.12 2019-03-22 12:28:02 +08:00
Michael Shilman
0a81425e86 v5.1.0-alpha.11 2019-03-21 04:30:44 +08:00
Iskren Slavov
0144d7f42c
Fix "lib/addons" default export for react-native. 2019-03-20 16:56:00 +02:00
Michael Shilman
5cff559d90 v5.1.0-alpha.10 2019-03-19 21:35:30 +08:00
Norbert de Langen
9510552a16 ADD always mock for util-deprecate && REMOVE loglines in tests for debug && CLEANUP tests log 2019-03-18 21:28:00 +01:00
Norbert de Langen
b18b2c8482 Merge branch 'next' into tech/api-package
# Conflicts:
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/cssresources/package.json
#	addons/notes/package.json
#	app/react-native-server/package.json
#	lib/addons/package.json
#	lib/api/src/modules/versions.ts
#	lib/ui/package.json
#	lib/ui/src/core/context.js
2019-03-18 16:54:21 +01:00
Michael Shilman
b51a247295 v5.1.0-alpha.9 2019-03-18 17:28:26 +08:00
Norbert de Langen
7c56ae7d4e Merge branch 'next' into tech/api-package
# Conflicts:
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/cssresources/package.json
#	addons/cssresources/src/css-resource-panel.tsx
#	addons/notes/package.json
#	app/react-native-server/package.json
#	app/react-native-server/src/client/manager/provider.js
#	examples-native/crna-kitchen-sink/package.json
#	lib/addons/package.json
#	lib/ui/package.json
#	yarn.lock
2019-03-18 07:52:44 +01:00
Michael Shilman
eb9be1fdc4 v5.1.0-alpha.8 2019-03-17 23:28:01 +08:00
Michael Shilman
76e5df9ace v5.1.0-alpha.7 2019-03-16 15:13:47 +08:00
Norbert de Langen
d689cdcc46 Merge branch 'next' into tech/api-package
# Conflicts:
#	lib/ui/src/containers/preview.js
#	lib/ui/src/core/init-provider-api.js
#	lib/ui/src/provider.js
#	yarn.lock
2019-03-15 12:24:04 +01:00
Norbert de Langen
f4a4e2ba21 Merge branch 'next' into react-native/use-core-for-server
# Conflicts:
#	addons/ondevice-knobs/package.json
#	app/react-native/package.json
2019-03-14 10:21:51 +01:00
Norbert de Langen
28ae982bb5 Merge branch 'next' into tech/api-package
# Conflicts:
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/cssresources/package.json
#	addons/notes/package.json
#	lib/addons/package.json
#	lib/api/src/modules/layout.ts
#	lib/api/src/modules/shortcuts.ts
#	lib/ui/package.json
2019-03-14 09:07:26 +01:00
Michael Shilman
daccff8919 v5.1.0-alpha.6 2019-03-14 08:48:59 +08:00
Norbert de Langen
d19c4c74dc FIX an issue with background tool && MIGRATE it to use the new Consumer with a non-pure filter 2019-03-13 23:55:55 +01:00
Norbert de Langen
219e6cf31f Merge branch 'next' into react-native/use-core-for-server
# Conflicts:
#	addons/ondevice-knobs/package.json
#	app/react-native/package.json
2019-03-13 11:50:54 +01:00
Norbert de Langen
0994524da1 Merge branch 'next' into tech/api-package
# Conflicts:
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/cssresources/package.json
#	addons/notes/package.json
#	lib/addons/package.json
#	lib/router/package.json
#	lib/ui/package.json
2019-03-13 11:44:11 +01:00
Michael Shilman
81f7d94fc5 v5.1.0-alpha.5 2019-03-13 05:25:31 +08:00
Norbert de Langen
c84b49e5a8 IMPROVE typing of lib/addon 2019-03-12 11:37:26 +01:00
Benoit Dion
1780e929e4 Merge remote-tracking branch 'upstream/next' into react-native/use-core-for-server 2019-03-11 21:58:38 -04:00
Norbert de Langen
80c0842155 Merge branch 'next' into tech/api-package
# Conflicts:
#	lib/router/package.json
#	lib/ui/package.json
2019-03-11 17:39:11 +01:00
Michael Shilman
aab869c4d8 v5.1.0-alpha.4 2019-03-11 22:29:26 +08:00
Norbert de Langen
de5e55acb7 Merge branch 'next' into tech/api-package
# Conflicts:
#	lib/api/src/modules/stories.ts
#	lib/router/package.json
#	lib/ui/package.json
#	yarn.lock
2019-03-09 22:44:30 +01:00
Michael Shilman
978caa7450 v5.1.0-alpha.3 2019-03-09 23:25:09 +08:00
Norbert de Langen
611e582ddb SYNC prettier printWidth with eslint && FIX resulting linting warnings 2019-03-09 01:21:02 +01:00
Norbert de Langen
d22ac673ff Merge branch 'next' into tech/api-package
# Conflicts:
#	lib/router/package.json
#	lib/ui/package.json
2019-03-08 12:13:52 +01:00
Michael Shilman
394cc91637 v5.1.0-alpha.2 2019-03-08 18:36:07 +08:00
Michael Shilman
04f1b79a97 Merge branch 'next' into 5831-add-corejs-to-everything 2019-03-08 11:28:55 +08:00
Tom Coleman
9c71efb3fe Add core JS dependencies across the stack where it was missing
For #5831
2019-03-08 11:40:29 +11:00
Norbert de Langen
7412d7bd64 Merge branch 'next' into tech/api-package
# Conflicts:
#	lib/router/package.json
#	lib/ui/package.json
2019-03-07 23:28:53 +01:00
Michael Shilman
ed9b342742 v5.1.0-alpha.1 2019-03-07 22:13:18 +08:00
Norbert de Langen
7a1fdc745c Merge branch 'next' into tech/api-package
# Conflicts:
#	lib/router/package.json
#	lib/ui/package.json
2019-03-06 16:48:16 +01:00
Norbert de Langen
f893431a8d Merge branch 'next' into tech/api-package
# Conflicts:
#	addons/cssresources/src/register.tsx
#	addons/notes/src/Panel.tsx
#	addons/notes/src/giphy.tsx
#	examples/official-storybook/stories/core/parameters.stories.js
#	lib/api/src/init-provider-api.ts
#	lib/api/src/lib/id.ts
#	lib/api/src/modules/addons.ts
#	lib/api/src/modules/layout.ts
#	lib/api/src/modules/stories.ts
#	lib/api/src/modules/url.ts
#	lib/api/src/modules/versions.ts
#	lib/api/src/store.ts
#	lib/api/src/tests/id.test.js
#	lib/api/src/tests/versions.test.js
#	lib/client-api/src/client_api.js
#	lib/client-logger/src/index.ts
#	lib/router/package.json
#	lib/router/src/tests/id.test.js
#	lib/router/src/typings.d.ts
#	lib/router/src/utils.ts
#	lib/theming/src/themes/dark-syntax.ts
#	lib/theming/src/themes/dark.ts
#	lib/theming/src/themes/light-syntax.ts
#	lib/theming/src/themes/light.ts
#	lib/ui/package.json
#	lib/ui/src/components/sidebar/treeview/utils.js
#	lib/ui/src/containers/nav.js
#	lib/ui/src/containers/preview.js
#	lib/ui/src/core/context.js
#	lib/ui/src/core/initial-state.js
#	lib/ui/src/index.js
#	lib/ui/src/libs/id.test.js
#	lib/ui/src/settings/__snapshots__/shortcuts.stories.storyshot
#	lib/ui/src/settings/about_page.js
#	lib/ui/src/settings/shortcuts.stories.js
#	lib/ui/src/settings/shortcuts_page.js
#	yarn.lock
2019-03-06 16:45:13 +01:00
Michael Shilman
a05491b07a v5.1.0-alpha.0 2019-03-06 10:39:47 +08:00
Norbert de Langen
396348a2c1 Merge branch 'next' into react-native/use-core-for-server
# Conflicts:
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/ondevice-knobs/package.json
#	addons/ondevice-notes/package.json
#	app/react-native/package.json
#	app/react/package.json
#	examples-native/crna-kitchen-sink/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	lib/components/package.json
#	lib/theming/package.json
#	lib/ui/package.json
#	package.json
#	yarn.lock
2019-03-06 00:29:19 +01:00
Michael Shilman
f2b625bab0 Merge master into next after 5.0.0 release 2019-03-06 02:08:02 +08:00
Norbert de Langen
589fa90f82 Merge branch 'next' into react-native/use-core-for-server
# Conflicts:
#	app/react-native/package.json
#	yarn.lock
2019-02-23 12:03:07 +01:00
Norbert de Langen
51334ebfa2
Merge pull request #5643 from greysteil/package-directories
Add directory attribute to repositories in package.json files
2019-02-20 11:32:38 +01:00