Merge pull request #785 from webpack/fix/ci

fix(tests): update jest
webpack · Mar 10, 2019 · 6fee805 · 6fee805
2 parents ccec130 + a8b46bf
commit 6fee805
Show file tree

Hide file tree

Showing 66 changed files with 3,002 additions and 3,842 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,11 +1,12 @@
 {
-    "presets": [
-      ["env",
-        {
-          "targets": {
-            "node": "current"
-          }
-        }],
-      "jest"
-    ]
-  }
+  "presets": [[
+    "@babel/preset-env",
+    {
+      "targets": {
+        "node": "current"
+      }
+    }
+  ],
+    "jest"
+  ]
+}
diff --git a/.eslintignore b/.eslintignore
@@ -9,3 +9,4 @@ test/**/null.js
 test/**/main.js
 test/**/cliEntry.js
 test/**/foo.js
+test/binCases/config-location/webpack-babel-config/bin/es6.js
diff --git a/.gitignore b/.gitignore
@@ -26,7 +26,6 @@ coverage
 test/js/*
 test/binCases/**/bin/
 test/binCases/**/**/bin/
-
 # lerna log
 lerna-debug.log
 

diff --git a/junit.xml b/junit.xml