[pull] master from shakacode:master

.circleci/config.yml

@@ -1,8 +1,9 @@
+# CircleCI is not longer in use by this repository & this file is now for reference only.
 version: 2
 
 aliases:
   - &docker-image
-    - image: circleci/ruby:2.7-node-browsers
+    - image: circleci/ruby:3.0-node-browsers
 
   # Print critical data and executables versions.
   - &print-system-info
@@ -53,16 +54,17 @@ aliases:
   - &install-dummy-app-ruby-gems
     name: Install Ruby Gems for dummy app
     command: |
-      gem install bundler
+      gem install bundler:2.5.9
       echo "Bundler version: "; bundle --version
-      cd spec/dummy && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
+      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
+      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
 
   # Restore node_modules dir from cache using yarn.lock checksum as a key.
@@ -129,7 +131,7 @@ jobs:
           name: prettier
           command: yarn start format.listDifferent
 
-  # Install Node modules for Renderer package with Yarn and save them to chache.
+  # Install Node modules for Renderer package with Yarn and save them to cache.
   install-package-node-packages:
     docker: *docker-image
     steps:
@@ -204,6 +206,9 @@ jobs:
       - run: *install-yalc-add-react-on-rails
       - run: *install-dummy-app-node-modules
       - run: *install-dummy-app-ruby-gems
+      - run:
+          name: generate file system-based packs
+          command: cd spec/dummy && bundle exec rake react_on_rails:generate_packs
       - run:
           name: Build test bundles for dummy app
           command: cd spec/dummy && yarn run build:test
@@ -316,6 +321,7 @@ workflows:
       - build-dummy-app-webpack-test-bundles:
           requires:
             - install-dummy-app-node-packages
+            - install-dummy-app-ruby-gems
       - package-js-tests:
           requires:
             - install-package-node-packages

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+A bug is a crash or incorrect behavior. If you have a debugging or troubleshooting question, please open [a discussion](https://github.com/shakacode/react_on_rails/discussions).
+
+## Environment
+
+1. Ruby version:
+2. Rails version:
+3. Shakapacker/Webpacker version:
+4. React on Rails version:
+
+## Expected behavior
+
+## Actual behavior
+
+## Small, reproducible repo

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,19 @@
+### Summary
+
+_Remove this paragraph and provide a general description of the code changes in your pull
+request... were there any bugs you had fixed? If so, mention them. If
+these bugs have open GitHub issues, be sure to tag them here as well,
+to keep the conversation linked together._
+
+### Pull Request checklist
+_Remove this line after checking all the items here. If the item is not applicable to the PR, both check it out and wrap it by `~`._
+
+- [ ] Add/update test to cover these changes
+- [ ] Update documentation
+- [ ] Update CHANGELOG file  
+  _Add the CHANGELOG entry at the top of the file._
+
+### Other Information
+
+_Remove this paragraph and mention any other important and relevant information such as benchmarks._
+

.github/workflows/examples.yml

@@ -0,0 +1,94 @@
+name: Generator tests
+
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+
+jobs:
+ examples:
+    env:
+      SKIP_YARN_COREPACK_CHECK: 0
+    strategy:
+      fail-fast: false
+      matrix:
+        versions: ['oldest', 'newest']
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+    - name: Get changed files
+      id: changed-files
+      uses: tj-actions/changed-files@v44
+      with:
+        files: |
+          lib/generators/**
+          rakelib/example_type.rb
+          rakelib/example_config.yml
+          rakelib/examples.rake
+          rakelib/run_rspec.rake
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.versions == 'oldest' && '3.0' || '3.3' }}
+        bundler: 2.5.9
+    - name: Setup Node
+      uses: actions/setup-node@v4
+      with:
+        node-version: 20
+    - name: Print system information
+      run: |
+        echo "Linux release: "; cat /etc/issue
+        echo "Current user: "; whoami
+        echo "Current directory: "; pwd
+        echo "Ruby version: "; ruby -v
+        echo "Node version: "; node -v
+        echo "Yarn version: "; yarn --version
+        echo "Bundler version: "; bundle --version
+    - name: run conversion script to support shakapacker v6
+      if: matrix.versions == 'oldest'
+      run: script/convert
+    - name: Save root node_modules to cache
+      uses: actions/cache@v4
+      with:
+        path: node_modules
+        key: v5-package-node-modules-cache-${{ hashFiles('yarn.lock') }}
+    - name: Save root ruby gems to cache
+      uses: actions/cache@v4
+      with:
+        path: vendor/bundle
+        key: package-app-gem-cache-${{ hashFiles('react_on_rails.gemspec') }}-${{ hashFiles('Gemfile.development_dependencies') }}-${{ matrix.versions }}
+    - id: get-sha
+      run: echo "::set-output name=sha::$(git rev-parse HEAD)"
+    - name: Install Node modules with Yarn for renderer package
+      run: |
+        yarn install --no-progress --no-emoji
+        sudo yarn global add yalc
+    - 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  _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"
+        MINIMUM_REQUIRED_CHROME_VERSION=75
+        INSTALLED_CHROME_MAJOR_VERSION="$(google-chrome --version | tr ' .' '\t' | cut -f3)"
+        if [[ $INSTALLED_CHROME_MAJOR_VERSION < $MINIMUM_REQUIRED_CHROME_VERSION ]]; then
+          wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+          sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+          sudo apt-get update
+          sudo apt-get install google-chrome-stable
+          echo -e "\nInstalled $(google-chrome --version)"
+        fi
+    - name: Increase the amount of inotify watchers
+      run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
+    - name: Main CI
+      if: steps.changed-files.outputs.any_changed == 'true'
+      run: bundle exec rake run_rspec:${{ matrix.versions == 'oldest' && 'web' || 'shaka' }}packer_examples
+    - name: Store test results
+      uses: actions/upload-artifact@v4
+      with:
+        name: main-rspec-${{ github.run_id }}-${{ github.job }}-${{ matrix.versions }}
+        path: ~/rspec

.github/workflows/lint-js-and-ruby.yml

@@ -1,24 +1,28 @@
 name: Lint JS and Ruby
 
-on: [push, pull_request]
+
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
 
 jobs:
   build:
-    strategy:
-      matrix:
-        ruby: [2.7]
-        node: [14]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby }}
+        ruby-version: 3
+        bundler: 2.5.9
     - name: Setup Node
-      uses: actions/setup-node@v2-beta
+      uses: actions/setup-node@v4
       with:
-        node-version: ${{ matrix.node }}
+        node-version: 20
     - name: Print system information
       run: |
         echo "Linux release: "; cat /etc/issue
@@ -29,25 +33,25 @@ jobs:
         echo "Yarn version: "; yarn --version
         echo "Bundler version: "; bundle --version
     - name: Save root node_modules to cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: node_modules
-        key: v4-package-node-modules-cache-${{ hashFiles('yarn.lock') }}
+        key: v5-package-node-modules-cache-${{ hashFiles('yarn.lock') }}
     - name: Save root ruby gems to cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: vendor/bundle
-        key: v4-package-app-gem-cache-${{ hashFiles('react_on_rails.gemspec') }}
+        key: package-app-gem-cache-${{ hashFiles('react_on_rails.gemspec') }}-${{ hashFiles('Gemfile.development_dependencies') }}-oldest
     - name: Install Node modules with Yarn for renderer package
       run: |
         yarn install --no-progress --no-emoji
-        yarn run eslint -v
-        sudo yarn global add yalc
     - 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: Linting of Ruby
       run: bundle exec rubocop
     - name: Linting of JS
       run: yarn start lint
     - name: Check formatting
       run: yarn start format.listDifferent
+    - name: Type-check TypeScript
+      run: yarn run type-check