From 46b7a462ff09102c9b1315fb05e4011c0e12073b Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Tue, 4 Aug 2020 23:52:08 -0400 Subject: [PATCH] Cleanup --- packages/d3-state-visualizer/.babelrc | 2 +- .../examples/tree/package.json | 6 +++--- .../examples/tree/webpack.config.js | 17 ++++------------- packages/d3-state-visualizer/package.json | 5 +++-- .../d3-state-visualizer/webpack.config.base.js | 4 ++-- .../webpack.config.development.js | 4 ++-- .../webpack.config.production.js | 10 ++-------- 7 files changed, 17 insertions(+), 31 deletions(-) diff --git a/packages/d3-state-visualizer/.babelrc b/packages/d3-state-visualizer/.babelrc index e60d3036..645cc56e 100644 --- a/packages/d3-state-visualizer/.babelrc +++ b/packages/d3-state-visualizer/.babelrc @@ -1,4 +1,4 @@ { "presets": ["@babel/preset-env", "@babel/preset-react"], - "plugins": ["@babel/plugin-proposal-class-properties"] + "plugins": ["@babel/plugin-proposal-class-properties", "@babel/plugin-proposal-export-default-from"] } diff --git a/packages/d3-state-visualizer/examples/tree/package.json b/packages/d3-state-visualizer/examples/tree/package.json index 477ea5bc..2d852792 100644 --- a/packages/d3-state-visualizer/examples/tree/package.json +++ b/packages/d3-state-visualizer/examples/tree/package.json @@ -8,7 +8,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/romseguy/d3-state-visualizer.git" + "url": "https://github.com/reduxjs/redux-devtools.git" }, "keywords": [ "d3", @@ -18,9 +18,9 @@ ], "license": "MIT", "bugs": { - "url": "https://github.com/romseguy/d3-state-visualizer/issues" + "url": "https://github.com/reduxjs/redux-devtools/issues" }, - "homepage": "https://github.com/romseguy/d3-state-visualizer", + "homepage": "https://github.com/reduxjs/redux-devtools", "dependencies": { "d3-state-visualizer": "^1.0.1", "map2tree": "^1.3.0" diff --git a/packages/d3-state-visualizer/examples/tree/webpack.config.js b/packages/d3-state-visualizer/examples/tree/webpack.config.js index a2e4cbd1..92055aad 100644 --- a/packages/d3-state-visualizer/examples/tree/webpack.config.js +++ b/packages/d3-state-visualizer/examples/tree/webpack.config.js @@ -2,6 +2,7 @@ var path = require('path'); var webpack = require('webpack'); module.exports = { + mode: process.env.NODE_ENV === 'production' ? 'production' : 'development', devtool: 'eval', entry: [ 'webpack-dev-server/client?http://localhost:3000', @@ -15,26 +16,16 @@ module.exports = { }, plugins: [ new webpack.HotModuleReplacementPlugin(), - new webpack.NoErrorsPlugin() ], resolve: { - alias: { - 'd3-state-visualizer': path.join(__dirname, '..', '..', 'src') - }, - extensions: ['', '.js'] + extensions: ['.js'] }, module: { - loaders: [{ + rules: [{ test: /\.js$/, - loaders: ['babel'], + loaders: ['babel-loader'], exclude: /node_modules/, include: __dirname - }, { - test: /\.js$/, - loaders: ['babel'], - include: [ - path.join(__dirname, '..', '..', 'src') - ] }] } }; diff --git a/packages/d3-state-visualizer/package.json b/packages/d3-state-visualizer/package.json index 1560b2a9..db6acbe5 100644 --- a/packages/d3-state-visualizer/package.json +++ b/packages/d3-state-visualizer/package.json @@ -11,8 +11,8 @@ "scripts": { "clean": "rimraf lib dist", "build": "babel src --out-dir lib", - "build:umd": "webpack src/index.js dist/d3-state-visualizer.js --config webpack.config.development.js", - "build:umd:min": "webpack src/index.js dist/d3-state-visualizer.min.js --config webpack.config.production.js", + "build:umd": "webpack src/index.js -o dist/d3-state-visualizer.js --config webpack.config.development.js", + "build:umd:min": "webpack src/index.js -o dist/d3-state-visualizer.min.js --config webpack.config.production.js", "prepare": "npm run build", "prepublishOnly": "npm run clean && npm run build && npm run build:umd && npm run build:umd:min" }, @@ -37,6 +37,7 @@ "@babel/cli": "^7.10.5", "@babel/core": "^7.11.0", "@babel/plugin-proposal-class-properties": "^7.10.4", + "@babel/plugin-proposal-export-default-from": "^7.10.4", "@babel/preset-env": "^7.11.0", "@babel/preset-react": "^7.10.4", "babel-loader": "^8.1.0", diff --git a/packages/d3-state-visualizer/webpack.config.base.js b/packages/d3-state-visualizer/webpack.config.base.js index e047b9e1..a15e2e76 100644 --- a/packages/d3-state-visualizer/webpack.config.base.js +++ b/packages/d3-state-visualizer/webpack.config.base.js @@ -2,7 +2,7 @@ module.exports = { module: { - loaders: [ + rules: [ { test: /\.js$/, loaders: ['babel-loader'], exclude: /node_modules/ } ] }, @@ -11,6 +11,6 @@ module.exports = { libraryTarget: 'umd' }, resolve: { - extensions: ['', '.js'] + extensions: ['.js'] } }; diff --git a/packages/d3-state-visualizer/webpack.config.development.js b/packages/d3-state-visualizer/webpack.config.development.js index e509d7cd..703f597b 100644 --- a/packages/d3-state-visualizer/webpack.config.development.js +++ b/packages/d3-state-visualizer/webpack.config.development.js @@ -3,9 +3,9 @@ var webpack = require('webpack'); var baseConfig = require('./webpack.config.base'); -var config = Object.create(baseConfig); +var config = Object.assign({}, baseConfig); +config.mode = 'development'; config.plugins = [ - new webpack.optimize.OccurenceOrderPlugin(), new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify('development') }) diff --git a/packages/d3-state-visualizer/webpack.config.production.js b/packages/d3-state-visualizer/webpack.config.production.js index f4589cc0..24b19db4 100644 --- a/packages/d3-state-visualizer/webpack.config.production.js +++ b/packages/d3-state-visualizer/webpack.config.production.js @@ -3,17 +3,11 @@ var webpack = require('webpack'); var baseConfig = require('./webpack.config.base'); -var config = Object.create(baseConfig); +var config = Object.assign({}, baseConfig); +config.mode = 'production'; config.plugins = [ - new webpack.optimize.OccurenceOrderPlugin(), new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify('production') - }), - new webpack.optimize.UglifyJsPlugin({ - compressor: { - screw_ie8: true, - warnings: false - } }) ];