Merge branch 'master' into js-cleanup

rmosolgo · Feb 23, 2024 · 50675f2 · 50675f2
2 parents 7452d81 + a7594d5
commit 50675f2
Show file tree

Hide file tree

Showing 17 changed files with 84,100 additions and 71,600 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,6 +1,5 @@
 name: Tests
-on:
-  push
+on: pull_request
 
 jobs:
   test:
@@ -15,7 +14,7 @@ jobs:
           - gemfile: Gemfile
             ruby: 3.2
           - gemfile: Gemfile
-            ruby: truffleruby-head  
+            ruby: truffleruby-head
     runs-on: ubuntu-20.04
     steps:
     - run: echo BUNDLE_GEMFILE=${{ matrix.gemfile }} > $GITHUB_ENV

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
@@ -1,4 +1,4 @@
-//= require ./react-17.0.2
-//= require ./react-dom-17.0.2
-//= require ./graphiql-2.4.0
+//= require ./react-18.2.0
+//= require ./react-dom-18.2.0
+//= require ./graphiql-3.1.1
 //= require ./graphiql_show