Merge branch 'master' into dependabot/bundler/src-api/redcarpet-3.5.1

Gemfile.lock

@@ -10,9 +10,9 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     afm (0.2.2)
-    algolia_html_extractor (2.6.2)
+    algolia_html_extractor (2.6.4)
       json (~> 2.0)
-      nokogiri (~> 1.10.4)
+      nokogiri (~> 1.10)
     algoliasearch (1.26.1)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
@@ -108,7 +108,7 @@ GEM
       nokogiri (~> 1.10)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.2.0)
+    json (2.5.1)
     kramdown (1.17.0)
     liquid (4.0.3)
     liquid-tag-parser (1.9.0)
@@ -119,11 +119,12 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minitest (5.14.1)
     multi_json (1.13.1)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     parallel (1.17.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
@@ -152,6 +153,7 @@ GEM
     public_suffix (3.1.1)
     pygments.rb (1.1.2)
       multi_json (>= 1.0.0)
+    racc (1.5.2)
     rack (2.1.4)
     rainbow (3.0.0)
     rake (13.0.3)

package.json

@@ -20,10 +20,17 @@
   },
   "devDependencies": {
     "@babel/core": "^7.13.10",
+  <<<<<<< dependabot/bundler/src-api/redcarpet-3.5.1
     "@babel/preset-env": "^7.13.10",
     "babel-loader": "^8.2.2",
     "uglifyjs-webpack-plugin": "^1.3.0",
     "webpack": "^5.26.3",
+  =======
+    "@babel/preset-env": "^7.13.12",
+    "babel-loader": "^8.2.2",
+    "uglifyjs-webpack-plugin": "^1.3.0",
+    "webpack": "^5.28.0",
+  >>>>>>> master
     "webpack-cli": "^3.1.0"
   }
 }

src-api/Gemfile.lock

@@ -25,7 +25,7 @@ GEM
     fast_blank (1.0.0)
     fastimage (2.0.1)
       addressable (~> 2)
-    ffi (1.9.17)
+    ffi (1.15.0)
     haml (5.1.2)
       temple (>= 0.8.0)
       tilt
@@ -93,7 +93,7 @@ GEM
       activesupport (>= 3.1)
     parallel (1.10.0)
     public_suffix (2.0.5)
-    rack (2.0.8)
+    rack (2.2.3)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)