From a9122a132c64686cbb075ba55789e44a960926f5 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Fri, 31 Jul 2020 23:51:44 -0400 Subject: [PATCH] fix(redux-slider-monitor): fix example build (#537) --- .gitignore | 1 + package.json | 3 ++- .../examples/todomvc/.babelrc | 10 ++-------- .../examples/todomvc/dist/index.html | 10 ++++++++++ .../examples/todomvc/package.json | 20 +++++++++++++++---- .../examples/todomvc/webpack.config.js | 20 ++----------------- packages/redux-slider-monitor/package.json | 2 +- yarn.lock | 7 ------- 8 files changed, 34 insertions(+), 39 deletions(-) create mode 100644 packages/redux-slider-monitor/examples/todomvc/dist/index.html diff --git a/.gitignore b/.gitignore index c3f40542..840e4db7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ build coverage .idea .eslintcache +!packages/redux-slider-monitor/examples/todomvc/dist/ diff --git a/package.json b/package.json index 807ff538..8c926eaa 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,8 @@ "packages/*", "packages/react-json-tree/examples", "packages/redux-devtools/examples/counter", - "packages/redux-devtools/examples/todomvc" + "packages/redux-devtools/examples/todomvc", + "packages/redux-slider-monitor/examples/todomvc" ], "engines": { "node": ">=8.0.0" diff --git a/packages/redux-slider-monitor/examples/todomvc/.babelrc b/packages/redux-slider-monitor/examples/todomvc/.babelrc index b772750d..cff1f9c7 100755 --- a/packages/redux-slider-monitor/examples/todomvc/.babelrc +++ b/packages/redux-slider-monitor/examples/todomvc/.babelrc @@ -1,10 +1,4 @@ { - "presets": [ - ["es2015", { "modules": false }], - "stage-0", - "react" - ], - "plugins": [ - "react-hot-loader/babel" - ] + "presets": ["@babel/preset-env", "@babel/preset-react"], + "plugins": ["@babel/plugin-proposal-class-properties", "react-hot-loader/babel"] } diff --git a/packages/redux-slider-monitor/examples/todomvc/dist/index.html b/packages/redux-slider-monitor/examples/todomvc/dist/index.html new file mode 100644 index 00000000..cf166b77 --- /dev/null +++ b/packages/redux-slider-monitor/examples/todomvc/dist/index.html @@ -0,0 +1,10 @@ + + + Redux TodoMVC + + +
+
+ + + diff --git a/packages/redux-slider-monitor/examples/todomvc/package.json b/packages/redux-slider-monitor/examples/todomvc/package.json index 371744dc..f12aacfa 100644 --- a/packages/redux-slider-monitor/examples/todomvc/package.json +++ b/packages/redux-slider-monitor/examples/todomvc/package.json @@ -1,15 +1,27 @@ { - "name": "todomvc", + "name": "slider-todomvc", "version": "0.0.0", "description": "TodoMVC example for redux", "main": "server.js", "scripts": { - "start": "../../node_modules/.bin/webpack-dev-server", - "build": "../../node_modules/.bin/webpack --config webpack.config.prod.js" + "start": "webpack-dev-server", + "build": "webpack --config webpack.config.prod.js" }, "repository": { "type": "git", "url": "https://github.com/calesce/redux-slider-monitor.git" }, - "license": "MIT" + "license": "MIT", + "devDependencies": { + "@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": { + "redux-slider-monitor": "^2.0.0-2" + } } diff --git a/packages/redux-slider-monitor/examples/todomvc/webpack.config.js b/packages/redux-slider-monitor/examples/todomvc/webpack.config.js index 8b98e8d1..ca59ce0b 100755 --- a/packages/redux-slider-monitor/examples/todomvc/webpack.config.js +++ b/packages/redux-slider-monitor/examples/todomvc/webpack.config.js @@ -21,20 +21,8 @@ module.exports = { filename: 'bundle.js' }, plugins: [ - new webpack.HotModuleReplacementPlugin(), - new webpack.NoEmitOnErrorsPlugin() + new webpack.HotModuleReplacementPlugin() ], - resolve: { - alias: { - 'redux-slider-monitor': path.join( - __dirname, - '..', - '..', - 'src/SliderMonitor' - ) - }, - extensions: ['.js'] - }, module: { rules: [ { @@ -45,11 +33,7 @@ module.exports = { }, { test: /\.css?$/, - use: ['style-loader', 'raw-loader'], - include: [ - __dirname, - path.join(__dirname, '../../../../node_modules/todomvc-app-css') - ] + use: ['style-loader', 'raw-loader'] } ] } diff --git a/packages/redux-slider-monitor/package.json b/packages/redux-slider-monitor/package.json index 0d653e49..13d46966 100644 --- a/packages/redux-slider-monitor/package.json +++ b/packages/redux-slider-monitor/package.json @@ -35,7 +35,7 @@ "redux-devtools-log-monitor": "^1.0.1", "redux-devtools": "^3.5.0", "rimraf": "^2.3.4", - "style-loader": "^0.16.1", + "style-loader": "^0.13.1", "todomvc-app-css": "^2.0.1" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 1379e334..52ab803e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17015,13 +17015,6 @@ style-loader@^0.13.0, style-loader@^0.13.1: dependencies: loader-utils "^1.0.2" -style-loader@^0.16.1: - version "0.16.1" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.16.1.tgz#50e325258d4e78421dd9680636b41e8661595d10" - integrity sha1-UOMlJY1OeEId2WgGNrQehmFZXRA= - dependencies: - loader-utils "^1.0.2" - style-loader@^0.23.1: version "0.23.1" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"