Skip to content
This repository has been archived by the owner on Mar 12, 2020. It is now read-only.

[Toolchain] Update Typescript to 3.0.3 #1185

Merged
merged 4 commits into from
Sep 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
src/__generated__/*.ts
src/__generated__/*.json
src/__generated__/*.graphql.ts
node_modules
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* Adding artwork badges to brick - matt
* Add @artsy/palette - yuki/orta/chris
* Adds a Labs setting UI to the example app - orta
* Updates Typescript version to 3.0.3

### 1.5.15

Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"homepage": "https://github.com/artsy/emission#readme",
"files": ["index.js", "data", "lib"],
"resolutions": {
"parse5": "5.1.0",
"graphql": "^0.13",
"relay-runtime": "https://github.com/alloy/relay/releases/download/v1.5.0-artsy.5/relay-runtime-1.5.0-artsy.5.tgz"
},
Expand Down Expand Up @@ -139,9 +140,9 @@
"stylelint-config-standard": "^18.0.0",
"stylelint-processor-styled-components": "^1.2.2",
"ts-jest": "^22.0.2",
"tslint": "^5.8.0",
"tslint": "^5.11.0",
"tslint-config-prettier": "^1.6.0",
"typescript": "^2.5.3",
"typescript": "^3.0.3",
"typescript-styled-plugin": "^0.1.2"
},
"jest": {
Expand Down
15 changes: 15 additions & 0 deletions patches/@types/react-native+0.52.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
patch-package
--- a/node_modules/@types/react-native/index.d.ts
+++ b/node_modules/@types/react-native/index.d.ts
@@ -8435,8 +8435,9 @@ export type Clipboard = ClipboardStatic;
export var DatePickerAndroid: DatePickerAndroidStatic;
export type DatePickerAndroid = DatePickerAndroidStatic;

-export var Geolocation: GeolocationStatic;
-export type Geolocation = GeolocationStatic;
+// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/24573
Copy link
Contributor

Choose a reason for hiding this comment

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

Gah, didn’t know we had this issue. This should really be worked around by getting rid of @types/node, because RN is not Node.

Looks like it’s being pulled in by enzyme/cheerio?? No clue why that would be a good idea of them.

=> Found "@types/node@8.5.1"
info Reasons this module exists
   - "enzyme#cheerio#parse5" depends on it
   - Hoisted from "enzyme#cheerio#parse5#@types#node"

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

I actually meant that no package should list @types/* packages as runtime deps. In this case it was parse5 (didn’t read properly yesterday). You can see that in v5.1.0 they removed this inikulin/parse5@4350f6a#diff-b9cfc7f2cdf78a7f4b91a753d10865a2, so the fix would be for us to force resolution of that version instead of the one that cheerio depends on.

Copy link
Member Author

Choose a reason for hiding this comment

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

Interesting:

screen shot 2018-09-12 at 12 37 59 pm

I removed the patch, and updated the resolution, yet the error re-appears.

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you do yarn why @types/node instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

screen shot 2018-09-12 at 12 43 39 pm

+// export var Geolocation: GeolocationStatic;
+// export type Geolocation = GeolocationStatic;

/** http://facebook.github.io/react-native/blog/2016/08/19/right-to-left-support-for-react-native-apps.html */
export var I18nManager: I18nManagerStatic;
6 changes: 2 additions & 4 deletions src/__generated__/About_artist.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/__generated__/About_gene.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions src/__generated__/ActiveBidsQuery.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions src/__generated__/ActiveBidsRefetchQuery.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/__generated__/ActiveBids_me.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/__generated__/Articles_articles.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/__generated__/ArtistForSaleArtworksGridQuery.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions src/__generated__/ArtistForSaleArtworksGrid_artist.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/__generated__/ArtistHeaderQuery.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions src/__generated__/ArtistNotForSaleArtworksGrid_artist.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/__generated__/ArtistQuery.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/__generated__/ArtistRail_rail.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/__generated__/ArtistsMeQuery.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions src/__generated__/Artists_me.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/__generated__/ArtworkCarousel_rail.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/__generated__/ArtworkRailRefetchQuery.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/__generated__/ArtworkRail_rail.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/__generated__/Artwork_artwork.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/__generated__/ArtworksQuery.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions src/__generated__/Artworks_me.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/__generated__/BidFlow_me.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/__generated__/BidFlow_sale_artwork.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/__generated__/CategoriesMeQuery.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions src/__generated__/Categories_me.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading