Merge branch 'next' of github.com:shakacode/shakapacker into strip-ad…

…ditional-paths-in-file-rule

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,14 +1,21 @@
 ### Summary
 
-_Remove this paragraph and describe 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, tag them here as well to keep the conversation linked._
+<!--
+  Describe the code changes in your pull request here - were there any bugs you had fixed, features you added, tradeoffs you made?
+  If so, mention them. If these changes have open GitHub issues, tag them here as well to keep the conversation linked.
+-->
 
 ### Pull Request checklist
-_Remove this line after checking all the items here. If the item does not apply to the PR, both check it out and wrap it by `~`._
+
+<!-- If any of the items on this checklist do not apply to the PR, both check it out and wrap it by `~`. -->
 
 - [ ] Add/update test to cover these changes
 - [ ] Update documentation
 - [ ] Update CHANGELOG file
 
 ### Other Information
 
-_Remove this paragraph and mention other important and relevant information, such as benchmarks._
+<!--
+  Mention any other important information that might relate to this PR but that don't belong in the summary,
+  like detailed benchmarks or possible follow-up changes.
+-->

.github/workflows/dummy.yml

@@ -3,9 +3,14 @@ name: Dummy specs
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
   pull_request:
 
+concurrency:
+  # Pushing new changes to a branch will cancel any in-progress CI runs
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest

.github/workflows/generator.yml

@@ -3,32 +3,37 @@ name: Generator specs
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
   pull_request:
 
+concurrency:
+  # Pushing new changes to a branch will cancel any in-progress CI runs
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     name: Generator specs
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby: ['2.6', '2.7', '3.0']
+        ruby: ['2.7', '3.0', '3.1', '3.2']
         use_package_json_gem: ['true', 'false']
         gemfile:
           - gemfiles/Gemfile-rails.6.0.x
           - gemfiles/Gemfile-rails.6.1.x
           - gemfiles/Gemfile-rails.7.0.x
+          - gemfiles/Gemfile-rails.7.1.x
           # Uncomment the following line only to ensure compatibility with the
           # upcomming Rails versions, maybe before a release.
           #- gemfiles/Gemfile-rails-edge
         exclude:
-          - ruby: 2.6
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails.7.0.x
-          - ruby: 2.6
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails-edge
+          - ruby: '3.1'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
+          - ruby: '3.2'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
+
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 
@@ -39,13 +44,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      # Bundler 2.5.0 dropped support for Ruby 2.6 and 2.7
-      - name: Use Bundler 2.4.22
-        run: |
-          gem install bundler -v '2.4.22'
-          bundle config --local path vendor/bundle
-      - name: Install dependencies
-        run: bundle install
+          bundler-cache: true
       - run: bundle exec rake run_spec:generator
         env:
           SHAKAPACKER_USE_PACKAGE_JSON_GEM: ${{ matrix.use_package_json_gem }}

.github/workflows/node.yml

@@ -0,0 +1,62 @@
+name: Node based checks
+
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+
+concurrency:
+  # Pushing new changes to a branch will cancel any in-progress CI runs
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    name: Linting
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node: [14.x, 16.x, 18.x, 20.x]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn --frozen-lockfile --non-interactive --prefer-offline
+
+      - name: Lint
+        run: yarn lint
+  test:
+    name: Testing
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node: [14.x, 16.x, 18.x, 20.x]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn --frozen-lockfile --non-interactive --prefer-offline
+
+      - name: Jest Specs
+        run: yarn test

.github/workflows/ruby.yml

@@ -1,33 +1,52 @@
-name: Ruby specs
+name: Ruby based checks
 
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
   pull_request:
 
+concurrency:
+  # Pushing new changes to a branch will cancel any in-progress CI runs
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
+  lint:
+    name: Linting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2'
+          bundler-cache: true
+
+      - name: Ruby rubocop
+        run: bundle exec rubocop
+
   test:
-    name: Ruby specs
+    name: Testing
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby: ['2.6', '2.7', '3.0']
+        ruby: ['2.7', '3.0', '3.1', '3.2']
         gemfile:
           - gemfiles/Gemfile-rails.6.0.x
           - gemfiles/Gemfile-rails.6.1.x
           - gemfiles/Gemfile-rails.7.0.x
+          - gemfiles/Gemfile-rails.7.1.x
           # Uncomment the following line only to ensure compatibility with the
           # upcomming Rails versions, maybe before a release.
           #- gemfiles/Gemfile-rails-edge
         exclude:
-          - ruby: 2.6
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails.7.0.x
-          - ruby: 2.6
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails-edge
+          - ruby: '3.1'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
+          - ruby: '3.2'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}

.rubocop.yml

@@ -1,5 +1,6 @@
 require: rubocop-performance
 AllCops:
+  TargetRubyVersion: 2.7
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true