Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DOMA-3959: Patch Dicer (keystone -> graphql-upload -> busboy -> dicer) #3815

Merged
merged 2 commits into from
Sep 7, 2023
Merged

DOMA-3959: Patch Dicer (keystone -> graphql-upload -> busboy -> dicer) #3815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a41d33a
fix(condo) DOMA-3959: change graphql-upload to 15.0.2,
toplenboren Sep 4, 2023
3e9ad9a
fix(condo): DOMA-3959 fix importing of graphql-upload in internal mod…
toplenboren Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .yarn/patches/@keystonejs-app-graphql-npm-6.3.2-26fe50b988.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff --git a/index.js b/index.js
index a24a43d2503f34eff529941303be82efeef7d137..bd1705055c10ba10669e3a401125d2674acecb36 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,5 @@
const express = require('express');
-const { graphqlUploadExpress } = require('graphql-upload');
+const graphqlUploadExpress = require('graphql-upload/graphqlUploadExpress.js');
const { GraphQLPlaygroundApp } = require('@keystonejs/app-graphql-playground');
const validation = require('./validation');

13 changes: 13 additions & 0 deletions .yarn/patches/@keystonejs-keystone-npm-19.3.4-2a53e53061.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/lib/Keystone/index.js b/lib/Keystone/index.js
index 5f76cf925886570bc5416d50d7335923d3992ae7..d7b88fc338bde487b7427a85798879111aef6311 100644
--- a/lib/Keystone/index.js
+++ b/lib/Keystone/index.js
@@ -4,7 +4,7 @@ const memoize = require('micro-memoize');
const falsey = require('falsey');
const createCorsMiddleware = require('cors');
const { execute, print } = require('graphql');
-const { GraphQLUpload } = require('graphql-upload');
+const GraphQLUpload= require('graphql-upload/GraphQLUpload.js');
const { arrayToObject, objMerge, flatten, unique, filterValues } = require('@keystonejs/utils');
const {
validateFieldAccessControl,
2 changes: 1 addition & 1 deletion apps/condo/domains/common/utils/serverSchema/export.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const fs = require('fs')

const { stringify } = require('csv-stringify')
const dayjs = require('dayjs')
const Upload = require('graphql-upload/public/Upload')
const Upload = require('graphql-upload/Upload.js')
const { get } = require('lodash')

const conf = require('@open-condo/config')
Expand Down
6 changes: 3 additions & 3 deletions apps/condo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@keystonejs/adapter-mongoose": "^11.2.0",
"@keystonejs/adapter-prisma": "^3.2.0",
"@keystonejs/app-admin-ui": "^7.5.0",
"@keystonejs/app-graphql": "^6.3.0",
"@keystonejs/app-graphql": "^6.3.2",
"@keystonejs/app-graphql-playground": "^5.2.2",
"@keystonejs/app-next": "^5.2.3",
"@keystonejs/app-static": "^5.2.0",
Expand All @@ -51,7 +51,7 @@
"@keystonejs/fields-markdown": "^5.3.2",
"@keystonejs/fields-wysiwyg-tinymce": "^5.4.0",
"@keystonejs/file-adapters": "^7.1.0",
"@keystonejs/keystone": "19.3.4",
"@keystonejs/keystone": "^19.3.4",
"@keystonejs/list-plugins": "^8.1.0",
"@keystonejs/server-side-graphql-client": "^2.1.0",
"@keystonejs/utils": "^6.1.0",
Expand Down Expand Up @@ -111,7 +111,7 @@
"get-contrast": "^2.0.0",
"graphql": "^15.6.1",
"graphql-tag": "^2.12.6",
"graphql-upload": "^11.0.0",
"graphql-upload": "^15.0.2",
"graphql-voyager": "^1.0.0-rc.31",
"html2canvas": "^1.0.0-rc.7",
"http-proxy-middleware": "^2.0.6",
Expand Down
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"packageManager": "[email protected]",
"resolutions": {
"npm": "latest-6",
"graphql-upload": "^15.0.2",
"@keystonejs/app-admin-ui/@types/react": "16.9.17",
"react-intl/@types/react": "16.9.17",
"@types/react-transition-group@npm:2.9.2/@types/react": "16.9.17",
Expand All @@ -76,6 +77,8 @@
"es5-ext": "0.10.53",
"debuglog": "1.0.1",
"debug": "4.3.4",
"knex": "0.95.15"
"knex": "0.95.15",
"@keystonejs/keystone": "patch:@keystonejs/keystone@npm:19.3.4#.yarn/patches/@keystonejs-keystone-npm-19.3.4-2a53e53061.patch",
"@keystonejs/app-graphql": "patch:@keystonejs/app-graphql@npm:6.3.2#.yarn/patches/@keystonejs-app-graphql-npm-6.3.2-26fe50b988.patch"
}
}
85 changes: 63 additions & 22 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ __metadata:
"@keystonejs/adapter-mongoose": ^11.2.0
"@keystonejs/adapter-prisma": ^3.2.0
"@keystonejs/app-admin-ui": ^7.5.0
"@keystonejs/app-graphql": ^6.3.0
"@keystonejs/app-graphql": ^6.3.2
"@keystonejs/app-graphql-playground": ^5.2.2
"@keystonejs/app-next": ^5.2.3
"@keystonejs/app-static": ^5.2.0
Expand All @@ -614,7 +614,7 @@ __metadata:
"@keystonejs/fields-markdown": ^5.3.2
"@keystonejs/fields-wysiwyg-tinymce": ^5.4.0
"@keystonejs/file-adapters": ^7.1.0
"@keystonejs/keystone": 19.3.4
"@keystonejs/keystone": ^19.3.4
"@keystonejs/list-plugins": ^8.1.0
"@keystonejs/server-side-graphql-client": ^2.1.0
"@keystonejs/utils": ^6.1.0
Expand Down Expand Up @@ -689,7 +689,7 @@ __metadata:
get-contrast: ^2.0.0
graphql: ^15.6.1
graphql-tag: ^2.12.6
graphql-upload: ^11.0.0
graphql-upload: ^15.0.2
graphql-voyager: ^1.0.0-rc.31
html2canvas: ^1.0.0-rc.7
http-proxy-middleware: ^2.0.6
Expand Down Expand Up @@ -8540,7 +8540,7 @@ __metadata:
languageName: node
linkType: hard

"@keystonejs/app-graphql@npm:^6.3.0":
"@keystonejs/app-graphql@npm:6.3.2":
version: 6.3.2
resolution: "@keystonejs/app-graphql@npm:6.3.2"
dependencies:
Expand All @@ -8556,6 +8556,22 @@ __metadata:
languageName: node
linkType: hard

"@keystonejs/app-graphql@patch:@keystonejs/app-graphql@npm:6.3.2#.yarn/patches/@keystonejs-app-graphql-npm-6.3.2-26fe50b988.patch::locator=root%40workspace%3A.":
version: 6.3.2
resolution: "@keystonejs/app-graphql@patch:@keystonejs/app-graphql@npm%3A6.3.2#.yarn/patches/@keystonejs-app-graphql-npm-6.3.2-26fe50b988.patch::version=6.3.2&hash=c39a71&locator=root%40workspace%3A."
dependencies:
"@keystonejs/app-graphql-playground": ^5.2.2
"@keystonejs/session": ^8.3.2
"@keystonejs/utils": ^6.1.2
graphql: ^15.5.0
graphql-upload: ^11.0.0
nanoassert: ^2.0.0
peerDependencies:
express: ^4.17.1
checksum: c048205b0234ca75ffc96ed4420caf4ea082681e005befe54a3ab0afcd31918afa7e8abfa183a5c9401a462d6c95512ebbd7d4816a1d44ef59c3474645d13180
languageName: node
linkType: hard

"@keystonejs/app-next@npm:^5.2.3":
version: 5.2.3
resolution: "@keystonejs/app-next@npm:5.2.3"
Expand Down Expand Up @@ -8833,7 +8849,7 @@ __metadata:
languageName: node
linkType: hard

"@keystonejs/keystone@npm:19.3.4, @keystonejs/keystone@npm:^19.3.1, @keystonejs/keystone@npm:^19.3.3":
"@keystonejs/keystone@npm:19.3.4":
version: 19.3.4
resolution: "@keystonejs/keystone@npm:19.3.4"
dependencies:
Expand Down Expand Up @@ -8873,6 +8889,46 @@ __metadata:
languageName: node
linkType: hard

"@keystonejs/keystone@patch:@keystonejs/keystone@npm:19.3.4#.yarn/patches/@keystonejs-keystone-npm-19.3.4-2a53e53061.patch::locator=root%40workspace%3A.":
version: 19.3.4
resolution: "@keystonejs/keystone@patch:@keystonejs/keystone@npm%3A19.3.4#.yarn/patches/@keystonejs-keystone-npm-19.3.4-2a53e53061.patch::version=19.3.4&hash=e3b25e&locator=root%40workspace%3A."
dependencies:
"@keystonejs/access-control": ^7.1.2
"@keystonejs/app-version": ^2.1.2
"@keystonejs/session": ^8.3.2
"@keystonejs/utils": ^6.1.2
apollo-errors: ^1.9.0
apollo-server-express: ^2.23.0
arg: ^5.0.0
chalk: ^4.1.1
ci-info: ^3.2.0
cors: ^2.8.5
cuid: ^2.1.8
endent: ^2.1.0
ensure-error: ^3.0.1
express: ^4.17.1
express-pino-logger: ^6.0.0
falsey: ^1.0.0
fs-extra: ^9.1.0
globby: ^11.0.3
graphql: ^15.5.0
graphql-type-json: ^0.3.2
graphql-upload: ^11.0.0
lodash.flattendeep: ^4.4.0
micro-memoize: ^4.0.9
ora: ^5.4.1
p-waterfall: ^2.1.1
pino: ^6.13.3
pluralize: ^8.0.0
serialize-error: ^8.1.0
stack-utils: ^2.0.3
terminal-link: ^2.1.1
bin:
keystone: bin/cli.js
checksum: 07b4962c7c070cbcc93b94997a418e5b91f4a2f2c587d7051478e709d2e46dc29760317eb0b6b3495c924e5ec833a1a376fb1e82fd8824c971d8b75a7ac85a60
languageName: node
linkType: hard

"@keystonejs/list-plugins@npm:^8.1.0":
version: 8.1.2
resolution: "@keystonejs/list-plugins@npm:8.1.2"
Expand Down Expand Up @@ -24086,7 +24142,7 @@ __metadata:
languageName: node
linkType: hard

"fs-capacitor@npm:^6.1.0, fs-capacitor@npm:^6.2.0":
"fs-capacitor@npm:^6.2.0":
version: 6.2.0
resolution: "fs-capacitor@npm:6.2.0"
checksum: acdbeb92eedb1d7094f623e7be518c4d73075cb45ea97cc80ae23fc31adb066853723be824caf3e3c8f40944548c8cdc9bf0f0735eabb9413e734fe045b303b1
Expand Down Expand Up @@ -25251,22 +25307,7 @@ __metadata:
languageName: node
linkType: hard

"graphql-upload@npm:^11.0.0":
version: 11.0.0
resolution: "graphql-upload@npm:11.0.0"
dependencies:
busboy: ^0.3.1
fs-capacitor: ^6.1.0
http-errors: ^1.7.3
isobject: ^4.0.0
object-path: ^0.11.4
peerDependencies:
graphql: 0.13.1 - 15
checksum: 4d17cf4a16cfba940ca73487710093bc0013b06550168c1b84cb1f915c2df26e172faf9ed873ae4fc1cb547cd0d4d6e8ee607a35634355f128b3f161f64f0e1f
languageName: node
linkType: hard

"graphql-upload@npm:^15.0.1":
"graphql-upload@npm:^15.0.2":
version: 15.0.2
resolution: "graphql-upload@npm:15.0.2"
dependencies:
Expand Down
Loading