From 8b3373b072ed96e624b7978d50eb4e6bcab4f118 Mon Sep 17 00:00:00 2001 From: cheremukhin23 Date: Fri, 24 Mar 2017 11:30:15 +0300 Subject: [PATCH 1/7] Update webpack from v2.2.1 to v2.3.1 --- .../react_on_rails/templates/base/base/client/package.json.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/generators/react_on_rails/templates/base/base/client/package.json.tt b/lib/generators/react_on_rails/templates/base/base/client/package.json.tt index a4ed3c3a3..deb3726cb 100644 --- a/lib/generators/react_on_rails/templates/base/base/client/package.json.tt +++ b/lib/generators/react_on_rails/templates/base/base/client/package.json.tt @@ -32,7 +32,7 @@ "react-redux": "^5.0.3", "redux": "^3.6.0", <%- end -%> - "webpack": "^2.2.1" + "webpack": "^2.3.1" }, "devDependencies": { } From 5ccb40f2fd1c067e26044df3f2b81d2cd6c7b585 Mon Sep 17 00:00:00 2001 From: cheremukhin23 Date: Fri, 24 Mar 2017 14:04:49 +0300 Subject: [PATCH 2/7] Change output path to absolute in generator's webpack config --- .../templates/base/base/client/webpack.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/generators/react_on_rails/templates/base/base/client/webpack.config.js b/lib/generators/react_on_rails/templates/base/base/client/webpack.config.js index 38489898c..7266ac43d 100644 --- a/lib/generators/react_on_rails/templates/base/base/client/webpack.config.js +++ b/lib/generators/react_on_rails/templates/base/base/client/webpack.config.js @@ -3,6 +3,7 @@ "only-multiline"} ] */ const webpack = require('webpack'); +const pathLib = require('path'); const devBuild = process.env.NODE_ENV !== 'production'; @@ -16,7 +17,7 @@ const config = { output: { filename: 'webpack-bundle.js', - path: '../app/assets/webpack', + path: pathLib.resolve(__dirname, '../app/assets/webpack'), }, resolve: { From 27cd9d49c2eeb837e7571fe0cc1d3a1e72d5bb65 Mon Sep 17 00:00:00 2001 From: cheremukhin23 Date: Fri, 24 Mar 2017 15:07:02 +0300 Subject: [PATCH 3/7] Update webpack.md in docs additional reading --- docs/additional-reading/webpack.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/additional-reading/webpack.md b/docs/additional-reading/webpack.md index 0ea54908d..485c6a04d 100644 --- a/docs/additional-reading/webpack.md +++ b/docs/additional-reading/webpack.md @@ -4,7 +4,7 @@ You can try out example app, [shakacode/react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial). We're building comprehensive production examples in our new, premium product, [**React on Rails Pro**](https://forum.shakacode.com/t/introducing-react-on-rails-pro-subscriptions/785). If you're interested, please see the details in [this forum post](https://forum.shakacode.com/t/introducing-react-on-rails-pro-subscriptions/785). ## Webpack v1 or v2? -We recommend using Webpack version 2.2.1 or greater. +We recommend using Webpack version 2.3.1 or greater. ## yarn or npm? Yarn is the current recommendation! From 9e07a2e8778b01e9382bb488e502b5286abd63a0 Mon Sep 17 00:00:00 2001 From: cheremukhin23 Date: Fri, 24 Mar 2017 15:08:09 +0300 Subject: [PATCH 4/7] Update main package.json file to use webpack ^2.3.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dc6ee31bb..5c8d89f60 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "release-it": "^2.5.4", "tap-spec": "^4.1.1", "tape": "^4.6.3", - "webpack": "^2.2.1" + "webpack": "^2.3.1" }, "peerDependencies": { "babel-runtime": ">= 6", From d0090df422aa78138d15e7cd8462bcaf3c34dfb0 Mon Sep 17 00:00:00 2001 From: cheremukhin23 Date: Fri, 24 Mar 2017 15:51:40 +0300 Subject: [PATCH 5/7] Change webpack output path to absolute in dummy app --- spec/dummy/client/webpack.client.js | 2 +- spec/dummy/client/webpack.client.rails.build.config.js | 3 ++- spec/dummy/client/webpack.server.js | 2 +- spec/dummy/client/webpack.server.rails.build.config.js | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spec/dummy/client/webpack.client.js b/spec/dummy/client/webpack.client.js index d0331066c..4af985f64 100644 --- a/spec/dummy/client/webpack.client.js +++ b/spec/dummy/client/webpack.client.js @@ -10,7 +10,7 @@ module.exports = { 'startup/clientRegistration', ], output: { - path: '../app/assets/webpack', + path: path.resolve(__dirname, '../app/assets/webpack'), // Implement chunkhash and bypass the asset pipeline // TODO: https://webpack.js.org/guides/code-splitting-libraries/#manifest-file filename: 'client.js', diff --git a/spec/dummy/client/webpack.client.rails.build.config.js b/spec/dummy/client/webpack.client.rails.build.config.js index 038681703..117309604 100644 --- a/spec/dummy/client/webpack.client.rails.build.config.js +++ b/spec/dummy/client/webpack.client.rails.build.config.js @@ -6,12 +6,13 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin'); const config = require('./webpack.client.base.config'); +const path = require('path'); const devBuild = process.env.NODE_ENV !== 'production'; config.output = { filename: '[name]-bundle.js', - path: '../app/assets/webpack', + path: path.resolve(__dirname, '../app/assets/webpack'), publicPath: '/assets/', }; diff --git a/spec/dummy/client/webpack.server.js b/spec/dummy/client/webpack.server.js index 9c8672a45..d0e145e7e 100644 --- a/spec/dummy/client/webpack.server.js +++ b/spec/dummy/client/webpack.server.js @@ -6,7 +6,7 @@ module.exports = { 'startup/serverRegistration', ], output: { - path: '../app/assets/webpack', + path: path.resolve(__dirname, '../app/assets/webpack'), filename: 'server.js', }, resolve: { diff --git a/spec/dummy/client/webpack.server.rails.build.config.js b/spec/dummy/client/webpack.server.rails.build.config.js index dd39905e4..42f056b7c 100644 --- a/spec/dummy/client/webpack.server.rails.build.config.js +++ b/spec/dummy/client/webpack.server.rails.build.config.js @@ -16,7 +16,7 @@ module.exports = { ], output: { filename: 'server-bundle.js', - path: '../app/assets/webpack', + path: path.resolve(__dirname, '../app/assets/webpack'), }, resolve: { extensions: ['.js', '.jsx'], From 26e4a0477bbf4272c9be75c6d58a1e2ffaf7e073 Mon Sep 17 00:00:00 2001 From: cheremukhin23 Date: Fri, 24 Mar 2017 15:52:35 +0300 Subject: [PATCH 6/7] Update dummy app package.json file to use webpack ^2.3.1 --- spec/dummy/client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/dummy/client/package.json b/spec/dummy/client/package.json index 7918bbe00..d95e6f0df 100644 --- a/spec/dummy/client/package.json +++ b/spec/dummy/client/package.json @@ -43,7 +43,7 @@ "sass-resources-loader": "1.2.0", "style-loader": "^0.13.2", "url-loader": "^0.5.8", - "webpack": "^2.2.1" + "webpack": "^2.3.1" }, "devDependencies": { "babel-plugin-react-transform": "^2.0.2", From 29baf83d4c373c1777b1d3ca7f004b12258f4063 Mon Sep 17 00:00:00 2001 From: cheremukhin23 Date: Fri, 24 Mar 2017 16:25:28 +0300 Subject: [PATCH 7/7] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ac3e2e8b..30f849a0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com] ## [Unreleased] *Please add entries here for your pull requests.* +## Changed +- Change webpack output path to absolute and update webpack to version ^2.3.1. [#771](https://github.com/shakacode/react_on_rails/pull/771) by [cheremukhin23](https://github.com/cheremukhin23). ## [6.8.1] - 2017-03-21 ### Fixed