From bdc37aa4c79a731b0a4cecf9f21eabb1b24d5f98 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 5 Aug 2018 09:09:57 -0400 Subject: [PATCH 1/5] Allow TypeScript 3 as a peer dependency --- packages/react-scripts/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 72983c264..07060b6c0 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -32,7 +32,7 @@ "dotenv-expand": "4.2.0", "extract-text-webpack-plugin": "3.0.2", "file-loader": "0.11.2", - "fork-ts-checker-webpack-plugin": "^0.2.8", + "fork-ts-checker-webpack-plugin": "^0.4.4", "fs-extra": "3.0.1", "html-webpack-plugin": "2.29.0", "jest": "22.4.2", @@ -46,7 +46,7 @@ "resolve": "1.6.0", "style-loader": "0.19.0", "sw-precache-webpack-plugin": "0.11.4", - "ts-jest": "22.0.1", + "ts-jest": "23.1.0", "ts-loader": "^2.3.7", "tsconfig-paths-webpack-plugin": "^2.0.0", "tslint": "^5.7.0", @@ -62,10 +62,10 @@ "devDependencies": { "react": "^15.5.4", "react-dom": "^15.5.4", - "typescript": "^2.7.1" + "typescript": "^3.0.1" }, "peerDependencies": { - "typescript": "2.x" + "typescript": "2.x || 3.x" }, "optionalDependencies": { "fsevents": "^1.1.3" From b66d9b2ec2a8322ae6cd529946d91e161a9bec6e Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sat, 1 Sep 2018 20:02:43 -0400 Subject: [PATCH 2/5] Fix newer Jest preprocessor --- config/jest/typescriptTransform.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From cab1607bee146c78b398a693ba2d0b89c4f0f8c8 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 2 Sep 2018 14:51:02 -0400 Subject: [PATCH 3/5] Use first version of fork-ts-checker-webpack-plugin that fixes peer deps --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 99464a522..16c8827e8 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "dotenv-expand": "4.2.0", "extract-text-webpack-plugin": "3.0.2", "file-loader": "1.1.5", - "fork-ts-checker-webpack-plugin": "0.4.9", + "fork-ts-checker-webpack-plugin": "0.4.4", "fs-extra": "3.0.1", "html-webpack-plugin": "2.29.0", "jest": "23.5.0", From b81ea83c2b66a4996c0d30c041023ae0191fdbce Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 2 Sep 2018 16:17:33 -0400 Subject: [PATCH 4/5] Install missing tslib for importHelpers --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 16c8827e8..64cb79dcd 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "ts-jest": "23.1.4", "ts-loader": "^2.3.7", "tsconfig-paths-webpack-plugin": "^2.0.0", + "tslib": "^1.9.3", "tslint": "^5.7.0", "tslint-config-prettier": "^1.10.0", "tslint-react": "^3.2.0", From 62574e5ee283a42e0bb629924e1976276e0da776 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 2 Sep 2018 16:38:53 -0400 Subject: [PATCH 5/5] Revert "Install missing tslib for importHelpers" This reverts commit b81ea83c2b66a4996c0d30c041023ae0191fdbce. --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 64cb79dcd..16c8827e8 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,6 @@ "ts-jest": "23.1.4", "ts-loader": "^2.3.7", "tsconfig-paths-webpack-plugin": "^2.0.0", - "tslib": "^1.9.3", "tslint": "^5.7.0", "tslint-config-prettier": "^1.10.0", "tslint-react": "^3.2.0",