Merge pull request #2788 from storybooks/move-more-things-to-core

Move more things to core

app/angular/src/server/config/defaults/webpack.config.js

@@ -1,73 +1,5 @@
-// import webpack from 'webpack';
-import autoprefixer from 'autoprefixer';
+import { createDefaultWebpackConfig } from '@storybook/core/server';
 import { includePaths } from '../utils';
 
-// Add a default custom config which is similar to what React Create App does.
-module.exports = storybookBaseConfig => {
-  const newConfig = { ...storybookBaseConfig };
-
-  newConfig.module.rules = [
-    ...storybookBaseConfig.module.rules,
-    {
-      test: /\.css$/,
-      use: [
-        require.resolve('style-loader'),
-        {
-          loader: require.resolve('css-loader'),
-          options: {
-            importLoaders: 1,
-          },
-        },
-        {
-          loader: require.resolve('postcss-loader'),
-          options: {
-            ident: 'postcss', // https://webpack.js.org/guides/migrating/#complex-options
-            plugins: () => [
-              require('postcss-flexbugs-fixes'), // eslint-disable-line
-              autoprefixer({
-                browsers: [
-                  '>1%',
-                  'last 4 versions',
-                  'Firefox ESR',
-                  'not ie < 9', // React doesn't support IE8 anyway
-                ],
-                flexbox: 'no-2009',
-              }),
-            ],
-          },
-        },
-      ],
-    },
-    {
-      test: /\.json$/,
-      include: includePaths,
-      loader: require.resolve('json-loader'),
-    },
-    {
-      test: /\.(ico|jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2)(\?.*)?$/,
-      include: includePaths,
-      loader: require.resolve('file-loader'),
-      query: {
-        name: 'static/media/[name].[hash:8].[ext]',
-      },
-    },
-    {
-      test: /\.(mp4|webm|wav|mp3|m4a|aac|oga)(\?.*)?$/,
-      include: includePaths,
-      loader: require.resolve('url-loader'),
-      query: {
-        limit: 10000,
-        name: 'static/media/[name].[hash:8].[ext]',
-      },
-    },
-  ];
-
-  newConfig.resolve.alias = {
-    ...storybookBaseConfig.resolve.alias,
-    // This is to support NPM2
-    'babel-runtime/regenerator': require.resolve('babel-runtime/regenerator'),
-  };
-
-  // Return the altered config
-  return newConfig;
-};
+module.exports = storybookBaseConfig =>
+  createDefaultWebpackConfig(storybookBaseConfig, includePaths);

app/angular/src/server/config/webpack.config.js

@@ -2,6 +2,7 @@ import path from 'path';
 import webpack from 'webpack';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
+import { managerPath } from '@storybook/core/client';
 import WatchMissingNodeModulesPlugin from './WatchMissingNodeModulesPlugin';
 
 import { includePaths, excludePaths, nodeModulesPaths, loadEnv, nodePaths } from './utils';
@@ -13,7 +14,7 @@ export default function(configDir) {
   const config = {
     devtool: 'cheap-module-source-map',
     entry: {
-      manager: [require.resolve('./polyfills'), require.resolve('../../client/manager')],
+      manager: [require.resolve('./polyfills'), managerPath],
       preview: [
         require.resolve('./polyfills'),
         require.resolve('./globals'),

app/angular/src/server/config/webpack.config.prod.js

@@ -2,6 +2,7 @@ import path from 'path';
 import webpack from 'webpack';
 import UglifyJsPlugin from 'uglifyjs-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
+import { managerPath } from '@storybook/core/client';
 
 import babelLoaderConfig from './babel.prod';
 import { includePaths, excludePaths, loadEnv, nodePaths } from './utils';
@@ -11,7 +12,7 @@ import { version } from '../../../package.json';
 export default function(configDir) {
   const entries = {
     preview: [require.resolve('./polyfills'), require.resolve('./globals')],
-    manager: [require.resolve('./polyfills'), path.resolve(__dirname, '../../client/manager')],
+    manager: [require.resolve('./polyfills'), managerPath],
   };
 
   const config = {

app/polymer/src/client/index.js

@@ -1,17 +1 @@
-// import deprecate from 'util-deprecate';
-
-// NOTE export these to keep backwards compatibility
-// import { action as deprecatedAction } from '@storybook/addon-actions';
-// import { linkTo as deprecatedLinkTo } from '@storybook/addon-links';
-
 export { storiesOf, setAddon, addDecorator, configure, getStorybook } from './preview';
-
-// export const action = deprecate(
-//   deprecatedAction,
-//   '@storybook/react action is deprecated. See: https://github.com/storybooks/storybook/tree/master/addons/actions'
-// );
-
-// export const linkTo = deprecate(
-//   deprecatedLinkTo,
-//   '@storybook/react linkTo is deprecated. See: https://github.com/storybooks/storybook/tree/master/addons/links'
-// );

app/polymer/src/server/config/defaults/webpack.config.js

@@ -1,73 +1,5 @@
-// import webpack from 'webpack';
-import autoprefixer from 'autoprefixer';
+import { createDefaultWebpackConfig } from '@storybook/core/server';
 import { includePaths } from '../utils';
 
-// Add a default custom config which is similar to what React Create App does.
-module.exports = storybookBaseConfig => {
-  const newConfig = { ...storybookBaseConfig };
-
-  newConfig.module.rules = [
-    ...storybookBaseConfig.module.rules,
-    {
-      test: /\.css$/,
-      use: [
-        require.resolve('style-loader'),
-        {
-          loader: require.resolve('css-loader'),
-          options: {
-            importLoaders: 1,
-          },
-        },
-        {
-          loader: require.resolve('postcss-loader'),
-          options: {
-            ident: 'postcss', // https://webpack.js.org/guides/migrating/#complex-options
-            plugins: () => [
-              require('postcss-flexbugs-fixes'), // eslint-disable-line
-              autoprefixer({
-                browsers: [
-                  '>1%',
-                  'last 4 versions',
-                  'Firefox ESR',
-                  'not ie < 9', // React doesn't support IE8 anyway
-                ],
-                flexbox: 'no-2009',
-              }),
-            ],
-          },
-        },
-      ],
-    },
-    {
-      test: /\.json$/,
-      include: includePaths,
-      loader: require.resolve('json-loader'),
-    },
-    {
-      test: /\.(ico|jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2)(\?.*)?$/,
-      include: includePaths,
-      loader: require.resolve('file-loader'),
-      query: {
-        name: 'static/media/[name].[hash:8].[ext]',
-      },
-    },
-    {
-      test: /\.(mp4|webm|wav|mp3|m4a|aac|oga)(\?.*)?$/,
-      include: includePaths,
-      loader: require.resolve('url-loader'),
-      query: {
-        limit: 10000,
-        name: 'static/media/[name].[hash:8].[ext]',
-      },
-    },
-  ];
-
-  newConfig.resolve.alias = {
-    ...storybookBaseConfig.resolve.alias,
-    // This is to support NPM2
-    'babel-runtime/regenerator': require.resolve('babel-runtime/regenerator'),
-  };
-
-  // Return the altered config
-  return newConfig;
-};
+module.exports = storybookBaseConfig =>
+  createDefaultWebpackConfig(storybookBaseConfig, includePaths);

app/polymer/src/server/config/webpack.config.js

@@ -3,6 +3,8 @@ import webpack from 'webpack';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import CopyWebpackPlugin from 'copy-webpack-plugin';
+import { managerPath } from '@storybook/core/client';
+
 import WatchMissingNodeModulesPlugin from './WatchMissingNodeModulesPlugin';
 import {
   getConfigDir,
@@ -20,7 +22,7 @@ export default function() {
   const config = {
     devtool: 'cheap-module-source-map',
     entry: {
-      manager: [require.resolve('./polyfills'), require.resolve('../../client/manager')],
+      manager: [require.resolve('./polyfills'), managerPath],
       preview: [
         require.resolve('./polyfills'),
         require.resolve('./globals'),

app/polymer/src/server/config/webpack.config.prod.js

@@ -1,7 +1,7 @@
-import path from 'path';
 import webpack from 'webpack';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import CopyWebpackPlugin from 'copy-webpack-plugin';
+import { managerPath } from '@storybook/core/client';
 import babelLoaderConfig from './babel.prod';
 import { getConfigDir, includePaths, excludePaths, loadEnv, nodePaths } from './utils';
 import { getPreviewHeadHtml, getManagerHeadHtml } from '../utils';
@@ -10,7 +10,7 @@ import { version } from '../../../package.json';
 export default function() {
   const entries = {
     preview: [require.resolve('./polyfills'), require.resolve('./globals')],
-    manager: [require.resolve('./polyfills'), path.resolve(__dirname, '../../client/manager')],
+    manager: [require.resolve('./polyfills'), managerPath],
   };
 
   const config = {