Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support React on Rails by merging Webpacker Lite #601

Closed
wants to merge 17 commits into from
Closed

Support React on Rails by merging Webpacker Lite #601

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
afe9c99
Support React on Rails by merging Webpacker Lite
justin808 Jul 28, 2017
41cda6a
Need to called load_instance for manifest in find!
justin808 Aug 2, 2017
b73fa8e
Provide WEBPACKER_DEV_SERVER env override
justin808 Aug 2, 2017
c71bd6f
Remove PRY
justin808 Aug 6, 2017
4cf3fca
Updates per review from dhh
justin808 Aug 6, 2017
23c1f23
Ran bundle to remove pry gems
justin808 Aug 6, 2017
4498a48
Remove comment
justin808 Aug 7, 2017
5740921
Remove Manifest.exist?
justin808 Aug 7, 2017
32ff0d0
Renamed load_instance and load_data back to load
justin808 Aug 9, 2017
5599fd6
Remove comments and React on Rails specifics
justin808 Aug 9, 2017
bb71faa
Merge branch 'master' into issue-464-merge-webpacker-lite-into-webpacker
gauravtiwari Aug 10, 2017
96fa67e
Inherit from configuration and fix typos
gauravtiwari Aug 10, 2017
fe292e6
Rename to hmr?
gauravtiwari Aug 10, 2017
e4337db
Update js for HMR
gauravtiwari Aug 10, 2017
d523fb9
Update readme
gauravtiwari Aug 10, 2017
007e36e
Change dev-server to a module and fix tests
gauravtiwari Aug 11, 2017
7f7fcac
Remove extra requires
gauravtiwari Aug 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions lib/install/config/webpack/development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
// Note: You must restart bin/webpack-dev-server for changes to take effect

const webpack = require('webpack')
const merge = require('webpack-merge')
const sharedConfig = require('./shared.js')
const { settings, output } = require('./configuration.js')
const { settings, output, env } = require('./configuration.js')

module.exports = merge(sharedConfig, {
devtool: 'cheap-eval-source-map',
Expand All @@ -16,6 +17,7 @@ module.exports = merge(sharedConfig, {
https: settings.dev_server.https,
host: settings.dev_server.host,
port: settings.dev_server.port,
hot: settings.dev_server.hmr,
contentBase: output.path,
publicPath: output.publicPath,
compress: true,
Expand All @@ -27,5 +29,10 @@ module.exports = merge(sharedConfig, {
stats: {
errorDetails: true
}
}
},

plugins: settings.dev_server.hmr ? [
new webpack.HotModuleReplacementPlugin(),
new webpack.NamedModulesPlugin()
] : []
})
4 changes: 1 addition & 3 deletions lib/install/config/webpack/shared.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ module.exports = {
plugins: [
new webpack.EnvironmentPlugin(JSON.parse(JSON.stringify(env))),
new ExtractTextPlugin(env.NODE_ENV === 'production' ? '[name]-[contenthash].css' : '[name].css'),
new ManifestPlugin({
writeToFileEmit: true
})
new ManifestPlugin({ writeToFileEmit: true })
],

resolve: {
Expand Down
2 changes: 1 addition & 1 deletion lib/install/config/webpacker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ development:
host: localhost
port: 8080
https: false
hot_reloading: false
hmr: false
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gauravtiwari @dhh FWIW, the docs for devServer.hot use hot and not hmr.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think hmr is consistent with names like 'WEBPACKER_HMR'

Also, considering usages like Webpacker::DevServer.hmr? and def hmr?, they are consistent.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ytbryan I agree in the sense that DevServer.hot? and WEBPACKER_HOT are a bit ambiguous.


test:
<<: *default
Expand Down