Skip to content

Commit

Permalink
[WIP] Second attempt at upgrading LUX and Webpack
Browse files Browse the repository at this point in the history
  • Loading branch information
jrgriffiniii committed Feb 13, 2019
1 parent c7c899d commit 5ee44f1
Show file tree
Hide file tree
Showing 6 changed files with 2,604 additions and 1,430 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ gem 'sprockets', '~> 3.7'
gem 'sprockets-es6'
gem 'sprockets-rails'
gem 'string_rtl'
gem 'webpacker', '~> 3.5'
gem 'webpacker', '>= 4.0.x'

# PUL Assets
gem 'dalli'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
webpacker (3.5.5)
webpacker (4.0.0.rc.7)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
Expand Down Expand Up @@ -656,7 +656,7 @@ DEPENDENCIES
vcr
web-console (~> 2.0)
webmock
webpacker (~> 3.5)
webpacker (>= 4.0.x)

BUNDLED WITH
1.17.2
6 changes: 5 additions & 1 deletion bin/webpack
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ require "bundler/setup"

require "webpacker"
require "webpacker/webpack_runner"
Webpacker::WebpackRunner.run(ARGV)

APP_ROOT = File.expand_path("..", __dir__)
Dir.chdir(APP_ROOT) do
Webpacker::WebpackRunner.run(ARGV)
end
6 changes: 5 additions & 1 deletion bin/webpack-dev-server
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ require "bundler/setup"

require "webpacker"
require "webpacker/dev_server_runner"
Webpacker::DevServerRunner.run(ARGV)

APP_ROOT = File.expand_path("..", __dir__)
Dir.chdir(APP_ROOT) do
Webpacker::DevServerRunner.run(ARGV)
end
15 changes: 12 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
{
"dependencies": {
"@rails/webpacker": "3.5",
"@rails/webpacker": "https://github.com/rails/webpacker",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-preset-env": "^1.7.0",
"caniuse-lite": "^1.0.30000936",
"css-loader": "^2.1.0",
"lux-design-system": "^2.0.3",
"postcss-cssnext": "^3.1.0",
"vue": "^2.6.5",
"vue-loader": "14.2.2",
"vue-template-compiler": "^2.6.5"
"vue-template-compiler": "^2.6.5",
"webpack": "^4.29.3"
},
"devDependencies": {
"webpack-dev-server": "2.11.2"
"webpack-cli": "^3.2.3",
"webpack-dev-server": "^3.1.14"
}
}
Loading

0 comments on commit 5ee44f1

Please sign in to comment.