21 Commits

Author SHA1 Message Date
igor-dv
dace0581c8 We don't need babel-merge now 2018-09-10 22:11:55 +03:00
igor-dv
885ad8165d Add mergeBabel 2018-08-24 16:29:34 +03:00
igor-dv
2ef180d488 Naming 2018-08-24 01:43:26 +03:00
Norbert de Langen
f7cd337677
FIX eslint 2018-08-15 04:56:20 +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
Norbert de Langen
4218659c12
CHANGE angular styles & scripts to the iframe-entrypoint 2018-08-02 22:13:24 +02:00
Norbert de Langen
78d8c6c181
CHANGE html-webpack-plugin for generate-page-webpack-plugin 2018-08-02 10:42:21 +02:00
Hypnosphi
113c182de2 Merge master 2018-06-16 20:25:47 +03:00
igor-dv
0690120f8f Remove unneeded exports 2018-06-16 15:45:03 +03:00
Hypnosphi
084671ca2e Fix lint error 2018-06-11 01:58:21 +03:00
Hypnosphi
4652a292c2 Refactor webpack and babel configs to core 2018-05-27 20:01:40 +03:00
Hypnosphi
aca74d1536 Extract preview html template to core 2018-04-18 03:04:28 +03:00
Hypnosphi
38966ff52d Extract manager html template to core 2018-04-16 02:20:59 +03:00
igor-dv
49ff47bde1 Fix storyshots 2018-03-22 19:04:42 +02:00
igor-dv
6125b1925b Move server/config to core 2018-03-22 17:48:15 +02:00
Hypnosphi
276c56ff41 Use WatchMissingNodeModulesPlugin from react-dev-utils package 2018-03-04 14:29:43 +03:00
Hypnosphi
50591f5758 Fix React-Native by moving managerPath export to server.js 2018-02-08 23:27:42 +03:00
igor
7af0e56266 Move WatchMissingNodeModulesPlugin to core 2018-02-07 17:35:36 +02:00
igor
2dd0f214d6 Move build.js and index.js to core as build-dev.js and build-static.js 2018-02-07 15:47:37 +02:00
igor
5bfd312827 Rename + use object assign 2018-01-20 10:58:06 +02:00
igor
5a97466c8c Move default webpack.config to core 2018-01-19 20:08:25 +02:00