Skip to content

Commit 53c9833

Browse files
author
Guillaume Chau
committed
Merge branch 'dev' of github.com:Akryum/vue-apollo into dev
2 parents f22c3f8 + 5320fd0 commit 53c9833

File tree

3 files changed

+30
-43
lines changed

3 files changed

+30
-43
lines changed

tests/demo/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@vue/eslint-config-standard": "^4.0.0",
3131
"eslint-plugin-graphql": "^2.1.1",
3232
"graphql-tag": "^2.5.0",
33-
"start-server-and-test": "^1.7.9",
33+
"start-server-and-test": "^1.10.2",
3434
"stylus": "^0.54.5",
3535
"stylus-loader": "^3.0.2",
3636
"vue-cli-plugin-apollo": "^0.21.0",

tests/demo/yarn.lock

+18-31
Original file line numberDiff line numberDiff line change
@@ -4591,18 +4591,20 @@ [email protected], execa@^0.10.0:
45914591
signal-exit "^3.0.0"
45924592
strip-eof "^1.0.0"
45934593

4594-
execa@0.11.0:
4595-
version "0.11.0"
4596-
resolved "https://registry.yarnpkg.com/execa/-/execa-0.11.0.tgz#0b3c71daf9b9159c252a863cd981af1b4410d97a"
4597-
integrity sha512-k5AR22vCt1DcfeiRixW46U5tMLtBg44ssdJM9PiXw3D8Bn5qyxFCSnKY/eR22y+ctFDGPqafpaXg2G4Emyua4A==
4594+
execa@2.0.4, execa@^2.0.1, execa@^2.0.3:
4595+
version "2.0.4"
4596+
resolved "https://registry.yarnpkg.com/execa/-/execa-2.0.4.tgz#2f5cc589c81db316628627004ea4e37b93391d8e"
4597+
integrity sha512-VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ==
45984598
dependencies:
4599-
cross-spawn "^6.0.0"
4600-
get-stream "^4.0.0"
4601-
is-stream "^1.1.0"
4602-
npm-run-path "^2.0.0"
4603-
p-finally "^1.0.0"
4604-
signal-exit "^3.0.0"
4605-
strip-eof "^1.0.0"
4599+
cross-spawn "^6.0.5"
4600+
get-stream "^5.0.0"
4601+
is-stream "^2.0.0"
4602+
merge-stream "^2.0.0"
4603+
npm-run-path "^3.0.0"
4604+
onetime "^5.1.0"
4605+
p-finally "^2.0.0"
4606+
signal-exit "^3.0.2"
4607+
strip-final-newline "^2.0.0"
46064608

46074609
execa@^0.7.0:
46084610
version "0.7.0"
@@ -4643,21 +4645,6 @@ execa@^1.0.0:
46434645
signal-exit "^3.0.0"
46444646
strip-eof "^1.0.0"
46454647

4646-
execa@^2.0.1, execa@^2.0.3:
4647-
version "2.0.4"
4648-
resolved "https://registry.yarnpkg.com/execa/-/execa-2.0.4.tgz#2f5cc589c81db316628627004ea4e37b93391d8e"
4649-
integrity sha512-VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ==
4650-
dependencies:
4651-
cross-spawn "^6.0.5"
4652-
get-stream "^5.0.0"
4653-
is-stream "^2.0.0"
4654-
merge-stream "^2.0.0"
4655-
npm-run-path "^3.0.0"
4656-
onetime "^5.1.0"
4657-
p-finally "^2.0.0"
4658-
signal-exit "^3.0.2"
4659-
strip-final-newline "^2.0.0"
4660-
46614648
46624649
version "4.1.1"
46634650
resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
@@ -9680,15 +9667,15 @@ stackframe@^1.0.4:
96809667
resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b"
96819668
integrity sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==
96829669

9683-
start-server-and-test@^1.7.9:
9684-
version "1.10.0"
9685-
resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.10.0.tgz#a7cd88932a52b42bc9de184430a498338e426c0b"
9686-
integrity sha512-wp6x++18wNUIkI0qT+EkgwVQFwoXh003u/PPUJVEEyh9lSNDONLD9CK2qleghS/kl5LxipbrIUw+FJVEFRVkGw==
9670+
start-server-and-test@^1.10.2:
9671+
version "1.10.2"
9672+
resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.10.2.tgz#31ecb54c6d6375b119840ece9bb6bfffdb8bc50e"
9673+
integrity sha512-CDJGFi+qlE4KFh7QgDRz51rKn30XGpWRVRuyuuA43tZw5BEh/mkusr7aHqvT0q19xtgChYXW/uhgOq817sb+7w==
96879674
dependencies:
96889675
bluebird "3.5.5"
96899676
check-more-types "2.24.0"
96909677
debug "4.1.1"
9691-
execa "0.11.0"
9678+
execa "2.0.4"
96929679
lazy-ass "1.6.0"
96939680
ps-tree "1.2.0"
96949681
wait-on "3.3.0"

yarn.lock

+11-11
Original file line numberDiff line numberDiff line change
@@ -1636,7 +1636,7 @@
16361636
"@types/istanbul-lib-coverage" "*"
16371637
"@types/istanbul-lib-report" "*"
16381638

1639-
"@types/node@>=6", "@types/node@^12.7.4":
1639+
"@types/node@>=6", "@types/node@^12.7.5":
16401640
version "12.7.5"
16411641
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.5.tgz#e19436e7f8e9b4601005d73673b6dc4784ffcc2f"
16421642
integrity sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w==
@@ -4137,9 +4137,9 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
41374137
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
41384138

41394139
eslint@^6.3.0:
4140-
version "6.3.0"
4141-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.3.0.tgz#1f1a902f67bfd4c354e7288b81e40654d927eb6a"
4142-
integrity sha512-ZvZTKaqDue+N8Y9g0kp6UPZtS4FSY3qARxBs7p4f0H0iof381XHduqVerFWtK8DPtKmemqbqCFENWSQgPR/Gow==
4140+
version "6.4.0"
4141+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.4.0.tgz#5aa9227c3fbe921982b2eda94ba0d7fae858611a"
4142+
integrity sha512-WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA==
41434143
dependencies:
41444144
"@babel/code-frame" "^7.0.0"
41454145
ajv "^6.10.0"
@@ -4838,9 +4838,9 @@ graphql-tag@^2.5.0:
48384838
integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==
48394839

48404840
graphql@*, graphql@^14.0.2:
4841-
version "14.5.4"
4842-
resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.5.4.tgz#b33fe957854e90c10d4c07c7d26b6c8e9f159a13"
4843-
integrity sha512-dPLvHoxy5m9FrkqWczPPRnH0X80CyvRE6e7Fa5AWEqEAzg9LpxHvKh24po/482E6VWHigOkAmb4xCp6P9yT9gw==
4841+
version "14.5.6"
4842+
resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.5.6.tgz#3fa12173b50e6ccdef953c31c82f37c50ef58bec"
4843+
integrity sha512-zJ6Oz8P1yptV4O4DYXdArSwvmirPetDOBnGFRBl0zQEC68vNW3Ny8qo8VzMgfr+iC8PKiRYJ+f2wub41oDCoQg==
48444844
dependencies:
48454845
iterall "^1.2.2"
48464846

@@ -8653,12 +8653,12 @@ rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1:
86538653
estree-walker "^0.6.1"
86548654

86558655
rollup@^1.21.2:
8656-
version "1.21.2"
8657-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.21.2.tgz#eaabd07d0bd309587ad8bebf731fca6fcb96f4d0"
8658-
integrity sha512-sCAHlcQ/PExU5t/kRwkEWHdhGmQrZ2IgdQzbjPVNfhWbKHMMZGYqkASVTpQqRPLtQKg15xzEscc+BnIK/TE7/Q==
8656+
version "1.21.3"
8657+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.21.3.tgz#2d957e04b230b06a85b8c617bf594f92c37c4d5d"
8658+
integrity sha512-43CgeUtHhfiqBOUd0uJo5NEOg2FuheF3SqGN8BqgvnqB4xM2TbfPdudeSdllDcMKpagHb//qtpaAADBurT4GzA==
86598659
dependencies:
86608660
"@types/estree" "0.0.39"
8661-
"@types/node" "^12.7.4"
8661+
"@types/node" "^12.7.5"
86628662
acorn "^7.0.0"
86638663

86648664
rsvp@^4.8.4:

0 commit comments

Comments
 (0)