Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ Changes since the last non-beta release.

- **Shakapacker 9.1.0 Upgrade**: Upgraded Shakapacker from 9.0.0 to 9.1.0. This minor version update includes bug fixes and improvements. Updated webpack configuration in Pro dummy apps to use forEach pattern for better compatibility with multiple SCSS rules. [PR 1921](https://github.com/shakacode/react_on_rails/pull/1921) by [justin808](https://github.com/justin808).

- **Shakapacker 9.2.0 Upgrade**: Upgraded Shakapacker from 9.1.0 to 9.2.0. This minor version update adds a new `bin/shakapacker-config` utility for debugging webpack/rspack configurations with doctor mode, save mode, and stdout mode options. Supports YAML, JSON, and Node.js inspect output formats. by [justin808](https://github.com/justin808).

#### Bug Fixes

- **Use as Git dependency**: All packages can now be installed as Git dependencies. This is useful for development and testing purposes. See [CONTRIBUTING.md](./CONTRIBUTING.md#git-dependencies) for documentation. [PR #1873](https://github.com/shakacode/react_on_rails/pull/1873) by [alexeyr-ci2](https://github.com/alexeyr-ci2).
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.development_dependencies
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

gem "shakapacker", "9.1.0"
gem "shakapacker", "9.2.0"
gem "bootsnap", require: false
gem "rails", "~> 7.1"

Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ GEM
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
semantic_range (3.1.0)
shakapacker (9.1.0)
shakapacker (9.2.0)
activesupport (>= 5.2)
package_json
rack-proxy (>= 0.6.1)
Expand Down Expand Up @@ -440,7 +440,7 @@ DEPENDENCIES
scss_lint
sdoc
selenium-webdriver (= 4.9.0)
shakapacker (= 9.1.0)
shakapacker (= 9.2.0)
spring (~> 4.0)
sprockets (~> 4.0)
sqlite3 (~> 1.6)
Expand Down
2 changes: 1 addition & 1 deletion react_on_rails_pro/Gemfile.development_dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ruby '3.3.7'

gem "react_on_rails", path: "../"

gem "shakapacker", "9.1.0"
gem "shakapacker", "9.2.0"
gem "bootsnap", require: false
gem "rails", "~> 7.1"
gem "puma", "~> 6"
Expand Down
11 changes: 11 additions & 0 deletions react_on_rails_pro/spec/dummy/bin/export-bundler-config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env node

// Minimal shim - all logic is in the TypeScript module
const { run } = require('shakapacker/configExporter')

run(process.argv.slice(2))
.then((exitCode) => process.exit(exitCode))
.catch((error) => {
console.error(error.message)
process.exit(1)
})
2 changes: 1 addition & 1 deletion react_on_rails_pro/spec/dummy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"sass": "^1.43.4",
"sass-loader": "^12.3.0",
"sass-resources-loader": "^2.0.0",
"shakapacker": "9.1.0",
"shakapacker": "9.2.0",
"style-loader": "^3.3.1",
"tailwindcss": "^3.2.7",
"terser-webpack-plugin": "5",
Expand Down
8 changes: 4 additions & 4 deletions react_on_rails_pro/spec/dummy/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5970,10 +5970,10 @@ sha.js@^2.4.0, sha.js@^2.4.8:
inherits "^2.0.1"
safe-buffer "^5.0.1"

shakapacker@9.1.0:
version "9.1.0"
resolved "https://registry.npmjs.org/shakapacker/-/shakapacker-9.1.0.tgz#6d63c4d27b9358073dd8fc3c6e79252b96d36a36"
integrity sha512-PL0DuzNLFJMwr5s908ImMuvejmC20WuDa7EfAPpPFU1pM5U8cPqqC4kwSdXFLfVU0Or/UqeegNyIB1sGBdSPiw==
shakapacker@9.2.0:
version "9.2.0"
resolved "https://registry.npmjs.org/shakapacker/-/shakapacker-9.2.0.tgz#130bbeef9e72f2bd7f8ce5b1316ca3c778201e97"
integrity sha512-eEjps0qlufHAFOYY1fixZaXkIXLOE+FgQdjwKHhARryHfv4KxYIZiSQTFU4I6BOEXaK32zkTfEXOdU46YQv2pg==
dependencies:
js-yaml "^4.1.0"
path-complete-extname "^1.0.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env node

// Minimal shim - all logic is in the TypeScript module
const { run } = require('shakapacker/configExporter')

run(process.argv.slice(2))
.then((exitCode) => process.exit(exitCode))
.catch((error) => {
console.error(error.message)
process.exit(1)
})
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-on-rails": "link:.yalc/react-on-rails",
"shakapacker": "9.1.0",
"shakapacker": "9.2.0",
"style-loader": "^4.0.0",
"terser-webpack-plugin": "5",
"webpack": "5",
Expand Down
8 changes: 4 additions & 4 deletions react_on_rails_pro/spec/execjs-compatible-dummy/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3657,10 +3657,10 @@ [email protected]:
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==

shakapacker@9.1.0:
version "9.1.0"
resolved "https://registry.npmjs.org/shakapacker/-/shakapacker-9.1.0.tgz#6d63c4d27b9358073dd8fc3c6e79252b96d36a36"
integrity sha512-PL0DuzNLFJMwr5s908ImMuvejmC20WuDa7EfAPpPFU1pM5U8cPqqC4kwSdXFLfVU0Or/UqeegNyIB1sGBdSPiw==
shakapacker@9.2.0:
version "9.2.0"
resolved "https://registry.npmjs.org/shakapacker/-/shakapacker-9.2.0.tgz#130bbeef9e72f2bd7f8ce5b1316ca3c778201e97"
integrity sha512-eEjps0qlufHAFOYY1fixZaXkIXLOE+FgQdjwKHhARryHfv4KxYIZiSQTFU4I6BOEXaK32zkTfEXOdU46YQv2pg==
dependencies:
js-yaml "^4.1.0"
path-complete-extname "^1.0.0"
Expand Down
4 changes: 2 additions & 2 deletions spec/dummy/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ GEM
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
semantic_range (3.1.0)
shakapacker (9.1.0)
shakapacker (9.2.0)
activesupport (>= 5.2)
package_json
rack-proxy (>= 0.6.1)
Expand Down Expand Up @@ -441,7 +441,7 @@ DEPENDENCIES
scss_lint
sdoc
selenium-webdriver (= 4.9.0)
shakapacker (= 9.1.0)
shakapacker (= 9.2.0)
spring (~> 4.0)
sprockets (~> 4.0)
sqlite3 (~> 1.6)
Expand Down
11 changes: 11 additions & 0 deletions spec/dummy/bin/export-bundler-config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env node

// Minimal shim - all logic is in the TypeScript module
const { run } = require('shakapacker/configExporter');

run(process.argv.slice(2))
.then((exitCode) => process.exit(exitCode))
.catch((error) => {
console.error(error.message);
process.exit(1);
});
2 changes: 1 addition & 1 deletion spec/dummy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"sass": "^1.43.4",
"sass-loader": "^12.3.0",
"sass-resources-loader": "^2.1.0",
"shakapacker": "9.1.0",
"shakapacker": "9.2.0",
"style-loader": "^3.3.1",
"terser-webpack-plugin": "5.3.1",
"url-loader": "^4.0.0",
Expand Down
8 changes: 4 additions & 4 deletions spec/dummy/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5653,10 +5653,10 @@ sha.js@^2.4.0, sha.js@^2.4.8:
inherits "^2.0.1"
safe-buffer "^5.0.1"

shakapacker@9.1.0:
version "9.1.0"
resolved "https://registry.npmjs.org/shakapacker/-/shakapacker-9.1.0.tgz#6d63c4d27b9358073dd8fc3c6e79252b96d36a36"
integrity sha512-PL0DuzNLFJMwr5s908ImMuvejmC20WuDa7EfAPpPFU1pM5U8cPqqC4kwSdXFLfVU0Or/UqeegNyIB1sGBdSPiw==
shakapacker@9.2.0:
version "9.2.0"
resolved "https://registry.npmjs.org/shakapacker/-/shakapacker-9.2.0.tgz#130bbeef9e72f2bd7f8ce5b1316ca3c778201e97"
integrity sha512-eEjps0qlufHAFOYY1fixZaXkIXLOE+FgQdjwKHhARryHfv4KxYIZiSQTFU4I6BOEXaK32zkTfEXOdU46YQv2pg==
dependencies:
js-yaml "^4.1.0"
path-complete-extname "^1.0.0"
Expand Down
Loading