Skip to content

Commit fcf32de

Browse files
committed
Merge branch '8.x-4.x' into apq_plugin
* 8.x-4.x: fix(dataproducer): Fix language definition to be single value in entity reference producers (drupal-graphql#1241) docs(server): Improved class property descriptions feat(server): Add configurable validation security rules for introspection and query complexity (drupal-graphql#1244) tests(buffer): Fix ArryObject usage to not depend on Zend (drupal-graphql#1247) test(phpstan): Add missing return type hint fix(file-upldoad): Validate files in the correct order fix(DataProducer): Fix entity reference loading by language (drupal-graphql#1232) tests(assertions): Implement leaked metadata detection for QueryResultAssertionTrait (drupal-graphql#1207) tests(github): Switch testing to Drupal core 9.2.x (drupal-graphql#1215) chore(voyager): yarn audit security updates (drupal-graphql#1214) test(phpstan): Enable PHPStan run on PHP 8.0 (drupal-graphql#1211) refactor(executor): Replace deprecated AST::getOperation() with AST::getOperationAST() (drupal-graphql#1210) fix(executor): Remove swapped errors compatibility mode
2 parents 3ea3cbb + eb7430e commit fcf32de

30 files changed

+2458
-3977
lines changed

Diff for: .github/workflows/testing.yml

+5-11
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,12 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-versions: ['7.3', '7.4']
17-
drupal-core: ['9.1.x']
18-
phpstan: ['1']
16+
php-versions: ['7.3', '7.4', '8.0']
17+
drupal-core: ['9.2.x']
1918
include:
2019
# Extra run to also test on latest Drupal 8 and PHP 7.2.
2120
- php-versions: '7.2'
2221
drupal-core: '8.9.x'
23-
phpstan: '1'
24-
# PHPStan does not work on PHP 8 yet for us.
25-
- php-versions: '8.0'
26-
drupal-core: '9.1.x'
27-
phpstan: '0'
2822
steps:
2923
- name: Checkout Drupal core
3024
uses: actions/checkout@v2
@@ -83,10 +77,10 @@ jobs:
8377
8478
- name: Install GraphQL dependencies
8579
run: composer --no-interaction --no-progress require \
86-
webonyx/graphql-php:^14.3 \
80+
webonyx/graphql-php:^14.8 \
8781
drupal/typed_data:^1.0 \
8882
drupal/redirect:^1.6 \
89-
phpstan/phpstan:^0.12.70 \
83+
phpstan/phpstan:^0.12.88 \
9084
mglaman/phpstan-drupal:^0.12.8 \
9185
phpstan/phpstan-deprecation-rules:^0.12.2 \
9286
jangregor/phpstan-prophecy:^0.8 \
@@ -109,7 +103,7 @@ jobs:
109103

110104
- name: Run PHPStan
111105
run: |
112-
if [[ ${{ matrix.phpstan }} == "1" ]]; then cd modules/graphql && ../../vendor/bin/phpstan analyse; fi
106+
cd modules/graphql && ../../vendor/bin/phpstan analyse
113107
114108
- name: Run PHPCS
115109
run: |

Diff for: assets/explorer/dist/bundle.min.js

+2-36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: assets/explorer/dist/bundle.min.js.LICENSE.txt

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
object-assign
3+
(c) Sindre Sorhus
4+
@license MIT
5+
*/
6+
7+
/** @license React v0.19.1
8+
* scheduler.production.min.js
9+
*
10+
* Copyright (c) Facebook, Inc. and its affiliates.
11+
*
12+
* This source code is licensed under the MIT license found in the
13+
* LICENSE file in the root directory of this source tree.
14+
*/
15+
16+
/** @license React v16.14.0
17+
* react-dom.production.min.js
18+
*
19+
* Copyright (c) Facebook, Inc. and its affiliates.
20+
*
21+
* This source code is licensed under the MIT license found in the
22+
* LICENSE file in the root directory of this source tree.
23+
*/
24+
25+
/** @license React v16.14.0
26+
* react.production.min.js
27+
*
28+
* Copyright (c) Facebook, Inc. and its affiliates.
29+
*
30+
* This source code is licensed under the MIT license found in the
31+
* LICENSE file in the root directory of this source tree.
32+
*/

Diff for: assets/explorer/dist/graphiql.css

+4-6
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,14 @@
161161
position: relative;
162162
}
163163

164-
.graphiql-container .variable-editor {
164+
.graphiql-container .secondary-editor {
165165
display: flex;
166166
flex-direction: column;
167167
height: 30px;
168168
position: relative;
169169
}
170170

171-
.graphiql-container .variable-editor-title {
171+
.graphiql-container .secondary-editor-title {
172172
background: #eeeeee;
173173
border-bottom: 1px solid #d6d6d6;
174174
border-top: 1px solid #e0e0e0;
@@ -1584,7 +1584,8 @@ li.CodeMirror-hint-active {
15841584

15851585
.graphiql-container .search-box {
15861586
border-bottom: 1px solid #d3d6db;
1587-
display: block;
1587+
display: flex;
1588+
align-items: center;
15881589
font-size: 14px;
15891590
margin: -15px -15px 12px 0;
15901591
position: relative;
@@ -1594,8 +1595,6 @@ li.CodeMirror-hint-active {
15941595
cursor: pointer;
15951596
display: block;
15961597
font-size: 24px;
1597-
position: absolute;
1598-
top: -2px;
15991598
transform: rotate(-45deg);
16001599
user-select: none;
16011600
}
@@ -1609,7 +1608,6 @@ li.CodeMirror-hint-active {
16091608
padding: 1px 5px 2px;
16101609
position: absolute;
16111610
right: 3px;
1612-
top: 8px;
16131611
user-select: none;
16141612
border: 0;
16151613
}

Diff for: assets/explorer/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"lint": "eslint src"
77
},
88
"dependencies": {
9-
"graphiql": "^0.17.5",
10-
"graphiql-explorer": "^0.6.2",
11-
"graphql": "^14.5.8",
9+
"graphiql": "^1.4.2",
10+
"graphiql-explorer": "^0.6.3",
11+
"graphql": "^15.5.1",
1212
"react": "^16.3",
1313
"react-dom": "^16.3"
1414
},
@@ -26,7 +26,7 @@
2626
"eslint-config-airbnb": "^18.1.0",
2727
"eslint-plugin-import": "^2.20.2",
2828
"rimraf": "^2.6.2",
29-
"webpack": "^4.41.2",
29+
"webpack": "^5.40.0",
3030
"webpack-cli": "^3.3.10"
3131
}
3232
}

0 commit comments

Comments
 (0)