From 0864f281560dcbad1ddb2ab985e23b841771cb8c Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Fri, 31 Jul 2020 17:32:41 -0400 Subject: [PATCH] fix(react-json-tree): fix react-json-tree examples (#531) * Consolidate dependencies in react-json-tree examples * Do it differently * Update --- package.json | 3 +- packages/react-json-tree/examples/.babelrc | 9 ++---- .../react-json-tree/examples/package.json | 17 +++++----- packages/react-json-tree/examples/src/App.js | 2 +- .../examples/webpack.config.js | 32 +++---------------- 5 files changed, 18 insertions(+), 45 deletions(-) mode change 100755 => 100644 packages/react-json-tree/examples/.babelrc diff --git a/package.json b/package.json index caf4cd4f..96c01cc0 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,8 @@ "test:all": "jest" }, "workspaces": [ - "packages/*" + "packages/*", + "packages/react-json-tree/examples" ], "engines": { "node": ">=8.0.0" diff --git a/packages/react-json-tree/examples/.babelrc b/packages/react-json-tree/examples/.babelrc old mode 100755 new mode 100644 index 422b2d38..e60d3036 --- a/packages/react-json-tree/examples/.babelrc +++ b/packages/react-json-tree/examples/.babelrc @@ -1,9 +1,4 @@ { - "plugins": [ - "transform-object-rest-spread", - "transform-class-properties" - ], - "presets": [ - "env", "react" - ] + "presets": ["@babel/preset-env", "@babel/preset-react"], + "plugins": ["@babel/plugin-proposal-class-properties"] } diff --git a/packages/react-json-tree/examples/package.json b/packages/react-json-tree/examples/package.json index a2255ffd..970e94d4 100644 --- a/packages/react-json-tree/examples/package.json +++ b/packages/react-json-tree/examples/package.json @@ -27,18 +27,19 @@ }, "homepage": "https://github.com/gaearon/react-hot-boilerplate", "devDependencies": { - "babel-core": "^6.26.0", - "babel-loader": "^7.1.2", - "babel-plugin-transform-class-properties": "^6.24.1", - "babel-plugin-transform-object-rest-spread": "^6.26.0", - "babel-preset-react": "^6.5.0", - "webpack": "^3.8.1", - "webpack-dev-server": "^3.10.3" + "@babel/core": "^7.2.2", + "@babel/plugin-proposal-class-properties": "^7.3.0", + "@babel/preset-env": "^7.3.1", + "@babel/preset-react": "^7.0.0", + "babel-loader": "^8.0.5", + "webpack": "^4.27.1", + "webpack-dev-server": "^3.1.14" }, "dependencies": { "immutable": "^3.8.1", "react": "^16.0.0", "react-base16-styling": "^0.5.3", - "react-dom": "^16.0.0" + "react-dom": "^16.0.0", + "react-json-tree": "^0.12.0" } } diff --git a/packages/react-json-tree/examples/src/App.js b/packages/react-json-tree/examples/src/App.js index 6874f42c..73398f4b 100755 --- a/packages/react-json-tree/examples/src/App.js +++ b/packages/react-json-tree/examples/src/App.js @@ -1,6 +1,6 @@ import React from 'react'; import { Map } from 'immutable'; -import JSONTree from '../../src'; +import JSONTree from 'react-json-tree'; const getLabelStyle = ({ style }, nodeType, expanded) => ({ style: { diff --git a/packages/react-json-tree/examples/webpack.config.js b/packages/react-json-tree/examples/webpack.config.js index 00ed36c9..6c27baee 100755 --- a/packages/react-json-tree/examples/webpack.config.js +++ b/packages/react-json-tree/examples/webpack.config.js @@ -4,6 +4,7 @@ var webpack = require('webpack'); var isProduction = process.env.NODE_ENV === 'production'; module.exports = { + mode: isProduction ? 'production' : 'development', devtool: 'source-map', entry: [ !isProduction && 'webpack-dev-server/client?http://localhost:3000', @@ -16,39 +17,14 @@ module.exports = { publicPath: '/static/' }, plugins: [ - new webpack.DefinePlugin({ - 'process.env': { - NODE_ENV: JSON.stringify(process.env.NODE_ENV) - } - }), new webpack.HotModuleReplacementPlugin(), - new webpack.NoEmitOnErrorsPlugin(), - isProduction && - new webpack.optimize.UglifyJsPlugin({ - compress: { warnings: false }, - output: { comments: false }, - sourceMap: true - }) - ].filter(Boolean), - resolve: { - alias: { - 'react-json-tree/lib': path.join(__dirname, '..', 'src'), - 'react-json-tree': path.join(__dirname, '..', 'src'), - react: path.join(__dirname, 'node_modules', 'react') - }, - extensions: ['.js'] - }, + ], module: { - loaders: [ + rules: [ { test: /\.js$/, - loaders: ['babel-loader'].filter(Boolean), + loader: 'babel-loader', include: path.join(__dirname, 'src') - }, - { - test: /\.js$/, - loaders: ['babel-loader'].filter(Boolean), - include: path.join(__dirname, '..', 'src') } ] }