Upgrade deps and gems (#1975)

rails · Mar 3, 2019 · 918876f · 918876f
1 parent 04477fa
commit 918876f
Show file tree

Hide file tree

Showing 4 changed files with 1,278 additions and 1,696 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,12 +1,13 @@
 GIT
   remote: https://github.com/rubocop-hq/rubocop.git
-  revision: 19d65afe162a5c095d81fd69982c1308fbbf9b46
+  revision: dc69686abf10d9f38ed3a39037fab76ae8874138
   specs:
-    rubocop (0.63.0)
+    rubocop (0.65.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
+      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
@@ -66,13 +67,13 @@ GEM
     arel (9.0.0)
     ast (2.4.0)
     builder (3.2.3)
-    byebug (10.0.2)
+    byebug (11.0.0)
     concurrent-ruby (1.1.4)
     crass (1.0.4)
     erubi (1.8.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.5.2)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.2)
     loofah (2.2.3)
@@ -90,10 +91,11 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
-    parallel (1.13.0)
+    parallel (1.14.0)
     parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
+    psych (3.1.0)
     rack (2.0.6)
     rack-proxy (0.6.5)
       rack

diff --git a/package.json b/package.json
@@ -12,51 +12,51 @@
     "yarn": ">=1.0.0"
   },
   "dependencies": {
-    "@babel/core": "^7.2.2",
-    "@babel/plugin-proposal-class-properties": "^7.2.3",
-    "@babel/plugin-proposal-object-rest-spread": "^7.2.0",
+    "@babel/core": "^7.3.4",
+    "@babel/plugin-proposal-class-properties": "^7.3.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.3.4",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/plugin-transform-destructuring": "^7.2.0",
-    "@babel/plugin-transform-regenerator": "^7.0.0",
-    "@babel/plugin-transform-runtime": "^7.2.0",
+    "@babel/plugin-transform-destructuring": "^7.3.2",
+    "@babel/plugin-transform-regenerator": "^7.3.4",
+    "@babel/plugin-transform-runtime": "^7.3.4",
     "@babel/polyfill": "^7.2.5",
-    "@babel/preset-env": "^7.2.3",
-    "@babel/runtime": "^7.2.0",
+    "@babel/preset-env": "^7.3.4",
+    "@babel/runtime": "^7.3.4",
     "babel-loader": "^8.0.5",
     "babel-plugin-dynamic-import-node": "^2.2.0",
-    "babel-plugin-macros": "^2.4.5",
-    "case-sensitive-paths-webpack-plugin": "^2.1.2",
+    "babel-plugin-macros": "^2.5.0",
+    "case-sensitive-paths-webpack-plugin": "^2.2.0",
     "compression-webpack-plugin": "^2.0.0",
     "css-loader": "^2.1.0",
     "file-loader": "^3.0.1",
     "flatted": "^2.0.0",
     "glob": "^7.1.3",
-    "js-yaml": "^3.12.1",
+    "js-yaml": "^3.12.2",
     "mini-css-extract-plugin": "^0.5.0",
     "node-sass": "^4.11.0",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
     "path-complete-extname": "^1.0.0",
-    "pnp-webpack-plugin": "^1.2.1",
+    "pnp-webpack-plugin": "^1.3.1",
     "postcss-flexbugs-fixes": "^4.1.0",
     "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
-    "postcss-preset-env": "^6.5.0",
+    "postcss-preset-env": "^6.6.0",
     "postcss-safe-parser": "^4.0.1",
     "sass-loader": "^7.1.0",
     "style-loader": "^0.23.1",
-    "terser-webpack-plugin": "^1.2.1",
-    "webpack": "^4.29.0",
+    "terser-webpack-plugin": "^1.2.3",
+    "webpack": "^4.29.6",
     "webpack-assets-manifest": "^3.1.1",
-    "webpack-cli": "^3.2.1",
+    "webpack-cli": "^3.2.3",
     "webpack-sources": "^1.3.0"
   },
   "devDependencies": {
-    "eslint": "^5.12.1",
+    "eslint": "^5.15.0",
     "eslint-config-airbnb": "^17.1.0",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-jsx-a11y": "^6.1.2",
+    "eslint-plugin-import": "^2.16.0",
+    "eslint-plugin-jsx-a11y": "^6.2.1",
     "eslint-plugin-react": "^7.12.4",
-    "jest": "^23.6.0"
+    "jest": "^24.1.0"
   },
   "jest": {
     "testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$",

diff --git a/test/compiler_test.rb b/test/compiler_test.rb
@@ -16,7 +16,7 @@ def teardown
   end
 
   def test_custom_environment_variables
-    assert Webpacker.compiler.send(:webpack_env)["FOO"] == nil
+    assert_nil Webpacker.compiler.send(:webpack_env)["FOO"]
     Webpacker.compiler.env["FOO"] = "BAR"
     assert Webpacker.compiler.send(:webpack_env)["FOO"] == "BAR"
   ensure
@@ -65,8 +65,8 @@ def test_compilation_digest_path
   end
 
   def test_external_env_variables
-    assert_equal Webpacker.compiler.send(:webpack_env)["WEBPACKER_ASSET_HOST"], ActionController::Base.helpers.compute_asset_host
-    assert_equal Webpacker.compiler.send(:webpack_env)["WEBPACKER_RELATIVE_URL_ROOT"], ActionController::Base.relative_url_root
+    assert_nil Webpacker.compiler.send(:webpack_env)["WEBPACKER_ASSET_HOST"]
+    assert_nil Webpacker.compiler.send(:webpack_env)["WEBPACKER_RELATIVE_URL_ROOT"]
 
     ENV["WEBPACKER_ASSET_HOST"] = "foo.bar"
     ENV["WEBPACKER_RELATIVE_URL_ROOT"] = "/baz"