From 9d180d9cd270ccdc48d17800f658a616e27de5e2 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Mon, 4 May 2020 23:09:19 -0400
Subject: [PATCH] Fix some stuff

---
 packages/react-json-tree/.babelrc              | 4 ++--
 packages/react-json-tree/.eslintignore         | 2 ++
 packages/react-json-tree/.prettierignore       | 2 ++
 packages/react-json-tree/README.md             | 2 +-
 packages/react-json-tree/test/index.spec.jsx   | 2 ++
 packages/react-json-tree/test/objType.spec.js  | 8 +++++++-
 packages/react-json-tree/webpack.config.umd.js | 7 ++++++-
 7 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 packages/react-json-tree/.prettierignore

diff --git a/packages/react-json-tree/.babelrc b/packages/react-json-tree/.babelrc
index b6f02798..8cc520a8 100644
--- a/packages/react-json-tree/.babelrc
+++ b/packages/react-json-tree/.babelrc
@@ -1,8 +1,8 @@
 {
   "presets": [
     "@babel/preset-env",
-    "@babel/preset-typescript",
-    "@babel/preset-react"
+    "@babel/preset-react",
+    "@babel/preset-typescript"
   ],
   "plugins": [
     "@babel/plugin-proposal-class-properties"
diff --git a/packages/react-json-tree/.eslintignore b/packages/react-json-tree/.eslintignore
index a65b4177..2c3ba010 100644
--- a/packages/react-json-tree/.eslintignore
+++ b/packages/react-json-tree/.eslintignore
@@ -1 +1,3 @@
 lib
+umd
+webpack.config.umd.js
diff --git a/packages/react-json-tree/.prettierignore b/packages/react-json-tree/.prettierignore
new file mode 100644
index 00000000..79681bfb
--- /dev/null
+++ b/packages/react-json-tree/.prettierignore
@@ -0,0 +1,2 @@
+lib
+umd
diff --git a/packages/react-json-tree/README.md b/packages/react-json-tree/README.md
index 8e00d47d..cc38dd35 100644
--- a/packages/react-json-tree/README.md
+++ b/packages/react-json-tree/README.md
@@ -35,7 +35,7 @@ Check out [examples](examples) directory for more details.
 This component now uses [react-base16-styling](https://github.com/alexkuz/react-base16-styling) module, which allows to customize component via `theme` property, which can be the following:
 
 - [base16](http://chriskempson.github.io/base16) theme data. [The example theme data can be found here](https://github.com/gaearon/redux-devtools/tree/75322b15ee7ba03fddf10ac3399881e302848874/src/react/themes).
-- object that contains style objects, strings (that treated as classnames) or functions. A function is used to extend its first argument `{ style, className }` and should return an object with the same structure. Other arguments depend on particular context (and should be described here). See [createStylingFromTheme.js](https://github.com/alexkuz/react-json-tree/blob/feature-refactor-styling/src/createStylingFromTheme.js) for the list of styling object keys. Also, this object can extend `base16` theme via `extend` property.
+- object that contains style objects, strings (that treated as classnames) or functions. A function is used to extend its first argument `{ style, className }` and should return an object with the same structure. Other arguments depend on particular context (and should be described here). See [createStylingFromTheme.ts](https://github.com/reduxjs/redux-devtools/blob/master/packages/react-json-tree/src/createStylingFromTheme.ts) for the list of styling object keys. Also, this object can extend `base16` theme via `extend` property.
 
 Every theme has a light version, which is enabled with `invertTheme` prop.
 
diff --git a/packages/react-json-tree/test/index.spec.jsx b/packages/react-json-tree/test/index.spec.jsx
index 9e21fdb8..8ebe242e 100644
--- a/packages/react-json-tree/test/index.spec.jsx
+++ b/packages/react-json-tree/test/index.spec.jsx
@@ -1,3 +1,5 @@
+/* eslint-env jest */
+
 import React from 'react';
 import { createRenderer } from 'react-test-renderer/shallow';
 
diff --git a/packages/react-json-tree/test/objType.spec.js b/packages/react-json-tree/test/objType.spec.js
index c8ec51c6..b0768d80 100644
--- a/packages/react-json-tree/test/objType.spec.js
+++ b/packages/react-json-tree/test/objType.spec.js
@@ -1,3 +1,5 @@
+/* eslint-env jest, es6 */
+
 import objType from '../src/objType';
 
 describe('objType', () => {
@@ -10,7 +12,11 @@ describe('objType', () => {
     expect(objType(new WeakSet())).toBe('WeakSet');
     expect(objType(new Error())).toBe('Error');
     expect(objType(new Date())).toBe('Date');
-    expect(objType(() => {})).toBe('Function');
+    expect(
+      objType(() => {
+        /* noop */
+      })
+    ).toBe('Function');
     expect(objType('')).toBe('String');
     expect(objType(true)).toBe('Boolean');
     expect(objType(null)).toBe('Null');
diff --git a/packages/react-json-tree/webpack.config.umd.js b/packages/react-json-tree/webpack.config.umd.js
index 2ae2f267..82252535 100644
--- a/packages/react-json-tree/webpack.config.umd.js
+++ b/packages/react-json-tree/webpack.config.umd.js
@@ -1,3 +1,5 @@
+/* eslint-env node */
+
 const path = require('path');
 const TerserPlugin = require('terser-webpack-plugin');
 
@@ -15,12 +17,15 @@ module.exports = (env = {}) => ({
   module: {
     rules: [
       {
-        test: /\.(ts|tsx)$/,
+        test: /\.tsx?$/,
         loader: 'babel-loader',
         exclude: /node_modules/
       }
     ]
   },
+  resolve: {
+    extensions: ['.js', '.jsx', '.ts', '.tsx']
+  },
   externals: {
     react: {
       root: 'React',