chore+fix: upgrade jest + fix flaky renderStream test! (#2350)

babel.config.js

@@ -9,6 +9,7 @@ const lodashOptimizations =
   process.env.WEBPACK === "true" ? ["use-lodash-es", "lodash"] : [];
 
 module.exports = {
+  babelrcRoots: ["./src/core/client/*"],
   env: {
     production: {
       plugins: [...lodashOptimizations],
@@ -18,7 +19,7 @@ module.exports = {
     },
     test: {
       presets: [
-        ["@babel/env", { targets: "last 2 versions", modules: "commonjs" }],
+        ["@babel/env", { targets: { node: "current" } }],
         "@babel/react",
       ],
       plugins: ["dynamic-import-node"],

config/jest/client.config.js

@@ -10,8 +10,7 @@ module.exports = {
     "<rootDir>/src/core/build/polyfills.js",
     "<rootDir>/src/core/client/test/setup.ts",
   ],
-  setupTestFrameworkScriptFile:
-    "<rootDir>/src/core/client/test/setupTestFramework.ts",
+  setupFilesAfterEnv: ["<rootDir>/src/core/client/test/setupTestFramework.ts"],
   testMatch: ["**/*.spec.{js,jsx,mjs,ts,tsx}"],
   testEnvironment: "node",
   testURL: "http://localhost",
@@ -40,7 +39,10 @@ module.exports = {
   globals: {
     "ts-jest": {
       useBabelrc: true,
-      tsConfigFile: path.resolve(__dirname, "tsconfig.jest.json"),
+      tsConfigFile: path.resolve(
+        __dirname,
+        "../../src/core/client/tsconfig.json"
+      ),
     },
   },
 };

config/jest/server.config.js

@@ -1,3 +1,5 @@
+const path = require("path");
+
 module.exports = {
   displayName: "server",
   rootDir: "../../",
@@ -19,6 +21,7 @@ module.exports = {
   globals: {
     "ts-jest": {
       useBabelrc: true,
+      tsConfigFile: path.resolve(__dirname, "../../src/tsconfig.json"),
     },
   },
 };

config/jest/tsconfig.jest.json

@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "target": "es2015",
-    "module": "es2015"
-  }
-}

package.json

@@ -129,11 +129,11 @@
     "verror": "^1.10.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.4.4",
+    "@babel/core": "^7.4.5",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/plugin-transform-modules-commonjs": "^7.4.4",
     "@babel/polyfill": "^7.4.4",
-    "@babel/preset-env": "^7.4.4",
+    "@babel/preset-env": "^7.4.5",
     "@babel/preset-react": "^7.0.0",
     "@babel/preset-typescript": "^7.3.3",
     "@coralproject/npm-run-all": "^4.1.5",
@@ -165,7 +165,7 @@
     "@types/html-to-text": "^1.4.31",
     "@types/html-webpack-plugin": "^3.2.0",
     "@types/ioredis": "^4.0.10",
-    "@types/jest": "^23.1.5",
+    "@types/jest": "^24.0.13",
     "@types/joi": "^13.0.8",
     "@types/jsdom": "^12.2.3",
     "@types/jsonwebtoken": "^7.2.7",
@@ -217,7 +217,7 @@
     "ansi-styles": "^3.2.0",
     "autoprefixer": "^9.5.1",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^24.8.0",
     "babel-loader": "^8.0.5",
     "babel-plugin-dynamic-import-node": "^2.2.0",
     "babel-plugin-lodash": "^3.3.4",
@@ -260,10 +260,10 @@
     "html-webpack-plugin": "^4.0.0-beta.5",
     "husky": "^2.2.0",
     "intersection-observer": "^0.6.0",
-    "jest": "^23.4.1",
-    "jest-junit": "^5.1.0",
-    "jest-localstorage-mock": "^2.2.0",
-    "jest-mock-console": "^0.4.0",
+    "jest": "^24.8.0",
+    "jest-junit": "^6.4.0",
+    "jest-localstorage-mock": "^2.4.0",
+    "jest-mock-console": "^1.0.0",
     "lint-staged": "^8.1.6",
     "loader-utils": "^1.2.3",
     "lodash-es": "^4.17.11",
@@ -315,7 +315,7 @@
     "terser-webpack-plugin": "^1.2.3",
     "thread-loader": "^2.1.2",
     "timekeeper": "^2.2.0",
-    "ts-jest": "^23.0.0",
+    "ts-jest": "<23.10.0",
     "ts-loader": "^6.0.0",
     "ts-node": "^8.1.0",
     "ts-node-dev": "^1.0.0-pre.37",

src/core/client/.babelrc.js

@@ -1,19 +1,19 @@
 const lodashOptimizations = ["use-lodash-es", "lodash"];
 
 module.exports = {
-  presets: [
-    ["@babel/env", { targets: "last 2 versions", modules: false }],
-    "@babel/react",
-  ],
+  presets: ["@babel/react"],
   plugins: ["@babel/syntax-dynamic-import"],
   env: {
     production: {
+      presets: [["@babel/env", { targets: "last 2 versions", modules: false }]],
       plugins: [...lodashOptimizations],
     },
     development: {
+      presets: [["@babel/env", { targets: "last 2 versions", modules: false }]],
       plugins: [...lodashOptimizations],
     },
     test: {
+      presets: [["@babel/env", { targets: { node: "current" } }]],
       plugins: ["@babel/transform-modules-commonjs"],
     },
   },