diff --git a/examples/bundle-webpack/.babelrc b/examples/bundle-webpack/.babelrc deleted file mode 100644 index b0b9a96ef..000000000 --- a/examples/bundle-webpack/.babelrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "stage": 0 -} diff --git a/examples/bundle-webpack/package.json b/examples/bundle-webpack/package.json index bd72b6710..48ecb1ec5 100644 --- a/examples/bundle-webpack/package.json +++ b/examples/bundle-webpack/package.json @@ -9,13 +9,21 @@ "license": "MIT", "keywords": [], "devDependencies": { - "babel-core": "^5.4.7", - "babel-loader": "^5.1.2", + "@babel/core": "^7.2.2", + "@babel/preset-env": "^7.3.1", + "@babel/preset-react": "^7.0.0", + "babel-loader": "^8.0.5", "ipfs-http-client": "../../", - "json-loader": "~0.5.3", - "react": "~0.13.0", - "react-hot-loader": "^1.3.0", - "webpack": "^1.9.6", - "webpack-dev-server": "^1.8.2" - } + "react": "^16.8.1", + "react-dom": "^16.8.1", + "react-hot-loader": "^4.6.5", + "webpack": "^4.29.3", + "webpack-dev-server": "^3.1.14" + }, + "browserslist": [ + ">1%", + "not dead", + "not ie <= 11", + "not op_mini all" + ] } diff --git a/examples/bundle-webpack/src/App.js b/examples/bundle-webpack/src/App.js index 50889088c..155c6897e 100644 --- a/examples/bundle-webpack/src/App.js +++ b/examples/bundle-webpack/src/App.js @@ -29,15 +29,9 @@ class App extends React.Component { if (err) throw err const hash = res[0].hash this.setState({added_file_hash: hash}) - ipfs.cat(hash, (err, res) => { + ipfs.cat(hash, (err, data) => { if (err) throw err - let data = '' - res.on('data', (d) => { - data = data + d - }) - res.on('end', () => { - this.setState({added_file_contents: data}) - }) + this.setState({added_file_contents: data.toString()}) }) }) } diff --git a/examples/bundle-webpack/src/index.js b/examples/bundle-webpack/src/index.js index ec74d11ce..6d9d7badf 100644 --- a/examples/bundle-webpack/src/index.js +++ b/examples/bundle-webpack/src/index.js @@ -1,5 +1,6 @@ 'use strict' const React = require('react') +const ReactDOM = require('react-dom') const App = require('./App') -React.render(, document.getElementById('root')) +ReactDOM.render(, document.getElementById('root')) diff --git a/examples/bundle-webpack/webpack.config.js b/examples/bundle-webpack/webpack.config.js index ca6675c54..31e883e55 100644 --- a/examples/bundle-webpack/webpack.config.js +++ b/examples/bundle-webpack/webpack.config.js @@ -1,9 +1,10 @@ 'use strict' -var path = require('path') -var webpack = require('webpack') +const path = require('path') +const webpack = require('webpack') module.exports = { + mode: 'production', devtool: 'eval', entry: [ 'webpack-dev-server/client?http://localhost:3000', @@ -19,11 +20,18 @@ module.exports = { new webpack.HotModuleReplacementPlugin() ], module: { - loaders: [{ - test: /\.js$/, - loaders: ['react-hot', 'babel'], - include: path.join(__dirname, 'src') - }, { test: /\.json$/, loader: 'json-loader' }] + rules: [ + { + test: /\.js$/, + exclude: /node_modules/, + use: { + loader: 'babel-loader', + options: { + presets: ['@babel/preset-env', '@babel/preset-react'] + } + } + } + ] }, node: { fs: 'empty',