492 Commits

Author SHA1 Message Date
Kai Röder
4b39d0d5dd reverted storybook angular-cli example start script 2018-09-18 10:45:11 +02:00
Kai Röder
b4995424f7 Merge branch 'master' into angular-build-time-optimization 2018-09-18 10:44:32 +02:00
igor-dv
abf3c3c045 Mock addon-jest.testresults.json for storyshots 2018-09-17 18:57:15 +03:00
igor-dv
665ef8448d Add "addon-jest.testresults.json" to .gitignore 2018-09-17 17:59:05 +03:00
igor-dv
000186fd3c Delete "addon-jest.testresults.json" 2018-09-17 17:49:49 +03:00
igor-dv
ccb409166d Fix "addon-jest.testresults.json" generation 2018-09-17 17:44:32 +03:00
Kai Röder
8d7a867a92 Merge branch 'master' into angular-build-time-optimization 2018-09-16 12:30:51 +02:00
Michael Shilman
729607334c v4.0.0-alpha.21 2018-09-07 10:17:06 -07: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
6ecde1b82d
Merge branch 'master' into tech/upgrades4
# Conflicts:
#	lib/cli/test/snapshots/react_static_next/package.json
#	package.json
#	yarn.lock
2018-08-31 14:39:44 +02:00
igor-dv
c92273cb18 Add an example of global scss file + stylePreprocessorOptions option 2018-08-28 19:43:44 +03:00
Norbert de Langen
00bead99ed
UPGRADE dependencies 2018-08-27 09:11:56 +02:00
Michael Shilman
324da43c22 v4.0.0-alpha.18 2018-08-25 13:57:15 -07:00
Michael Shilman
3a470c6ea8 v4.0.0-alpha.17 2018-08-24 11:40:14 -07:00
igor-dv
04f6ef84ba Fix jest-ts-babel.js 2018-08-15 17:26:24 +03:00
Norbert de Langen
1209703ec4
REVERT changes to angular require-context (BROKEN) 2018-08-15 15:31:54 +02:00
Norbert de Langen
850b08391c
FIX angular example with a hack? 2018-08-15 11:51:16 +02:00
Norbert de Langen
e6c055cc4e
FIX snapshots 2018-08-15 02:18:11 +02:00
Norbert de Langen
a039c96426
Merge branch 'master' into babel-7
# Conflicts:
#	MIGRATION.md
#	addons/backgrounds/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/info/src/__snapshots__/index.test.js.snap
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	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/html/package.json
#	app/marko/package.json
#	app/mithril/package.json
#	app/polymer/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/angular-cli/package.json
#	examples/cra-kitchen-sink/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/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
#	examples/official-storybook/stories/__snapshots__/other-dirname.stories.storyshot
#	examples/polymer-cli/package.json
#	examples/vue-kitchen-sink/package.json
#	jest.config.js
#	lib/cli/package.json
#	lib/cli/test/snapshots/angular-cli/package.json
#	lib/cli/test/snapshots/marko/package.json
#	lib/cli/test/snapshots/meteor/package.json
#	lib/cli/test/snapshots/mithril/package.json
#	lib/cli/test/snapshots/polymer/package.json
#	lib/cli/test/snapshots/react/package.json
#	lib/cli/test/snapshots/react_project/package.json
#	lib/cli/test/snapshots/react_scripts/package.json
#	lib/cli/test/snapshots/sfc_vue/package.json
#	lib/cli/test/snapshots/update_package_organisations/package.json
#	lib/cli/test/snapshots/vue/package.json
#	lib/cli/test/snapshots/webpack_react/package.json
#	lib/codemod/package.json
#	lib/components/src/layout/__snapshots__/index.stories.storyshot
#	lib/core/package.json
#	lib/core/src/server/config/webpack.config.prod.js
#	package.json
#	yarn.lock
2018-08-15 00:01:36 +02:00
Michael Shilman
52f0bc687a v4.0.0-alpha.16 2018-08-06 22:25:51 +08:00
Norbert de Langen
1d67415ff3
FIX ts files linting after upgrade 2018-08-05 20:36:28 +02:00
igor-dv
0b5028fd8d Fix jest-ts-babel.js. it now returns object with source and map instead of just source. 2018-08-05 12:29:44 +03:00
Norbert de Langen
24e2526833
UPGRADE more dependencies 2018-08-05 00:37:24 +02:00
Norbert de Langen
dcb8797d71
UPGRADE more tools 2018-08-04 15:59:52 +02:00
Norbert de Langen
809ecf5165
FIX snapshots 2018-08-04 01:00:53 +02:00
Norbert de Langen
947e9bad62
UPGRADE all minor dependencies 2018-08-04 00:41:08 +02:00
Michael Shilman
819ff14255 v4.0.0-alpha.15 2018-08-03 17:56:23 +08:00
Igor
989aa6c9b3
Merge pull request #3913 from storybooks/support-different-config-files-exts
Support different extensions for "config" and "addons" files
2018-07-25 12:27:03 +03:00
t_hammb
4dbc6e2732 fixing addon type naming conventions. 2018-07-23 13:43:11 -07:00
igor-dv
e21590d6a8 Initial logic of supporting "config" and "addons" files with the different extensions 2018-07-23 20:28:07 +03:00
t_hammb
34e74f8f92 refining code more and fixing more issues found within the code. 2018-07-19 11:26:20 -07:00
Norbert de Langen
ba544ef8e1
Merge branch 'master' into babel-7
# Conflicts:
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	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/html/package.json
#	app/marko/package.json
#	app/mithril/package.json
#	app/polymer/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/cra-kitchen-sink/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/vue-kitchen-sink/package.json
#	lib/cli/package.json
#	lib/cli/test/snapshots/angular-cli/package.json
#	lib/cli/test/snapshots/marko/package.json
#	lib/cli/test/snapshots/meteor/package.json
#	lib/cli/test/snapshots/mithril/package.json
#	lib/cli/test/snapshots/polymer/package.json
#	lib/cli/test/snapshots/react/package.json
#	lib/cli/test/snapshots/react_native/package.json
#	lib/cli/test/snapshots/react_native_scripts/package.json
#	lib/cli/test/snapshots/react_project/package.json
#	lib/cli/test/snapshots/react_scripts/package.json
#	lib/cli/test/snapshots/sfc_vue/package.json
#	lib/cli/test/snapshots/update_package_organisations/package.json
#	lib/cli/test/snapshots/vue/package.json
#	lib/cli/test/snapshots/webpack_react/package.json
#	lib/core/package.json
#	yarn.lock
2018-07-16 10:57:17 -07:00
Michael Shilman
e5e1e3aff8 v4.0.0-alpha.14 2018-07-11 17:13:57 -07:00
Michael Shilman
681869bfcd v4.0.0-alpha.13 2018-07-09 21:31:07 -07:00
Hypnosphi
e496dfbb91 Update CLI 2018-07-04 23:12:47 +03:00
Hypnosphi
0f93c5e68f Add @babel/runtime dependency to all the packages with server-side part 2018-07-04 18:18:53 +03:00
Hypnosphi
b6153d1034 Merge master 2018-07-04 17:45:57 +03:00
Tom Coleman
a10c19a916 Merge remote-tracking branch 'origin/master' into tmeasday/refactor-jest-addon 2018-07-04 15:43:52 +10:00
Michael Shilman
a14a8e4a9a v4.0.0-alpha.12 2018-07-03 15:58:21 -07:00
Michael Shilman
9a872790a2 v4.0.0-alpha.11 2018-07-02 11:14:04 -07:00
Hypnosphi
27e44b4621 Add yarn resolution for graphql 2018-06-28 13:57:13 +02:00
Michael Shilman
4e70f9d192 v4.0.0-alpha.10 2018-06-21 21:48:49 +08:00
Hypnosphi
73dc63bb67 Update dependencies 2018-06-20 13:50:17 +03:00
Sam Grace
f0b7885f2a update snapshots 2018-06-13 12:13:58 +01:00
igor-dv
0c98009520 Add custom config implementation + allow configPath to point on config.js file 2018-06-11 02:51:24 +03:00
Michael Shilman
1a03042590 v4.0.0-alpha.9 2018-06-10 15:42:04 +08:00
igor-dv
9b13bfc6e9 Merge remote-tracking branch 'origin/master' into new-angular-cli-integration
# Conflicts:
#	examples/marko-cli/package.json
#	yarn.lock
2018-06-06 10:37:40 +03:00
Dependencies.io Bot
ca69ab1ec1 Update typescript from 2.8.3 to 2.9.1 in examples/angular-cli 2018-06-04 23:17:44 +00:00
Dependencies.io Bot
b7e879a597 Update ts-node from 6.0.5 to 6.1.0 in examples/angular-cli 2018-06-04 23:17:44 +00:00