Merge branch 'staging' into rake-13.0.6

code-dot-org · Apr 13, 2023 · f831869 · f831869
2 parents efe7e9e + 027850e
commit f831869
Show file tree

Hide file tree

Showing 14,145 changed files with 705,312 additions and 112,620 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -3,70 +3,43 @@
 // or overridden for a particular subset of the project.  See
 // other .eslintrc.js files for those rules.
 module.exports = {
-  plugins: ["react", "react-hooks", "mocha", "babel", "cdo-custom-rules"],
-  extends: [
-    "plugin:prettier/recommended",
-    "eslint:recommended",
-    "plugin:react/recommended",
-  ],
+  extends: ['eslint:recommended'],
   env: {
     browser: true,
     node: true,
-    mocha: true,
+    mocha: true
   },
   rules: {
-    "cdo-custom-rules/style-blocks-below-class": "error",
-    "array-bracket-spacing": ["error", "never"],
-    "babel/semi": "error", // autofixable
-    "brace-style": ["error", "1tbs", { allowSingleLine: true }],
-    "comma-dangle": "off",
-    curly: "error",
-    "dot-location": ["error", "property"],
-    "eol-last": "error",
-    eqeqeq: "error",
-    "jsx-quotes": "error", // autofixable
-    "keyword-spacing": "error",
-    "mocha/no-exclusive-tests": "error",
-    "no-array-constructor": "error",
-    "no-console": "off",
-    "no-duplicate-imports": "error",
-    "no-empty": "off",
-    "no-eval": "error",
-    "no-ex-assign": "off",
-    "no-extra-boolean-cast": "off",
-    "no-implicit-globals": "error",
-    "no-new-object": "error",
-    "no-restricted-imports": ["error", "radium"],
-    "no-trailing-spaces": "error",
-    "no-undef": "error",
-    "no-unused-vars": ["error", { args: "none" }],
-    "no-useless-escape": "off",
-    "no-with": "error",
-    "object-curly-spacing": "off",
-    "react/button-has-type": "error",
-    "react/display-name": "off",
-    "react/jsx-closing-bracket-location": "error", // autofixable
-    "react/jsx-curly-spacing": "error", // autofixable
-    "react/jsx-first-prop-new-line": ["error", "multiline"],
-    "react/jsx-indent-props": ["error", 2], // autofixable
-    "react/jsx-key": "off",
-    "react/jsx-no-target-blank": "error",
-    "react/jsx-wrap-multilines": "error", // autofixable
-    "react/no-find-dom-node": "off",
-    "react/no-render-return-value": "off",
-    "react/no-string-refs": "off",
-    "react/no-unescaped-entities": "off",
-    "react/self-closing-comp": "error",
-    "react/no-danger": "error",
-    "react-hooks/exhaustive-deps": "error",
-    "react-hooks/rules-of-hooks": "error",
-    semi: "off", // enforced by babel/semi
-    "space-before-blocks": "error",
-    strict: "error",
-  },
-  settings: {
-    react: {
-      version: "detect",
-    },
-  },
+    'array-bracket-spacing': ['error', 'never'],
+    'brace-style': ['error', '1tbs', {allowSingleLine: true}],
+    'comma-dangle': 'off',
+    curly: 'error',
+    'dot-location': ['error', 'property'],
+    'eol-last': 'error',
+    eqeqeq: 'error',
+    'jsx-quotes': 'error', // autofixable
+    'keyword-spacing': 'error',
+    'no-array-constructor': 'error',
+    'no-console': 'off',
+    'no-duplicate-imports': 'error',
+    'no-empty': 'off',
+    'no-eval': 'error',
+    'no-ex-assign': 'off',
+    'no-extra-boolean-cast': 'off',
+    'no-implicit-globals': 'error',
+    'no-new-object': 'error',
+    // TODO: Turn back to error once we've fixed all the existing warnings
+    'no-prototype-builtins': 'off',
+    'no-redeclare': ['error', {builtinGlobals: false}],
+    'no-restricted-imports': ['error', 'radium'],
+    'no-trailing-spaces': 'error',
+    'no-undef': 'error',
+    'no-unused-vars': ['error', {args: 'none'}],
+    'no-useless-escape': 'off',
+    'no-with': 'error',
+    'object-curly-spacing': 'off',
+    semi: 'off', // enforced by babel/semi
+    'space-before-blocks': 'error',
+    strict: 'error'
+  }
 };
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,3 +1,15 @@
+## Warning!!
+
+The AP CSP Create Performance Task is in progress from April 1 - May 1 2023. Please
+consider any risk introduced by this PR that could affect our students taking AP CSP. Code.org
+students taking AP CSP primarily use App Lab for their Create Task, however a small percent use Game
+Lab. Carefully consider whether your change has any risk of alterering, changing, or breaking
+anything in these two labs. Even small changes, such as a different button color, are considered
+significant during this time period. Reach out to the Student Learning team or Curriculum team for
+more details.
+
+<!-- end warning -->
+
 <!--
   A summary of the change, including any relevant background, motivation, and context.
   If relevant, include a description, screenshots, and/or video of the existing and new behavior.

diff --git a/Gemfile b/Gemfile
@@ -61,7 +61,7 @@ gem 'rack-mini-profiler'
 group :development do
   gem 'annotate', '~> 3.1.1'
   gem 'aws-google', '~> 0.2.0'
-  gem 'web-console'
+  gem 'web-console', '~> 4.2.0'
 end
 
 # Rack::Cache middleware used in development/test;
@@ -78,7 +78,6 @@ group :development, :test do
   gem 'active_record_query_trace'
   gem 'benchmark-ips'
   gem 'better_errors', '>= 2.7.0'
-  gem 'binding_of_caller'
   gem 'brakeman'
   gem 'haml-rails' # haml (instead of erb) generators
   gem 'ruby-prof'
@@ -101,7 +100,7 @@ group :development, :test do
   gem 'rinku'
   gem 'rspec'
   gem 'selenium-webdriver', '3.141.0'
-  gem 'spring'
+  gem 'spring', '~> 3.1.1'
   gem 'spring-commands-testunit'
   gem 'webdrivers', '~> 3.0'
 
@@ -111,7 +110,7 @@ group :development, :test do
 end
 
 # Needed for unit testing, and also for /rails/mailers email previews.
-gem 'factory_bot_rails', '~> 4.8.2', group: [:development, :staging, :test, :adhoc]
+gem 'factory_bot_rails', '~> 4.11', group: [:development, :staging, :test, :adhoc]
 
 # For pegasus PDF generation.
 gem 'open_uri_redirections', require: false
@@ -123,7 +122,7 @@ gem 'nakayoshi_fork'
 # Ref: https://github.com/puma/puma/pull/1646
 gem 'puma', github: 'wjordan/puma', branch: 'debugging'
 gem 'puma_worker_killer'
-gem 'unicorn', '~> 5.1.0'
+gem 'raindrops'
 
 gem 'chronic', '~> 0.10.2'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -280,8 +280,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindata (2.4.10)
-    binding_of_caller (0.8.0)
-      debug_inspector (>= 0.0.1)
+    bindex (0.8.1)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
     brakeman (4.5.0)
@@ -338,7 +337,6 @@ GEM
       json
       json-schema
       rest-client
-    debug_inspector (0.0.3)
     declarative (0.0.20)
     devise (4.7.3)
       bcrypt (~> 3.0)
@@ -375,10 +373,10 @@ GEM
       nokogiri
       selenium-webdriver
       state_machine
-    factory_bot (4.8.2)
+    factory_bot (4.11.1)
       activesupport (>= 3.0.0)
-    factory_bot_rails (4.8.2)
-      factory_bot (~> 4.8.2)
+    factory_bot_rails (4.11.1)
+      factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
     fakeredis (0.6.0)
       redis (~> 3.2)
@@ -514,7 +512,6 @@ GEM
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.11.3)
     launchy (2.5.2)
       addressable (~> 2.8)
     libv8 (8.4.255.0)
@@ -806,8 +803,7 @@ GEM
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    spring (2.0.1)
-      activesupport (>= 4.2)
+    spring (3.1.1)
     spring-commands-testunit (1.0.1)
       spring (>= 0.9.1)
     sprockets-rails (3.3.0)
@@ -854,9 +850,6 @@ GEM
     unf_ext (0.0.7.2)
     unicode-display_width (2.1.0)
     unicode_utils (1.4.0)
-    unicorn (5.1.0)
-      kgio (~> 2.6)
-      raindrops (~> 0.7)
     user_agent_parser (2.3.0)
     validate_email (0.1.6)
       activemodel (>= 3.0)
@@ -869,11 +862,11 @@ GEM
     vcr (3.0.3)
     warden (1.2.7)
       rack (>= 1.0)
-    web-console (3.3.1)
-      actionview (>= 5.0)
-      activemodel (>= 5.0)
-      debug_inspector
-      railties (>= 5.0)
+    web-console (4.2.0)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
+      bindex (>= 0.4.0)
+      railties (>= 6.0.0)
     webdrivers (3.7.2)
       net_http_ssl_fix
       nokogiri (~> 1.6)
@@ -928,7 +921,6 @@ DEPENDENCIES
   bcrypt (= 3.1.13)
   benchmark-ips
   better_errors (>= 2.7.0)
-  binding_of_caller
   bootstrap-sass (~> 2.3.2.2)
   brakeman
   cancancan (~> 3.2.0)
@@ -947,7 +939,7 @@ DEPENDENCIES
   dotiw
   execjs
   eyes_selenium (= 3.18.4)
-  factory_bot_rails (~> 4.8.2)
+  factory_bot_rails (~> 4.11)
   fakeredis
   firebase
   firebase_token_generator
@@ -1021,6 +1013,7 @@ DEPENDENCIES
   rack_csrf
   rails (= 6.0.6)
   rails-controller-testing (~> 1.0.5)
+  raindrops
   rambling-trie (>= 2.1.1)
   recaptcha
   redcarpet (~> 3.3.4)
@@ -1050,7 +1043,7 @@ DEPENDENCIES
   shotgun
   sinatra (= 2.1.0)
   sort_alphabetical!
-  spring
+  spring (~> 3.1.1)
   spring-commands-testunit
   sprockets!
   sprockets-rails (= 3.3.0)
@@ -1063,11 +1056,10 @@ DEPENDENCIES
   twilio-ruby
   uglifier (>= 1.3.0)
   unf_ext (= 0.0.7.2)
-  unicorn (~> 5.1.0)
   user_agent_parser
   validates_email_format_of
   vcr
-  web-console
+  web-console (~> 4.2.0)
   webdrivers (~> 3.0)
   webmock (~> 3.8)
   xxhash

diff --git a/SETUP.md b/SETUP.md
@@ -154,8 +154,6 @@ These steps may need to change over time as 3rd party tools update to have versi
 
 1. Install an assortment of additional packages via `brew install enscript gs imagemagick ruby-build coreutils sqlite parallel tidy-html5`
 
-1. [Check your rmagick version](#rmagick)
-
 1. Install [Node Version Manager](https://github.com/nvm-sh/nvm) and install Node
     1. Install NVM via `brew install nvm`
 
@@ -271,7 +269,6 @@ These steps may need to change over time as 3rd party tools update to have versi
 1. Install OpenSSL:
     1. `brew install openssl`
     1. `export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/`
-1. [Check rmagick version](#rmagick)
 1. If you want to render personalized certificates locally, see these special instructions regarding [ImageMagick with pango](#imagemagick-with-pango).
 1. Prevent future problems related to the `Too many open files` error:
     1. Add the following to `~/.bash_profile` or your desired shell configuration file:
@@ -487,16 +484,6 @@ Wondering where to start?  See our [contribution guidelines](CONTRIBUTING.md) fo
 ---
 ### Bundle Install Tips
 
-#### rmagick
-If rmagick doesn't install, check your version of imagemagick, and downgrade if >= 7
-- `convert --version`
-- `brew install imagemagick@6`
-- `brew unlink imagemagick`
-- `brew link imagemagick@6 --force`
-If you continue to have issues with rmagick, after changing your imagemagick version, you may need to uninstall/reinstall the gem
-- `gem uninstall rmagick`
-- `gem install rmagick -v 2.16.0`
-
 #### Apple Silicon (M1) bundle install steps
 
 On Apple Silicon, additional steps are required to get `bundle install` to work.