Skip to content

Commit

Permalink
Binding webpack 5
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric-Guo committed Jan 4, 2022
1 parent ae7376f commit 7e949cd
Show file tree
Hide file tree
Showing 4 changed files with 998 additions and 4,214 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gem "pg"
# Use Puma as the app server
gem "puma"
# Use development version of Webpacker
gem "webpacker"
gem "webpacker", '~> 6.0.0.rc.6'

# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem "turbolinks", "~> 5"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ GEM
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (~> 4.0)
webpacker (5.4.3)
webpacker (6.0.0.rc.6)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
Expand Down Expand Up @@ -319,7 +319,7 @@ DEPENDENCIES
tzinfo-data
web-console
webdrivers
webpacker
webpacker (~> 6.0.0.rc.6)

RUBY VERSION
ruby 3.0.3p157
Expand Down
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@rails/actioncable": "^6.1.4-4",
"@rails/activestorage": "^6.1.4-4",
"@rails/ujs": "^6.1.4-4",
"@rails/webpacker": "^5.4.3",
"@rails/webpacker": "^6.0.0-rc.6",
"@stimulus/polyfills": "^2.0.0",
"bootstrap": "^4.6.1",
"core-js": "^3.19.3",
Expand All @@ -23,12 +23,14 @@
"postinstall-postinstall": "^2.1.0",
"regenerator-runtime": "^0.13.9",
"stimulus": "^2.0.0",
"turbolinks": "^5.2.0"
"turbolinks": "^5.2.0",
"webpack": "^5.65.0",
"webpack-cli": "^4.9.1"
},
"devDependencies": {
"@webpack-cli/serve": "^1.6.0",
"typescript": "^3.9.10",
"webpack": "^4.46.0",
"webpack-dev-server": "^3.11.3"
"webpack-dev-server": "^4.7.1"
},
"resolutions": {
"chokidar": "^3.5.2"
Expand Down
Loading

0 comments on commit 7e949cd

Please sign in to comment.