From f5be18fb019121678981cd5f2a41975eba50a0e2 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 22 Nov 2022 14:49:47 -0300 Subject: [PATCH 01/27] docs: documented bind Enviroment --- packages/meteor/dynamics_nodejs.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/meteor/dynamics_nodejs.js b/packages/meteor/dynamics_nodejs.js index 2a278acd5e..fe0ca03287 100644 --- a/packages/meteor/dynamics_nodejs.js +++ b/packages/meteor/dynamics_nodejs.js @@ -200,6 +200,9 @@ const bindEnvironmentFibers = (func, onException, _this) => { }; }; +// This function has two reasons: +// 1. Return the function to be executed on the MeteorJS context, having it assinged in the async localstorage. +// 2. Better error handling, the error message will be more clear. const bindEnvironmentAsync = (func, onException, _this) => { var dynamics = Meteor._getValueFromAslStore("_meteor_dynamics"); var boundValues = Array.isArray(dynamics) ? dynamics.slice() : []; From 078661e8897b342de458ce9499a9c2e2ffc393d8 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 22 Nov 2022 14:50:01 -0300 Subject: [PATCH 02/27] chore: added async to collection.js --- packages/mongo-async/collection.js | 31 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/packages/mongo-async/collection.js b/packages/mongo-async/collection.js index 855b2f3c14..287b370949 100644 --- a/packages/mongo-async/collection.js +++ b/packages/mongo-async/collection.js @@ -745,16 +745,16 @@ Object.assign(Mongo.Collection.prototype, { // We'll actually design an index API later. For now, we just pass through to // Mongo's, but make it synchronous. - _ensureIndex(index, options) { + async _ensureIndex(index, options) { var self = this; if (!self._collection._ensureIndex || !self._collection.createIndex) throw new Error('Can only call createIndex on server collections'); if (self._collection.createIndex) { - self._collection.createIndex(index, options); + await self._collection.createIndex(index, options); } else { import { Log } from 'meteor/logging'; - Log.debug(`_ensureIndex has been deprecated, please use the new 'createIndex' instead${options?.name ? `, index name: ${options.name}` : `, index: ${JSON.stringify(index)}`}`) - self._collection._ensureIndex(index, options); + Log.debug(`_ensureIndex has been deprecated, please use the new 'createIndex' instead${ options?.name ? `, index name: ${ options.name }` : `, index: ${ JSON.stringify(index) }` }`) + await self._collection._ensureIndex(index, options); } }, @@ -770,37 +770,38 @@ Object.assign(Mongo.Collection.prototype, { * @param {Boolean} options.unique Define that the index values must be unique, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-unique/) * @param {Boolean} options.sparse Define that the index is sparse, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-sparse/) */ - createIndex(index, options) { + async createIndex(index, options) { var self = this; if (!self._collection.createIndex) throw new Error('Can only call createIndex on server collections'); + console.dir(index, options) try { - self._collection.createIndex(index, options); + await self._collection.createIndex(index, options); } catch (e) { if (e.message.includes('An equivalent index already exists with the same name but different options.') && Meteor.settings?.packages?.mongo?.reCreateIndexOnOptionMismatch) { import { Log } from 'meteor/logging'; - - Log.info(`Re-creating index ${index} for ${self._name} due to options mismatch.`); - self._collection._dropIndex(index); - self._collection.createIndex(index, options); + Log.info(`Re-creating index ${ index } for ${ self._name } due to options mismatch.`); + await self._collection._dropIndex(index); + await self._collection.createIndex(index, options); } else { - throw new Meteor.Error(`An error occurred when creating an index for collection "${self._name}: ${e.message}`); + console.error(e); + throw new Meteor.Error(`An error occurred when creating an index for collection "${ self._name }: ${ e.message }`); } } }, - _dropIndex(index) { + async _dropIndex(index) { var self = this; if (!self._collection._dropIndex) throw new Error('Can only call _dropIndex on server collections'); self._collection._dropIndex(index); }, - _dropCollection() { + async _dropCollection() { var self = this; if (!self._collection.dropCollection) throw new Error('Can only call _dropCollection on server collections'); - self._collection.dropCollection(); + await self._collection.dropCollection(); }, _createCappedCollection(byteSize, maxDocuments) { @@ -830,7 +831,7 @@ Object.assign(Mongo.Collection.prototype, { * @summary Returns the [`Db`](http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html) object corresponding to this collection's database connection from the [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`. * @locus Server * @memberof Mongo.Collection - * @instance + * @ce */ rawDatabase() { var self = this; From 63e411176aacc462e7184c84b0645edbd73818bf Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 22 Nov 2022 14:50:17 -0300 Subject: [PATCH 03/27] chore: updated mongo_driver.js to async --- packages/mongo-async/mongo_driver.js | 45 +++++++++++++++++++++------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/packages/mongo-async/mongo_driver.js b/packages/mongo-async/mongo_driver.js index 44f399142c..ae1f477c7c 100644 --- a/packages/mongo-async/mongo_driver.js +++ b/packages/mongo-async/mongo_driver.js @@ -426,19 +426,25 @@ MongoConnection.prototype._remove = function (collection_name, selector, } }; -MongoConnection.prototype._dropCollection = function (collectionName, cb) { +MongoConnection.prototype._dropCollection = async function (collectionName, cb) { var self = this; var write = self._maybeBeginWrite(); var refresh = function () { - Meteor.refresh({collection: collectionName, id: null, - dropCollection: true}); + return Meteor.refresh({ + collection: collectionName, + id: null, + dropCollection: true + }); }; - cb = bindEnvironmentForWrite(writeCallback(write, refresh, cb)); + // TODO[FIBERS]: Check if this is correct after the DDP changes. + const fn = bindEnvironmentForWrite( + writeCallback(write, refresh, cb) + ); try { var collection = self.rawCollection(collectionName); - collection.drop(cb); + await Meteor.promisify(collection.drop)(fn); } catch (e) { write.committed(); throw e; @@ -447,17 +453,17 @@ MongoConnection.prototype._dropCollection = function (collectionName, cb) { // For testing only. Slightly better than `c.rawDatabase().dropDatabase()` // because it lets the test's fence wait for it to be complete. -MongoConnection.prototype._dropDatabase = function (cb) { +MongoConnection.prototype._dropDatabase = async function (cb) { var self = this; var write = self._maybeBeginWrite(); var refresh = function () { Meteor.refresh({ dropDatabase: true }); }; - cb = bindEnvironmentForWrite(writeCallback(write, refresh, cb)); + const fn = Meteor.bindEnvironment(writeCallback(write, refresh, cb)) try { - self.db.dropDatabase(cb); + await Meteor.promisify(self.db.dropDatabase)(fn); } catch (e) { write.committed(); throw e; @@ -838,8 +844,17 @@ MongoConnection.prototype.createIndex = async function (collectionName, index, // We expect this function to be called at startup, not from within a method, // so we don't interact with the write fence. - var collection = self.rawCollection(collectionName); - var indexName = await collection.createIndex(index, options); + var collection = self.rawCollection(collectionName) + console.dir(index) + const p = new Promise(async (resolve, reject) => { + try { + const j = await collection.createIndex(index, options) + resolve(j) + } catch (e) { + reject(e); + } + }) + var indexName = await p }; MongoConnection.prototype._ensureIndex = MongoConnection.prototype.createIndex; @@ -850,7 +865,15 @@ MongoConnection.prototype._dropIndex = async function (collectionName, index) { // This function is only used by test code, not within a method, so we don't // interact with the write fence. var collection = self.rawCollection(collectionName); - var indexName = await collection.dropIndex(index); + const p = new Promise(async (resolve, reject) => { + try { + const k = await collection.dropIndex(index) + resolve(k) + } catch (e) { + reject(e); + } + }) + var indexName = await p; }; // CURSORS From c79f71b07af6bcf0fd5697b9758a43f00d2e22dc Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 22 Nov 2022 14:50:55 -0300 Subject: [PATCH 04/27] chore: commented code in package.js to focus on tests --- packages/mongo-async/package.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/mongo-async/package.js b/packages/mongo-async/package.js index f31b7efe27..e3687ef120 100644 --- a/packages/mongo-async/package.js +++ b/packages/mongo-async/package.js @@ -93,13 +93,13 @@ Package.onTest(function (api) { 'ddp', 'base64']); // XXX test order dependency: the allow_tests "partial allow" test // fails if it is run before mongo_livedata_tests. - api.addFiles('mongo_livedata_tests.js', ['client', 'server']); - api.addFiles('upsert_compatibility_test.js', 'server'); - api.addFiles('allow_tests.js', ['client', 'server']); - api.addFiles('collection_tests.js', ['client', 'server']); - api.addFiles('collection_async_tests.js', ['client', 'server']); - api.addFiles('observe_changes_tests.js', ['client', 'server']); + // api.addFiles('mongo_livedata_tests.js', ['client', 'server']); + // api.addFiles('upsert_compatibility_test.js', 'server'); + // api.addFiles('allow_tests.js', ['client', 'server']); + // api.addFiles('collection_tests.js', ['client', 'server']); + // api.addFiles('collection_async_tests.js', ['client', 'server']); + // api.addFiles('observe_changes_tests.js', ['client', 'server']); api.addFiles('oplog_tests.js', 'server'); - api.addFiles('oplog_v2_converter_tests.js', 'server'); - api.addFiles('doc_fetcher_tests.js', 'server'); + // api.addFiles('oplog_v2_converter_tests.js', 'server'); + // api.addFiles('doc_fetcher_tests.js', 'server'); }); From bf1b8a100eb2423256c5525b502a6ac27e8c900b Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 22 Nov 2022 14:52:32 -0300 Subject: [PATCH 05/27] chore: updated shrinkwarp of babel-compiler --- .../.npm/package/npm-shrinkwrap.json | 746 +++++++++--------- 1 file changed, 358 insertions(+), 388 deletions(-) diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json index 4453e83e92..1504288778 100644 --- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json +++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json @@ -2,206 +2,213 @@ "lockfileVersion": 1, "dependencies": { "@ampproject/remapping": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz", - "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", + "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==" }, "@babel/code-frame": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz", - "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", + "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==" }, "@babel/compat-data": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz", - "integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==" + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz", + "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==" }, "@babel/core": { - "version": "7.17.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz", - "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.2.tgz", + "integrity": "sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g==", "dependencies": { "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==" } } }, "@babel/generator": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.3.tgz", - "integrity": "sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==" + "version": "7.20.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.4.tgz", + "integrity": "sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==", + "dependencies": { + "@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==" + } + } }, "@babel/helper-annotate-as-pure": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz", - "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz", + "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==" }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz", - "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==" + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz", + "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==" }, "@babel/helper-compilation-targets": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz", - "integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==" + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz", + "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==" }, "@babel/helper-create-class-features-plugin": { - "version": "7.17.1", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz", - "integrity": "sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ==" + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.2.tgz", + "integrity": "sha512-k22GoYRAHPYr9I+Gvy2ZQlAe5mGy8BqWst2wRt8cwIufWTxrsVshhIBvYNqC80N0GSFWTsqRVexOtfzlgOEDvA==" }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz", - "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==" + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz", + "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==" }, "@babel/helper-define-polyfill-provider": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz", - "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==" + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz", + "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==" }, "@babel/helper-environment-visitor": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz", - "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==" + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", + "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==" }, "@babel/helper-explode-assignable-expression": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz", - "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz", + "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==" }, "@babel/helper-function-name": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz", - "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==" - }, - "@babel/helper-get-function-arity": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz", - "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==" + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", + "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==" }, "@babel/helper-hoist-variables": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz", - "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", + "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==" }, "@babel/helper-member-expression-to-functions": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz", - "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==" + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz", + "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==" }, "@babel/helper-module-imports": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz", - "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", + "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==" }, "@babel/helper-module-transforms": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz", - "integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==" + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz", + "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==" }, "@babel/helper-optimise-call-expression": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz", - "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz", + "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==" }, "@babel/helper-plugin-utils": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz", - "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==" + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", + "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==" }, "@babel/helper-remap-async-to-generator": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz", - "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==" + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz", + "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==" }, "@babel/helper-replace-supers": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz", - "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==" + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz", + "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==" }, "@babel/helper-simple-access": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz", - "integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==" + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", + "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==" }, "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz", - "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==" + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz", + "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==" }, "@babel/helper-split-export-declaration": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz", - "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", + "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==" + }, + "@babel/helper-string-parser": { + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", + "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==" }, "@babel/helper-validator-identifier": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz", - "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==" + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", + "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==" }, "@babel/helper-validator-option": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz", - "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", + "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==" }, "@babel/helper-wrap-function": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz", - "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==" + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz", + "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==" }, "@babel/helpers": { - "version": "7.17.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.2.tgz", - "integrity": "sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==" + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz", + "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==" }, "@babel/highlight": { - "version": "7.16.10", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz", - "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", + "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==" }, "@babel/parser": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz", - "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==" + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz", + "integrity": "sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==" }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz", - "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==" + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz", + "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==" }, "@babel/plugin-proposal-class-properties": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz", - "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", + "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==" }, "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz", - "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==" + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz", + "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==" }, "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz", - "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", + "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==" }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz", - "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==" + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz", + "integrity": "sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==" }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz", - "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz", + "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==" }, "@babel/plugin-proposal-optional-chaining": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz", - "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==" + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz", + "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==" }, "@babel/plugin-syntax-async-generators": { "version": "7.8.4", @@ -219,9 +226,9 @@ "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==" }, "@babel/plugin-syntax-jsx": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz", - "integrity": "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz", + "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==" }, "@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", @@ -249,139 +256,139 @@ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==" }, "@babel/plugin-transform-arrow-functions": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz", - "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz", + "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==" }, "@babel/plugin-transform-async-to-generator": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz", - "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz", + "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==" }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz", - "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz", + "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==" }, "@babel/plugin-transform-block-scoping": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz", - "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==" + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz", + "integrity": "sha512-y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ==" }, "@babel/plugin-transform-classes": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz", - "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==" + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz", + "integrity": "sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==" }, "@babel/plugin-transform-computed-properties": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz", - "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==" + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz", + "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==" }, "@babel/plugin-transform-destructuring": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz", - "integrity": "sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==" + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz", + "integrity": "sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==" }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz", - "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz", + "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==" }, "@babel/plugin-transform-for-of": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz", - "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==" + "version": "7.18.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz", + "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==" }, "@babel/plugin-transform-literals": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz", - "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==" + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz", + "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==" }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz", - "integrity": "sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==" + "version": "7.19.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz", + "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==" }, "@babel/plugin-transform-object-super": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz", - "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz", + "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==" }, "@babel/plugin-transform-parameters": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz", - "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==" + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.3.tgz", + "integrity": "sha512-oZg/Fpx0YDrj13KsLyO8I/CX3Zdw7z0O9qOd95SqcoIzuqy/WTGWvePeHAnZCN54SfdyjHcb1S30gc8zlzlHcA==" }, "@babel/plugin-transform-property-literals": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz", - "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz", + "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==" }, "@babel/plugin-transform-react-display-name": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz", - "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz", + "integrity": "sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==" }, "@babel/plugin-transform-react-jsx": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz", - "integrity": "sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==" + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz", + "integrity": "sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==" }, "@babel/plugin-transform-react-jsx-development": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz", - "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz", + "integrity": "sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==" }, "@babel/plugin-transform-react-pure-annotations": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz", - "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz", + "integrity": "sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==" }, "@babel/plugin-transform-regenerator": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz", - "integrity": "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz", + "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==" }, "@babel/plugin-transform-runtime": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz", - "integrity": "sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A==" + "version": "7.19.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz", + "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==" }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz", - "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz", + "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==" }, "@babel/plugin-transform-spread": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz", - "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==" + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz", + "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==" }, "@babel/plugin-transform-sticky-regex": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz", - "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz", + "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==" }, "@babel/plugin-transform-template-literals": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz", - "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==" + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz", + "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==" }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz", - "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==" + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz", + "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==" }, "@babel/plugin-transform-unicode-regex": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz", - "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz", + "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==" }, "@babel/preset-react": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.16.7.tgz", - "integrity": "sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==" + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz", + "integrity": "sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==" }, "@babel/runtime": { "version": "7.17.2", @@ -389,39 +396,49 @@ "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==" }, "@babel/template": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz", - "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==" + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==" }, "@babel/traverse": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz", - "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==" + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz", + "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==" }, "@babel/types": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz", - "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==" + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz", + "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==" + }, + "@jridgewell/gen-mapping": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", + "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==" }, "@jridgewell/resolve-uri": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz", - "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" + }, + "@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==" }, "@jridgewell/sourcemap-codec": { - "version": "1.4.11", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz", - "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==" + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, "@jridgewell/trace-mapping": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz", - "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==" + "version": "0.3.17", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", + "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==" }, "@meteorjs/babel": { - "version": "7.16.0-beta.1", - "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.16.0-beta.1.tgz", - "integrity": "sha512-PSyp2+oO2nrGMBTXd3VAP0EzHLW4bFqRIzmbTfHnr/s0dGhb7XaaGg3sOGAInewrFNCWfMHNe3hSiyOvC9bS2A==" + "version": "7.16.0-beta.7", + "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.16.0-beta.7.tgz", + "integrity": "sha512-++ZngcRX51mu0fgijc7VYQnVlPr2tiq5p+sr1tOSQoe6gqH4toRCzVr4lzmPkrBXHl9IvSvkWcQYIGP5iSRsJw==" }, "@meteorjs/reify": { "version": "0.23.0", @@ -436,9 +453,9 @@ } }, "@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz", + "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==" }, "acorn": { "version": "6.4.2", @@ -463,38 +480,33 @@ "babel-helper-flip-expressions": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.4.3.tgz", - "integrity": "sha1-NpZzahKKwYvCUlS19AoizrPB0/0=" + "integrity": "sha512-rSrkRW4YQ2ETCWww9gbsWk4N0x1BOtln349Tk0dlCS90oT68WMLyGR7WvaMp3eAnsVrCqdUtC19lo1avyGPejA==" }, "babel-helper-is-nodes-equiv": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz", - "integrity": "sha1-NOmzALFHnd2Y7HfqC76TQt/jloQ=" + "integrity": "sha512-ri/nsMFVRqXn7IyT5qW4/hIAGQxuYUFHa3qsxmPtbk6spZQcYlyDogfVpNm2XYOslH/ULS4VEJGUqQX5u7ACQw==" }, "babel-helper-is-void-0": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/babel-helper-is-void-0/-/babel-helper-is-void-0-0.4.3.tgz", - "integrity": "sha1-fZwBtFYee5Xb2g9u7kj1tg5nMT4=" + "integrity": "sha512-07rBV0xPRM3TM5NVJEOQEkECX3qnHDjaIbFvWYPv+T1ajpUiVLiqTfC+MmiZxY5KOL/Ec08vJdJD9kZiP9UkUg==" }, "babel-helper-mark-eval-scopes": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.4.3.tgz", - "integrity": "sha1-0kSjvvmESHJgP/tG4izorN9VFWI=" + "integrity": "sha512-+d/mXPP33bhgHkdVOiPkmYoeXJ+rXRWi7OdhwpyseIqOS8CmzHQXHUp/+/Qr8baXsT0kjGpMHHofHs6C3cskdA==" }, "babel-helper-remove-or-void": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.3.tgz", - "integrity": "sha1-pPA7QAd6D/6I5F0HAQ3uJB/1rmA=" + "integrity": "sha512-eYNceYtcGKpifHDir62gHJadVXdg9fAhuZEXiRQnJJ4Yi4oUTpqpNY//1pM4nVyjjDMPYaC2xSf0I+9IqVzwdA==" }, "babel-helper-to-multiple-sequence-expressions": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.5.0.tgz", "integrity": "sha512-m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA==" }, - "babel-plugin-dynamic-import-node": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", - "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==" - }, "babel-plugin-minify-builtins": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz", @@ -506,14 +518,14 @@ "integrity": "sha512-Vj97CTn/lE9hR1D+jKUeHfNy+m1baNiJ1wJvoGyOBUx7F7kJqDZxr9nCHjO/Ad+irbR3HzR6jABpSSA29QsrXQ==" }, "babel-plugin-minify-dead-code-elimination": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.1.tgz", - "integrity": "sha512-x8OJOZIrRmQBcSqxBcLbMIK8uPmTvNWPXH2bh5MDCW1latEqYiRMuUkPImKcfpo59pTUB2FT7HfcgtG8ZlR5Qg==" + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.2.tgz", + "integrity": "sha512-krq9Lwi0QIzyAlcNBXTL4usqUvevB4BzktdEsb8srcXC1AaYqRJiAQw6vdKdJSaXbz6snBvziGr6ch/aoRCfpA==" }, "babel-plugin-minify-flip-comparisons": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.4.3.tgz", - "integrity": "sha1-AMqHDLjxO0XAOLPB68DyJyk8llo=" + "integrity": "sha512-8hNwgLVeJzpeLVOVArag2DfTkbKodzOHU7+gAZ8mGBFGPQHK6uXVpg3jh5I/F6gfi5Q5usWU2OKcstn1YbAV7A==" }, "babel-plugin-minify-guarded-expressions": { "version": "0.4.4", @@ -523,17 +535,17 @@ "babel-plugin-minify-infinity": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.4.3.tgz", - "integrity": "sha1-37h2obCKBldjhO8/kuZTumB7Oco=" + "integrity": "sha512-X0ictxCk8y+NvIf+bZ1HJPbVZKMlPku3lgYxPmIp62Dp8wdtbMLSekczty3MzvUOlrk5xzWYpBpQprXUjDRyMA==" }, "babel-plugin-minify-mangle-names": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.5.0.tgz", - "integrity": "sha512-3jdNv6hCAw6fsX1p2wBGPfWuK69sfOjfd3zjUXkbq8McbohWy23tpXfy5RnToYWggvqzuMOwlId1PhyHOfgnGw==" + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.5.1.tgz", + "integrity": "sha512-8KMichAOae2FHlipjNDTo2wz97MdEb2Q0jrn4NIRXzHH7SJ3c5TaNNBkeTHbk9WUsMnqpNUx949ugM9NFWewzw==" }, "babel-plugin-minify-numeric-literals": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.4.3.tgz", - "integrity": "sha1-jk/VYcefeAEob/YOjF/Z3u6TwLw=" + "integrity": "sha512-5D54hvs9YVuCknfWywq0eaYDt7qYxlNwCqW9Ipm/kYeS9gYhJd0Rr/Pm2WhHKJ8DC6aIlDdqSBODSthabLSX3A==" }, "babel-plugin-minify-replace": { "version": "0.5.0", @@ -548,62 +560,62 @@ "babel-plugin-minify-type-constructors": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.4.3.tgz", - "integrity": "sha1-G8bxW4f3qxCF1CszC3F2V6IVZQA=" + "integrity": "sha512-4ADB0irJ/6BeXWHubjCJmrPbzhxDgjphBMjIjxCc25n4NGJ00NsYqwYt+F/OvE9RXx8KaSW7cJvp+iZX436tnQ==" }, "babel-plugin-polyfill-corejs2": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz", - "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==" + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz", + "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==" }, "babel-plugin-polyfill-corejs3": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz", - "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==" + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz", + "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==" }, "babel-plugin-polyfill-regenerator": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz", - "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==" + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz", + "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==" }, "babel-plugin-transform-inline-consecutive-adds": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz", - "integrity": "sha1-Mj1Ho+pjqDp6w8gRro5pQfrysNE=" + "integrity": "sha512-8D104wbzzI5RlxeVPYeQb9QsUyepiH1rAO5hpPpQ6NPRgQLpIVwkS/Nbx944pm4K8Z+rx7CgjPsFACz/VCBN0Q==" }, "babel-plugin-transform-member-expression-literals": { "version": "6.9.4", "resolved": "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz", - "integrity": "sha1-NwOcmgwzE6OUlfqsL/OmtbnQOL8=" + "integrity": "sha512-Xq9/Rarpj+bjOZSl1nBbZYETsNEDDJSrb6Plb1sS3/36FukWFLLRysgecva5KZECjUJTrJoQqjJgtWToaflk5Q==" }, "babel-plugin-transform-merge-sibling-variables": { - "version": "6.9.4", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.4.tgz", - "integrity": "sha1-hbQi/DN3tEnJ0c3kQIcgNTJAHa4=" + "version": "6.9.5", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.5.tgz", + "integrity": "sha512-xj/KrWi6/uP+DrD844h66Qh2cZN++iugEIgH8QcIxhmZZPNP6VpOE9b4gP2FFW39xDAY43kCmYMM6U0QNKN8fw==" }, "babel-plugin-transform-minify-booleans": { "version": "6.9.4", "resolved": "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz", - "integrity": "sha1-rLs+VqNVXdI5KOS1gtKFFi3SsZg=" + "integrity": "sha512-9pW9ePng6DZpzGPalcrULuhSCcauGAbn8AeU3bE34HcDkGm8Ldt0ysjGkyb64f0K3T5ilV4mriayOVv5fg0ASA==" }, "babel-plugin-transform-property-literals": { "version": "6.9.4", "resolved": "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz", - "integrity": "sha1-mMHSHiVXNlc/k+zlRFn2ziSYXTk=" + "integrity": "sha512-Pf8JHTjTPxecqVyL6KSwD/hxGpoTZjiEgV7nCx0KFQsJYM0nuuoCajbg09KRmZWeZbJ5NGTySABYv8b/hY1eEA==" }, "babel-plugin-transform-regexp-constructors": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.3.tgz", - "integrity": "sha1-WLd3W2OvzzMyj66aX4j71PsLSWU=" + "integrity": "sha512-JjymDyEyRNhAoNFp09y/xGwYVYzT2nWTGrBrWaL6eCg2m+B24qH2jR0AA8V8GzKJTgC8NW6joJmc6nabvWBD/g==" }, "babel-plugin-transform-remove-console": { "version": "6.9.4", "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz", - "integrity": "sha1-uYA2DAZzhOJLNXpYjYB9PINSd4A=" + "integrity": "sha512-88blrUrMX3SPiGkT1GnvVY8E/7A+k6oj3MNvUtTIxJflFzXTw1bHkuJ/y039ouhFMp2prRn5cQGzokViYi1dsg==" }, "babel-plugin-transform-remove-debugger": { "version": "6.9.4", "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz", - "integrity": "sha1-QrcnYxyXl44estGZp67IShgznvI=" + "integrity": "sha512-Kd+eTBYlXfwoFzisburVwrngsrz4xh9I0ppoJnU/qlLysxVBRgI4Pj+dk3X8F5tDiehp3hhP8oarRMT9v2Z3lw==" }, "babel-plugin-transform-remove-undefined": { "version": "0.5.0", @@ -613,12 +625,12 @@ "babel-plugin-transform-simplify-comparison-operators": { "version": "6.9.4", "resolved": "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz", - "integrity": "sha1-9ir+CWyrDh9ootdT/fKDiIRxzrk=" + "integrity": "sha512-GLInxhGAQWJ9YIdjwF6dAFlmh4U+kN8pL6Big7nkDzHoZcaDQOtBm28atEhQJq6m9GpAovbiGEShKqXv4BSp0A==" }, "babel-plugin-transform-undefined-to-void": { "version": "6.9.4", "resolved": "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz", - "integrity": "sha1-viQcqBQEAwZ4t0hxcyK4nQyP4oA=" + "integrity": "sha512-D2UbwxawEY1xVc9svYAUZQM2xarwSNXue2qDIx6CeV2EuMGaes/0su78zlIDIAgE7BvnMw4UpmSo9fDy+znghg==" }, "babel-preset-meteor": { "version": "7.10.0", @@ -626,24 +638,19 @@ "integrity": "sha512-bcdNfRCQAjTV42cUcmaG5/ltLZZQLpZajUcP+o0Lr+aLTY/XLNkGfASM5383wdXiAkEFl0sDOXeknnLlQtrmdg==" }, "babel-preset-minify": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.5.1.tgz", - "integrity": "sha512-1IajDumYOAPYImkHbrKeiN5AKKP9iOmRoO2IPbIuVp0j2iuCcj0n7P260z38siKMZZ+85d3mJZdtW8IgOv+Tzg==" + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.5.2.tgz", + "integrity": "sha512-v4GL+kk0TfovbRIKZnC3HPbu2cAGmPAby7BsOmuPdMJfHV+4FVdsGXTH/OOGQRKYdjemBuL1+MsE6mobobhe9w==" }, "browserslist": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.2.tgz", - "integrity": "sha512-97XU1CTZ5TwU9Qy/Taj+RtiI6SQM1WIhZ9osT7EY0oO2aWXGABZT2OZeRL+6PfaQsiiMIjjwIoYFPq4APgspgQ==" - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==" + "version": "4.21.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", + "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==" }, "caniuse-lite": { - "version": "1.0.30001312", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz", - "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==" + "version": "1.0.30001434", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz", + "integrity": "sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA==" }, "chalk": { "version": "2.4.2", @@ -658,39 +665,27 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" }, "convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==" + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" }, "core-js-compat": { - "version": "3.21.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz", - "integrity": "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==", - "dependencies": { - "semver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==" - } - } + "version": "3.26.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.1.tgz", + "integrity": "sha512-622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A==" }, "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==" - }, - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==" + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==" }, "electron-to-chromium": { - "version": "1.4.71", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz", - "integrity": "sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw==" + "version": "1.4.284", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", + "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, "escalade": { "version": "3.1.1", @@ -700,7 +695,7 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==" }, "estree-walker": { "version": "2.0.2", @@ -722,11 +717,6 @@ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" }, - "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==" - }, "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -740,17 +730,12 @@ "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, - "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "is-core-module": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", - "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==" + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", + "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==" }, "is-reference": { "version": "1.2.1", @@ -780,22 +765,22 @@ "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" + "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" }, "magic-string": { - "version": "0.25.7", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz", - "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==" + "version": "0.25.9", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", + "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==" }, "meteor-babel-helpers": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/meteor-babel-helpers/-/meteor-babel-helpers-0.0.3.tgz", - "integrity": "sha1-8uXZ+HlvvS6JAQI9dpnlsgLqn7A=" + "integrity": "sha512-PgfmiyT/HiBaxwGHxS4t3Qi0fpmEW3O0WW2VfrgekiMGz3aZPd9/4PRIaMMZsfyjQ1vyEm6dZqTAFZENbuoTxw==" }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", + "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" }, "ms": { "version": "2.1.2", @@ -803,19 +788,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node-releases": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz", - "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==" - }, - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" - }, - "object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==" + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", + "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" }, "path-parse": { "version": "1.0.7", @@ -838,62 +813,52 @@ "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" }, "regenerate-unicode-properties": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz", - "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==" + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", + "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==" }, "regenerator-runtime": { - "version": "0.13.9", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "regenerator-transform": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz", - "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==" + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", + "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==" }, "regexpu-core": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz", - "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==" + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz", + "integrity": "sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==" }, "regjsgen": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz", - "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==" + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz", + "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==" }, "regjsparser": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz", - "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==", + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", + "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", "dependencies": { "jsesc": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==" } } }, "resolve": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==" - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "version": "1.22.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", + "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==" }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, "sourcemap-codec": { "version": "1.4.8", "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", @@ -912,12 +877,12 @@ "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==" }, "typescript": { - "version": "4.5.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz", - "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==" + "version": "4.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz", + "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==" }, "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", @@ -930,14 +895,19 @@ "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==" }, "unicode-match-property-value-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", - "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", + "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==" }, "unicode-property-aliases-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz", - "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", + "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==" + }, + "update-browserslist-db": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", + "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==" } } } From 1f2a9c555d56cf0341a15f24e89ac2b1032bff93 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 22 Nov 2022 14:52:50 -0300 Subject: [PATCH 06/27] tests: updated to async in calling native find --- packages/mongo-async/collection_tests.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mongo-async/collection_tests.js b/packages/mongo-async/collection_tests.js index c5d88db645..a6a1d79979 100644 --- a/packages/mongo-async/collection_tests.js +++ b/packages/mongo-async/collection_tests.js @@ -147,8 +147,8 @@ Tinytest.addAsync('collection - calling native find with good hint and maxTimeMs Promise.resolve( Meteor.isServer && collection.rawCollection().createIndex({ a: 1 }) - ).then(() => { - test.equal(collection.find({}, { + ).then(async () => { + test.equal(await collection.find({}, { hint: {a: 1}, maxTimeMs: 1000 }).count(), 1); From ee4e8d20209488425ad28fd0362d4674909b6f0b Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 22 Nov 2022 14:53:27 -0300 Subject: [PATCH 07/27] wip-test: trying to make oplog - entry skipping pass --- packages/mongo-async/oplog_tests.js | 271 ++++++++++++++-------------- 1 file changed, 139 insertions(+), 132 deletions(-) diff --git a/packages/mongo-async/oplog_tests.js b/packages/mongo-async/oplog_tests.js index e6fead6ba6..e7e3f03de3 100644 --- a/packages/mongo-async/oplog_tests.js +++ b/packages/mongo-async/oplog_tests.js @@ -2,11 +2,14 @@ var OplogCollection = new Mongo.Collection("oplog-" + Random.id()); Tinytest.addAsync("mongo-livedata - oplog - cursorSupported", async function (test) { var oplogEnabled = - !!MongoInternals.defaultRemoteCollectionDriver().mongo._oplogHandle; + !!MongoInternals.defaultRemoteCollectionDriver().mongo._oplogHandle; var supported = async function (expected, selector, options) { var cursor = OplogCollection.find(selector, options); - var handle = await cursor.observeChanges({added: function () {}}); + var handle = await cursor.observeChanges({ + added: function () { + } + }); // If there's no oplog at all, we shouldn't ever use it. if (!oplogEnabled) expected = false; @@ -18,152 +21,156 @@ Tinytest.addAsync("mongo-livedata - oplog - cursorSupported", async function (te await supported(true, 1234); await supported(true, new Mongo.ObjectID()); - await supported(true, {_id: "asdf"}); - await supported(true, {_id: 1234}); - await supported(true, {_id: new Mongo.ObjectID()}); + await supported(true, { _id: "asdf" }); + await supported(true, { _id: 1234 }); + await supported(true, { _id: new Mongo.ObjectID() }); - await supported(true, {foo: "asdf", - bar: 1234, - baz: new Mongo.ObjectID(), - eeney: true, - miney: false, - moe: null}); + await supported(true, { + foo: "asdf", + bar: 1234, + baz: new Mongo.ObjectID(), + eeney: true, + miney: false, + moe: null + }); await supported(true, {}); - await supported(true, {$and: [{foo: "asdf"}, {bar: "baz"}]}); - await supported(true, {foo: {x: 1}}); - await supported(true, {foo: {$gt: 1}}); - await supported(true, {foo: [1, 2, 3]}); + await supported(true, { $and: [{ foo: "asdf" }, { bar: "baz" }] }); + await supported(true, { foo: { x: 1 } }); + await supported(true, { foo: { $gt: 1 } }); + await supported(true, { foo: [1, 2, 3] }); // No $where. - await supported(false, {$where: "xxx"}); - await supported(false, {$and: [{foo: "adsf"}, {$where: "xxx"}]}); + await supported(false, { $where: "xxx" }); + await supported(false, { $and: [{ foo: "adsf" }, { $where: "xxx" }] }); // No geoqueries. - await supported(false, {x: {$near: [1,1]}}); + await supported(false, { x: { $near: [1, 1] } }); // Nothing Minimongo doesn't understand. (Minimongo happens to fail to // implement $elemMatch inside $all which MongoDB supports.) - await supported(false, {x: {$all: [{$elemMatch: {y: 2}}]}}); + await supported(false, { x: { $all: [{ $elemMatch: { y: 2 } }] } }); - await supported(true, {}, { sort: {x:1} }); - await supported(true, {}, { sort: {x:1}, limit: 5 }); - await supported(false, {}, { sort: {$natural:1}, limit: 5 }); + await supported(true, {}, { sort: { x: 1 } }); + await supported(true, {}, { sort: { x: 1 }, limit: 5 }); + await supported(false, {}, { sort: { $natural: 1 }, limit: 5 }); await supported(false, {}, { limit: 5 }); await supported(false, {}, { skip: 2, limit: 5 }); await supported(false, {}, { skip: 2 }); }); // TODO -> Index here. -// process.env.MONGO_OPLOG_URL && testAsyncMulti( -// "mongo-livedata - oplog - entry skipping", [ -// function (test, expect) { -// var self = this; -// self.collectionName = Random.id(); -// self.collection = new Mongo.Collection(self.collectionName); -// self.collection.createIndex({species: 1}); -// -// // Fill collection with lots of irrelevant objects (red cats) and some -// // relevant ones (blue dogs). -// -// // After updating to mongo 3.2 with the 2.1.18 driver it was no longer -// // possible to make this test fail with TOO_FAR_BEHIND = 2000. -// // The documents waiting to be processed would hardly go beyond 1000 -// // using mongo 3.2 with WiredTiger -// MongoInternals.defaultRemoteCollectionDriver() -// .mongo._oplogHandle._defineTooFarBehind(500); -// -// self.IRRELEVANT_SIZE = 15000; -// self.RELEVANT_SIZE = 10; -// var docs = []; -// var i; -// for (i = 0; i < self.IRRELEVANT_SIZE; ++i) { -// docs.push({ -// name: "cat " + i, -// species: 'cat', -// color: 'red' -// }); -// } -// for (i = 0; i < self.RELEVANT_SIZE; ++i) { -// docs.push({ -// name: "dog " + i, -// species: 'dog', -// color: 'blue' -// }); -// } -// // XXX implement bulk insert #1255 -// var rawCollection = self.collection.rawCollection(); -// rawCollection.insertMany(docs, Meteor.bindEnvironment(expect(function (err) { -// test.isFalse(err); -// }))); -// }, -// -// function (test, expect) { -// var self = this; -// -// test.equal(self.collection.find().count(), -// self.IRRELEVANT_SIZE + self.RELEVANT_SIZE); -// -// var blueDog5Id = null; -// var gotSpot = false; -// -// // Watch for blue dogs. -// const gotSpotPromise = new Promise(resolve => { -// self.subHandle = self.collection.find({ -// species: 'dog', -// color: 'blue', -// }).observeChanges({ -// added(id, fields) { -// if (fields.name === 'dog 5') { -// blueDog5Id = id; -// } -// }, -// changed(id, fields) { -// if (EJSON.equals(id, blueDog5Id) && -// fields.name === 'spot') { -// gotSpot = true; -// resolve(); -// } -// }, -// }); -// }); -// -// test.isTrue(self.subHandle._multiplexer._observeDriver._usesOplog); -// test.isTrue(blueDog5Id); -// test.isFalse(gotSpot); -// -// self.skipped = false; -// self.skipHandle = MongoInternals.defaultRemoteCollectionDriver() -// .mongo._oplogHandle.onSkippedEntries(function () { -// self.skipped = true; -// }); -// -// // Dye all the cats blue. This adds lots of oplog mentries that look like -// // they might in theory be relevant (since they say "something you didn't -// // know about is now blue", and who knows, maybe it's a dog) which puts -// // the OplogObserveDriver into FETCHING mode, which performs poorly. -// self.collection.update({species: 'cat'}, -// {$set: {color: 'blue'}}, -// {multi: true}); -// self.collection.update(blueDog5Id, {$set: {name: 'spot'}}); -// -// // We ought to see the spot change soon! -// return gotSpotPromise; -// }, -// -// function (test, expect) { -// var self = this; -// test.isTrue(self.skipped); -// -// //This gets the TOO_FAR_BEHIND back to its initial value -// MongoInternals.defaultRemoteCollectionDriver() -// .mongo._oplogHandle._resetTooFarBehind(); -// -// self.skipHandle.stop(); -// self.subHandle.stop(); -// self.collection.remove({}); -// } -// ] -// ); +process.env.MONGO_OPLOG_URL && testAsyncMulti( + "mongo-livedata - oplog - entry skipping", [ + async function (test, expect) { + var self = this; + self.collectionName = Random.id(); + self.collection = new Mongo.Collection(self.collectionName); + await self.collection.createIndex({ species: 1 }); + + // Fill collection with lots of irrelevant objects (red cats) and some + // relevant ones (blue dogs). + + // After updating to mongo 3.2 with the 2.1.18 driver it was no longer + // possible to make this test fail with TOO_FAR_BEHIND = 2000. + // The documents waiting to be processed would hardly go beyond 1000 + // using mongo 3.2 with WiredTiger + MongoInternals.defaultRemoteCollectionDriver() + .mongo._oplogHandle._defineTooFarBehind(500); + + self.IRRELEVANT_SIZE = 15000; + self.RELEVANT_SIZE = 10; + var docs = []; + var i; + for (i = 0; i < self.IRRELEVANT_SIZE; ++i) { + docs.push({ + name: "cat " + i, + species: 'cat', + color: 'red' + }); + } + for (i = 0; i < self.RELEVANT_SIZE; ++i) { + docs.push({ + name: "dog " + i, + species: 'dog', + color: 'blue' + }); + } + // XXX implement bulk insert #1255 + var rawCollection = self.collection.rawCollection(); + rawCollection.insertMany(docs, Meteor.bindEnvironment(expect(function (err) { + test.isFalse(err); + }))); + }, + + async function (test, expect) { + var self = this; + + test.equal((await self.collection.find().count()), + self.IRRELEVANT_SIZE + self.RELEVANT_SIZE); + + var blueDog5Id = null; + var gotSpot = false; + let resolver; const gotSpotPromise = new Promise(resolve => resolver = resolve) + let resolver2; const gotSpotPromise2 = new Promise(resolve => resolver = resolve) + self.subHandle = await self.collection.find({ + species: 'dog', + color: 'blue', + }).observeChanges({ + added(id, fields) { + console.log(id, fields) + if (fields.name === 'dog 5') { + blueDog5Id = true + resolver2() + } + }, + changed(id, fields) { + if (EJSON.equals(id, blueDog5Id) && + fields.name === 'spot') { + gotSpot = true; + resolver(); + } + }, + }); + console.log(self.subHandle._multiplexer._observeDriver._usesOplog); + console.log(blueDog5Id); + console.log(gotSpot); + test.isTrue(self.subHandle._multiplexer._observeDriver._usesOplog); + test.isTrue(blueDog5Id); + test.isFalse(gotSpot); + + self.skipped = false; + self.skipHandle = MongoInternals.defaultRemoteCollectionDriver() + .mongo._oplogHandle.onSkippedEntries(function () { + self.skipped = true; + }); + + // Dye all the cats blue. This adds lots of oplog mentries that look like + // they might in theory be relevant (since they say "something you didn't + // know about is now blue", and who knows, maybe it's a dog) which puts + // the OplogObserveDriver into FETCHING mode, which performs poorly. + await self.collection.update({ species: 'cat' }, + { $set: { color: 'blue' } }, + { multi: true }); + await self.collection.update(blueDog5Id, { $set: { name: 'spot' } }); + + // We ought to see the spot change soon! + return await Promise.all[gotSpotPromise, gotSpotPromise2]; + }, + + async function (test, expect) { + var self = this; + test.isTrue(self.skipped); + + //This gets the TOO_FAR_BEHIND back to its initial value + MongoInternals.defaultRemoteCollectionDriver() + .mongo._oplogHandle._resetTooFarBehind(); + + await self.skipHandle.stop(); + await self.subHandle.stop(); + await self.collection.remove({}); + } + ] +); Meteor.isServer && Tinytest.addAsync( From 580a4c588d2dacafb0b7a43751d085cd9c1e9bf7 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 22 Nov 2022 17:40:43 -0300 Subject: [PATCH 08/27] chore: removed console.log in colletction.js --- packages/mongo-async/collection.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/mongo-async/collection.js b/packages/mongo-async/collection.js index 287b370949..9b4b1fb045 100644 --- a/packages/mongo-async/collection.js +++ b/packages/mongo-async/collection.js @@ -774,7 +774,6 @@ Object.assign(Mongo.Collection.prototype, { var self = this; if (!self._collection.createIndex) throw new Error('Can only call createIndex on server collections'); - console.dir(index, options) try { await self._collection.createIndex(index, options); } catch (e) { From 4ad4db28dec8c335722669d60094be6098b1a95d Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 22 Nov 2022 17:41:02 -0300 Subject: [PATCH 09/27] tests: adjusted tests for oplog --- packages/mongo-async/oplog_tests.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/mongo-async/oplog_tests.js b/packages/mongo-async/oplog_tests.js index e7e3f03de3..d3aa5792e5 100644 --- a/packages/mongo-async/oplog_tests.js +++ b/packages/mongo-async/oplog_tests.js @@ -111,7 +111,7 @@ process.env.MONGO_OPLOG_URL && testAsyncMulti( var blueDog5Id = null; var gotSpot = false; let resolver; const gotSpotPromise = new Promise(resolve => resolver = resolve) - let resolver2; const gotSpotPromise2 = new Promise(resolve => resolver = resolve) + let resolver2; const gotSpotPromise2 = new Promise(resolve => resolver2 = resolve) self.subHandle = await self.collection.find({ species: 'dog', color: 'blue', @@ -119,7 +119,7 @@ process.env.MONGO_OPLOG_URL && testAsyncMulti( added(id, fields) { console.log(id, fields) if (fields.name === 'dog 5') { - blueDog5Id = true + blueDog5Id = id resolver2() } }, @@ -131,13 +131,7 @@ process.env.MONGO_OPLOG_URL && testAsyncMulti( } }, }); - console.log(self.subHandle._multiplexer._observeDriver._usesOplog); - console.log(blueDog5Id); - console.log(gotSpot); test.isTrue(self.subHandle._multiplexer._observeDriver._usesOplog); - test.isTrue(blueDog5Id); - test.isFalse(gotSpot); - self.skipped = false; self.skipHandle = MongoInternals.defaultRemoteCollectionDriver() .mongo._oplogHandle.onSkippedEntries(function () { @@ -151,10 +145,13 @@ process.env.MONGO_OPLOG_URL && testAsyncMulti( await self.collection.update({ species: 'cat' }, { $set: { color: 'blue' } }, { multi: true }); + test.isTrue(blueDog5Id); + test.isFalse(gotSpot); await self.collection.update(blueDog5Id, { $set: { name: 'spot' } }); + // We ought to see the spot change soon! - return await Promise.all[gotSpotPromise, gotSpotPromise2]; + return Promise.all([gotSpotPromise, gotSpotPromise2]); }, async function (test, expect) { From be98140822a93e1e425ac62aaa8ab79b58d64b3e Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 22 Nov 2022 17:50:56 -0300 Subject: [PATCH 10/27] tests: removed console.log from oplog_tests --- packages/mongo-async/oplog_tests.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/mongo-async/oplog_tests.js b/packages/mongo-async/oplog_tests.js index d3aa5792e5..09bdbf35f6 100644 --- a/packages/mongo-async/oplog_tests.js +++ b/packages/mongo-async/oplog_tests.js @@ -117,7 +117,6 @@ process.env.MONGO_OPLOG_URL && testAsyncMulti( color: 'blue', }).observeChanges({ added(id, fields) { - console.log(id, fields) if (fields.name === 'dog 5') { blueDog5Id = id resolver2() From b6b551c72b2575ac2b59a4b433ea9457b44b810e Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 22 Nov 2022 17:51:59 -0300 Subject: [PATCH 11/27] chore: renamed variables for promise await --- packages/mongo-async/mongo_driver.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/mongo-async/mongo_driver.js b/packages/mongo-async/mongo_driver.js index ae1f477c7c..14977cfa1e 100644 --- a/packages/mongo-async/mongo_driver.js +++ b/packages/mongo-async/mongo_driver.js @@ -848,8 +848,8 @@ MongoConnection.prototype.createIndex = async function (collectionName, index, console.dir(index) const p = new Promise(async (resolve, reject) => { try { - const j = await collection.createIndex(index, options) - resolve(j) + const i = await collection.createIndex(index, options) + resolve(i) } catch (e) { reject(e); } @@ -867,8 +867,8 @@ MongoConnection.prototype._dropIndex = async function (collectionName, index) { var collection = self.rawCollection(collectionName); const p = new Promise(async (resolve, reject) => { try { - const k = await collection.dropIndex(index) - resolve(k) + const i = await collection.dropIndex(index) + resolve(i) } catch (e) { reject(e); } From 513b3b3a5054c3bc5e4af2e3d37cf1a8766c62fc Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 22 Nov 2022 17:52:21 -0300 Subject: [PATCH 12/27] chore:removed console.log in mongo_driver --- packages/mongo-async/mongo_driver.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/mongo-async/mongo_driver.js b/packages/mongo-async/mongo_driver.js index 14977cfa1e..aead47ab90 100644 --- a/packages/mongo-async/mongo_driver.js +++ b/packages/mongo-async/mongo_driver.js @@ -845,7 +845,6 @@ MongoConnection.prototype.createIndex = async function (collectionName, index, // We expect this function to be called at startup, not from within a method, // so we don't interact with the write fence. var collection = self.rawCollection(collectionName) - console.dir(index) const p = new Promise(async (resolve, reject) => { try { const i = await collection.createIndex(index, options) From d8e8014fc0ae3939cf5723f997a2f9f1acf08c24 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 22 Nov 2022 17:53:18 -0300 Subject: [PATCH 13/27] tests: all tests are on again :rocket: --- packages/mongo-async/package.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/mongo-async/package.js b/packages/mongo-async/package.js index e3687ef120..f31b7efe27 100644 --- a/packages/mongo-async/package.js +++ b/packages/mongo-async/package.js @@ -93,13 +93,13 @@ Package.onTest(function (api) { 'ddp', 'base64']); // XXX test order dependency: the allow_tests "partial allow" test // fails if it is run before mongo_livedata_tests. - // api.addFiles('mongo_livedata_tests.js', ['client', 'server']); - // api.addFiles('upsert_compatibility_test.js', 'server'); - // api.addFiles('allow_tests.js', ['client', 'server']); - // api.addFiles('collection_tests.js', ['client', 'server']); - // api.addFiles('collection_async_tests.js', ['client', 'server']); - // api.addFiles('observe_changes_tests.js', ['client', 'server']); + api.addFiles('mongo_livedata_tests.js', ['client', 'server']); + api.addFiles('upsert_compatibility_test.js', 'server'); + api.addFiles('allow_tests.js', ['client', 'server']); + api.addFiles('collection_tests.js', ['client', 'server']); + api.addFiles('collection_async_tests.js', ['client', 'server']); + api.addFiles('observe_changes_tests.js', ['client', 'server']); api.addFiles('oplog_tests.js', 'server'); - // api.addFiles('oplog_v2_converter_tests.js', 'server'); - // api.addFiles('doc_fetcher_tests.js', 'server'); + api.addFiles('oplog_v2_converter_tests.js', 'server'); + api.addFiles('doc_fetcher_tests.js', 'server'); }); From d7b58fdd617cf190115dc4983d8684ba2421d143 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 23 Nov 2022 10:32:14 -0300 Subject: [PATCH 14/27] fix: typo --- packages/mongo-async/collection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mongo-async/collection.js b/packages/mongo-async/collection.js index 9b4b1fb045..b4878e725f 100644 --- a/packages/mongo-async/collection.js +++ b/packages/mongo-async/collection.js @@ -830,7 +830,7 @@ Object.assign(Mongo.Collection.prototype, { * @summary Returns the [`Db`](http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html) object corresponding to this collection's database connection from the [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`. * @locus Server * @memberof Mongo.Collection - * @ce + * @instance */ rawDatabase() { var self = this; From 5ccfdd2fc9ec118eee015fe380982921adcb64f3 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 25 Nov 2022 07:52:09 -0300 Subject: [PATCH 15/27] fix: removed unecessary promise --- packages/mongo-async/mongo_driver.js | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/packages/mongo-async/mongo_driver.js b/packages/mongo-async/mongo_driver.js index aead47ab90..0de93d0c5f 100644 --- a/packages/mongo-async/mongo_driver.js +++ b/packages/mongo-async/mongo_driver.js @@ -845,15 +845,7 @@ MongoConnection.prototype.createIndex = async function (collectionName, index, // We expect this function to be called at startup, not from within a method, // so we don't interact with the write fence. var collection = self.rawCollection(collectionName) - const p = new Promise(async (resolve, reject) => { - try { - const i = await collection.createIndex(index, options) - resolve(i) - } catch (e) { - reject(e); - } - }) - var indexName = await p + var indexName = await collection.createIndex(index, options) }; MongoConnection.prototype._ensureIndex = MongoConnection.prototype.createIndex; @@ -864,15 +856,7 @@ MongoConnection.prototype._dropIndex = async function (collectionName, index) { // This function is only used by test code, not within a method, so we don't // interact with the write fence. var collection = self.rawCollection(collectionName); - const p = new Promise(async (resolve, reject) => { - try { - const i = await collection.dropIndex(index) - resolve(i) - } catch (e) { - reject(e); - } - }) - var indexName = await p; + var indexName = await collection.dropIndex(index) }; // CURSORS From bd457fc724afd87b335038b8ffdf50a1fef45470 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 25 Nov 2022 07:52:23 -0300 Subject: [PATCH 16/27] tests: removed todo comment --- packages/mongo-async/oplog_tests.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/mongo-async/oplog_tests.js b/packages/mongo-async/oplog_tests.js index 09bdbf35f6..8861d9cf3f 100644 --- a/packages/mongo-async/oplog_tests.js +++ b/packages/mongo-async/oplog_tests.js @@ -58,7 +58,6 @@ Tinytest.addAsync("mongo-livedata - oplog - cursorSupported", async function (te await supported(false, {}, { skip: 2 }); }); -// TODO -> Index here. process.env.MONGO_OPLOG_URL && testAsyncMulti( "mongo-livedata - oplog - entry skipping", [ async function (test, expect) { From 3939f77188bca61f08d00bf40c337ca36a19790c Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 25 Nov 2022 11:32:29 -0300 Subject: [PATCH 17/27] docs: added a depracieation note --- packages/mongo-async/collection.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/mongo-async/collection.js b/packages/mongo-async/collection.js index b4878e725f..874e43821b 100644 --- a/packages/mongo-async/collection.js +++ b/packages/mongo-async/collection.js @@ -745,6 +745,19 @@ Object.assign(Mongo.Collection.prototype, { // We'll actually design an index API later. For now, we just pass through to // Mongo's, but make it synchronous. + /** + * @summary Creates the specified index on the collection. + * @locus server + * @deprecated in 3.0 + * @method createIndex + * @memberof Mongo.Collection + * @instance + * @param {Object} index A document that contains the field and value pairs where the field is the index key and the value describes the type of index for that field. For an ascending index on a field, specify a value of `1`; for descending index, specify a value of `-1`. Use `text` for text indexes. + * @param {Object} [options] All options are listed in [MongoDB documentation](https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/#options) + * @param {String} options.name Name of the index + * @param {Boolean} options.unique Define that the index values must be unique, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-unique/) + * @param {Boolean} options.sparse Define that the index is sparse, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-sparse/) + */ async _ensureIndex(index, options) { var self = this; if (!self._collection._ensureIndex || !self._collection.createIndex) From 63d34b38a37ce114c1e57f05cbf6aff8e99fe063 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 25 Nov 2022 11:33:48 -0300 Subject: [PATCH 18/27] fix: removed @ method sign --- packages/mongo-async/collection.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/mongo-async/collection.js b/packages/mongo-async/collection.js index 874e43821b..48ae036433 100644 --- a/packages/mongo-async/collection.js +++ b/packages/mongo-async/collection.js @@ -749,7 +749,6 @@ Object.assign(Mongo.Collection.prototype, { * @summary Creates the specified index on the collection. * @locus server * @deprecated in 3.0 - * @method createIndex * @memberof Mongo.Collection * @instance * @param {Object} index A document that contains the field and value pairs where the field is the index key and the value describes the type of index for that field. For an ascending index on a field, specify a value of `1`; for descending index, specify a value of `-1`. Use `text` for text indexes. From e2003c93a8b14ba7df559efad9e4d55d5b3f36b0 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 29 Nov 2022 09:48:00 -0300 Subject: [PATCH 19/27] fix: added instance in jsdocs --- packages/mongo-async/collection.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mongo-async/collection.js b/packages/mongo-async/collection.js index 48ae036433..dc2d29c206 100644 --- a/packages/mongo-async/collection.js +++ b/packages/mongo-async/collection.js @@ -745,9 +745,10 @@ Object.assign(Mongo.Collection.prototype, { // We'll actually design an index API later. For now, we just pass through to // Mongo's, but make it synchronous. - /** + /** * @summary Creates the specified index on the collection. * @locus server + * @method _ensureIndex * @deprecated in 3.0 * @memberof Mongo.Collection * @instance From 91129808e078f0d8d0eb18acdf2c6479be515e97 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Thu, 15 Dec 2022 16:06:21 -0300 Subject: [PATCH 20/27] docs: updating meteor generate docs --- docs/source/commandline.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/source/commandline.md b/docs/source/commandline.md index ebb9381d3a..1be73f5058 100644 --- a/docs/source/commandline.md +++ b/docs/source/commandline.md @@ -203,6 +203,10 @@ Create a basic [Solid](https://www.solidjs.com/) app. you what is the name of the model you want to generate, if you do want methods for your api and publications. It can be used as a command line only operation as well. +> _Important to note:_ +> By default, the generator will use JavaScript but if it detects that you have a +``tsconfig.json`` file in your project, it will use TypeScript instead. + running ```bash meteor generate customer From f6eea4b228672f617082f2136093189cc7605e9f Mon Sep 17 00:00:00 2001 From: filipenevola Date: Sat, 17 Dec 2022 01:34:33 -0400 Subject: [PATCH 21/27] Adds a comment to wrapAsync usage inside deprecated http package --- packages/deprecated/http/httpcall_server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/deprecated/http/httpcall_server.js b/packages/deprecated/http/httpcall_server.js index 0413d0bdba..9ed4549c5f 100644 --- a/packages/deprecated/http/httpcall_server.js +++ b/packages/deprecated/http/httpcall_server.js @@ -161,4 +161,5 @@ function _call (method, url, options, callback) { .catch(err => callback(err)); } +// we are keeping wrapAsync here as this package is deprecated HTTP.call = Meteor.wrapAsync(_call); From d631371311c059e774f483554300574f454a6d8e Mon Sep 17 00:00:00 2001 From: filipenevola Date: Sat, 17 Dec 2022 01:39:34 -0400 Subject: [PATCH 22/27] Changes email package to be fully async Removes email package sync tests Fixes email package test when a hook should cancel the send action --- docs/history.md | 22 +++++++ packages/email/email.js | 81 +++--------------------- packages/email/email_tests.js | 116 ++-------------------------------- 3 files changed, 37 insertions(+), 182 deletions(-) diff --git a/docs/history.md b/docs/history.md index 2c41408d65..729b5b4e61 100644 --- a/docs/history.md +++ b/docs/history.md @@ -1,3 +1,25 @@ +## v3.0, TBD + +### Highlights + +#### Breaking Changes + +* `email`: + `Email.send` is no longer available. Use `Email.sendAsync` instead. + +#### Internal API changes + + +#### Migration Steps + +You can follow in [here](https://guide.meteor.com/3.0-migration.html). + +#### Meteor Version Release + +#### Special thanks to + +For making this great framework even better! + ## v2.9, 2022-12-12 ### Highlights diff --git a/packages/email/email.js b/packages/email/email.js index eed8dbd9b3..dabfbe4122 100644 --- a/packages/email/email.js +++ b/packages/email/email.js @@ -24,7 +24,7 @@ export const EmailInternals = { const MailComposer = EmailInternals.NpmModules.mailcomposer.module; -const makeTransport = function (mailUrlString) { +const makeTransport = async function (mailUrlString) { const mailUrl = new URL(mailUrlString); if (mailUrl.protocol !== 'smtp:' && mailUrl.protocol !== 'smtps:') { @@ -52,10 +52,7 @@ const makeTransport = function (mailUrlString) { mailUrl.query.pool = 'true'; } - const transport = nodemailer.createTransport(url.format(mailUrl)); - - transport._syncSendMail = Meteor.wrapAsync(transport.sendMail, transport); - return transport; + return nodemailer.createTransport(url.format(mailUrl)); }; // More info: https://nodemailer.com/smtp/well-known/ @@ -96,20 +93,17 @@ const knownHostsTransport = function (settings = undefined, url = undefined) { ); } - const transport = nodemailer.createTransport({ + return nodemailer.createTransport({ service: settings?.service || service, auth: { user: settings?.user || user, pass: settings?.password || password, }, }); - - transport._syncSendMail = Meteor.wrapAsync(transport.sendMail, transport); - return transport; }; EmailTest.knowHostsTransport = knownHostsTransport; -const getTransport = function () { +const getTransport = async function () { const packageSettings = Meteor.settings.packages?.email || {}; // We delay this check until the first call to Email.send, in case someone // set process.env.MAIL_URL in startup code. Then we store in a cache until @@ -130,7 +124,7 @@ const getTransport = function () { this.cache = knownHostsTransport(packageSettings, url); } else { this.cacheKey = url; - this.cache = url ? makeTransport(url, packageSettings) : null; + this.cache = url ? await makeTransport(url, packageSettings) : null; } } return this.cache; @@ -170,10 +164,6 @@ const devModeSendAsync = function (mail, options) { }); }; -const smtpSend = function (transport, mail) { - transport._syncSendMail(mail); -}; - const sendHooks = new Hook(); /** @@ -198,58 +188,6 @@ Email.hookSend = function (f) { */ Email.customTransport = undefined; -/** - * @summary Send an email. Throws an `Error` on failure to contact mail server - * or if mail server returns an error. All fields should match - * [RFC5322](http://tools.ietf.org/html/rfc5322) specification. - * - * If the `MAIL_URL` environment variable is set, actually sends the email. - * Otherwise, prints the contents of the email to standard out. - * - * Note that this package is based on **nodemailer**, so make sure to refer to - * [the documentation](http://nodemailer.com/) - * when using the `attachments` or `mailComposer` options. - * - * @locus Server - * @param {Object} options - * @param {String} [options.from] "From:" address (required) - * @param {String|String[]} options.to,cc,bcc,replyTo - * "To:", "Cc:", "Bcc:", and "Reply-To:" addresses - * @param {String} [options.inReplyTo] Message-ID this message is replying to - * @param {String|String[]} [options.references] Array (or space-separated string) of Message-IDs to refer to - * @param {String} [options.messageId] Message-ID for this message; otherwise, will be set to a random value - * @param {String} [options.subject] "Subject:" line - * @param {String} [options.text|html] Mail body (in plain text and/or HTML) - * @param {String} [options.watchHtml] Mail body in HTML specific for Apple Watch - * @param {String} [options.icalEvent] iCalendar event attachment - * @param {Object} [options.headers] Dictionary of custom headers - e.g. `{ "header name": "header value" }`. To set an object under a header name, use `JSON.stringify` - e.g. `{ "header name": JSON.stringify({ tracking: { level: 'full' } }) }`. - * @param {Object[]} [options.attachments] Array of attachment objects, as - * described in the [nodemailer documentation](https://nodemailer.com/message/attachments/). - * @param {MailComposer} [options.mailComposer] A [MailComposer](https://nodemailer.com/extras/mailcomposer/#e-mail-message-fields) - * object representing the message to be sent. Overrides all other options. - * You can create a `MailComposer` object via - * `new EmailInternals.NpmModules.mailcomposer.module`. - */ -Email.send = function (options) { - if (Email.customTransport) { - // Preserve current behavior - const email = options.mailComposer ? options.mailComposer.mail : options; - let send = true; - sendHooks.forEach((hook) => { - send = hook(email); - return send; - }); - if (!send) { - return; - } - const packageSettings = Meteor.settings.packages?.email || {}; - Email.customTransport({ packageSettings, ...email }); - return; - } - // Using Fibers Promise.await - return Promise.await(Email.sendAsync(options)); -}; - /** * @summary Send an email with asyncronous method. Capture Throws an `Error` on failure to contact mail server * or if mail server returns an error. All fields should match @@ -284,12 +222,11 @@ Email.send = function (options) { * `new EmailInternals.NpmModules.mailcomposer.module`. */ Email.sendAsync = async function (options) { - const email = options.mailComposer ? options.mailComposer.mail : options; let send = true; - sendHooks.forEach((hook) => { - send = hook(email); + await sendHooks.forEachAsync(async (sendHook) => { + send = await sendHook(email); return send; }); if (!send) { @@ -313,8 +250,8 @@ Email.sendAsync = async function (options) { } if (mailUrlEnv || mailUrlSettings) { - const transport = getTransport(); - smtpSend(transport, email); + const transport = await getTransport(); + await transport.sendMail(email); return; } return devModeSendAsync(email, options); diff --git a/packages/email/email_tests.js b/packages/email/email_tests.js index 6f016f26b9..585d4b9990 100644 --- a/packages/email/email_tests.js +++ b/packages/email/email_tests.js @@ -10,22 +10,9 @@ const sleep = (ms) => { return new Promise((resolve) => setTimeout(resolve, ms)); }; -// Create dynamic sync tests -TEST_CASES.forEach(({ title, options, testCalls }) => { - Tinytest.add(`[Sync] ${title}`, function (test) { - smokeEmailTest((stream) => { - Object.entries(options).forEach(([key, option]) => { - const testCall = testCalls[key]; - Email.send({ ...option, stream }); - testCall(test, stream); - }); - }); - }); -}); - // Create dynamic async tests TEST_CASES.forEach(({ title, options, testCalls }) => { - Tinytest.addAsync(`[Async] ${title}`, function (test, onComplete) { + Tinytest.addAsync(`${title}`, function (test, onComplete) { smokeEmailTest((stream) => { const allPromises = Object.entries(options).map(([key, option]) => { const testCall = testCalls[key]; @@ -38,82 +25,10 @@ TEST_CASES.forEach(({ title, options, testCalls }) => { }); }); -// Individual sync tests - -Tinytest.add( - '[Sync] email - alternate API is used for sending gets data', - function (test) { - smokeEmailTest(function (stream) { - Email.customTransport = (options) => { - test.equal(options.from, 'foo@example.com'); - }; - Email.send({ - from: 'foo@example.com', - to: 'bar@example.com', - text: '*Cool*, man', - html: 'Cool, man', - stream, - }); - test.equal(stream.getContentsAsString('utf8'), false); - }); - - smokeEmailTest(function (stream) { - Meteor.settings.packages = CUSTOM_TRANSPORT_SETTINGS; - Email.customTransport = (options) => { - test.equal(options.from, 'foo@example.com'); - test.equal(options.packageSettings?.service, '1on1'); - }; - - Email.send({ - from: 'foo@example.com', - to: 'bar@example.com', - text: '*Cool*, man', - html: 'Cool, man', - stream, - }); - - test.equal(stream.getContentsAsString('utf8'), false); - }); - Email.customTransport = undefined; - Meteor.settings.packages = undefined; - } -); - -Tinytest.add('[Sync] email - hooks stop the sending', function (test) { - // Register hooks - const hook1 = Email.hookSend((options) => { - // Test that we get options through - test.equal(options.from, 'foo@example.com'); - console.log('EXECUTE'); - return true; - }); - const hook2 = Email.hookSend(() => { - console.log('STOP'); - return false; - }); - const hook3 = Email.hookSend(() => { - console.log('FAIL'); - }); - smokeEmailTest(function (stream) { - Email.send({ - from: 'foo@example.com', - to: 'bar@example.com', - text: '*Cool*, man', - html: 'Cool, man', - stream, - }); - - test.equal(stream.getContentsAsString('utf8'), false); - }); - hook1.stop(); - hook2.stop(); - hook3.stop(); -}); - // Individual Async tests Tinytest.addAsync( - '[Async] email - alternate API is used for sending gets data', + 'email - alternate API is used for sending gets data', function (test, onComplete) { const allPromises = []; smokeEmailTest((stream) => { @@ -161,7 +76,7 @@ Tinytest.addAsync( ); Tinytest.addAsync( - '[Async] email - hooks stop the sending', + 'email - hooks stop the sending', function (test, onComplete) { // Register hooks const hook1 = Email.hookSend((options) => { @@ -197,7 +112,7 @@ Tinytest.addAsync( // Another tests -Tinytest.add('[Sync] email - URL string for known hosts', function (test) { +Tinytest.add('email - URL string for known hosts', function (test) { const oneTransport = EmailTest.knowHostsTransport({ service: '1und1', user: 'test', @@ -254,7 +169,7 @@ Tinytest.add('[Sync] email - URL string for known hosts', function (test) { }); Tinytest.addAsync( - '[Async] email - with custom transport exception', + 'email - with custom transport exception', async function (test) { Meteor.settings.packages = CUSTOM_TRANSPORT_SETTINGS; Email.customTransport = (options) => { @@ -274,7 +189,7 @@ Tinytest.addAsync( ); Tinytest.addAsync( - '[Async] email - with custom transport long time running', + 'email - with custom transport long time running', async function (test) { Meteor.settings.packages = CUSTOM_TRANSPORT_SETTINGS; Email.customTransport = async (options) => { @@ -290,22 +205,3 @@ Tinytest.addAsync( Email.customTransport = undefined; } ); - -Tinytest.addAsync( - '[Sync] email - with custom transport long time running', - function (test, onComplete) { - Meteor.settings.packages = CUSTOM_TRANSPORT_SETTINGS; - Email.customTransport = async (options) => { - await sleep(3000); - test.equal(options.from, 'foo@example.com'); - test.equal(options.packageSettings?.service, '1on1'); - Meteor.settings.packages = undefined; - Email.customTransport = undefined; - onComplete(); - }; - Email.send({ - from: 'foo@example.com', - to: 'bar@example.com', - }); - } -); From 222e801235f5e0a34eff462f626dbcade4705e47 Mon Sep 17 00:00:00 2001 From: filipenevola Date: Sat, 17 Dec 2022 07:57:56 -0400 Subject: [PATCH 23/27] Adds Email.send using Email.sendAsync inside, handles error and prints a warning in case of success --- packages/email/email.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/packages/email/email.js b/packages/email/email.js index dabfbe4122..bbdf0dab39 100644 --- a/packages/email/email.js +++ b/packages/email/email.js @@ -256,3 +256,22 @@ Email.sendAsync = async function (options) { } return devModeSendAsync(email, options); }; + +/** + * @deprecated use Email.sendAsync + * @param options + */ +Email.send = function(options) { + Email.sendAsync(options) + .then(() => + console.warn( + `Email.send is no longer recommended, you should use Email.sendAsync` + ) + ) + .catch(e => + console.error( + `Email.send is no longer recommended and an error happened`, + e + ) + ); +}; From 7f4f9e3efd7f7d89bfe60eee42d547da821ddd56 Mon Sep 17 00:00:00 2001 From: filipenevola Date: Sat, 17 Dec 2022 08:11:43 -0400 Subject: [PATCH 24/27] Changes `Accounts.sendResetPasswordEmail`, `Accounts.sendEnrollmentEmail`,`Accounts.sendVerificationEmail` to async --- packages/accounts-password/password_server.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js index 5127342209..6b6a8d59f6 100644 --- a/packages/accounts-password/password_server.js +++ b/packages/accounts-password/password_server.js @@ -368,7 +368,7 @@ const pluckAddresses = (emails = []) => emails.map(email => email.address); // Method called by a user to request a password reset email. This is // the start of the reset process. -Meteor.methods({forgotPassword: options => { +Meteor.methods({forgotPassword: async options => { check(options, {email: String}) const user = Accounts.findUserByEmail(options.email, { fields: { emails: 1 } }); @@ -382,7 +382,7 @@ Meteor.methods({forgotPassword: options => { email => email.toLowerCase() === options.email.toLowerCase() ); - Accounts.sendResetPasswordEmail(user._id, caseSensitiveEmail); + await Accounts.sendResetPasswordEmail(user._id, caseSensitiveEmail); }}); /** @@ -532,12 +532,12 @@ Accounts.generateVerificationToken = (userId, email, extraTokenData) => { * @returns {Object} Object with {email, user, token, url, options} values. * @importFromPackage accounts-base */ -Accounts.sendResetPasswordEmail = (userId, email, extraTokenData, extraParams) => { +Accounts.sendResetPasswordEmail = async (userId, email, extraTokenData, extraParams) => { const {email: realEmail, user, token} = Accounts.generateResetToken(userId, email, 'resetPassword', extraTokenData); const url = Accounts.urls.resetPassword(token, extraParams); const options = Accounts.generateOptionsForEmail(realEmail, user, url, 'resetPassword'); - Email.send(options); + await Email.sendAsync(options); if (Meteor.isDevelopment) { console.log(`\nReset password URL: ${url}`); } @@ -562,12 +562,12 @@ Accounts.sendResetPasswordEmail = (userId, email, extraTokenData, extraParams) = * @returns {Object} Object with {email, user, token, url, options} values. * @importFromPackage accounts-base */ -Accounts.sendEnrollmentEmail = (userId, email, extraTokenData, extraParams) => { +Accounts.sendEnrollmentEmail = async (userId, email, extraTokenData, extraParams) => { const {email: realEmail, user, token} = Accounts.generateResetToken(userId, email, 'enrollAccount', extraTokenData); const url = Accounts.urls.enrollAccount(token, extraParams); const options = Accounts.generateOptionsForEmail(realEmail, user, url, 'enrollAccount'); - Email.send(options); + await Email.sendAsync(options); if (Meteor.isDevelopment) { console.log(`\nEnrollment email URL: ${url}`); } @@ -711,7 +711,7 @@ Meteor.methods({resetPassword: async function (...args) { * @returns {Object} Object with {email, user, token, url, options} values. * @importFromPackage accounts-base */ -Accounts.sendVerificationEmail = (userId, email, extraTokenData, extraParams) => { +Accounts.sendVerificationEmail = async (userId, email, extraTokenData, extraParams) => { // XXX Also generate a link using which someone can delete this // account if they own said address but weren't those who created // this account. @@ -720,7 +720,7 @@ Accounts.sendVerificationEmail = (userId, email, extraTokenData, extraParams) => Accounts.generateVerificationToken(userId, email, extraTokenData); const url = Accounts.urls.verifyEmail(token, extraParams); const options = Accounts.generateOptionsForEmail(realEmail, user, url, 'verifyEmail'); - Email.send(options); + await Email.sendAsync(options); if (Meteor.isDevelopment) { console.log(`\nVerification email URL: ${url}`); } @@ -979,9 +979,9 @@ Accounts.createUserVerifyingEmail = async (options) => { // that address. if (options.email && Accounts._options.sendVerificationEmail) { if (options.password) { - Accounts.sendVerificationEmail(userId, options.email); + await Accounts.sendVerificationEmail(userId, options.email); } else { - Accounts.sendEnrollmentEmail(userId, options.email); + await Accounts.sendEnrollmentEmail(userId, options.email); } } From 6799471779463c5ceb805b58a695f9f6387e1e17 Mon Sep 17 00:00:00 2001 From: filipenevola Date: Sat, 17 Dec 2022 08:11:49 -0400 Subject: [PATCH 25/27] Changes `Accounts.sendResetPasswordEmail`, `Accounts.sendEnrollmentEmail`,`Accounts.sendVerificationEmail` to async --- docs/history.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/history.md b/docs/history.md index 729b5b4e61..6ebff195e2 100644 --- a/docs/history.md +++ b/docs/history.md @@ -7,6 +7,11 @@ * `email`: `Email.send` is no longer available. Use `Email.sendAsync` instead. +* `accounts-password`: + - `Accounts.sendResetPasswordEmail` is now async + - `Accounts.sendEnrollmentEmail` is now async + - `Accounts.sendVerificationEmail` is now async + #### Internal API changes From 4868a2bb9411b9620e640696ed2d3c400b30b12c Mon Sep 17 00:00:00 2001 From: filipenevola Date: Sat, 17 Dec 2022 08:20:13 -0400 Subject: [PATCH 26/27] Changes `Accounts.sendLoginTokenEmail` to async --- docs/history.md | 5 ++++- .../accounts-passwordless/passwordless_server.js | 13 +++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/history.md b/docs/history.md index 6ebff195e2..e68b7c6f98 100644 --- a/docs/history.md +++ b/docs/history.md @@ -11,7 +11,10 @@ - `Accounts.sendResetPasswordEmail` is now async - `Accounts.sendEnrollmentEmail` is now async - `Accounts.sendVerificationEmail` is now async - + +* `accounts-passwordless`: + - `Accounts.sendLoginTokenEmail` is now async + #### Internal API changes diff --git a/packages/accounts-passwordless/passwordless_server.js b/packages/accounts-passwordless/passwordless_server.js index 382867926a..55f3f46222 100644 --- a/packages/accounts-passwordless/passwordless_server.js +++ b/packages/accounts-passwordless/passwordless_server.js @@ -110,7 +110,7 @@ function generateSequence() { } Meteor.methods({ - requestLoginTokenForUser: ({ selector, userData, options = {} }) => { + requestLoginTokenForUser: async ({ selector, userData, options = {} }) => { let user = Accounts._findUserByQuery(selector, { fields: { emails: 1 }, }); @@ -189,14 +189,15 @@ Meteor.methods({ : true; if (shouldSendLoginTokenEmail) { - tokens.forEach(({ email, sequence }) => { + const sendLogins = tokens.map(({ email, sequence }) => Accounts.sendLoginTokenEmail({ userId: user._id, sequence, email, ...(options.extra ? { extra: options.extra } : {}), - }); - }); + }) + ); + await Promise.all(sendLogins); } return result; @@ -213,7 +214,7 @@ Meteor.methods({ * @param {Object} options.extra Optional. Extra properties * @returns {Object} Object with {email, user, token, url, options} values. */ -Accounts.sendLoginTokenEmail = ({ userId, sequence, email, extra = {} }) => { +Accounts.sendLoginTokenEmail = async ({ userId, sequence, email, extra = {} }) => { const user = getUserById(userId); const url = Accounts.urls.loginToken(email, sequence); const options = Accounts.generateOptionsForEmail( @@ -223,7 +224,7 @@ Accounts.sendLoginTokenEmail = ({ userId, sequence, email, extra = {} }) => { 'sendLoginToken', { ...extra, sequence } ); - Email.send({ ...options, extra }); + await Email.sendAsync({ ...options, extra }); if (Meteor.isDevelopment) { console.log(`\nLogin Token url: ${url}`); } From 3800cb199882e7e9e25c5d0d769a82aa03183b7a Mon Sep 17 00:00:00 2001 From: filipenevola Date: Sat, 17 Dec 2022 08:24:58 -0400 Subject: [PATCH 27/27] Updates email.d.ts to include the new sendAsync --- packages/email/email.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/email/email.d.ts b/packages/email/email.d.ts index 71380d328e..a34ce0a17d 100644 --- a/packages/email/email.d.ts +++ b/packages/email/email.d.ts @@ -17,7 +17,9 @@ export namespace Email { packageSettings?: unknown; } + /** @deprecated */ function send(options: EmailOptions): void; + function sendAsync(options: EmailOptions): Promise; function hookSend(fn: (options: EmailOptions) => boolean): void; function customTransport(fn: (options: CustomEmailOptions) => void): void; }