Skip to content

Commit 01bd844

Browse files
committed
Fix building of electron app with new typescript
1 parent 2fb6533 commit 01bd844

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
electron-build:
1616
macos:
17-
xcode: '10.0'
17+
xcode: '9.4.1'
1818
steps:
1919
- checkout
2020
- run: |

packages/graphql-playground-electron/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
"tslint": "5.10.0",
166166
"tslint-graphcool-frontend": "0.0.3",
167167
"tslint-loader": "3.6.0",
168-
"typescript": "2.8.3",
168+
"typescript": "3.0.1",
169169
"url-loader": "0.6.2",
170170
"wait-on": "2.1.0",
171171
"webpack": "3.10.0",

packages/graphql-playground-electron/src/renderer/components/App.tsx

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ class App extends React.Component<ReduxProps, State> {
128128
return {
129129
endpoint: args.endpoint,
130130
subscriptionsEndpoint: args['subscriptions-endpoint'],
131-
platformToken: args['platform-token'] || localStorage.platformToken,
131+
platformToken:
132+
args['platform-token'] || localStorage.getItem('platformToken'),
132133
env: args.env,
133134
}
134135
}
@@ -648,14 +649,17 @@ const mapStateToProps = createStructuredSelector({
648649
endpoint: getEndpoint,
649650
})
650651

651-
export default connect(mapStateToProps, {
652-
openSettingsTab,
653-
selectNextTab,
654-
selectPrevTab,
655-
closeSelectedTab,
656-
refetchSchema,
657-
newSession,
658-
saveFile,
659-
newFileTab,
660-
selectAppHistoryItem,
661-
})(App)
652+
export default connect(
653+
mapStateToProps,
654+
{
655+
openSettingsTab,
656+
selectNextTab,
657+
selectPrevTab,
658+
closeSelectedTab,
659+
refetchSchema,
660+
newSession,
661+
saveFile,
662+
newFileTab,
663+
selectAppHistoryItem,
664+
},
665+
)(App)

packages/graphql-playground-electron/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1883,7 +1883,7 @@ code-point-at@^1.0.0:
18831883
version "1.1.0"
18841884
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
18851885

1886-
codemirror-graphql@^0.6.11, "codemirror-graphql@github:timsuchanek/codemirror-graphql#details-fix":
1886+
codemirror-graphql@^0.6.11, codemirror-graphql@timsuchanek/codemirror-graphql#details-fix:
18871887
version "0.6.12"
18881888
resolved "https://codeload.github.com/timsuchanek/codemirror-graphql/tar.gz/801ec32683c38d6dc0f8f7bc19014a111edc9ebd"
18891889
dependencies:
@@ -8270,9 +8270,9 @@ typedarray@^0.0.6:
82708270
version "0.0.6"
82718271
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
82728272

8273-
typescript@2.8.3:
8274-
version "2.8.3"
8275-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
8273+
typescript@3.0.1:
8274+
version "3.0.1"
8275+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"
82768276

82778277
ua-parser-js@^0.7.9:
82788278
version "0.7.18"

0 commit comments

Comments
 (0)