Skip to content
This repository was archived by the owner on Jan 26, 2019. It is now read-only.

Fix peer dependencies #387

Closed
wants to merge 7 commits into from
Closed

Fix peer dependencies #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bdc37aa
Allow TypeScript 3 as a peer dependency
nickserv Aug 5, 2018
a1543bf
Merge branch 'typescript' into typescript-3
nickserv Sep 1, 2018
b66d9b2
Fix newer Jest preprocessor
nickserv Sep 2, 2018
140301f
Merge branch 'master' into fix-peer-dependencies
nickserv Sep 2, 2018
cab1607
Use first version of fork-ts-checker-webpack-plugin that fixes peer deps
nickserv Sep 2, 2018
b81ea83
Install missing tslib for importHelpers
nickserv Sep 2, 2018
62574e5
Revert "Install missing tslib for importHelpers"
nickserv Sep 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/jest/typescriptTransform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

'use strict';

const tsJestPreprocessor = require('ts-jest/preprocessor');
const tsJestPreprocessor = require('ts-jest');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we can remove this file and add

"transform": {
   "^.+\\.tsx?$": "ts-jest",
}

into scripts/utils/createJestConfig.js config.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice to be able to remove this workaround, but it should be tested thoroughly.
There were some issues in the past regarding the proper resolution in both ejected and non-ejected environments. This wrapper file was a (kinda hacky, but working) way to get around these issues.


module.exports = tsJestPreprocessor;
18 changes: 13 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,34 @@
"bugs": {
"url": "https://github.com/wmonk/create-react-app/issues"
},
"files": ["bin", "config", "scripts", "template", "utils"],
"files": [
"bin",
"config",
"scripts",
"template",
"utils"
],
"bin": {
"react-scripts-ts": "./bin/react-scripts-ts.js"
},
"dependencies": {
"autoprefixer": "7.1.6",
"babel-jest": "20.0.3",
"babel-core": "6.26.3",
"babel-jest": "23.4.2",
"babel-loader": "7.1.2",
"babel-preset-react-app": "^3.1.2",
"babel-runtime": "6.26.0",
"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": "1.1.5",
"fork-ts-checker-webpack-plugin": "^0.2.8",
"fork-ts-checker-webpack-plugin": "0.4.4",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The latest version is 0.4.9.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On master this dependency version was upgraded and then downgraded back to 0.2.x, any idea why?

"fs-extra": "3.0.1",
"html-webpack-plugin": "2.29.0",
"jest": "20.0.4",
"jest": "23.5.0",
"object-assign": "4.1.1",
"postcss-flexbugs-fixes": "3.2.0",
"postcss-loader": "2.0.8",
Expand All @@ -40,7 +48,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.4",
"ts-loader": "^2.3.7",
"tsconfig-paths-webpack-plugin": "^2.0.0",
"tslint": "^5.7.0",
Expand Down