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

should force load react-components which send over turbo-stream #1614

Closed
wants to merge 6 commits into from
Closed

should force load react-components which send over turbo-stream #1614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87fee8c
make sure that bundler:2.5.3 is used (#1618)
Judahmeek May 15, 2024
1295ce9
Make pack generation import statement commitable (#1610)
Judahmeek May 16, 2024
4f44915
should force load react-components which send over turbo-stream
theforestvn88 May 4, 2024
fef75be
Update README.md
justin808 May 16, 2024
0c9fb65
Switch to bundler 2.5.9 and commit top gemfile.lock (#1619)
justin808 May 17, 2024
d2e0e27
Merge branch 'master' into react_over_hotwired
justin808 May 17, 2024
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ aliases:
- &install-dummy-app-ruby-gems
name: Install Ruby Gems for dummy app
command: |
gem install bundler:2.5.3
gem install bundler:2.5.9
echo "Bundler version: "; bundle --version
cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3

# Install ruby gems unless existing set of gems is satisfying bundler.
- &install-package-ruby-gems
name: Install Ruby Gems for package
command: |
gem install bundler:2.5.3
gem install bundler:2.5.9
echo "Bundler version: "; bundle --version
bundle lock --add-platform 'x86_64-linux'
bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3
bundler: 2.5.3
bundler: 2.5.9
- name: Setup Node
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- name: yalc publish for react-on-rails
run: yalc publish
- name: Install Ruby Gems for package
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
- name: Ensure minimum required Chrome version
run: |
echo -e "Already installed $(google-chrome --version)\n"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-js-and-ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: 2.5.3
bundler: 2.5.9
- name: Setup Node
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
yarn run eslint -v
sudo yarn global add yalc
- name: Install Ruby Gems for package
run: bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3
run: bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
- name: Linting of Ruby
run: bundle exec rubocop
- name: Linting of JS
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: 2.5.3
bundler: 2.5.9
# libyaml-dev is needed for psych v5
# this gem depends on sdoc which depends on rdoc which depends on psych
- name: Fix dependency for libyaml-dev
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
path: spec/dummy/vendor/bundle
key: v5-dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}
- name: Install Ruby Gems for dummy app
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
- name: generate file system-based packs
run: cd spec/dummy && RAILS_ENV=test bundle exec rake react_on_rails:generate_packs
- name: Build test bundles for dummy app
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: 2.5.3
bundler: 2.5.9
- name: Setup Node
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -145,9 +145,9 @@ jobs:
- name: yalc add react-on-rails
run: cd spec/dummy && yalc add react-on-rails
- name: Install Ruby Gems for package
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
- name: Install Ruby Gems for dummy app
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3
run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
- name: Ensure minimum required Chrome version
run: |
echo -e "Already installed $(google-chrome --version)\n"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rspec-package-specs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: 2.5.3
bundler: 2.5.9
- name: Print system information
run: |
echo "Linux release: "; cat /etc/issue
Expand All @@ -37,7 +37,7 @@ jobs:
path: vendor/bundle
key: v5-package-app-gem-cache-${{ hashFiles('react_on_rails.gemspec') }}
- name: Install Ruby Gems for package
run: bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
run: bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
- name: Run rspec tests
run: bundle exec rspec spec/react_on_rails
- name: Store test results
Expand Down
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/.bundle/
/.yardoc
/Gemfile.lock
/_yardoc/
/coverage/
/doc/
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: required
language: ruby

rvm:
- 2.5.3
- 2.5.9
- 2.6.5
- 2.7.0

Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Please follow the recommendations outlined at [keepachangelog.com](http://keepac
## Versions
### [Unreleased]
Changes since the last non-beta release.
#### Added
- Pack Generation: Added functionality that will add an import statement, if missing, to the server bundle entrypoint even if the autobundle generated files still exist [PR 1610](https://github.com/shakacode/react_on_rails/pull/1610) by [judahmeek](https://github.com/judahmeek).

### [14.0.0] - 2024-04-03
_Major bump because dropping support for Ruby 2.7 and deprecated `webpackConfigLoader.js`._
Expand Down
3 changes: 2 additions & 1 deletion Gemfile.development_dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ gem "sass-rails", "~> 6.0"
gem "uglifier"
gem "jquery-rails"
gem "puma", "~> 6.0"
gem "bundler", "2.5.3"

# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem "turbolinks" if ENV["DISABLE_TURBOLINKS"].nil? || ENV["DISABLE_TURBOLINKS"].strip.empty?
Expand All @@ -23,6 +22,8 @@ gem "sprockets", "~> 4.0"

gem "amazing_print"

gem "turbo-rails"

group :development, :test do
gem "listen"
gem "pry"
Expand Down
Loading
Loading