Skip to content

Commit fce358b

Browse files
committed
Prepare 3.3.0 release and update master to main references
- Updated CHANGELOG.md with 3.3.0 release for Propshaft support - Renamed master branch references to main in documentation links - Updated VERSIONS.md to show main branch instead of master
1 parent 28ee689 commit fce358b

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ Changes since the last non-beta release.
1515

1616
_Please add entries here for your pull requests that have not yet been released. Include LINKS for PRs and committers._
1717

18+
## [3.3.0] - 2024-11-22
19+
20+
#### Added
1821
- Support for Propshaft server rendering. [PR 1345](https://github.com/reactjs/react-rails/pull/1345) by [elektronaut](https://github.com/elektronaut)
1922

2023
## [3.2.1] - 2024-05-16
@@ -590,8 +593,9 @@ _Please add entries here for your pull requests that have not yet been released.
590593
- Server rendering with `prerender: true`
591594
- Transform `.jsx` in the asset pipeline
592595

593-
[Unreleased]: https://github.com/reactjs/react-rails/compare/v3.2.1...main
594-
[3.2.1]: https://github.com/reactjs/react-rails/compare/v3.2.1...v3.2.1
596+
[Unreleased]: https://github.com/reactjs/react-rails/compare/v3.3.0...main
597+
[3.3.0]: https://github.com/reactjs/react-rails/compare/v3.2.1...v3.3.0
598+
[3.2.1]: https://github.com/reactjs/react-rails/compare/v3.2.0...v3.2.1
595599
[3.2.0]: https://github.com/reactjs/react-rails/compare/v3.1.1...v3.2.0
596600
[3.1.1]: https://github.com/reactjs/react-rails/compare/v3.1.0...v3.1.1
597601
[3.1.0]: https://github.com/reactjs/react-rails/compare/v3.0.0...v3.1.0

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ React-Rails is a flexible tool to use [React](http://facebook.github.io/react/)
1818

1919
While ShakaCode will continue to support this gem, you might consider migrating to [React on Rails](https://github.com/shakacode/react_on_rails) or [React on Rails Pro with proper Node rendering](https://www.shakacode.com/react-on-rails-pro/).
2020

21-
Why? React on Rails code receives much more active development and testing. For example, consider the [ReactRailsUJS](https://github.com/reactjs/react-rails/blob/master/react_ujs/index.js) implementation compared to the [ReactOnRails Node package](https://github.com/shakacode/react_on_rails/tree/master/node_package) which is written in TypeScript. For another example, React on Rails has work underway to support the latest React features, such as [React Server Components](https://react.dev/reference/rsc/server-components).
21+
Why? React on Rails code receives much more active development and testing. For example, consider the [ReactRailsUJS](https://github.com/reactjs/react-rails/blob/main/react_ujs/index.js) implementation compared to the [ReactOnRails Node package](https://github.com/shakacode/react_on_rails/tree/master/node_package) which is written in TypeScript. For another example, React on Rails has work underway to support the latest React features, such as [React Server Components](https://react.dev/reference/rsc/server-components).
2222

23-
You can find [migration to React on Rails steps here](https://github.com/reactjs/react-rails/blob/master/docs/migrating-from-react-rails-to-react_on_rails.md).
23+
You can find [migration to React on Rails steps here](https://github.com/reactjs/react-rails/blob/main/docs/migrating-from-react-rails-to-react_on_rails.md).
2424

2525
---
2626
## ShakaCode Support

VERSIONS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
99

1010
| Gem | React.js | |
1111
| -------- | -------- | -------------- |
12-
| master | 16.14.0 |
12+
| main | 16.14.0 |
1313
| 2.6.2 | 16.14.0 |
1414
| 2.6.1 | 16.9.0 |
1515
| 2.6.0 | 16.8.6 |

docs/get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,4 +335,4 @@ MyApp::Application.configure do
335335
end
336336
```
337337

338-
Be sure to restart your Rails server after changing these files. See [VERSIONS.md](https://github.com/reactjs/react-rails/blob/master/VERSIONS.md) to learn which version of React.js is included with your `react-rails` version. In some edge cases you may need to bust the sprockets cache with `rake tmp:clear`
338+
Be sure to restart your Rails server after changing these files. See [VERSIONS.md](https://github.com/reactjs/react-rails/blob/main/VERSIONS.md) to learn which version of React.js is included with your `react-rails` version. In some edge cases you may need to bust the sprockets cache with `rake tmp:clear`

0 commit comments

Comments
 (0)