From 14dac1337004bb16656434b42cd1f8c10188d049 Mon Sep 17 00:00:00 2001 From: Brian McBride Date: Mon, 1 Oct 2018 16:33:16 -0700 Subject: [PATCH 1/7] Adding in GlobalSetup and GlobalTeardown keys Allowing users to define Jest GlobalSetup and GlobalTeardown for testing. --- scripts/utils/createJestConfig.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/utils/createJestConfig.js b/scripts/utils/createJestConfig.js index d56482765..e3a97097a 100644 --- a/scripts/utils/createJestConfig.js +++ b/scripts/utils/createJestConfig.js @@ -76,6 +76,8 @@ module.exports = (resolve, rootDir, isEjecting) => { 'collectCoverageFrom', 'coverageReporters', 'coverageThreshold', + 'globalSetup', + 'globalTeardown', 'snapshotSerializers', 'moduleNameMapper', ]; From 909bbbffe5d6356685822b143cfbd10be453106a Mon Sep 17 00:00:00 2001 From: Brian McBride Date: Mon, 1 Oct 2018 16:43:25 -0700 Subject: [PATCH 2/7] Update package.json Updating packages here and there as source repo is a bit behind. --- package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 092fd8790..15fff0802 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "autoprefixer": "7.1.6", - "babel-jest": "20.0.3", + "babel-jest": "23.6.0", "babel-loader": "7.1.2", "babel-preset-react-app": "^3.1.2", "case-sensitive-paths-webpack-plugin": "2.1.1", @@ -31,11 +31,11 @@ "dotenv": "4.0.0", "dotenv-expand": "4.2.0", "extract-text-webpack-plugin": "3.0.2", - "file-loader": "1.1.5", + "file-loader": "2.0.0", "fork-ts-checker-webpack-plugin": "^0.2.8", "fs-extra": "3.0.1", "html-webpack-plugin": "2.29.0", - "jest": "20.0.4", + "jest": "23.6.0", "object-assign": "4.1.1", "postcss-flexbugs-fixes": "3.2.0", "postcss-loader": "2.0.8", @@ -46,12 +46,12 @@ "resolve": "1.6.0", "style-loader": "0.19.0", "sw-precache-webpack-plugin": "0.11.4", - "ts-jest": "22.0.1", + "ts-jest": "22.4.6", "ts-loader": "^2.3.7", "tsconfig-paths-webpack-plugin": "^2.0.0", - "tslint": "^5.7.0", - "tslint-config-prettier": "^1.10.0", - "tslint-react": "^3.2.0", + "tslint": "^5.11.0", + "tslint-config-prettier": "^1.15.0", + "tslint-react": "^3.6.0", "uglifyjs-webpack-plugin": "1.2.5", "url-loader": "0.6.2", "webpack": "3.8.1", @@ -60,9 +60,9 @@ "whatwg-fetch": "2.0.3" }, "devDependencies": { - "react": "^15.5.4", - "react-dom": "^15.5.4", - "typescript": "3.0.1" + "react": "^16.5.2", + "react-dom": "^16.5.2", + "typescript": "3.1.1" }, "peerDependencies": { "typescript": "3.x.x" From a7b933c73b4b6e7ac5cc61821bde980271dcb0e8 Mon Sep 17 00:00:00 2001 From: Brian McBride Date: Mon, 1 Oct 2018 20:49:02 -0700 Subject: [PATCH 3/7] Updating config for current ts-jest --- config/jest/typescriptTransform.js | 2 +- scripts/utils/createJestConfig.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/jest/typescriptTransform.js b/config/jest/typescriptTransform.js index 9b138ac8e..e06652be6 100644 --- a/config/jest/typescriptTransform.js +++ b/config/jest/typescriptTransform.js @@ -2,6 +2,6 @@ 'use strict'; -const tsJestPreprocessor = require('ts-jest/preprocessor'); +const tsJestPreprocessor = require('ts-jest'); module.exports = tsJestPreprocessor; diff --git a/scripts/utils/createJestConfig.js b/scripts/utils/createJestConfig.js index e3a97097a..c481fa453 100644 --- a/scripts/utils/createJestConfig.js +++ b/scripts/utils/createJestConfig.js @@ -64,7 +64,7 @@ module.exports = (resolve, rootDir, isEjecting) => { ], globals: { 'ts-jest': { - tsConfigFile: paths.appTsTestConfig, + tsConfig: paths.appTsTestConfig, }, }, }; From cff111e81fe3de7689fdfbe237018f446d3ad213 Mon Sep 17 00:00:00 2001 From: Brian McBride Date: Mon, 1 Oct 2018 21:00:34 -0700 Subject: [PATCH 4/7] Dependency Updated after testing #1 --- package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 15fff0802..2bb631888 100644 --- a/package.json +++ b/package.json @@ -21,34 +21,34 @@ "react-scripts-ts": "./bin/react-scripts-ts.js" }, "dependencies": { - "autoprefixer": "7.1.6", + "autoprefixer": "9.1.5", "babel-jest": "23.6.0", - "babel-loader": "7.1.2", - "babel-preset-react-app": "^3.1.2", + "babel-loader": "8.0.4", + "babel-preset-react-app": "^5.0.2", "case-sensitive-paths-webpack-plugin": "2.1.1", - "chalk": "1.1.3", - "css-loader": "0.28.7", + "chalk": "2.4.1", + "css-loader": "1.0.0", "dotenv": "4.0.0", "dotenv-expand": "4.2.0", "extract-text-webpack-plugin": "3.0.2", "file-loader": "2.0.0", - "fork-ts-checker-webpack-plugin": "^0.2.8", + "fork-ts-checker-webpack-plugin": "^0.4.9", "fs-extra": "3.0.1", "html-webpack-plugin": "2.29.0", "jest": "23.6.0", "object-assign": "4.1.1", "postcss-flexbugs-fixes": "3.2.0", "postcss-loader": "2.0.8", - "promise": "8.0.1", + "promise": "8.0.2", "raf": "3.4.0", "source-map-loader": "^0.2.1", "react-dev-utils": "^5.0.2", "resolve": "1.6.0", "style-loader": "0.19.0", "sw-precache-webpack-plugin": "0.11.4", - "ts-jest": "22.4.6", - "ts-loader": "^2.3.7", - "tsconfig-paths-webpack-plugin": "^2.0.0", + "ts-jest": "23.10.3", + "ts-loader": "^5.2.1", + "tsconfig-paths-webpack-plugin": "^3.2.0", "tslint": "^5.11.0", "tslint-config-prettier": "^1.15.0", "tslint-react": "^3.6.0", From f9ac0830d1a157c935f6920c875f908b41863f3c Mon Sep 17 00:00:00 2001 From: Brian McBride Date: Mon, 1 Oct 2018 21:05:13 -0700 Subject: [PATCH 5/7] Dependency Updated after testing #2 --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 2bb631888..a05e46654 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "babel-jest": "23.6.0", "babel-loader": "8.0.4", "babel-preset-react-app": "^5.0.2", - "case-sensitive-paths-webpack-plugin": "2.1.1", + "case-sensitive-paths-webpack-plugin": "2.1.2", "chalk": "2.4.1", "css-loader": "1.0.0", "dotenv": "4.0.0", @@ -42,18 +42,18 @@ "promise": "8.0.2", "raf": "3.4.0", "source-map-loader": "^0.2.1", - "react-dev-utils": "^5.0.2", - "resolve": "1.6.0", - "style-loader": "0.19.0", - "sw-precache-webpack-plugin": "0.11.4", + "react-dev-utils": "^6.0.3", + "resolve": "1.8.1", + "style-loader": "0.23.0", + "sw-precache-webpack-plugin": "0.11.5", "ts-jest": "23.10.3", "ts-loader": "^5.2.1", "tsconfig-paths-webpack-plugin": "^3.2.0", "tslint": "^5.11.0", "tslint-config-prettier": "^1.15.0", "tslint-react": "^3.6.0", - "uglifyjs-webpack-plugin": "1.2.5", - "url-loader": "0.6.2", + "uglifyjs-webpack-plugin": "2.0.1", + "url-loader": "1.1.1", "webpack": "3.8.1", "webpack-dev-server": "2.11.3", "webpack-manifest-plugin": "1.3.2", From e91640d5f7522cadea1eea10030c4ec53d9aef00 Mon Sep 17 00:00:00 2001 From: Brian McBride Date: Mon, 1 Oct 2018 21:32:49 -0700 Subject: [PATCH 6/7] Update package.json Reducing changes for now --- package.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index a05e46654..15fff0802 100644 --- a/package.json +++ b/package.json @@ -21,39 +21,39 @@ "react-scripts-ts": "./bin/react-scripts-ts.js" }, "dependencies": { - "autoprefixer": "9.1.5", + "autoprefixer": "7.1.6", "babel-jest": "23.6.0", - "babel-loader": "8.0.4", - "babel-preset-react-app": "^5.0.2", - "case-sensitive-paths-webpack-plugin": "2.1.2", - "chalk": "2.4.1", - "css-loader": "1.0.0", + "babel-loader": "7.1.2", + "babel-preset-react-app": "^3.1.2", + "case-sensitive-paths-webpack-plugin": "2.1.1", + "chalk": "1.1.3", + "css-loader": "0.28.7", "dotenv": "4.0.0", "dotenv-expand": "4.2.0", "extract-text-webpack-plugin": "3.0.2", "file-loader": "2.0.0", - "fork-ts-checker-webpack-plugin": "^0.4.9", + "fork-ts-checker-webpack-plugin": "^0.2.8", "fs-extra": "3.0.1", "html-webpack-plugin": "2.29.0", "jest": "23.6.0", "object-assign": "4.1.1", "postcss-flexbugs-fixes": "3.2.0", "postcss-loader": "2.0.8", - "promise": "8.0.2", + "promise": "8.0.1", "raf": "3.4.0", "source-map-loader": "^0.2.1", - "react-dev-utils": "^6.0.3", - "resolve": "1.8.1", - "style-loader": "0.23.0", - "sw-precache-webpack-plugin": "0.11.5", - "ts-jest": "23.10.3", - "ts-loader": "^5.2.1", - "tsconfig-paths-webpack-plugin": "^3.2.0", + "react-dev-utils": "^5.0.2", + "resolve": "1.6.0", + "style-loader": "0.19.0", + "sw-precache-webpack-plugin": "0.11.4", + "ts-jest": "22.4.6", + "ts-loader": "^2.3.7", + "tsconfig-paths-webpack-plugin": "^2.0.0", "tslint": "^5.11.0", "tslint-config-prettier": "^1.15.0", "tslint-react": "^3.6.0", - "uglifyjs-webpack-plugin": "2.0.1", - "url-loader": "1.1.1", + "uglifyjs-webpack-plugin": "1.2.5", + "url-loader": "0.6.2", "webpack": "3.8.1", "webpack-dev-server": "2.11.3", "webpack-manifest-plugin": "1.3.2", From 661a8265ee2aefdb1de9817e89f0eae51234a2c6 Mon Sep 17 00:00:00 2001 From: Brian McBride Date: Mon, 1 Oct 2018 21:59:25 -0700 Subject: [PATCH 7/7] Bring ts-jest back to 23.10.3 Accidently simplified too far last commit. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 15fff0802..4a4068d64 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "resolve": "1.6.0", "style-loader": "0.19.0", "sw-precache-webpack-plugin": "0.11.4", - "ts-jest": "22.4.6", + "ts-jest": "23.10.3", "ts-loader": "^2.3.7", "tsconfig-paths-webpack-plugin": "^2.0.0", "tslint": "^5.11.0",