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/.babelrc b/packages/react-json-tree/babel.config.json similarity index 100% rename from packages/react-json-tree/.babelrc rename to packages/react-json-tree/babel.config.json diff --git a/packages/react-json-tree/examples/.babelrc b/packages/react-json-tree/examples/.babelrc deleted file mode 100755 index 422b2d38..00000000 --- a/packages/react-json-tree/examples/.babelrc +++ /dev/null @@ -1,9 +0,0 @@ -{ - "plugins": [ - "transform-object-rest-spread", - "transform-class-properties" - ], - "presets": [ - "env", "react" - ] -} diff --git a/packages/react-json-tree/examples/package.json b/packages/react-json-tree/examples/package.json index a2255ffd..a21f4e80 100644 --- a/packages/react-json-tree/examples/package.json +++ b/packages/react-json-tree/examples/package.json @@ -27,13 +27,13 @@ }, "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", diff --git a/packages/react-json-tree/examples/webpack.config.js b/packages/react-json-tree/examples/webpack.config.js index 00ed36c9..b6069aa8 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,32 @@ 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') + 'react-json-tree': path.join(__dirname, '..', 'src') }, extensions: ['.js'] }, module: { - loaders: [ + rules: [ { test: /\.js$/, - loaders: ['babel-loader'].filter(Boolean), - include: path.join(__dirname, 'src') + loader: 'babel-loader', + include: path.join(__dirname, 'src'), + options: { + rootMode: 'upward' + } }, { test: /\.js$/, - loaders: ['babel-loader'].filter(Boolean), - include: path.join(__dirname, '..', 'src') + loader: 'babel-loader', + include: path.join(__dirname, '..', 'src'), + options: { + rootMode: 'upward' + } } ] }