Merge pull request #651 from openlattice/develop

Release 2021-02-09

.eslintrc

@@ -141,6 +141,7 @@
     "react/no-did-update-set-state": "warn",
     "react/prefer-stateless-function": "warn",
     "react/prop-types": "warn",
+    "react/react-in-jsx-scope": "off",
     "react/require-default-props": [
       "error",
       {

.flowconfig

@@ -19,3 +19,6 @@
 !<PROJECT_ROOT>/node_modules/lattice-ui-kit
 !<PROJECT_ROOT>/node_modules/redux-reqseq
 .*/node_modules/immutable/.*
+
+[options]
+react.runtime=automatic

config/babel/babel.config.js

@@ -15,6 +15,8 @@ module.exports = {
   presets: [
     '@babel/preset-env',
     '@babel/preset-flow',
-    '@babel/preset-react',
+    ['@babel/preset-react', {
+      runtime: 'automatic'
+    }],
   ],
 };

config/jest/test.config.js

@@ -1 +1,2 @@
-import '@babel/polyfill';
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';

config/storybook/main.js

@@ -0,0 +1,8 @@
+module.exports = {
+  stories: ['../../src/**/*.stories.js'],
+  addons: [
+    '@storybook/addon-actions',
+    '@storybook/addon-docs',
+    '@storybook/addon-storysource',
+  ]
+};

config/storybook/storybookTheme.js → config/storybook/manager.js

@@ -1,9 +1,10 @@
+import { addons } from '@storybook/addons';
 import { create } from '@storybook/theming';
 import { Colors } from 'lattice-ui-kit';
 
 const { NEUTRAL } = Colors;
 
-export default create({
+const theme = create({
   base: 'light',
 
   // Typography
@@ -13,3 +14,7 @@ export default create({
   // Text color
   textColor: `${NEUTRAL.N900}`
 });
+
+addons.setConfig({
+  theme
+});

config/storybook/config.js → config/storybook/preview.js

@@ -1,7 +1,5 @@
-import React from 'react';
-
 import styled from 'styled-components';
-import { addDecorator, addParameters, configure } from '@storybook/react';
+import { addDecorator } from '@storybook/react';
 import {
   Colors,
   LatticeLuxonUtils,
@@ -11,7 +9,7 @@ import {
   lightTheme,
 } from 'lattice-ui-kit';
 
-import storybookTheme from './storybookTheme';
+import storybookTheme from './manager';
 
 const { NEUTRAL } = Colors;
 
@@ -53,16 +51,3 @@ addDecorator((StoryFn) => (
     </StoryInnerWrapper>
   </StoryOuterWrapper>
 ));
-
-addParameters({
-  options: {
-    theme: storybookTheme
-  },
-});
-// automatically import all files ending in *.stories.js
-const req = require.context('../../src/', true, /\.stories\.js$/);
-function loadStories() {
-  req.keys().forEach((filename) => req(filename));
-}
-
-configure(loadStories, module);

config/storybook/webpack.config.js

@@ -10,7 +10,7 @@ const Webpack = require('webpack');
 module.exports = function({ config, mode }) {
   config.module.rules.push({
     test: /\.stories.jsx?$/,
-    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    loaders: [require.resolve('@storybook/source-loader')],
     enforce: 'pre',
   });
 

config/webpack/webpack.config.js

@@ -107,7 +107,7 @@ module.exports = (env = {}) => {
       extensions: ['.js'],
       modules: [
         LIB_PATHS.ABS.SOURCE,
-        LIB_PATHS.ABS.NODE,
+        'node_modules',
       ]
     },
     target: 'web',