Fix GitHub workflow (#3150)

* fix rubocop.yml

* fix compatibility with ruby 2.4

* fix jest Development environment tests

* bump jest to current version

* fix github workflow files

Author: crawler

.github/workflows/jest.yml

@@ -13,10 +13,15 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+
       - name: Install yarn maybe
-        run: which yarn || sudo npm install -g yarn
+        run: which yarn || npm install -g yarn
 
-      - uses: actions/checkout@v2
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -29,11 +34,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ matrix.node }}-yarn-
 
-      - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
-
       - name: Install dependencies
         run: yarn --frozen-lockfile
 

.github/workflows/js-lint.yml

@@ -9,13 +9,18 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [14.x]
+        node: [14]
 
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+
       - name: Install yarn maybe
-        run: which yarn || sudo npm install -g yarn
+        run: which yarn || npm install -g yarn
 
       - uses: actions/checkout@v2
       - name: Get yarn cache directory path
@@ -30,11 +35,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
-
       - name: Install dependencies
         run: yarn --frozen-lockfile
 

.github/workflows/ruby.yml

@@ -14,6 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
+        node: [14]
         ruby: [
           2.4,
           2.5,
@@ -55,8 +56,13 @@ jobs:
           restore-keys: |
             bundle-use-ruby-${{ matrix.ruby }}-${{ matrix.gemfile }}-gems-
 
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+
       - name: Install yarn maybe
-        run: which yarn || sudo npm install -g yarn
+        run: which yarn || npm install -g yarn
 
       - uses: ruby/setup-ruby@v1
         with:

.rubocop.yml

@@ -1,6 +1,6 @@
 require: rubocop-performance
 AllCops:
-  TargetRubyVersion: 2.4
+  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

lib/tasks/yarn.rake

@@ -5,28 +5,30 @@
 namespace :yarn do
   desc "Install all JavaScript dependencies as specified via Yarn"
   task :install do
-    # Install only production deps when for not usual envs.
-    valid_node_envs = %w[test development production]
-    node_env = ENV.fetch("NODE_ENV") do
-      valid_node_envs.include?(Rails.env) ? Rails.env : "production"
-    end
-
-    yarn_flags =
-      if `#{RbConfig.ruby} "#{Rails.root}/bin/yarn" --version`.start_with?("1")
-        "--no-progress --frozen-lockfile"
-      else
-        "--immutable"
+    begin
+      # Install only production deps when for not usual envs.
+      valid_node_envs = %w[test development production]
+      node_env = ENV.fetch("NODE_ENV") do
+        valid_node_envs.include?(Rails.env) ? Rails.env : "production"
       end
 
-    system(
-      { "NODE_ENV" => node_env },
-      "#{RbConfig.ruby} \"#{Rails.root}/bin/yarn\" install #{yarn_flags}",
-      exception: true
-    )
-  rescue Errno::ENOENT
-    $stderr.puts "bin/yarn was not found."
-    $stderr.puts "Please run `bundle exec rails app:update:bin` to create it."
-    exit 1
+      yarn_flags =
+        if `#{RbConfig.ruby} "#{Rails.root}/bin/yarn" --version`.start_with?("1")
+          "--no-progress --frozen-lockfile"
+        else
+          "--immutable"
+        end
+
+      system(
+        { "NODE_ENV" => node_env },
+        "#{RbConfig.ruby} \"#{Rails.root}/bin/yarn\" install #{yarn_flags}",
+        exception: true
+      )
+    rescue Errno::ENOENT
+      $stderr.puts "bin/yarn was not found."
+      $stderr.puts "Please run `bundle exec rails app:update:bin` to create it."
+      exit 1
+    end
   end
 end
 

package.json

@@ -37,7 +37,7 @@
     "eslint-plugin-import": "^2.24.1",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.24.0",
-    "jest": "^27.0.6"
+    "jest": "^27.1.0"
   },
   "jest": {
     "testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$",

package/__tests__/development.js

@@ -14,7 +14,7 @@ describe('Development environment', () => {
     test('should use development config and environment including devServer if WEBPACK_SERVE', () => {
       process.env.RAILS_ENV = 'development'
       process.env.NODE_ENV = 'development'
-      process.env.WEBPACK_DEV_SERVER = 'true'
+      process.env.WEBPACK_SERVE = 'true'
       const { webpackConfig } = require('../index')
 
       expect(webpackConfig.output.path).toEqual(resolve('public', 'packs'))
@@ -31,7 +31,7 @@ describe('Development environment', () => {
     test('should use development config and environment if WEBPACK_SERVE', () => {
       process.env.RAILS_ENV = 'development'
       process.env.NODE_ENV = 'development'
-      process.env.WEBPACK_DEV_SERVER = undefined
+      process.env.WEBPACK_SERVE = undefined
       const { webpackConfig } = require('../index')
 
       expect(webpackConfig.output.path).toEqual(resolve('public', 'packs'))