Merge branch 'master' into propshaft-support

rmosolgo · Feb 23, 2024 · 76634ce · 76634ce
2 parents ffc0cfa + d66b263
commit 76634ce
Show file tree

Hide file tree

Showing 16 changed files with 84,098 additions and 71,588 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,6 +10,10 @@ jobs:
         include:
           - gemfile: Gemfile
             ruby: 3.0
+          - gemfile: Gemfile
+            ruby: 3.1
+          - gemfile: Gemfile
+            ruby: 3.2
           - gemfile: Gemfile
             ruby: truffleruby-head  
     runs-on: ubuntu-20.04

diff --git a/Rakefile b/Rakefile
@@ -48,8 +48,8 @@ task :update_graphiql do
       new_css_versions["graphiql"] = new_version
 
       puts "Copying GraphiQL #{new_version}"
-      FileUtils.cp("./graphiql.js", "../../../app/assets/javascripts/graphiql/rails/graphiql-#{new_version}.js")
-      FileUtils.cp("./graphiql.css", "../../../app/assets/stylesheets/graphiql/rails/graphiql-#{new_version}.css")
+      FileUtils.cp("./graphiql.min.js", "../../../app/assets/javascripts/graphiql/rails/graphiql-#{new_version}.js")
+      FileUtils.cp("./graphiql.min.css", "../../../app/assets/stylesheets/graphiql/rails/graphiql-#{new_version}.css")
     end
 
     FileUtils.cd("./node_modules/react") do

diff --git a/app/assets/javascripts/graphiql/rails/application.js b/app/assets/javascripts/graphiql/rails/application.js
@@ -0,0 +1,5 @@
+//= require ./react-18.2.0
+//= require ./react-dom-18.2.0
+//= require ./fetch-0.10.1
+//= require ./graphiql-3.1.1
+//= require ./graphiql_show