From b4ec63e8a713fef464ca7b93fbc224581775df13 Mon Sep 17 00:00:00 2001 From: dblythy Date: Tue, 10 Nov 2020 11:36:45 +1100 Subject: [PATCH 1/9] Init (#6999) --- src/Options/docs.js | 1 + src/Options/index.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/Options/docs.js b/src/Options/docs.js index febe3d77cc..9d8553d9f6 100644 --- a/src/Options/docs.js +++ b/src/Options/docs.js @@ -27,6 +27,7 @@ * @property {Boolean} enableAnonymousUsers Enable (or disable) anonymous users, defaults to true * @property {Boolean} enableExpressErrorHandler Enables the default express error handler for all errors * @property {Boolean} enableSingleSchemaCache Use a single schema cache shared across requests. Reduces number of queries made to _SCHEMA, defaults to false, i.e. unique schema cache per request. + * @property {String} encryptionKey Key for encrypting your files * @property {Boolean} expireInactiveSessions Sets wether we should expire the inactive sessions, defaults to true * @property {String} fileKey Key for your files * @property {Adapter} filesAdapter Adapter module for the files sub-system diff --git a/src/Options/index.js b/src/Options/index.js index 1283f849a7..84ec9c7b99 100644 --- a/src/Options/index.js +++ b/src/Options/index.js @@ -77,6 +77,9 @@ export interface ParseServerOptions { javascriptKey: ?string; /* Key for Unity and .Net SDK */ dotNetKey: ?string; + /* Key for encrypting your files + :ENV: PARSE_SERVER_ENCRYPTION_KEY */ + encryptionKey: ?string; /* Key for REST calls :ENV: PARSE_SERVER_REST_API_KEY */ restAPIKey: ?string; From 568c285369717ef5423e63304291016b41daca5d Mon Sep 17 00:00:00 2001 From: Corey Date: Wed, 11 Nov 2020 11:57:41 -0500 Subject: [PATCH 2/9] Fix includeAll for querying a Pointer and Pointer array (#7002) * initial test * Add failing testcase * fix includeAll by considering array --- spec/ParseQuery.spec.js | 84 +++++++++++++++++++++++++++++++++++++++++ src/RestQuery.js | 5 ++- 2 files changed, 88 insertions(+), 1 deletion(-) diff --git a/spec/ParseQuery.spec.js b/spec/ParseQuery.spec.js index 5b8581dc93..846818fc9f 100644 --- a/spec/ParseQuery.spec.js +++ b/spec/ParseQuery.spec.js @@ -4008,6 +4008,90 @@ describe('Parse.Query testing', () => { }); }); + it('include pointer and pointer array', function (done) { + const child = new TestObject(); + const child2 = new TestObject(); + child.set('foo', 'bar'); + child2.set('hello', 'world'); + Parse.Object.saveAll([child, child2]).then(function () { + const parent = new Container(); + parent.set('child', child.toPointer()); + parent.set('child2', [child2.toPointer()]); + parent.save().then(function () { + const query = new Parse.Query(Container); + query.include(['child', 'child2']); + query.find().then(function (results) { + equal(results.length, 1); + const parentAgain = results[0]; + const childAgain = parentAgain.get('child'); + ok(childAgain); + equal(childAgain.get('foo'), 'bar'); + const child2Again = parentAgain.get('child2'); + equal(child2Again.length, 1); + ok(child2Again); + equal(child2Again[0].get('hello'), 'world'); + done(); + }); + }); + }); + }); + + it('include pointer and pointer array (keys switched)', function (done) { + const child = new TestObject(); + const child2 = new TestObject(); + child.set('foo', 'bar'); + child2.set('hello', 'world'); + Parse.Object.saveAll([child, child2]).then(function () { + const parent = new Container(); + parent.set('child', child.toPointer()); + parent.set('child2', [child2.toPointer()]); + parent.save().then(function () { + const query = new Parse.Query(Container); + query.include(['child2', 'child']); + query.find().then(function (results) { + equal(results.length, 1); + const parentAgain = results[0]; + const childAgain = parentAgain.get('child'); + ok(childAgain); + equal(childAgain.get('foo'), 'bar'); + const child2Again = parentAgain.get('child2'); + equal(child2Again.length, 1); + ok(child2Again); + equal(child2Again[0].get('hello'), 'world'); + done(); + }); + }); + }); + }); + + it('includeAll pointer and pointer array', function (done) { + const child = new TestObject(); + const child2 = new TestObject(); + child.set('foo', 'bar'); + child2.set('hello', 'world'); + Parse.Object.saveAll([child, child2]).then(function () { + const parent = new Container(); + parent.set('child', child.toPointer()); + parent.set('child2', [child2.toPointer()]); + parent.save().then(function () { + const query = new Parse.Query(Container); + query.includeAll(); + query.find().then(function (results) { + equal(results.length, 1); + const parentAgain = results[0]; + const childAgain = parentAgain.get('child'); + ok(childAgain); + equal(childAgain.get('foo'), 'bar'); + const child2Again = parentAgain.get('child2'); + equal(child2Again.length, 1); + ok(child2Again); + equal(child2Again[0].get('hello'), 'world'); + done(); + }); + }); + }); + }); + it('select nested keys 2 level includeAll', done => { const Foobar = new Parse.Object('Foobar'); const BarBaz = new Parse.Object('Barbaz'); diff --git a/src/RestQuery.js b/src/RestQuery.js index ec43992a07..78fd022bc1 100644 --- a/src/RestQuery.js +++ b/src/RestQuery.js @@ -676,7 +676,10 @@ RestQuery.prototype.handleIncludeAll = function () { const includeFields = []; const keyFields = []; for (const field in schema.fields) { - if (schema.fields[field].type && schema.fields[field].type === 'Pointer') { + if ( + (schema.fields[field].type && schema.fields[field].type === 'Pointer') || + (schema.fields[field].type && schema.fields[field].type === 'Array') + ) { includeFields.push([field]); keyFields.push(field); } From a4c84c09be605a9216bc795e876483a288bd4119 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Wed, 11 Nov 2020 19:39:25 -0600 Subject: [PATCH 3/9] fix(beforeSave): Skip Sanitizing Database results (#7003) * fix(beforeSave): Skip Sanitizing Database results * fix test --- spec/CloudCode.spec.js | 15 +++++++++++++++ src/RestWrite.js | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/spec/CloudCode.spec.js b/spec/CloudCode.spec.js index 995d09b6cc..e60b6db491 100644 --- a/spec/CloudCode.spec.js +++ b/spec/CloudCode.spec.js @@ -1479,6 +1479,21 @@ describe('Cloud Code', () => { }); }); + it('beforeSave should not sanitize database', async done => { + let count = 0; + Parse.Cloud.beforeSave('CloudIncrementNested', () => { + count += 1; + }); + + const obj = new Parse.Object('CloudIncrementNested'); + obj.set('objectField', { number: 5 }); + await obj.save(); + + obj.increment('objectField.number', 10); + await obj.save(); + count === 2 ? done() : fail(); + }); + /** * Verifies that an afterSave hook throwing an exception * will not prevent a successful save response from being returned diff --git a/src/RestWrite.js b/src/RestWrite.js index 0825267eeb..9467c6a2d1 100644 --- a/src/RestWrite.js +++ b/src/RestWrite.js @@ -235,7 +235,7 @@ RestWrite.prototype.runBeforeSaveTrigger = function () { this.query, this.data, this.runOptions, - false, + true, true ); } else { From c1971b2ab1a950a3bf029bd99c280dc044b2b536 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 12 Nov 2020 15:14:44 -0600 Subject: [PATCH 4/9] fix(beforeSave/afterSave): Return value instead of Parse.Op for nested fields (#7005) * fix(beforeSave): Return value instead of Parse.Op * afterSave test * Improve Tests * Fixed postgres test by saveArgumentsByValue --- spec/CloudCode.spec.js | 26 +++++++++++++++++++++++++- src/RestWrite.js | 20 ++++++++++++-------- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/spec/CloudCode.spec.js b/spec/CloudCode.spec.js index e60b6db491..0a672db17e 100644 --- a/spec/CloudCode.spec.js +++ b/spec/CloudCode.spec.js @@ -1480,17 +1480,41 @@ describe('Cloud Code', () => { }); it('beforeSave should not sanitize database', async done => { + const { adapter } = Config.get(Parse.applicationId).database; + const spy = spyOn(adapter, 'findOneAndUpdate').and.callThrough(); + spy.calls.saveArgumentsByValue(); + let count = 0; - Parse.Cloud.beforeSave('CloudIncrementNested', () => { + Parse.Cloud.beforeSave('CloudIncrementNested', req => { count += 1; + req.object.set('foo', 'baz'); + expect(typeof req.object.get('objectField').number).toBe('number'); + }); + + Parse.Cloud.afterSave('CloudIncrementNested', req => { + expect(typeof req.object.get('objectField').number).toBe('number'); }); const obj = new Parse.Object('CloudIncrementNested'); obj.set('objectField', { number: 5 }); + obj.set('foo', 'bar'); await obj.save(); obj.increment('objectField.number', 10); await obj.save(); + + const [ + , + , + , + /* className */ /* schema */ /* query */ update, + ] = adapter.findOneAndUpdate.calls.first().args; + expect(update).toEqual({ + 'objectField.number': { __op: 'Increment', amount: 10 }, + foo: 'baz', + updatedAt: obj.updatedAt.toISOString(), + }); + count === 2 ? done() : fail(); }); diff --git a/src/RestWrite.js b/src/RestWrite.js index 9467c6a2d1..38b318100c 100644 --- a/src/RestWrite.js +++ b/src/RestWrite.js @@ -1558,15 +1558,19 @@ RestWrite.prototype.buildUpdatedObject = function (extraData) { const updatedObject = triggers.inflate(extraData, this.originalData); Object.keys(this.data).reduce(function (data, key) { if (key.indexOf('.') > 0) { - // subdocument key with dot notation ('x.y':v => 'x':{'y':v}) - const splittedKey = key.split('.'); - const parentProp = splittedKey[0]; - let parentVal = updatedObject.get(parentProp); - if (typeof parentVal !== 'object') { - parentVal = {}; + if (typeof data[key].__op === 'string') { + updatedObject.set(key, data[key]); + } else { + // subdocument key with dot notation { 'x.y': v } => { 'x': { 'y' : v } }) + const splittedKey = key.split('.'); + const parentProp = splittedKey[0]; + let parentVal = updatedObject.get(parentProp); + if (typeof parentVal !== 'object') { + parentVal = {}; + } + parentVal[splittedKey[1]] = data[key]; + updatedObject.set(parentProp, parentVal); } - parentVal[splittedKey[1]] = data[key]; - updatedObject.set(parentProp, parentVal); delete data[key]; } return data; From 87639931104f032af7f6929b085f328c98ce595d Mon Sep 17 00:00:00 2001 From: Manuel Date: Mon, 16 Nov 2020 18:05:39 +0100 Subject: [PATCH 5/9] update stale bot (#6998) * removed stale bot * changed stale bot to only close features and enhancements --- .github/stale.yml | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/.github/stale.yml b/.github/stale.yml index 6807ed061f..2d688c8a25 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,29 +1,19 @@ # Number of days of inactivity before an issue becomes stale -daysUntilStale: 45 +daysUntilStale: 30 # Number of days of inactivity before a stale issue is closed -daysUntilClose: 7 -# Issues with these labels will never be considered stale -exemptLabels: - - bug - - enhancement - - feature request - - good first issue - - hacktoberfest - - help wanted - - needs investigation - - needs more info - - question - - pinned - - security - - up-for-grabs +daysUntilClose: 30 +# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled) +onlyLabels: + - ":rocket: feature" + - ":dna: enhancement" # Label to use when marking an issue as stale -staleLabel: stale +staleLabel: up-for-grabs # Limit to only `issues` not `pulls` only: issues # Comment to post when marking an issue as stale. Set to `false` to disable markComment: > - This issue has been automatically marked as stale because it has not had + This issue has been automatically marked as up-for-grabs because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. # Comment to post when closing a stale issue. Set to `false` to disable -closeComment: false +closeComment: false \ No newline at end of file From b71e4851a6be3c19e299fc3bc34639b861b78d77 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Tue, 17 Nov 2020 07:22:17 +0200 Subject: [PATCH 6/9] fix: upgrade graphql from 15.3.0 to 15.4.0 (#7011) Snyk has created this PR to upgrade graphql from 15.3.0 to 15.4.0. See this package in npm: https://www.npmjs.com/package/graphql See this project in Snyk: https://app.snyk.io/org/acinader/project/8c1a9edb-c8f5-4dc1-b221-4d6030a323eb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index ef031dace3..7e270e6058 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7175,9 +7175,9 @@ "dev": true }, "graphql": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.3.0.tgz", - "integrity": "sha512-GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w==" + "version": "15.4.0", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.4.0.tgz", + "integrity": "sha512-EB3zgGchcabbsU9cFe1j+yxdzKQKAbGUWRb13DsrsMN1yyfmmIq+2+L5MqVWcDCE4V89R5AyUOi7sMOGxdsYtA==" }, "graphql-extensions": { "version": "0.12.5", diff --git a/package.json b/package.json index f41d8c4ac7..52af66c7ad 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "deepcopy": "2.1.0", "express": "4.17.1", "follow-redirects": "1.13.0", - "graphql": "15.3.0", + "graphql": "15.4.0", "graphql-list-fields": "2.0.2", "graphql-relay": "0.6.0", "graphql-upload": "11.0.0", From 78b693bfe6743b7a57354b4516c699dc6e7998c3 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Tue, 17 Nov 2020 07:56:08 +0200 Subject: [PATCH 7/9] fix: upgrade jwks-rsa from 1.10.1 to 1.11.0 (#7008) Snyk has created this PR to upgrade jwks-rsa from 1.10.1 to 1.11.0. See this package in npm: https://www.npmjs.com/package/jwks-rsa See this project in Snyk: https://app.snyk.io/org/acinader/project/8c1a9edb-c8f5-4dc1-b221-4d6030a323eb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 20 +++++++++++++------- package.json | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7e270e6058..20d39b24ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8396,9 +8396,9 @@ } }, "jwks-rsa": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-1.10.1.tgz", - "integrity": "sha512-UmjOsATVu7eQr17wbBCS+BSoz5LFtl57PtNXHbHFeT1WKomHykCHtn7c8inWVI7tpnsy6CZ1KOMJTgipFwXPig==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-1.11.0.tgz", + "integrity": "sha512-G7ZgXZ3dlGbOUBQwgF+U/SVzOlI9KxJ9Uzp61bue2S5TV0h7c+kJRCl3bEPkC5PVmeu7/h82B3uQALVJMjzt/Q==", "requires": { "@types/express-jwt": "0.0.42", "axios": "^0.19.2", @@ -8408,13 +8408,14 @@ "jsonwebtoken": "^8.5.1", "limiter": "^1.1.5", "lru-memoizer": "^2.1.2", - "ms": "^2.1.2" + "ms": "^2.1.2", + "proxy-from-env": "^1.1.0" }, "dependencies": { "agent-base": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz", - "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "requires": { "debug": "4" } @@ -8445,6 +8446,11 @@ "agent-base": "6", "debug": "4" } + }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" } } }, diff --git a/package.json b/package.json index 52af66c7ad..9b00d858f0 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "graphql-upload": "11.0.0", "intersect": "1.0.1", "jsonwebtoken": "8.5.1", - "jwks-rsa": "1.10.1", + "jwks-rsa": "1.11.0", "ldapjs": "2.2.0", "lodash": "4.17.20", "lru-cache": "5.1.1", From 6207758d21d6751f895592954d9c15a16d2b731d Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Tue, 17 Nov 2020 08:02:34 +0200 Subject: [PATCH 8/9] fix: upgrade pg-promise from 10.7.0 to 10.7.1 (#7009) Snyk has created this PR to upgrade pg-promise from 10.7.0 to 10.7.1. See this package in npm: https://www.npmjs.com/package/pg-promise See this project in Snyk: https://app.snyk.io/org/acinader/project/8c1a9edb-c8f5-4dc1-b221-4d6030a323eb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 20 ++++++++++---------- package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 20d39b24ff..862bc7cd10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10454,9 +10454,9 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "pg": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/pg/-/pg-8.4.0.tgz", - "integrity": "sha512-01LcNrAf+mBI46c78mE86I5o5KkOM942lLiSBdiCfgHTR+oUNIjh1fKClWeoPNHJz2oXe/VUSqtk1vwAQYwWEg==", + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/pg/-/pg-8.4.1.tgz", + "integrity": "sha512-NRsH0aGMXmX1z8Dd0iaPCxWUw4ffu+lIAmGm+sTCwuDDWkpEgRCAHZYDwqaNhC5hG5DRMOjSUFasMWhvcmLN1A==", "requires": { "buffer-writer": "2.0.0", "packet-reader": "1.0.0", @@ -10488,20 +10488,20 @@ "integrity": "sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==" }, "pg-promise": { - "version": "10.7.0", - "resolved": "https://registry.npmjs.org/pg-promise/-/pg-promise-10.7.0.tgz", - "integrity": "sha512-jQui6HvPUpvnFGDo8hxJ1/4KamqRGjYan7+QApp+dA7hOv5GIJP+IRZayYqsX6+ktHqUFqxvn3se+Bd4WW/vmw==", + "version": "10.7.1", + "resolved": "https://registry.npmjs.org/pg-promise/-/pg-promise-10.7.1.tgz", + "integrity": "sha512-WP+FP+g5t4GGHVFsWVMOuC5VCM4GbVeZgQDlfS79yMzRKUliwpRaHN/MMO0r/OiA23sfL4gQgH4WPTKNjyvCHw==", "requires": { "assert-options": "0.6.2", - "pg": "8.4.0", + "pg": "8.4.1", "pg-minify": "1.6.1", "spex": "3.0.2" } }, "pg-protocol": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.3.0.tgz", - "integrity": "sha512-64/bYByMrhWULUaCd+6/72c9PMWhiVFs3EVxl9Ct6a3v/U8+rKgqP2w+kKg/BIGgMJyB+Bk/eNivT32Al+Jghw==" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz", + "integrity": "sha512-El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA==" }, "pg-types": { "version": "2.2.0", diff --git a/package.json b/package.json index 9b00d858f0..306a63e2cd 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "mime": "2.4.6", "mongodb": "3.6.2", "parse": "2.17.0", - "pg-promise": "10.7.0", + "pg-promise": "10.7.1", "pluralize": "8.0.0", "redis": "3.0.2", "semver": "7.3.2", From ccb045b68c5b4d983a90fa125513fc476e4e2387 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Tue, 17 Nov 2020 11:19:06 +0200 Subject: [PATCH 9/9] fix: upgrade @graphql-tools/links from 6.2.4 to 6.2.5 (#7007) Snyk has created this PR to upgrade @graphql-tools/links from 6.2.4 to 6.2.5. See this package in npm: https://www.npmjs.com/package/@graphql-tools/links See this project in Snyk: https://app.snyk.io/org/acinader/project/8c1a9edb-c8f5-4dc1-b221-4d6030a323eb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 79 ++++++++++------------------------------------- package.json | 2 +- 2 files changed, 18 insertions(+), 63 deletions(-) diff --git a/package-lock.json b/package-lock.json index 862bc7cd10..5b6b7d0579 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@apollo/client": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.2.1.tgz", - "integrity": "sha512-w1EdCf3lvSwsxG2zbn8Rm31nPh9gQrB7u61BnU1QCM5BNIfOxiuuldzGNMHi5kI9KleisFvZl/9OA7pEkVg/yw==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.2.5.tgz", + "integrity": "sha512-zpruxnFMz6K94gs2pqc3sidzFDbQpKT5D6P/J/I9s8ekHZ5eczgnRp6pqXC86Bh7+44j/btpmOT0kwiboyqTnA==", "requires": { "@graphql-typed-document-node/core": "^3.0.0", "@types/zen-observable": "^0.8.0", @@ -16,10 +16,9 @@ "fast-json-stable-stringify": "^2.0.0", "graphql-tag": "^2.11.0", "hoist-non-react-statics": "^3.3.2", - "optimism": "^0.12.1", + "optimism": "^0.13.0", "prop-types": "^15.7.2", "symbol-observable": "^2.0.0", - "terser": "^5.2.0", "ts-invariant": "^0.4.4", "tslib": "^1.10.0", "zen-observable": "^0.8.14" @@ -47,9 +46,9 @@ "integrity": "sha512-VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA==" }, "optimism": { - "version": "0.12.2", - "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.12.2.tgz", - "integrity": "sha512-k7hFhlmfLl6HNThIuuvYMQodC1c+q6Uc6V9cLVsMWyW514QuaxVJH/khPu2vLRIoDTpFdJ5sojlARhg1rzyGbg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.13.0.tgz", + "integrity": "sha512-6JAh3dH+YUE4QUdsgUw8nUQyrNeBKfAEKOHMlLkQ168KhIYFIxzPsHakWrRXDnTO+x61RJrS3/2uEt6W0xlocA==", "requires": { "@wry/context": "^0.5.2" } @@ -2863,11 +2862,11 @@ } }, "@graphql-tools/links": { - "version": "6.2.4", - "resolved": "https://registry.npmjs.org/@graphql-tools/links/-/links-6.2.4.tgz", - "integrity": "sha512-dQH3oWVTkCwzGmfIi1OjyKAjPw1jOexP1f3hv8UajgU7Um/DCjVkvXQHeMGlihXg4bH/wogFheCJ0SwF4oFFUA==", + "version": "6.2.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/links/-/links-6.2.5.tgz", + "integrity": "sha512-XeGDioW7F+HK6HHD/zCeF0HRC9s12NfOXAKv1HC0J7D50F4qqMvhdS/OkjzLoBqsgh/Gm8icRc36B5s0rOA9ig==", "requires": { - "@graphql-tools/utils": "^6.2.4", + "@graphql-tools/utils": "^7.0.0", "apollo-link": "1.2.14", "apollo-upload-client": "14.1.2", "cross-fetch": "3.0.6", @@ -2876,18 +2875,10 @@ "tslib": "~2.0.1" }, "dependencies": { - "@ardatan/aggregate-error": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@ardatan/aggregate-error/-/aggregate-error-0.0.6.tgz", - "integrity": "sha512-vyrkEHG1jrukmzTPtyWB4NLPauUw5bQeg4uhn8f+1SSynmrOcyvlb1GKQjjgoBzElLdfXCRYX8UnBlhklOHYRQ==", - "requires": { - "tslib": "~2.0.1" - } - }, "@graphql-tools/utils": { - "version": "6.2.4", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.4.tgz", - "integrity": "sha512-ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.0.2.tgz", + "integrity": "sha512-VQQ7krHeoXO0FS3qbWsb/vZb8c8oyiCYPIH4RSgeK9SKOUpatWYt3DW4jmLmyHZLVVMk0yjUbsOhKTBEMejKSA==", "requires": { "@ardatan/aggregate-error": "0.0.6", "camel-case": "4.1.1", @@ -2915,9 +2906,9 @@ "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==" }, "tslib": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", - "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" } } }, @@ -4542,11 +4533,6 @@ "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", "dev": true }, - "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" - }, "buffer-writer": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz", @@ -11554,15 +11540,6 @@ "urix": "^0.1.0" } }, - "source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -12000,28 +11977,6 @@ "xtend": "^4.0.0" } }, - "terser": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.3.tgz", - "integrity": "sha512-vRQDIlD+2Pg8YMwVK9kMM3yGylG95EIwzBai1Bw7Ot4OBfn3VP1TZn3EWx4ep2jERN/AmnVaTiGuelZSN7ds/A==", - "requires": { - "commander": "^2.20.0", - "source-map": "~0.7.2", - "source-map-support": "~0.5.19" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" - } - } - }, "test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", diff --git a/package.json b/package.json index 306a63e2cd..169e2b5911 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "license": "BSD-3-Clause", "dependencies": { "@apollographql/graphql-playground-html": "1.6.26", - "@graphql-tools/links": "6.2.4", + "@graphql-tools/links": "6.2.5", "@graphql-tools/stitch": "6.2.4", "@graphql-tools/utils": "6.2.4", "@parse/fs-files-adapter": "1.2.0",