Skip to content

Commit 16d7b30

Browse files
authored
fix: load makeAddPgTableConditionPlugins before PgConnectionArgOrderBy (#658)
1 parent 396a1c2 commit 16d7b30

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ examples
1111
dist
1212
CHANGELOG.md
1313
package.json
14+
lerna.json

packages/graphile-utils/src/makeAddPgTableConditionPlugin.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,13 @@ export default function makeAddPgTableConditionPlugin(
130130
});
131131

132132
return args;
133-
}
133+
},
134+
[],
135+
// Make sure we're loaded before PgConnectionArgOrderBy, otherwise
136+
// ordering added by conditions will be overridden by the default
137+
// ordering.
138+
["PgConnectionArgOrderBy"],
139+
[]
134140
);
135141
};
136142
plugin.displayName = displayName;

yarn.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -7847,11 +7847,11 @@ posix-character-classes@^0.1.0:
78477847
integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
78487848

78497849
postgraphile@^4.4.0, postgraphile@^4.4.4:
7850-
version "4.8.0"
7851-
resolved "https://registry.yarnpkg.com/postgraphile/-/postgraphile-4.8.0.tgz#222992e8aed62023c88f790a9d33ae6c7fd33243"
7852-
integrity sha512-NSETJhg5smqiu8mbr6AqATVypPb5WMVq95i7smlaE+XIzOT+bbJz4bAuB+Gvp399tOwFOwUyfOZxQvq5jxJg+A==
7850+
version "4.9.0"
7851+
resolved "https://registry.yarnpkg.com/postgraphile/-/postgraphile-4.9.0.tgz#71bca224833f702803169802ce9b79e36b739be1"
7852+
integrity sha512-ltsYwzcNmR/VZX2gKgVt7hCT1h+JB81Hcn7xLKvvFyjh6CKAia4fYKUh84dq67nQTzj6tZrJVtbGYQ0NIApLBw==
78537853
dependencies:
7854-
"@graphile/lru" "4.8.0-rc.0"
7854+
"@graphile/lru" "4.9.0"
78557855
"@types/json5" "^0.0.30"
78567856
"@types/jsonwebtoken" "^8.3.2"
78577857
"@types/koa" "^2.0.44"
@@ -7862,7 +7862,7 @@ postgraphile@^4.4.0, postgraphile@^4.4.4:
78627862
commander "^2.19.0"
78637863
debug "^4.1.1"
78647864
finalhandler "^1.0.6"
7865-
graphile-utils "^4.8.0"
7865+
graphile-utils "^4.9.0"
78667866
graphql "^0.6.0 || ^0.7.0 || ^0.8.0-b || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.2"
78677867
http-errors "^1.5.1"
78687868
iterall "^1.0.2"
@@ -7871,10 +7871,10 @@ postgraphile@^4.4.0, postgraphile@^4.4.4:
78717871
parseurl "^1.3.2"
78727872
pg ">=6.1.0 <9"
78737873
pg-connection-string "^2.0.0"
7874-
pg-sql2 "4.8.0"
7875-
postgraphile-core "4.8.0"
7874+
pg-sql2 "4.9.0"
7875+
postgraphile-core "4.9.0"
78767876
subscriptions-transport-ws "^0.9.15"
7877-
tslib "^1.5.0"
7877+
tslib "^2.0.1"
78787878
ws "^6.1.3"
78797879

78807880
postgres-array@~2.0.0:
@@ -9377,7 +9377,7 @@ [email protected], ts-node@^9.0.0:
93779377
source-map-support "^0.5.17"
93789378
yn "3.1.1"
93799379

9380-
tslib@^1.10.0, tslib@^1.5.0, tslib@^1.8.1, tslib@^1.9.0:
9380+
tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
93819381
version "1.13.0"
93829382
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
93839383
integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==

0 commit comments

Comments
 (0)