Merge pull request #9759 from storybookjs/fix/master

FIX master
storybookjs · Feb 6, 2020 · 7d5a408 · 7d5a408
2 parents 88381d8 + ca2c5c9
commit 7d5a408
Show file tree

Hide file tree

Showing 13 changed files with 4,891 additions and 3,268 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -13,6 +13,7 @@ module.exports = {
     'react/jsx-props-no-spreading': 'off',
     'react/jsx-fragments': 'off',
     '@typescript-eslint/ban-ts-ignore': 'off',
+    '@typescript-eslint/no-empty-function': 'off',
     '@typescript-eslint/no-object-literal-type-assertion': 'off',
     'react/sort-comp': [
       'error',

diff --git a/addons/docs/src/frameworks/react/lib/inspection/acornParser.ts b/addons/docs/src/frameworks/react/lib/inspection/acornParser.ts
@@ -2,6 +2,7 @@ import { Parser } from 'acorn';
 // @ts-ignore
 import jsx from 'acorn-jsx';
 import { isNil } from 'lodash';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import estree from 'estree';
 // @ts-ignore
 import * as acornWalk from 'acorn-walk';

diff --git a/addons/knobs/src/__types__/knob-test-cases.ts b/addons/knobs/src/__types__/knob-test-cases.ts
@@ -15,7 +15,6 @@ import {
 } from '../index';
 
 // Note: this is a helper to batch test return types and avoid "declared but never read" errors
-// eslint-disable-next-line @typescript-eslint/no-empty-function
 function expectKnobOfType<T>(..._: T[]) {}
 
 const groupId = 'GROUP-ID1';

diff --git a/app/react/package.json b/app/react/package.json
@@ -47,7 +47,7 @@
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "lodash": "^4.17.15",
-    "mini-css-extract-plugin": "^0.9.0",
+    "mini-css-extract-plugin": "^0.7.0",
     "prop-types": "^15.7.2",
     "react-dev-utils": "^9.0.0",
     "regenerator-runtime": "^0.13.3",

diff --git a/app/react/src/server/cra-config.ts b/app/react/src/server/cra-config.ts
@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import semver from 'semver';
 import { Configuration, Plugin, RuleSetRule } from 'webpack';
-import MiniCssExtractPlugin from 'mini-css-extract-plugin';
+// import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import { normalizeCondition } from 'webpack/lib/RuleSet';
 import { logger } from '@storybook/node-logger';
 
@@ -164,12 +164,15 @@ export function applyCRAWebpackConfig(baseConfig: Configuration, configDir: stri
     ? getTypeScriptRules(craWebpackConfig.module.rules, configDir)
     : [];
 
+  // I disabled the MiniCssExtractPlugin, because there's often a version mismatch between CRA & storybook
+  // causing a lot of issues of the build-storybook failing
+
   //  Add css minification for production
   const plugins = [...baseConfig.plugins];
-  if (baseConfig.mode === 'production') {
-    // @ts-ignore
-    plugins.push(new MiniCssExtractPlugin());
-  }
+  // if (baseConfig.mode === 'production') {
+  //   // @ts-ignore
+  //   plugins.push(new MiniCssExtractPlugin());
+  // }
 
   return {
     ...baseConfig,

diff --git a/app/riot/src/client/preview/rendering/stringified.js b/app/riot/src/client/preview/rendering/stringified.js
@@ -1,4 +1,3 @@
-/* eslint-disable import/no-duplicates */
 import { mount, unregister, tag2 as tag } from 'riot';
 import * as riot from 'riot';
 import compiler from 'riot-compiler';

diff --git a/app/vue/package.json b/app/vue/package.json
@@ -43,7 +43,7 @@
     "webpack": "^4.33.0"
   },
   "devDependencies": {
-    "@types/mini-css-extract-plugin": "^0.8.0",
+    "@types/mini-css-extract-plugin": "^0.9.0",
     "@types/node": "^12.12.11",
     "@types/webpack": "^4.41.0",
     "babel-preset-vue": "^2.0.2",

diff --git a/examples/angular-cli/src/stories/moduleMetadata/dummy.service.ts b/examples/angular-cli/src/stories/moduleMetadata/dummy.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 
 @Injectable()
 export class DummyService {
-  // eslint-disable-next-line @typescript-eslint/no-empty-function, no-useless-constructor
+  // eslint-disable-next-line no-useless-constructor
   constructor() {}
 
   getItems() {

diff --git a/examples/cra-ts-kitchen-sink/src/stories/Button.tsx b/examples/cra-ts-kitchen-sink/src/stories/Button.tsx
@@ -14,7 +14,7 @@ interface ButtonProps {
   /**
    * default is false
    */
-  secondary: boolean;
+  secondary?: boolean;
 }
 
 /**

diff --git a/examples/preact-kitchen-sink/src/stories/__snapshots__/addon-centered.stories.storyshot b/examples/preact-kitchen-sink/src/stories/__snapshots__/addon-centered.stories.storyshot
@@ -5,7 +5,7 @@ Object {
   "__": null,
   "__b": 0,
   "__c": null,
-  "__d": null,
+  "__d": undefined,
   "__e": null,
   "__k": null,
   "constructor": undefined,
@@ -15,7 +15,7 @@ Object {
       "__": null,
       "__b": 0,
       "__c": null,
-      "__d": null,
+      "__d": undefined,
       "__e": null,
       "__k": null,
       "constructor": undefined,

diff --git a/lib/components/src/tabs/tabs.tsx b/lib/components/src/tabs/tabs.tsx
@@ -114,7 +114,7 @@ export const panelProps = {
 
 const childrenToList = (children: any, selected: string) =>
   Children.toArray(children).map(
-    ({ props: { title, id, color, children: childrenOfChild } }, index) => {
+    ({ props: { title, id, color, children: childrenOfChild } }: React.ReactElement, index) => {
       const content = Array.isArray(childrenOfChild) ? childrenOfChild[0] : childrenOfChild;
       return {
         active: selected ? id === selected : index === 0,

diff --git a/lib/core-events/src/index.test.ts b/lib/core-events/src/index.test.ts
@@ -1,4 +1,3 @@
-/* eslint-disable import/no-duplicates */
 import * as EventsPackageExport from '.';
 import EventsDefaultExport, { CHANNEL_CREATED } from './index';