Skip to content

Commit 8a4efd6

Browse files
committed
chore(build): Disable yarn workspaces again until nohoist is implemented
We have to wait until yarnpkg/yarn#4979 is merged, as electron-builder can't resolve the dependencies otherwise.
1 parent 283ba0a commit 8a4efd6

File tree

6 files changed

+2141
-257
lines changed

6 files changed

+2141
-257
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"private": true,
3-
"workspaces": [
3+
"_workspaces": [
44
"packages/*"
55
],
66
"scripts": {

packages/graphql-playground-electron/postcss.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = ctx => ({
44
variables: () => require('graphcool-styles/dist/variables/variables.js'),
55
}),
66
require('postcss-inherit')({
7-
globalStyles: '../../node_modules/graphcool-styles/dist/styles.css',
7+
globalStyles: 'node_modules/graphcool-styles/dist/styles.css',
88
propertyRegExp: /^(inherit|extend|p)s?:?$/i,
99
}),
1010
],

packages/graphql-playground-electron/yarn.lock

Lines changed: 74 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,14 +1744,7 @@ code-point-at@^1.0.0:
17441744
version "1.1.0"
17451745
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
17461746

1747-
1748-
version "0.6.11"
1749-
resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.6.11.tgz#795efa3933523815a5245eefe8d6831d3c4ad026"
1750-
dependencies:
1751-
graphql-language-service-interface "0.0.19"
1752-
graphql-language-service-parser "0.0.15"
1753-
1754-
codemirror-graphql@^0.6.11, codemirror-graphql@^0.6.12:
1747+
[email protected], codemirror-graphql@^0.6.11, codemirror-graphql@^0.6.12:
17551748
version "0.6.12"
17561749
resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.6.12.tgz#91a273fe5188857524a30221d06e645b4ca41f00"
17571750
dependencies:
@@ -2097,7 +2090,7 @@ [email protected]:
20972090
postcss-value-parser "^3.3.0"
20982091
source-list-map "^2.0.0"
20992092

2100-
css-modules-loader-core@^1.0.1:
2093+
css-modules-loader-core@^1.0.1, css-modules-loader-core@^1.1.0:
21012094
version "1.1.0"
21022095
resolved "https://registry.yarnpkg.com/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz#5908668294a1becd261ae0a4ce21b0b551f21d16"
21032096
dependencies:
@@ -3551,22 +3544,6 @@ graphql-import@^0.4.0:
35513544
graphql "^0.12.3"
35523545
lodash "^4.17.4"
35533546

3554-
3555-
version "0.0.17"
3556-
resolved "https://registry.yarnpkg.com/graphql-language-service-config/-/graphql-language-service-config-0.0.17.tgz#36b5a9906c0bf0d356d31b7583058f9b85d1793e"
3557-
dependencies:
3558-
graphql-language-service-types "0.0.21"
3559-
3560-
3561-
version "0.0.19"
3562-
resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-0.0.19.tgz#c58fa7bd95d2f30e33e04937a1a2c00a9740926e"
3563-
dependencies:
3564-
graphql "^0.10.1"
3565-
graphql-language-service-config "0.0.17"
3566-
graphql-language-service-parser "0.0.15"
3567-
graphql-language-service-types "0.0.21"
3568-
graphql-language-service-utils "0.0.17"
3569-
35703547
graphql-language-service-interface@^1.0.16:
35713548
version "1.0.18"
35723549
resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-1.0.18.tgz#c0fc1ef72c6f6f4bf9042bd7a8a8a66e0772caa8"
@@ -3576,12 +3553,6 @@ graphql-language-service-interface@^1.0.16:
35763553
graphql-language-service-types "^1.0.18"
35773554
graphql-language-service-utils "^1.0.18"
35783555

3579-
3580-
version "0.0.15"
3581-
resolved "https://registry.yarnpkg.com/graphql-language-service-parser/-/graphql-language-service-parser-0.0.15.tgz#fd64afd8873624fa3c4a5831a08de9ccd6cc5182"
3582-
dependencies:
3583-
graphql-language-service-types "0.0.21"
3584-
35853556
graphql-language-service-parser@^0.1.14:
35863557
version "0.1.14"
35873558
resolved "https://registry.yarnpkg.com/graphql-language-service-parser/-/graphql-language-service-parser-0.1.14.tgz#dd25abda5dcff4f2268c9a19e026004271491661"
@@ -3595,12 +3566,6 @@ graphql-language-service-parser@^1.0.18:
35953566
graphql-config "1.1.4"
35963567
graphql-language-service-types "^1.0.18"
35973568

3598-
3599-
version "0.0.21"
3600-
resolved "https://registry.yarnpkg.com/graphql-language-service-types/-/graphql-language-service-types-0.0.21.tgz#b9453366fc8985765034bf34056fe93603a24b82"
3601-
dependencies:
3602-
graphql "^0.10.1"
3603-
36043569
graphql-language-service-types@^0.1.14:
36053570
version "0.1.14"
36063571
resolved "https://registry.yarnpkg.com/graphql-language-service-types/-/graphql-language-service-types-0.1.14.tgz#e6112785fc23ea8222f59a7f00e61b359f263c88"
@@ -3611,34 +3576,27 @@ graphql-language-service-types@^1.0.18:
36113576
dependencies:
36123577
graphql-config "1.1.4"
36133578

3614-
3615-
version "0.0.17"
3616-
resolved "https://registry.yarnpkg.com/graphql-language-service-utils/-/graphql-language-service-utils-0.0.17.tgz#a8b91eca80c6aa5a0d461a0bbb63317986f9b989"
3617-
dependencies:
3618-
graphql "^0.10.1"
3619-
graphql-language-service-types "0.0.21"
3620-
36213579
graphql-language-service-utils@^1.0.18:
36223580
version "1.0.18"
36233581
resolved "https://registry.yarnpkg.com/graphql-language-service-utils/-/graphql-language-service-utils-1.0.18.tgz#133fd0ce8ce360aad09c41feb47015eb7878cd3a"
36243582
dependencies:
36253583
graphql-config "1.1.4"
36263584
graphql-language-service-types "^1.0.18"
36273585

3628-
3629-
version "1.4.1"
3630-
resolved "https://registry.yarnpkg.com/graphql-playground-react/-/graphql-playground-react-1.4.1.tgz#54254e83ba5988eba8680ca5a10c5c2f27df378a"
3586+
3587+
version "1.4.2"
3588+
resolved "https://registry.yarnpkg.com/graphql-playground-react/-/graphql-playground-react-1.4.2.tgz#7fca83656655d5b32acfddd4b8f98506d8751bac"
36313589
dependencies:
36323590
calculate-size "^1.1.1"
36333591
classnames "^2.2.5"
36343592
codemirror "^5.27.4"
3635-
codemirror-graphql "0.6.11"
3593+
codemirror-graphql "0.6.12"
36363594
cuid "^1.3.8"
36373595
graphcool-styles "0.2.7"
36383596
graphcool-tmp-ui "^0.0.11"
36393597
graphcool-ui "0.0.14"
36403598
graphiql "^0.11.2"
3641-
graphql "^0.10.5"
3599+
graphql "^0.11.7"
36423600
isomorphic-fetch "^2.2.1"
36433601
js-yaml "^3.10.0"
36443602
json-stable-stringify "^1.0.1"
@@ -3648,28 +3606,30 @@ [email protected]:
36483606
markdown-it "^8.4.0"
36493607
marked "^0.3.9"
36503608
polished "^1.9.0"
3651-
postcss-modules "^0.6.4"
3609+
postcss-modules "^1.1.0"
36523610
prop-types "^15.6.0"
36533611
react "^16.2.0"
36543612
react-addons-shallow-compare "^15.6.2"
36553613
react-codemirror "^1.0.0"
36563614
react-copy-to-clipboard "^5.0.1"
36573615
react-dom "^16.2.0"
36583616
react-helmet "^5.2.0"
3659-
react-modal "^3.1.10"
3617+
react-modal "^3.1.11"
36603618
react-redux "^5.0.6"
36613619
react-router-dom "^4.2.2"
3662-
react-transition-group "^1.1.3"
3620+
react-transition-group "^2.2.1"
36633621
react-virtualized "^9.12.0"
36643622
redux "^3.7.2"
36653623
redux-localstorage rc
36663624
redux-localstorage-filter "^0.1.1"
36673625
rxjs "^5.0.3"
36683626
seamless-immutable "^7.0.1"
36693627
styled-components "^2.4.0"
3628+
styled-jsx "^2.2.1"
36703629
styled-jsx-postcss "git+https://github.com/timsuchanek/styled-jsx-postcss#build3"
36713630
styled-theming "^2.2.0"
3672-
subscriptions-transport-ws "^0.8.1"
3631+
subscriptions-transport-ws "^0.9.5"
3632+
webpack-bundle-analyzer "^2.9.2"
36733633

36743634
36753635
version "1.3.17"
@@ -3733,12 +3693,18 @@ graphql-tag@^2.4.2:
37333693
version "2.6.1"
37343694
resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.6.1.tgz#4788d509f6e29607d947fc47a40c4e18f736d34a"
37353695

3736-
graphql@^0.10.1, graphql@^0.10.5:
3696+
graphql@^0.10.5:
37373697
version "0.10.5"
37383698
resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.10.5.tgz#c9be17ca2bdfdbd134077ffd9bbaa48b8becd298"
37393699
dependencies:
37403700
iterall "^1.1.0"
37413701

3702+
graphql@^0.11.7:
3703+
version "0.11.7"
3704+
resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.11.7.tgz#e5abaa9cb7b7cccb84e9f0836bf4370d268750c6"
3705+
dependencies:
3706+
iterall "1.1.3"
3707+
37423708
graphql@^0.12.3:
37433709
version "0.12.3"
37443710
resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.12.3.tgz#11668458bbe28261c0dcb6e265f515ba79f6ce07"
@@ -5969,6 +5935,15 @@ postcss-modules@^0.6.4:
59695935
postcss "^5.2.8"
59705936
string-hash "^1.1.1"
59715937

5938+
postcss-modules@^1.1.0:
5939+
version "1.1.0"
5940+
resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-1.1.0.tgz#c9f94f76ff6addf7c35b842e69ed442118156bb0"
5941+
dependencies:
5942+
css-modules-loader-core "^1.1.0"
5943+
generic-names "^1.0.2"
5944+
postcss "^6.0.1"
5945+
string-hash "^1.1.1"
5946+
59725947
postcss-normalize-charset@^1.1.0:
59735948
version "1.1.1"
59745949
resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
@@ -6379,6 +6354,14 @@ react-modal@^3.1.10:
63796354
prop-types "^15.5.10"
63806355
warning "^3.0.0"
63816356

6357+
react-modal@^3.1.11:
6358+
version "3.1.11"
6359+
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.11.tgz#95c8223fcee7013258ad2d149c38c9f870c89958"
6360+
dependencies:
6361+
exenv "^1.2.0"
6362+
prop-types "^15.5.10"
6363+
warning "^3.0.0"
6364+
63826365
react-proxy@^1.1.7:
63836366
version "1.1.8"
63846367
resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-1.1.8.tgz#9dbfd9d927528c3aa9f444e4558c37830ab8c26a"
@@ -6456,6 +6439,17 @@ react-transition-group@^1.1.3:
64566439
prop-types "^15.5.6"
64576440
warning "^3.0.0"
64586441

6442+
react-transition-group@^2.2.1:
6443+
version "2.2.1"
6444+
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.2.1.tgz#e9fb677b79e6455fd391b03823afe84849df4a10"
6445+
dependencies:
6446+
chain-function "^1.0.0"
6447+
classnames "^2.2.5"
6448+
dom-helpers "^3.2.0"
6449+
loose-envify "^1.3.1"
6450+
prop-types "^15.5.8"
6451+
warning "^3.0.0"
6452+
64596453
react-virtualized@^9.12.0:
64606454
version "9.16.1"
64616455
resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.16.1.tgz#2a9c8262094bc5cca309a3ee29f2b4b572ae95a1"
@@ -7406,7 +7400,18 @@ styled-components@^2.4.0:
74067400
postcss-load-plugins "^2.2.0"
74077401
styled-jsx "^0.5.7"
74087402

7409-
7403+
"styled-jsx-postcss@git+https://github.com/timsuchanek/styled-jsx-postcss.git#build3":
7404+
version "0.2.0"
7405+
resolved "git+https://github.com/timsuchanek/styled-jsx-postcss.git#677ee0fb7f9138047a00e03c8c3e44adbb33cf2a"
7406+
dependencies:
7407+
babel-traverse "^6.21.0"
7408+
babylon "^6.14.1"
7409+
deasync "^0.1.9"
7410+
postcss "^5.2.8"
7411+
postcss-load-plugins "^2.2.0"
7412+
styled-jsx "^0.5.7"
7413+
7414+
[email protected], styled-jsx@^2.2.1:
74107415
version "2.2.1"
74117416
resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-2.2.1.tgz#8b38b9e53e5d9767e392595ab1afdc8426b3ba5d"
74127417
dependencies:
@@ -7462,6 +7467,19 @@ subscriptions-transport-ws@^0.8.1:
74627467
symbol-observable "^1.0.4"
74637468
ws "^3.0.0"
74647469

7470+
subscriptions-transport-ws@^0.9.5:
7471+
version "0.9.5"
7472+
resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.5.tgz#faa9eb1230d5f2efe355368cd973b867e4483c53"
7473+
dependencies:
7474+
backo2 "^1.0.2"
7475+
eventemitter3 "^2.0.3"
7476+
iterall "^1.1.1"
7477+
lodash.assign "^4.2.0"
7478+
lodash.isobject "^3.0.2"
7479+
lodash.isstring "^4.0.1"
7480+
symbol-observable "^1.0.4"
7481+
ws "^3.0.0"
7482+
74657483
sumchecker@^1.2.0:
74667484
version "1.3.1"
74677485
resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-1.3.1.tgz#79bb3b4456dd04f18ebdbc0d703a1d1daec5105d"
@@ -8052,7 +8070,7 @@ wbuf@^1.1.0, wbuf@^1.7.2:
80528070
dependencies:
80538071
minimalistic-assert "^1.0.0"
80548072

8055-
8073+
[email protected], webpack-bundle-analyzer@^2.9.2:
80568074
version "2.9.2"
80578075
resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.2.tgz#63ed86eb71cc4cda86f68e685a84530ba0126449"
80588076
dependencies:

packages/graphql-playground-react/postcss.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = (ctx) => ({
55
}),
66
require('postcss-cssnext')(),
77
require('postcss-inherit')({
8-
globalStyles: '../../node_modules/graphcool-styles/dist/styles.css',
8+
globalStyles: 'node_modules/graphcool-styles/dist/styles.css',
99
propertyRegExp: /^(inherit|extend|p)s?:?$/i,
1010
}),
1111
]

0 commit comments

Comments
 (0)