From 9a6cad4df971c72de957c8e1bb4216e1a85e245d Mon Sep 17 00:00:00 2001 From: denihs Date: Tue, 24 Jan 2023 15:58:56 -0400 Subject: [PATCH 01/29] empty commit just to not auto merge this branch when the branch release-3.0-tools-and-mongo is merged From 96e28a4582c37e08c7e49e1083a9e917f5b37c74 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 15 Feb 2023 11:59:41 -0300 Subject: [PATCH 02/29] Revert "Revert "wip: added logs to commands"" This reverts commit 732f292cc4d13cbf1beb19970fd5af31d4c06f9c. --- tools/cli/commands.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/cli/commands.js b/tools/cli/commands.js index 619dbc6e4a..6e8a6c9857 100644 --- a/tools/cli/commands.js +++ b/tools/cli/commands.js @@ -2015,9 +2015,9 @@ async function doTestCommand(options) { projectContext = new projectContextModule.ProjectContext(projectContextOptions); await projectContext.init(); - await main.captureAndExit("=> Errors while setting up tests:", function () { + await main.captureAndExit("=> Errors while setting up tests:", async function () { // Read metadata and initialize catalog. - return projectContext.initializeCatalog(); + return await projectContext.initializeCatalog(); }); } else { throw new Error("Unexpected: neither test-packages nor test"); @@ -2055,7 +2055,7 @@ async function doTestCommand(options) { options.cordovaRunner = cordovaRunner; - return runTestAppForPackages(projectContext, Object.assign( + return await runTestAppForPackages(projectContext, Object.assign( options, { mobileServerUrl: utils.formatUrl(parsedMobileServerUrl), @@ -2123,6 +2123,7 @@ var getTestPackageNames = async function (projectContext, packageNames) { }; var runTestAppForPackages = async function (projectContext, options) { + console.log('in tests'); var buildOptions = { minifyMode: options.production ? 'production' : 'development' }; From 39ae2d77616dbb914c92df93c7c57cc22548e921 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 15 Feb 2023 11:59:46 -0300 Subject: [PATCH 03/29] Revert "Revert "awip: dded and await in profile"" This reverts commit 36fb27162cd48b3387cf3cd22c85396ff4a0e686. --- tools/isobuild/bundler.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js index 62792faba3..3d7e97aab1 100644 --- a/tools/isobuild/bundler.js +++ b/tools/isobuild/bundler.js @@ -3256,7 +3256,7 @@ async function bundle({ var packageSource = new PackageSource(); packageSource.initFromAppDir(projectContext, exports.ignoreFiles); - var makeClientTarget = Profile( + var makeClientTarget = await Profile( "bundler.bundle..makeClientTarget", async function (app, webArch, options) { var client = new ClientTarget({ bundlerCacheDir, @@ -3280,7 +3280,7 @@ async function bundle({ return client; }); - var makeServerTarget = Profile( + var makeServerTarget = await Profile( "bundler.bundle..makeServerTarget", async function (app, clientArchs) { const server = new ServerTarget({ bundlerCacheDir, From 2c12bd1292a6247431c37c116c5a65e7f0117dc2 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 15 Feb 2023 11:59:48 -0300 Subject: [PATCH 04/29] Revert "Revert "added async await in isopack to have better tracing"" This reverts commit 79572c5f1b03086700df3b65811467c05133b145. --- tools/project-context.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/project-context.js b/tools/project-context.js index 9dd2a752cf..fc16fa5c44 100644 --- a/tools/project-context.js +++ b/tools/project-context.js @@ -1002,8 +1002,8 @@ Object.assign(ProjectContext.prototype, { ? null : self._forceRebuildPackages); } - await buildmessage.enterJob('building local packages', function () { - return self.isopackCache.buildLocalPackages(); + await buildmessage.enterJob('building local packages', async function () { + return await self.isopackCache.buildLocalPackages(); }); self._completedStage = STAGE.BUILD_LOCAL_PACKAGES; }), From a01a0c30573ecbd489acc4267f52f210d32f4b5a Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 15 Feb 2023 11:59:51 -0300 Subject: [PATCH 05/29] Revert "Revert "wip: added logs in run-all.js"" This reverts commit 23b423b80b369e3f3fbf8936661b8de8891eaa10. --- tools/runners/run-all.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/runners/run-all.js b/tools/runners/run-all.js index ea8af7f01c..e2d4cfc3ec 100644 --- a/tools/runners/run-all.js +++ b/tools/runners/run-all.js @@ -185,7 +185,7 @@ class Runner { if (tries > 0) { await self.mongoRunner.stop(); - await setTimeout(() => startMongo(tries), 1000); + setTimeout(async () => await startMongo(tries), 1000); } else { await self.mongoRunner._fail(); } @@ -194,7 +194,6 @@ class Runner { } await startMongo(); - if (!self.noReleaseCheck && ! self.stopped) { await self.updater.start(); } @@ -208,13 +207,17 @@ class Runner { } if (! self.stopped) { + console.log('bro is in appRunner.start'); await buildmessage.enterJob({ title: "starting your app" }, async function () { + console.log('just being sure'); await self.appRunner.start(); + console.log('broke?'); }); if (! self.quiet && ! self.stopped) { runLog.log("Started your app.", { arrow: true }); } } + console.log('bro is falskdj appRunner.start'); if (! self.stopped && ! self.quiet) { runLog.log(""); @@ -234,14 +237,15 @@ class Runner { } if (self.selenium && ! self.stopped) { - await buildmessage.enterJob({ title: "starting Selenium" }, function () { - return self.selenium.start(); + await buildmessage.enterJob({ title: "starting Selenium" }, async function () { + return await self.selenium.start(); }); if (! self.quiet && ! self.stopped) { runLog.log("Started Selenium.", { arrow: true }); } } + console.log('ended start'); // XXX It'd be nice to (cosmetically) handle failure better. Right // now we overwrite the "starting foo..." message with the // error. It'd be better to overwrite it with "failed to start @@ -340,7 +344,7 @@ class Runner { exports.run = async function (options) { var runOptions = _.clone(options); var once = runOptions.once; - + console.log('inside run all'); var promise = new Promise(function (resolve) { runOptions.onFailure = async function () { // Ensure that runner stops now. You might think this is unnecessary @@ -353,6 +357,7 @@ exports.run = async function (options) { }; runOptions.onRunEnd = function (result) { + console.log(result.outcome); if (once || result.outcome === "conflicting-versions" || result.outcome === "wrong-release" || @@ -401,6 +406,7 @@ exports.run = async function (options) { } var runner = new Runner(runOptions); + console.log('before initng runner'); await runner.init(); await runner.start(); var result = await promise; From 6fb93d137c3a7ad79359470d2baf01cba5ded795 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 15 Feb 2023 11:59:52 -0300 Subject: [PATCH 06/29] Revert "Revert "wip: added logs in run-app.js"" This reverts commit 52769ead52596089e01517edbcbe0d5f82a65a7d. --- tools/runners/run-app.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js index e509f9022c..63425a1cc1 100644 --- a/tools/runners/run-app.js +++ b/tools/runners/run-app.js @@ -404,7 +404,7 @@ Object.assign(AppRunner.prototype, { self.startPromise = self._makePromise("start"); self.isRunning = true; - self._runApp(); + await self._runApp(); await self.startPromise; self.startPromise = null; @@ -521,8 +521,8 @@ Object.assign(AppRunner.prototype, { // shown from the previous solution. preservePackageMap: true }); - var messages = await buildmessage.capture(function () { - return self.projectContext.readProjectMetadata(); + var messages = await buildmessage.capture(async function () { + return await self.projectContext.readProjectMetadata(); }); if (messages.hasMessages()) { return { @@ -548,7 +548,7 @@ Object.assign(AppRunner.prototype, { } messages = await buildmessage.capture(async function () { - await self.projectContext.prepareProjectForBuild(); + return await self.projectContext.prepareProjectForBuild(); }); if (messages.hasMessages()) { return { @@ -573,7 +573,7 @@ Object.assign(AppRunner.prototype, { }); } - var bundleResult = await Profile.run((firstRun?"B":"Reb")+"uild App", async () => { + var bundleResult = await Profile.run((firstRun?"B":"Reb")+"uild App", async function() { return await bundler.bundle({ projectContext: self.projectContext, outputPath: bundlePath, @@ -941,6 +941,7 @@ Object.assign(AppRunner.prototype, { var self = this; var firstRun = true; + console.log('before while'); while (true) { var runResult = await self._runOnce({ onListen: function () { @@ -1032,10 +1033,12 @@ Object.assign(AppRunner.prototype, { break; } + console.log('before close'); // Allow the process to exit normally, since optimistic file watchers // may be keeping the event loop busy. closeAllWatchers(); + console.log('before clean'); // Giving up for good. self._cleanUpPromises(); From 4398c0cc1f9333ed7b91867e3b71ded2c4c1bb34 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Thu, 16 Feb 2023 14:54:58 -0300 Subject: [PATCH 07/29] removing logs from commands.js --- tools/cli/commands.js | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/cli/commands.js b/tools/cli/commands.js index 6e8a6c9857..951f342668 100644 --- a/tools/cli/commands.js +++ b/tools/cli/commands.js @@ -2123,7 +2123,6 @@ var getTestPackageNames = async function (projectContext, packageNames) { }; var runTestAppForPackages = async function (projectContext, options) { - console.log('in tests'); var buildOptions = { minifyMode: options.production ? 'production' : 'development' }; From 2ee22899632a4c5796ae91ef3af64bfcffee1af7 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Thu, 16 Feb 2023 14:55:08 -0300 Subject: [PATCH 08/29] removing logs from run-all.js --- tools/runners/run-all.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tools/runners/run-all.js b/tools/runners/run-all.js index e2d4cfc3ec..3f76fcc357 100644 --- a/tools/runners/run-all.js +++ b/tools/runners/run-all.js @@ -207,17 +207,13 @@ class Runner { } if (! self.stopped) { - console.log('bro is in appRunner.start'); await buildmessage.enterJob({ title: "starting your app" }, async function () { - console.log('just being sure'); await self.appRunner.start(); - console.log('broke?'); }); if (! self.quiet && ! self.stopped) { runLog.log("Started your app.", { arrow: true }); } } - console.log('bro is falskdj appRunner.start'); if (! self.stopped && ! self.quiet) { runLog.log(""); @@ -245,7 +241,6 @@ class Runner { } } - console.log('ended start'); // XXX It'd be nice to (cosmetically) handle failure better. Right // now we overwrite the "starting foo..." message with the // error. It'd be better to overwrite it with "failed to start @@ -344,7 +339,6 @@ class Runner { exports.run = async function (options) { var runOptions = _.clone(options); var once = runOptions.once; - console.log('inside run all'); var promise = new Promise(function (resolve) { runOptions.onFailure = async function () { // Ensure that runner stops now. You might think this is unnecessary @@ -357,7 +351,6 @@ exports.run = async function (options) { }; runOptions.onRunEnd = function (result) { - console.log(result.outcome); if (once || result.outcome === "conflicting-versions" || result.outcome === "wrong-release" || @@ -406,7 +399,6 @@ exports.run = async function (options) { } var runner = new Runner(runOptions); - console.log('before initng runner'); await runner.init(); await runner.start(); var result = await promise; From be247f5655de881bba653348aac748fa573ebbed Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Thu, 16 Feb 2023 14:55:15 -0300 Subject: [PATCH 09/29] removing logs from run-app.js --- tools/runners/run-app.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js index 63425a1cc1..5ec1fc74b6 100644 --- a/tools/runners/run-app.js +++ b/tools/runners/run-app.js @@ -941,7 +941,6 @@ Object.assign(AppRunner.prototype, { var self = this; var firstRun = true; - console.log('before while'); while (true) { var runResult = await self._runOnce({ onListen: function () { @@ -1033,12 +1032,10 @@ Object.assign(AppRunner.prototype, { break; } - console.log('before close'); // Allow the process to exit normally, since optimistic file watchers // may be keeping the event loop busy. closeAllWatchers(); - console.log('before clean'); // Giving up for good. self._cleanUpPromises(); From 2064c8f2ddb976314d4fa62f625cb9301cae86f7 Mon Sep 17 00:00:00 2001 From: "Henrique A. Schmaiske" Date: Thu, 23 Feb 2023 15:18:14 -0300 Subject: [PATCH 10/29] remove unnecessary awaits --- tools/isobuild/import-scanner.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/isobuild/import-scanner.ts b/tools/isobuild/import-scanner.ts index 03ac55cc05..4f0b4b5f3a 100644 --- a/tools/isobuild/import-scanner.ts +++ b/tools/isobuild/import-scanner.ts @@ -976,7 +976,7 @@ export default class ImportScanner { private async findImportedModuleIdentifiers( file: File, ): Promise> { - const fileHash = await file.hash; + const fileHash = file.hash; if (IMPORT_SCANNER_CACHE.has(fileHash)) { return IMPORT_SCANNER_CACHE.get(fileHash); } @@ -1168,7 +1168,7 @@ export default class ImportScanner { } private async getDataString(file: File) { - const fileData = await file.data; + const fileData = file.data; if (typeof fileData === "string") { return fileData; } From f21c00438ca2738ab77892611e56d6d56022da58 Mon Sep 17 00:00:00 2001 From: "Henrique A. Schmaiske" Date: Thu, 23 Feb 2023 15:35:35 -0300 Subject: [PATCH 11/29] add await to file.data --- tools/isobuild/import-scanner.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/isobuild/import-scanner.ts b/tools/isobuild/import-scanner.ts index 4f0b4b5f3a..bf6616af94 100644 --- a/tools/isobuild/import-scanner.ts +++ b/tools/isobuild/import-scanner.ts @@ -1168,7 +1168,7 @@ export default class ImportScanner { } private async getDataString(file: File) { - const fileData = file.data; + const fileData = await file.data; if (typeof fileData === "string") { return fileData; } From ab3dac132f2df5c0766ecf82a6b87b82f992754e Mon Sep 17 00:00:00 2001 From: "Henrique A. Schmaiske" Date: Thu, 23 Feb 2023 16:21:11 -0300 Subject: [PATCH 12/29] fix local cache --- packages/babel-compiler/package.js | 4 ++-- packages/webapp/webapp_server.js | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 7363403282..fcc03ec750 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -5,8 +5,8 @@ Package.describe({ }); Npm.depends({ - // '@meteorjs/babel': '7.18.0-beta.5', - '@meteorjs/babel': 'file:///../../../../npm-packages/meteor-babel', + '@meteorjs/babel': '7.18.0-beta.5', + // '@meteorjs/babel': 'file:///../../../../npm-packages/meteor-babel', 'json5': '2.1.1', 'semver': '7.3.8' }); diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js index f520484cc3..c738c3b046 100644 --- a/packages/webapp/webapp_server.js +++ b/packages/webapp/webapp_server.js @@ -1494,5 +1494,7 @@ WebAppInternals.getBoilerplate = getBoilerplate; WebAppInternals.additionalStaticJs = additionalStaticJs; // TODO[fibers]: change this when we have TLA -await runWebAppServer(); - +async function main() { + await runWebAppServer(); +} +main(); From e156aed3bfbb2173d703e435040a514217309c39 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 24 Feb 2023 14:44:48 -0300 Subject: [PATCH 13/29] wip node err --- .../.npm/package/npm-shrinkwrap.json | 2055 ++++++++--------- packages/webapp/webapp_server.js | 9 +- tools/cli/commands.js | 12 +- tools/runners/run-all.js | 4 +- tools/runners/run-app.js | 45 +- tools/static-assets/server/boot.js | 6 +- 6 files changed, 994 insertions(+), 1137 deletions(-) diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json index 8b0424dfcb..f96fa62a6b 100644 --- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json +++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json @@ -1,1147 +1,968 @@ { "lockfileVersion": 1, "dependencies": { - "@meteorjs/babel": { - "version": "7.19.0-beta.1", + "@ampproject/remapping": { + "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.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.21.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz", + "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==" + }, + "@babel/core": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz", + "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==", "dependencies": { - "@ampproject/remapping": { - "version": "2.1.1" - }, - "@babel/code-frame": { - "version": "7.16.7" - }, - "@babel/compat-data": { - "version": "7.14.9" - }, - "@babel/core": { - "version": "7.17.2", - "dependencies": { - "@babel/compat-data": { - "version": "7.17.0" - }, - "@babel/helper-compilation-targets": { - "version": "7.16.7" - }, - "@babel/helper-validator-option": { - "version": "7.16.7" - }, - "browserslist": { - "version": "4.19.1" - }, - "caniuse-lite": { - "version": "1.0.30001312" - }, - "electron-to-chromium": { - "version": "1.4.68" - }, - "node-releases": { - "version": "2.0.2" - } - } - }, - "@babel/generator": { - "version": "7.17.0", - "dependencies": { - "source-map": { - "version": "0.5.7" - } - } - }, - "@babel/helper-annotate-as-pure": { - "version": "7.14.5" - }, - "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.14.5" - }, - "@babel/helper-compilation-targets": { - "version": "7.14.5" - }, - "@babel/helper-create-class-features-plugin": { - "version": "7.14.8" - }, - "@babel/helper-create-regexp-features-plugin": { - "version": "7.14.5" - }, - "@babel/helper-define-polyfill-provider": { - "version": "0.3.1" - }, - "@babel/helper-environment-visitor": { - "version": "7.16.7" - }, - "@babel/helper-explode-assignable-expression": { - "version": "7.14.5" - }, - "@babel/helper-function-name": { - "version": "7.14.5" - }, - "@babel/helper-get-function-arity": { - "version": "7.14.5" - }, - "@babel/helper-hoist-variables": { - "version": "7.16.7" - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.14.7" - }, - "@babel/helper-module-imports": { - "version": "7.14.5" - }, - "@babel/helper-module-transforms": { - "version": "7.16.7", - "dependencies": { - "@babel/helper-module-imports": { - "version": "7.16.7" - }, - "@babel/helper-split-export-declaration": { - "version": "7.16.7" - } - } - }, - "@babel/helper-optimise-call-expression": { - "version": "7.14.5" - }, - "@babel/helper-plugin-utils": { - "version": "7.14.5" - }, - "@babel/helper-remap-async-to-generator": { - "version": "7.14.5" - }, - "@babel/helper-replace-supers": { - "version": "7.14.5" - }, - "@babel/helper-simple-access": { - "version": "7.16.7" - }, - "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.14.5" - }, - "@babel/helper-split-export-declaration": { - "version": "7.14.5" - }, - "@babel/helper-validator-identifier": { - "version": "7.16.7" - }, - "@babel/helper-validator-option": { - "version": "7.14.5" - }, - "@babel/helper-wrap-function": { - "version": "7.14.5" - }, - "@babel/helpers": { - "version": "7.17.2" - }, - "@babel/highlight": { - "version": "7.16.10" - }, - "@babel/parser": { - "version": "7.17.0" - }, - "@babel/plugin-proposal-async-generator-functions": { - "version": "7.14.9" - }, - "@babel/plugin-proposal-class-properties": { - "version": "7.16.7", - "dependencies": { - "@babel/helper-annotate-as-pure": { - "version": "7.16.7" - }, - "@babel/helper-create-class-features-plugin": { - "version": "7.17.1" - }, - "@babel/helper-function-name": { - "version": "7.16.7" - }, - "@babel/helper-get-function-arity": { - "version": "7.16.7" - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.16.7" - }, - "@babel/helper-optimise-call-expression": { - "version": "7.16.7" - }, - "@babel/helper-plugin-utils": { - "version": "7.16.7" - }, - "@babel/helper-replace-supers": { - "version": "7.16.7" - }, - "@babel/helper-split-export-declaration": { - "version": "7.16.7" - } - } - }, - "@babel/plugin-proposal-decorators": { - "version": "7.14.5" - }, - "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.14.5" - }, - "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.14.5" - }, - "@babel/plugin-proposal-object-rest-spread": { - "version": "7.14.7" - }, - "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.14.5" - }, - "@babel/plugin-proposal-optional-chaining": { - "version": "7.14.5" - }, - "@babel/plugin-syntax-async-generators": { - "version": "7.8.4" - }, - "@babel/plugin-syntax-class-properties": { - "version": "7.12.13" - }, - "@babel/plugin-syntax-decorators": { - "version": "7.14.5" - }, - "@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3" - }, - "@babel/plugin-syntax-jsx": { - "version": "7.16.7", - "dependencies": { - "@babel/helper-plugin-utils": { - "version": "7.16.7" - } - } - }, - "@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4" - }, - "@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3" - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3" - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3" - }, - "@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3" - }, - "@babel/plugin-transform-arrow-functions": { - "version": "7.14.5" - }, - "@babel/plugin-transform-async-to-generator": { - "version": "7.14.5" - }, - "@babel/plugin-transform-block-scoped-functions": { - "version": "7.14.5" - }, - "@babel/plugin-transform-block-scoping": { - "version": "7.14.5" - }, - "@babel/plugin-transform-classes": { - "version": "7.14.9" - }, - "@babel/plugin-transform-computed-properties": { - "version": "7.14.5" - }, - "@babel/plugin-transform-destructuring": { - "version": "7.14.7" - }, - "@babel/plugin-transform-exponentiation-operator": { - "version": "7.14.5" - }, - "@babel/plugin-transform-for-of": { - "version": "7.14.5" - }, - "@babel/plugin-transform-literals": { - "version": "7.14.5" - }, - "@babel/plugin-transform-modules-commonjs": { - "version": "7.16.8", - "dependencies": { - "@babel/helper-plugin-utils": { - "version": "7.16.7" - } - } - }, - "@babel/plugin-transform-object-super": { - "version": "7.14.5" - }, - "@babel/plugin-transform-parameters": { - "version": "7.14.5" - }, - "@babel/plugin-transform-property-literals": { - "version": "7.14.5" - }, - "@babel/plugin-transform-react-display-name": { - "version": "7.16.7", - "dependencies": { - "@babel/helper-plugin-utils": { - "version": "7.16.7" - } - } - }, - "@babel/plugin-transform-react-jsx": { - "version": "7.16.7", - "dependencies": { - "@babel/helper-annotate-as-pure": { - "version": "7.16.7" - }, - "@babel/helper-module-imports": { - "version": "7.16.7" - }, - "@babel/helper-plugin-utils": { - "version": "7.16.7" - } - } - }, - "@babel/plugin-transform-react-jsx-development": { - "version": "7.16.7" - }, - "@babel/plugin-transform-react-pure-annotations": { - "version": "7.16.7", - "dependencies": { - "@babel/helper-annotate-as-pure": { - "version": "7.16.7" - }, - "@babel/helper-plugin-utils": { - "version": "7.16.7" - } - } - }, - "@babel/plugin-transform-regenerator": { - "version": "7.14.5" - }, - "@babel/plugin-transform-runtime": { - "version": "7.17.0", - "dependencies": { - "@babel/helper-module-imports": { - "version": "7.16.7" - }, - "@babel/helper-plugin-utils": { - "version": "7.16.7" - } - } - }, - "@babel/plugin-transform-shorthand-properties": { - "version": "7.14.5" - }, - "@babel/plugin-transform-spread": { - "version": "7.14.6" - }, - "@babel/plugin-transform-sticky-regex": { - "version": "7.14.5" - }, - "@babel/plugin-transform-template-literals": { - "version": "7.14.5" - }, - "@babel/plugin-transform-typeof-symbol": { - "version": "7.14.5" - }, - "@babel/plugin-transform-unicode-regex": { - "version": "7.14.5" - }, - "@babel/preset-react": { - "version": "7.16.7", - "dependencies": { - "@babel/helper-plugin-utils": { - "version": "7.16.7" - }, - "@babel/helper-validator-option": { - "version": "7.16.7" - } - } - }, - "@babel/runtime": { - "version": "7.17.2" - }, - "@babel/template": { - "version": "7.16.7" - }, - "@babel/traverse": { - "version": "7.17.0", - "dependencies": { - "@babel/helper-function-name": { - "version": "7.16.7" - }, - "@babel/helper-get-function-arity": { - "version": "7.16.7" - }, - "@babel/helper-split-export-declaration": { - "version": "7.16.7" - } - } - }, - "@babel/types": { - "version": "7.17.0" - }, - "@jridgewell/resolve-uri": { - "version": "3.0.5" - }, - "@jridgewell/sourcemap-codec": { - "version": "1.4.11" - }, - "@jridgewell/trace-mapping": { - "version": "0.3.4" - }, - "@meteorjs/reify": { - "version": "https://github.com/meteor/reify/tarball/5078da9d0827cc17741504762f3a7f71c3b01448", - "integrity": "sha512-LEdx+3A7wV8XeTFWrfkOu0PtX+Vjgl28b4mW8bsM3lZPWIqx0PXTfpbXfDy61MgmmYXR7/cWjVJ8xqgSunF3Mg==", - "dependencies": { - "acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==" - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } - } - }, - "@types/estree": { - "version": "0.0.50" - }, - "acorn": { - "version": "6.4.2" - }, - "acorn-dynamic-import": { - "version": "4.0.0" - }, - "ansi-colors": { - "version": "3.2.3" - }, - "ansi-regex": { - "version": "3.0.0" - }, - "ansi-styles": { - "version": "3.2.1" - }, - "argparse": { - "version": "1.0.10" - }, - "asap": { - "version": "2.0.6" - }, - "babel-helper-evaluate-path": { - "version": "0.5.0" - }, - "babel-helper-flip-expressions": { - "version": "0.4.3" - }, - "babel-helper-is-nodes-equiv": { - "version": "0.0.1" - }, - "babel-helper-is-void-0": { - "version": "0.4.3" - }, - "babel-helper-mark-eval-scopes": { - "version": "0.4.3" - }, - "babel-helper-remove-or-void": { - "version": "0.4.3" - }, - "babel-helper-to-multiple-sequence-expressions": { - "version": "0.5.0" - }, - "babel-plugin-dynamic-import-node": { - "version": "2.3.3" - }, - "babel-plugin-minify-builtins": { - "version": "0.5.0" - }, - "babel-plugin-minify-constant-folding": { - "version": "0.5.0" - }, - "babel-plugin-minify-dead-code-elimination": { - "version": "0.5.1" - }, - "babel-plugin-minify-flip-comparisons": { - "version": "0.4.3" - }, - "babel-plugin-minify-guarded-expressions": { - "version": "0.4.4" - }, - "babel-plugin-minify-infinity": { - "version": "0.4.3" - }, - "babel-plugin-minify-mangle-names": { - "version": "0.5.0" - }, - "babel-plugin-minify-numeric-literals": { - "version": "0.4.3" - }, - "babel-plugin-minify-replace": { - "version": "0.5.0" - }, - "babel-plugin-minify-simplify": { - "version": "0.5.1" - }, - "babel-plugin-minify-type-constructors": { - "version": "0.4.3" - }, - "babel-plugin-polyfill-corejs2": { - "version": "0.3.1" - }, - "babel-plugin-polyfill-corejs3": { - "version": "0.5.2" - }, - "babel-plugin-polyfill-regenerator": { - "version": "0.3.1" - }, - "babel-plugin-transform-inline-consecutive-adds": { - "version": "0.4.3" - }, - "babel-plugin-transform-member-expression-literals": { - "version": "6.9.4" - }, - "babel-plugin-transform-merge-sibling-variables": { - "version": "6.9.4" - }, - "babel-plugin-transform-minify-booleans": { - "version": "6.9.4" - }, - "babel-plugin-transform-property-literals": { - "version": "6.9.4" - }, - "babel-plugin-transform-regexp-constructors": { - "version": "0.4.3" - }, - "babel-plugin-transform-remove-console": { - "version": "6.9.4" - }, - "babel-plugin-transform-remove-debugger": { - "version": "6.9.4" - }, - "babel-plugin-transform-remove-undefined": { - "version": "0.5.0" - }, - "babel-plugin-transform-simplify-comparison-operators": { - "version": "6.9.4" - }, - "babel-plugin-transform-undefined-to-void": { - "version": "6.9.4" - }, - "babel-preset-meteor": { - "version": "7.10.0" - }, - "babel-preset-minify": { - "version": "0.5.1" - }, - "balanced-match": { - "version": "1.0.2" - }, - "brace-expansion": { - "version": "1.1.11" - }, - "browser-stdout": { - "version": "1.3.1" - }, - "browserslist": { - "version": "4.16.6" - }, - "call-bind": { - "version": "1.0.2" - }, - "camelcase": { - "version": "5.3.1" - }, - "caniuse-lite": { - "version": "1.0.30001248" - }, - "chalk": { - "version": "2.4.2" - }, - "cliui": { - "version": "5.0.0", - "dependencies": { - "ansi-regex": { - "version": "4.1.0" - }, - "string-width": { - "version": "3.1.0" - }, - "strip-ansi": { - "version": "5.2.0" - } - } - }, - "color-convert": { - "version": "1.9.3" - }, - "color-name": { - "version": "1.1.3" - }, - "colorette": { - "version": "1.2.2" - }, - "commander": { - "version": "2.20.3" - }, - "concat-map": { - "version": "0.0.1" - }, - "convert-source-map": { - "version": "1.8.0" - }, - "core-js-compat": { - "version": "3.21.0", - "dependencies": { - "browserslist": { - "version": "4.19.1" - }, - "caniuse-lite": { - "version": "1.0.30001312" - }, - "electron-to-chromium": { - "version": "1.4.68" - }, - "node-releases": { - "version": "2.0.2" - }, - "semver": { - "version": "7.0.0" - } - } - }, - "d3": { - "version": "4.13.0" - }, - "d3-array": { - "version": "1.2.1" - }, - "d3-axis": { - "version": "1.0.8" - }, - "d3-brush": { - "version": "1.0.4" - }, - "d3-chord": { - "version": "1.0.4" - }, - "d3-collection": { - "version": "1.0.4" - }, - "d3-color": { - "version": "1.0.3" - }, - "d3-dispatch": { - "version": "1.0.3" - }, - "d3-drag": { - "version": "1.2.1" - }, - "d3-dsv": { - "version": "1.0.8" - }, - "d3-ease": { - "version": "1.0.3" - }, - "d3-force": { - "version": "1.1.0" - }, - "d3-format": { - "version": "1.2.2" - }, - "d3-geo": { - "version": "1.9.1" - }, - "d3-hierarchy": { - "version": "1.1.5" - }, - "d3-interpolate": { - "version": "1.1.6" - }, - "d3-path": { - "version": "1.0.5" - }, - "d3-polygon": { - "version": "1.0.3" - }, - "d3-quadtree": { - "version": "1.0.3" - }, - "d3-queue": { - "version": "3.0.7" - }, - "d3-random": { - "version": "1.1.0" - }, - "d3-request": { - "version": "1.0.6" - }, - "d3-scale": { - "version": "1.0.7" - }, - "d3-selection": { - "version": "1.3.0" - }, - "d3-shape": { - "version": "1.2.0" - }, - "d3-time": { - "version": "1.0.8" - }, - "d3-time-format": { - "version": "2.1.1" - }, - "d3-timer": { - "version": "1.0.7" - }, - "d3-transition": { - "version": "1.1.1" - }, - "d3-voronoi": { - "version": "1.1.2" - }, - "d3-zoom": { - "version": "1.7.1" - }, - "debug": { - "version": "4.3.3" - }, - "decamelize": { - "version": "1.2.0" - }, - "define-properties": { - "version": "1.1.3" - }, - "detect-libc": { - "version": "1.0.3" - }, - "diff": { - "version": "3.5.0" - }, - "electron-to-chromium": { - "version": "1.3.793" - }, - "emoji-regex": { - "version": "7.0.3" - }, - "es-abstract": { - "version": "1.18.5" - }, - "es-to-primitive": { - "version": "1.2.1" - }, - "escalade": { - "version": "3.1.1" - }, - "escape-string-regexp": { - "version": "1.0.5" - }, - "esprima": { - "version": "4.0.1" - }, - "estree-walker": { - "version": "2.0.2" - }, - "esutils": { - "version": "2.0.3" - }, - "fibers": { - "version": "5.0.0" - }, - "find-up": { - "version": "3.0.0" - }, - "flat": { - "version": "4.1.1" - }, - "fs.realpath": { - "version": "1.0.0" - }, - "function-bind": { - "version": "1.1.1" - }, - "gensync": { - "version": "1.0.0-beta.2" - }, - "get-caller-file": { - "version": "2.0.5" - }, - "get-intrinsic": { - "version": "1.1.1" - }, - "glob": { - "version": "7.1.3" - }, - "globals": { - "version": "11.12.0" - }, - "growl": { - "version": "1.10.5" - }, - "has": { - "version": "1.0.3" - }, - "has-bigints": { - "version": "1.0.1" - }, - "has-flag": { - "version": "3.0.0" - }, - "has-symbols": { - "version": "1.0.2" - }, - "he": { - "version": "1.2.0" - }, - "iconv-lite": { - "version": "0.4.24" - }, - "inflight": { - "version": "1.0.6" - }, - "inherits": { - "version": "2.0.4" - }, - "internal-slot": { - "version": "1.0.3" - }, - "is-bigint": { - "version": "1.0.2" - }, - "is-boolean-object": { - "version": "1.1.1" - }, - "is-buffer": { - "version": "2.0.5" - }, - "is-callable": { - "version": "1.2.3" - }, - "is-core-module": { - "version": "2.8.1" - }, - "is-date-object": { - "version": "1.0.4" - }, - "is-fullwidth-code-point": { - "version": "2.0.0" - }, - "is-negative-zero": { - "version": "2.0.1" - }, - "is-number-object": { - "version": "1.0.5" - }, - "is-reference": { - "version": "1.2.1" - }, - "is-regex": { - "version": "1.1.3" - }, - "is-string": { - "version": "1.0.6" - }, - "is-symbol": { - "version": "1.0.4" - }, - "isexe": { - "version": "2.0.0" - }, - "js-tokens": { - "version": "4.0.0" - }, - "js-yaml": { - "version": "3.13.1" - }, - "jsesc": { - "version": "2.5.2" - }, "json5": { - "version": "2.2.0" - }, - "locate-path": { - "version": "3.0.0" - }, - "lodash": { - "version": "4.17.21" - }, - "lodash.debounce": { - "version": "4.0.8" - }, - "log-symbols": { - "version": "2.2.0" - }, - "magic-string": { - "version": "0.25.7" - }, - "meteor-babel-helpers": { - "version": "0.0.3" - }, - "meteor-promise": { - "version": "0.9.0" - }, - "minimatch": { - "version": "3.0.4" - }, - "minimist": { - "version": "1.2.6" - }, - "mkdirp": { - "version": "0.5.4" - }, - "mocha": { - "version": "6.2.3", - "dependencies": { - "debug": { - "version": "3.2.6" - }, - "ms": { - "version": "2.1.1" - }, - "object.assign": { - "version": "4.1.0" - }, - "supports-color": { - "version": "6.0.0" - } - } - }, - "ms": { - "version": "2.1.2" - }, - "node-environment-flags": { - "version": "1.0.5", - "dependencies": { - "semver": { - "version": "5.7.1" - } - } - }, - "node-releases": { - "version": "1.1.73" - }, - "object-inspect": { - "version": "1.11.0" - }, - "object-keys": { - "version": "1.1.1" - }, - "object.assign": { - "version": "4.1.2" - }, - "object.getownpropertydescriptors": { - "version": "2.1.2" - }, - "once": { - "version": "1.4.0" - }, - "p-limit": { - "version": "2.3.0" - }, - "p-locate": { - "version": "3.0.0" - }, - "p-try": { - "version": "2.2.0" - }, - "path-exists": { - "version": "3.0.0" - }, - "path-is-absolute": { - "version": "1.0.1" - }, - "path-parse": { - "version": "1.0.7" - }, - "periscopic": { - "version": "2.0.3" - }, - "picocolors": { - "version": "1.0.0" - }, - "promise": { - "version": "8.1.0" - }, - "regenerate": { - "version": "1.4.2" - }, - "regenerate-unicode-properties": { - "version": "8.2.0" - }, - "regenerator-runtime": { - "version": "0.13.9" - }, - "regenerator-transform": { - "version": "0.14.5" - }, - "regexpu-core": { - "version": "4.7.1" - }, - "regjsgen": { - "version": "0.5.2" - }, - "regjsparser": { - "version": "0.6.9", - "dependencies": { - "jsesc": { - "version": "0.5.0" - } - } - }, - "require-directory": { - "version": "2.1.1" - }, - "require-main-filename": { - "version": "2.0.0" - }, - "resolve": { - "version": "1.22.0" - }, - "rw": { - "version": "1.3.3" - }, - "safe-buffer": { - "version": "5.1.2" - }, - "safer-buffer": { - "version": "2.1.2" + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" }, "semver": { - "version": "6.3.0" - }, - "set-blocking": { - "version": "2.0.0" - }, - "side-channel": { - "version": "1.0.4" - }, - "source-map": { - "version": "0.6.1" - }, - "sourcemap-codec": { - "version": "1.4.8" - }, - "sprintf-js": { - "version": "1.0.3" - }, - "string-width": { - "version": "2.1.1" - }, - "string.prototype.trimend": { - "version": "1.0.4" - }, - "string.prototype.trimstart": { - "version": "1.0.4" - }, - "strip-ansi": { - "version": "4.0.0" - }, - "strip-json-comments": { - "version": "2.0.1" - }, - "supports-color": { - "version": "5.5.0" - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0" - }, - "to-fast-properties": { - "version": "2.0.0" - }, - "typescript": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", - "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==" - }, - "unbox-primitive": { - "version": "1.0.1" - }, - "unicode-canonical-property-names-ecmascript": { - "version": "1.0.4" - }, - "unicode-match-property-ecmascript": { - "version": "1.0.4" - }, - "unicode-match-property-value-ecmascript": { - "version": "1.2.0" - }, - "unicode-property-aliases-ecmascript": { - "version": "1.1.0" - }, - "which": { - "version": "1.3.1" - }, - "which-boxed-primitive": { - "version": "1.0.2" - }, - "which-module": { - "version": "2.0.0" - }, - "wide-align": { - "version": "1.1.3" - }, - "wrap-ansi": { - "version": "5.1.0", - "dependencies": { - "ansi-regex": { - "version": "4.1.0" - }, - "string-width": { - "version": "3.1.0" - }, - "strip-ansi": { - "version": "5.2.0" - } - } - }, - "wrappy": { - "version": "1.0.2" - }, - "xmlhttprequest": { - "version": "1.8.0" - }, - "y18n": { - "version": "4.0.3" - }, - "yargs": { - "version": "13.3.2", - "dependencies": { - "ansi-regex": { - "version": "4.1.0" - }, - "string-width": { - "version": "3.1.0" - }, - "strip-ansi": { - "version": "5.2.0" - } - } - }, - "yargs-parser": { - "version": "13.1.2" - }, - "yargs-unparser": { - "version": "1.6.0" + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" } } }, + "@babel/generator": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz", + "integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==", + "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.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.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.20.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", + "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, + "@babel/helper-create-class-features-plugin": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz", + "integrity": "sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ==" + }, + "@babel/helper-create-regexp-features-plugin": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz", + "integrity": "sha512-N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg==" + }, + "@babel/helper-define-polyfill-provider": { + "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==", + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, + "@babel/helper-environment-visitor": { + "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.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.21.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz", + "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==" + }, + "@babel/helper-hoist-variables": { + "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.21.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz", + "integrity": "sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==" + }, + "@babel/helper-module-imports": { + "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.21.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz", + "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==" + }, + "@babel/helper-optimise-call-expression": { + "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.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.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.20.7", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz", + "integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==" + }, + "@babel/helper-simple-access": { + "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.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.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.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.21.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz", + "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==" + }, + "@babel/helper-wrap-function": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz", + "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==" + }, + "@babel/helpers": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz", + "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==" + }, + "@babel/highlight": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", + "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==" + }, + "@babel/parser": { + "version": "7.21.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz", + "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==" + }, + "@babel/plugin-proposal-async-generator-functions": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz", + "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==" + }, + "@babel/plugin-proposal-class-properties": { + "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.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz", + "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==" + }, + "@babel/plugin-proposal-nullish-coalescing-operator": { + "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.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz", + "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==" + }, + "@babel/plugin-proposal-optional-catch-binding": { + "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.21.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz", + "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==" + }, + "@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==" + }, + "@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==" + }, + "@babel/plugin-syntax-dynamic-import": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", + "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==" + }, + "@babel/plugin-syntax-jsx": { + "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", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==" + }, + "@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==" + }, + "@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==" + }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==" + }, + "@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==" + }, + "@babel/plugin-transform-arrow-functions": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz", + "integrity": "sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==" + }, + "@babel/plugin-transform-async-to-generator": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz", + "integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==" + }, + "@babel/plugin-transform-block-scoped-functions": { + "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.21.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz", + "integrity": "sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==" + }, + "@babel/plugin-transform-classes": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz", + "integrity": "sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==" + }, + "@babel/plugin-transform-computed-properties": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz", + "integrity": "sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==" + }, + "@babel/plugin-transform-destructuring": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz", + "integrity": "sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==" + }, + "@babel/plugin-transform-exponentiation-operator": { + "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.21.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz", + "integrity": "sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==" + }, + "@babel/plugin-transform-literals": { + "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.21.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz", + "integrity": "sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==" + }, + "@babel/plugin-transform-object-super": { + "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.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz", + "integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==" + }, + "@babel/plugin-transform-property-literals": { + "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.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.21.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz", + "integrity": "sha512-6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg==" + }, + "@babel/plugin-transform-react-jsx-development": { + "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.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.20.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz", + "integrity": "sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==" + }, + "@babel/plugin-transform-runtime": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz", + "integrity": "sha512-ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg==", + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, + "@babel/plugin-transform-shorthand-properties": { + "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.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz", + "integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==" + }, + "@babel/plugin-transform-sticky-regex": { + "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.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.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.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.18.6", + "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz", + "integrity": "sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==" + }, + "@babel/regjsgen": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", + "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==" + }, + "@babel/runtime": { + "version": "7.17.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz", + "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==" + }, + "@babel/template": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", + "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==" + }, + "@babel/traverse": { + "version": "7.21.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz", + "integrity": "sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==" + }, + "@babel/types": { + "version": "7.21.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz", + "integrity": "sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==" + }, + "@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.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.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.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.18.0-beta.5", + "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.18.0-beta.5.tgz", + "integrity": "sha512-OWtjVxsaOgMc1PAzRXEicYc7ZDwTFQDAJ3C8UfwIPGhSojVj3OiLz8vZMZGeAiEac8IxZffiskirsc7NwresyQ==" + }, + "@meteorjs/reify": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@meteorjs/reify/-/reify-0.23.0.tgz", + "integrity": "sha512-sHQCbZHoM+PxT+pWvkJDsaOpJP+tMQ31Mr2t1T0YcXl18eScb0bQNafe8TugNCc4pngByppfscVX4ppr84MzDw==", + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, + "@types/estree": { + "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", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", + "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==" + }, + "acorn-dynamic-import": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", + "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==" + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==" + }, + "babel-helper-evaluate-path": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.5.0.tgz", + "integrity": "sha512-mUh0UhS607bGh5wUMAQfOpt2JX2ThXMtppHRdRU1kL7ZLRWIXxoV2UIV1r2cAeeNeU1M5SB5/RSUgUxrK8yOkA==" + }, + "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": "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": "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": "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": "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": "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-minify-builtins": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz", + "integrity": "sha512-wpqbN7Ov5hsNwGdzuzvFcjgRlzbIeVv1gMIlICbPj0xkexnfoIDe7q+AZHMkQmAE/F9R5jkrB6TLfTegImlXag==" + }, + "babel-plugin-minify-constant-folding": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.5.0.tgz", + "integrity": "sha512-Vj97CTn/lE9hR1D+jKUeHfNy+m1baNiJ1wJvoGyOBUx7F7kJqDZxr9nCHjO/Ad+irbR3HzR6jABpSSA29QsrXQ==" + }, + "babel-plugin-minify-dead-code-elimination": { + "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": "sha512-8hNwgLVeJzpeLVOVArag2DfTkbKodzOHU7+gAZ8mGBFGPQHK6uXVpg3jh5I/F6gfi5Q5usWU2OKcstn1YbAV7A==" + }, + "babel-plugin-minify-guarded-expressions": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.4.tgz", + "integrity": "sha512-RMv0tM72YuPPfLT9QLr3ix9nwUIq+sHT6z8Iu3sLbqldzC1Dls8DPCywzUIzkTx9Zh1hWX4q/m9BPoPed9GOfA==" + }, + "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": "sha512-X0ictxCk8y+NvIf+bZ1HJPbVZKMlPku3lgYxPmIp62Dp8wdtbMLSekczty3MzvUOlrk5xzWYpBpQprXUjDRyMA==" + }, + "babel-plugin-minify-mangle-names": { + "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": "sha512-5D54hvs9YVuCknfWywq0eaYDt7qYxlNwCqW9Ipm/kYeS9gYhJd0Rr/Pm2WhHKJ8DC6aIlDdqSBODSthabLSX3A==" + }, + "babel-plugin-minify-replace": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.5.0.tgz", + "integrity": "sha512-aXZiaqWDNUbyNNNpWs/8NyST+oU7QTpK7J9zFEFSA0eOmtUNMU3fczlTTTlnCxHmq/jYNFEmkkSG3DDBtW3Y4Q==" + }, + "babel-plugin-minify-simplify": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.1.tgz", + "integrity": "sha512-OSYDSnoCxP2cYDMk9gxNAed6uJDiDz65zgL6h8d3tm8qXIagWGMLWhqysT6DY3Vs7Fgq7YUDcjOomhVUb+xX6A==" + }, + "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": "sha512-4ADB0irJ/6BeXWHubjCJmrPbzhxDgjphBMjIjxCc25n4NGJ00NsYqwYt+F/OvE9RXx8KaSW7cJvp+iZX436tnQ==" + }, + "babel-plugin-polyfill-corejs2": { + "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==", + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, + "babel-plugin-polyfill-corejs3": { + "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.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": "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": "sha512-Xq9/Rarpj+bjOZSl1nBbZYETsNEDDJSrb6Plb1sS3/36FukWFLLRysgecva5KZECjUJTrJoQqjJgtWToaflk5Q==" + }, + "babel-plugin-transform-merge-sibling-variables": { + "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": "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": "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": "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": "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": "sha512-Kd+eTBYlXfwoFzisburVwrngsrz4xh9I0ppoJnU/qlLysxVBRgI4Pj+dk3X8F5tDiehp3hhP8oarRMT9v2Z3lw==" + }, + "babel-plugin-transform-remove-undefined": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.5.0.tgz", + "integrity": "sha512-+M7fJYFaEE/M9CXa0/IRkDbiV3wRELzA1kKQFCJ4ifhrzLKn/9VCCgj9OFmYWwBd8IB48YdgPkHYtbYq+4vtHQ==" + }, + "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": "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": "sha512-D2UbwxawEY1xVc9svYAUZQM2xarwSNXue2qDIx6CeV2EuMGaes/0su78zlIDIAgE7BvnMw4UpmSo9fDy+znghg==" + }, + "babel-preset-meteor": { + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/babel-preset-meteor/-/babel-preset-meteor-7.10.0.tgz", + "integrity": "sha512-bcdNfRCQAjTV42cUcmaG5/ltLZZQLpZajUcP+o0Lr+aLTY/XLNkGfASM5383wdXiAkEFl0sDOXeknnLlQtrmdg==" + }, + "babel-preset-minify": { + "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.21.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==" + }, + "caniuse-lite": { + "version": "1.0.30001457", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001457.tgz", + "integrity": "sha512-SDIV6bgE1aVbK6XyxdURbUE89zY7+k1BBBaOwYwkNCglXlel/E7mELiHC64HQ+W0xSKlqWhV9Wh7iHxUjMs4fA==" + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==" + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==" + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + }, + "convert-source-map": { + "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.28.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.28.0.tgz", + "integrity": "sha512-myzPgE7QodMg4nnd3K1TDoES/nADRStM8Gpz0D6nhkwbmwEnE0ZGJgoWsvQ722FR8D7xS0n0LV556RcEicjTyg==" + }, + "debug": { + "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.310", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.310.tgz", + "integrity": "sha512-/xlATgfwkm5uDDwLw5nt/MNEf7c1oazLURMZLy39vOioGYyYzLWIDT8fZMJak6qTiAJ7udFTy7JG7ziyjNutiA==" + }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==" + }, + "estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" + }, + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" + }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==" + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" + }, + "is-core-module": { + "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", + "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", + "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==" + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" + }, "json5": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz", "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==" }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" + }, "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==" + }, + "magic-string": { + "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": "sha512-PgfmiyT/HiBaxwGHxS4t3Qi0fpmEW3O0WW2VfrgekiMGz3aZPd9/4PRIaMMZsfyjQ1vyEm6dZqTAFZENbuoTxw==" }, "minimist": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node-releases": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz", + "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==" + }, + "path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + }, + "periscopic": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-2.0.3.tgz", + "integrity": "sha512-FuCZe61mWxQOJAQFEfmt9FjzebRlcpFz8sFPbyaCKtdusPkMEbA9ey0eARnRav5zAhmXznhaQkKGFAPn7X9NUw==" + }, + "picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + }, + "regenerate": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", + "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" + }, + "regenerate-unicode-properties": { + "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.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.15.1", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", + "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==" + }, + "regexpu-core": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.1.tgz", + "integrity": "sha512-nCOzW2V/X15XpLsK2rlgdwrysrBq+AauCn+omItIz4R1pIcmeot5zvjdmOBRLzEH/CkC6IxMJVmxDe3QcMuNVQ==" + }, + "regjsparser": { + "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": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==" + } + } + }, + "resolve": { + "version": "1.22.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", + "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==" + }, "semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==" + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==" + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, + "sourcemap-codec": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==" + }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" + }, + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==" + }, + "typescript": { + "version": "4.7.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", + "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==" + }, + "unicode-canonical-property-names-ecmascript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", + "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==" + }, + "unicode-match-property-ecmascript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", + "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==" + }, + "unicode-match-property-value-ecmascript": { + "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.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==" }, "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" } } } diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js index c738c3b046..669af18557 100644 --- a/packages/webapp/webapp_server.js +++ b/packages/webapp/webapp_server.js @@ -1495,6 +1495,11 @@ WebAppInternals.additionalStaticJs = additionalStaticJs; // TODO[fibers]: change this when we have TLA async function main() { - await runWebAppServer(); + await runWebAppServer() } -main(); +main() + .catch(e => { + console.log("error", e); + console.error(e.stack); + }); + diff --git a/tools/cli/commands.js b/tools/cli/commands.js index 951f342668..528d149873 100644 --- a/tools/cli/commands.js +++ b/tools/cli/commands.js @@ -987,10 +987,10 @@ var buildCommands = { main.registerCommand({ name: "build", ...buildCommands, -}, function (options) { - return Profile.run( +}, async function (options) { + return await Profile.run( "meteor build", - () => buildCommand(options) + async () => await buildCommand(options) ); }); @@ -1002,7 +1002,7 @@ main.registerCommand({ name: "bundle", hidden: true, ...buildCommands, -}, function (options) { +}, async function (options) { Console.error( "This command has been deprecated in favor of " + Console.command("'meteor build'") + ", which allows you to " + @@ -1011,9 +1011,9 @@ main.registerCommand({ "for more information."); Console.error(); - return Profile.run( + return await Profile.run( "meteor bundle", - () => buildCommand({ + async () => await buildCommand({ ...options, _bundleOnly: true, }) diff --git a/tools/runners/run-all.js b/tools/runners/run-all.js index 3f76fcc357..7ad186eebb 100644 --- a/tools/runners/run-all.js +++ b/tools/runners/run-all.js @@ -207,13 +207,15 @@ class Runner { } if (! self.stopped) { + console.log("before start"); await buildmessage.enterJob({ title: "starting your app" }, async function () { - await self.appRunner.start(); + return await self.appRunner.start(); }); if (! self.quiet && ! self.stopped) { runLog.log("Started your app.", { arrow: true }); } } + console.log("Died :<("); if (! self.stopped && ! self.quiet) { runLog.log(""); diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js index 5ec1fc74b6..c0a020fbdc 100644 --- a/tools/runners/run-app.js +++ b/tools/runners/run-app.js @@ -404,8 +404,9 @@ Object.assign(AppRunner.prototype, { self.startPromise = self._makePromise("start"); self.isRunning = true; - await self._runApp(); - + console.log("here ?"); + await self._runApp() // BREAKES here + console.log("before startPromise ?"); await self.startPromise; self.startPromise = null; }, @@ -428,6 +429,7 @@ Object.assign(AppRunner.prototype, { _cleanUpPromises: function () { if (this._promiseResolvers) { _.each(this._promiseResolvers, function (resolve) { + console.log(typeof resolve); resolve && resolve(); }); this._promiseResolvers = null; @@ -478,6 +480,7 @@ Object.assign(AppRunner.prototype, { // Run the program once, wait for it to exit, and then return. The // return value is same as onRunEnd. _runOnce: async function (options) { + console.log("run once?"); var self = this; options = options || {}; var firstRun = options.firstRun; @@ -500,7 +503,6 @@ Object.assign(AppRunner.prototype, { // it even if we refreshed previously, since that might have been a // little while ago. catalog.triedToRefreshRecently = false; - // If this isn't the first time we've run, we need to reset the project // context since everything we have cached may have changed. // XXX We can try to be a little less conservative here: @@ -572,6 +574,7 @@ Object.assign(AppRunner.prototype, { projectContext: self.projectContext }); } + console.log("bundleResult once?"); var bundleResult = await Profile.run((firstRun?"B":"Reb")+"uild App", async function() { return await bundler.bundle({ @@ -618,7 +621,7 @@ Object.assign(AppRunner.prototype, { watchSet.merge(br.clientWatchSet); return watchSet; }; - + console.log("will bundle app?"); var bundleResult; var bundleResultOrRunResult = await bundleApp(); if (bundleResultOrRunResult.runResult) { @@ -626,6 +629,7 @@ Object.assign(AppRunner.prototype, { } bundleResult = bundleResultOrRunResult.bundleResult; + console.log("bundled app?"); firstRun = false; // Read the settings file, if any @@ -708,7 +712,7 @@ Object.assign(AppRunner.prototype, { await self.runPromise; var runPromise = self.runPromise = self._makePromise("run"); - var listenPromise = self._makePromise("listen"); + var listenPromise = self._makePromise("listen"); // Run the program options.beforeRun && options.beforeRun(); @@ -722,6 +726,7 @@ Object.assign(AppRunner.prototype, { oplogUrl: self.oplogUrl, mobileServerUrl: self.mobileServerUrl, onExit: function (code, signal) { + console.log("resolved?"); self._resolvePromise("run", { outcome: 'terminated', code: code, @@ -735,9 +740,13 @@ Object.assign(AppRunner.prototype, { if (self.hmrServer) { self.hmrServer.setAppState("okay"); } + console.log("here before listen"); options.onListen && options.onListen(); + console.log("here afther listen listen"); self._resolvePromise("start"); self._resolvePromise("listen"); + console.log("Resolved"); + }, nodeOptions: getNodeOptionsFromEnvironment(), settings: settings, @@ -753,7 +762,10 @@ Object.assign(AppRunner.prototype, { } } + console.log("stated proccess?"); await appProcess.start(); + console.log("running? proccess?"); + function maybePrintLintWarnings(bundleResult) { if (! (self.projectContext.lintAppAndLocalPackages && bundleResult.warnings)) { @@ -782,9 +794,11 @@ Object.assign(AppRunner.prototype, { // hashes and lists of matching files in each directory. var serverWatcher; var clientWatcher; + console.log("shell ?"); appProcess.proc.onMessage("shell-server", message => { if (message && message.command === "reload") { + console.log("run gbsdhtglasfkd"); self._resolvePromise("run", { outcome: "changed" }); } else { return Promise.reject("Unsupported shell command: " + message); @@ -795,6 +809,7 @@ Object.assign(AppRunner.prototype, { serverWatcher = new watch.Watcher({ watchSet: serverWatchSet, onChange: function () { + console.log("watcher changed"); self._resolvePromise("run", { outcome: 'changed' }); @@ -843,6 +858,7 @@ Object.assign(AppRunner.prototype, { } async function runPostStartupCallbacks(bundleResult) { + console.log("started running"); const callbacks = bundleResult.postStartupCallbacks; if (! callbacks) return; @@ -874,17 +890,24 @@ Object.assign(AppRunner.prototype, { } Console.enableProgressDisplay(false); + console.log("before race"); - await Promise.race([ - listenPromise, - runPromise]); - const postStartupResult = await runPostStartupCallbacks(bundleResult); + const promList = [runPromise, listenPromise]; + const promOfResult = + Promise.race(promList) + .then(() => runPostStartupCallbacks(bundleResult)) + .catch(err => console.log(err)) + + const postStartupResult = await promOfResult; + console.log("afhter promOfResult", {postStartupResult}); if (postStartupResult) return postStartupResult; // Wait for either the process to exit, or (if watchForChanges) a // source file to change. Or, for stop() to be called. + console.log("before runPromise"); var ret = await runPromise; + console.log("afhter runPromise"); try { while (ret.outcome === 'changed-refreshable') { @@ -895,6 +918,8 @@ Object.assign(AppRunner.prototype, { // We stay in this loop as long as only refreshable assets have changed. // When ret.refreshable becomes false, we restart the server. bundleResultOrRunResult = await bundleApp(); + console.log("afhter bundleApp"); + if (bundleResultOrRunResult.runResult) { return bundleResultOrRunResult.runResult; } @@ -1002,7 +1027,7 @@ Object.assign(AppRunner.prototype, { } if (self.watchForChanges) { - self.watchPromise = self._makePromise("watch"); + self.watchPromise = self._makePromise("watch"); if (!runResult.watchSet) { throw Error("watching for changes with no watchSet?"); diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js index ca6f586c25..32dc5b5362 100644 --- a/tools/static-assets/server/boot.js +++ b/tools/static-assets/server/boot.js @@ -503,5 +503,9 @@ var runMain = Profile("Run main()", async function () { await runMain(); }); }); -})().catch(e => console.log('error on boot.js', e)); +})().catch(e => { + console.log('error on boot.js', e ) + console.log(e.stack); + process.exit(1) +}); From e24da97ba6e29983449b1c9c2326d1109063d077 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 24 Feb 2023 18:13:33 -0300 Subject: [PATCH 14/29] wip --- tools/runners/run-all.js | 2 +- tools/runners/run-app.js | 77 ++++++++++++++++++++++++---------------- 2 files changed, 47 insertions(+), 32 deletions(-) diff --git a/tools/runners/run-all.js b/tools/runners/run-all.js index 7ad186eebb..2286812360 100644 --- a/tools/runners/run-all.js +++ b/tools/runners/run-all.js @@ -175,7 +175,7 @@ class Runner { async function startMongo(tries = 3) { try { await self._startMongoAsync(); - await unblockAppRunner(); + await unblockAppRunner; } catch (error) { --tries; const left = tries + (tries === 1 ? " try" : " tries"); diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js index c0a020fbdc..99f558b686 100644 --- a/tools/runners/run-app.js +++ b/tools/runners/run-app.js @@ -13,7 +13,7 @@ import { pluginVersionsFromStarManifest } from '../cordova/index.js'; import { closeAllWatchers } from "../fs/safe-watcher"; import { eachline } from "../utils/eachline"; import { loadIsopackage } from '../tool-env/isopackets.js'; - +import { once , EventEmitter} from "events" // Parse out s as if it were a bash command line. var bashParse = function (s) { if (s.search("\"") !== -1 || s.search("'") !== -1) { @@ -77,6 +77,8 @@ var AppProcess = function (options) { Object.assign(AppProcess.prototype, { // Call to start the process. start: async function () { + console.log("started process"); + debugger var self = this; if (self.proc) { @@ -232,6 +234,7 @@ Object.assign(AppProcess.prototype, { // Spawn the server process and return the handle from child_process.spawn. _spawn: async function () { var self = this; + console.log('server?'); // Path conversions var entryPoint = files.convertToOSPath( @@ -411,26 +414,36 @@ Object.assign(AppRunner.prototype, { self.startPromise = null; }, + /** + * @param name + * @return {Promise<[any]>} + * @private + */ _makePromise: function (name) { var self = this; - return new Promise(function (resolve) { - self._promiseResolvers[name] = resolve; - }); + const ee = new EventEmitter(); + self._promiseResolvers[name] = ee; + + return once(ee, name); + // var self = this; + // return new Promise(function (resolve) { + // self._promiseResolvers[name] = resolve; + // }); }, _resolvePromise: function (name, value) { - var resolve = this._promiseResolvers[name]; - if (resolve) { + const ee = this._promiseResolvers[name]; + if (ee) { + ee.emit(name, value); this._promiseResolvers[name] = null; - resolve(value); } }, _cleanUpPromises: function () { if (this._promiseResolvers) { - _.each(this._promiseResolvers, function (resolve) { - console.log(typeof resolve); - resolve && resolve(); + _.each(this._promiseResolvers, (resolve) => { + console.log("clean up", resolve); + resolve && this._promiseResolvers[resolve]?.emit(resolve, false); }); this._promiseResolvers = null; } @@ -454,10 +467,10 @@ Object.assign(AppRunner.prototype, { // The existence of this promise makes the fiber break out of its loop. self.exitPromise = self._makePromise("exit"); - + console.log("exited?"); self._resolvePromise("run", { outcome: 'stopped' }); self._resolvePromise("watch"); - + console.log(self._beforeStartPromise); if (self._beforeStartPromise) { // If we stopped before mongod started (eg, due to mongod startup // failure), unblock the runner fiber from waiting for mongod to start. @@ -707,15 +720,18 @@ Object.assign(AppRunner.prototype, { return { outcome: 'stopped' }; } + console.log('waiting in run promise'); // We should have reset self.runPromise to null by now, but await it // just in case it's still defined. await self.runPromise; - - var runPromise = self.runPromise = self._makePromise("run"); - var listenPromise = self._makePromise("listen"); + self.runPromise = self._makePromise("run"); + var runPromise = self.runPromise + var listenPromise = self._makePromise("listen"); + console.log('Mde more promises'); // Run the program options.beforeRun && options.beforeRun(); + console.log("will run app?"); var appProcess = new AppProcess({ projectContext: self.projectContext, bundlePath: bundlePath, @@ -754,14 +770,15 @@ Object.assign(AppRunner.prototype, { autoRestart: self.autoRestart, hmrSecret: self.hmrSecret }); + console.log("Done? processing?"); if (options.firstRun && self._beforeStartPromise) { - var stopped = await self._beforeStartPromise; - if (stopped) { - return true; - } + console.log("Here?"); + var [stopped] = await self._beforeStartPromise; + if (stopped) { + throw stopped + } } - console.log("stated proccess?"); await appProcess.start(); console.log("running? proccess?"); @@ -820,7 +837,7 @@ Object.assign(AppRunner.prototype, { } var setupClientWatcher = function () { - clientWatcher && clientWatcher.stop(); + clientWatcher && clientWatcher.stop(); clientWatcher = new watch.Watcher({ watchSet: bundleResult.clientWatchSet, onChange: function () { @@ -893,12 +910,10 @@ Object.assign(AppRunner.prototype, { console.log("before race"); const promList = [runPromise, listenPromise]; - const promOfResult = - Promise.race(promList) - .then(() => runPostStartupCallbacks(bundleResult)) - .catch(err => console.log(err)) + await Promise.race(promList) - const postStartupResult = await promOfResult; + const postStartupResult = + await runPostStartupCallbacks(bundleResult) console.log("afhter promOfResult", {postStartupResult}); if (postStartupResult) return postStartupResult; @@ -906,7 +921,7 @@ Object.assign(AppRunner.prototype, { // Wait for either the process to exit, or (if watchForChanges) a // source file to change. Or, for stop() to be called. console.log("before runPromise"); - var ret = await runPromise; + var [ret] = await runPromise; console.log("afhter runPromise"); try { @@ -940,7 +955,7 @@ Object.assign(AppRunner.prototype, { if (postStartupResult) return postStartupResult; // Wait until another file changes. - ret = await oldPromise; + [ret] = await oldPromise; } } finally { self.runPromise = null; @@ -953,10 +968,10 @@ Object.assign(AppRunner.prototype, { if (self.hmrServer) { self.hmrServer.setAppState("okay"); } - appProcess.stop(); + await appProcess.stop(); - serverWatcher && serverWatcher.stop(); - clientWatcher && clientWatcher.stop(); + serverWatcher && serverWatcher.stop(); + clientWatcher && clientWatcher.stop(); } return ret; From c61c858b879ce8dae3e219014c213f7823df26b9 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Mon, 27 Feb 2023 14:34:30 -0300 Subject: [PATCH 15/29] wip: trying to find where error is --- tools/runners/run-all.js | 14 +++++++++----- tools/runners/run-app.js | 17 +++++++++-------- tools/runners/run-mongo.js | 2 ++ 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/tools/runners/run-all.js b/tools/runners/run-all.js index 2286812360..5e7f1fe1b3 100644 --- a/tools/runners/run-all.js +++ b/tools/runners/run-all.js @@ -170,18 +170,22 @@ class Runner { runLog.log("Started proxy.", { arrow: true }); } + /** + * + * @type {(function(): *)} + */ var unblockAppRunner = self.appRunner.makeBeforeStartPromise(); async function startMongo(tries = 3) { try { await self._startMongoAsync(); - await unblockAppRunner; + unblockAppRunner(); } catch (error) { --tries; const left = tries + (tries === 1 ? " try" : " tries"); Console.error( `Error starting Mongo (${left} left): ${error.message}` - ); + ); if (tries > 0) { await self.mongoRunner.stop(); @@ -195,11 +199,11 @@ class Runner { await startMongo(); if (!self.noReleaseCheck && ! self.stopped) { - await self.updater.start(); + self.updater.start(); } if (!self.stopped && self.hmrServer) { - await self.hmrServer.start(); + self.hmrServer.start(); if (!self.quiet && !self.stopped) { runLog.log("Started HMR server.", { arrow: true }); @@ -209,7 +213,7 @@ class Runner { if (! self.stopped) { console.log("before start"); await buildmessage.enterJob({ title: "starting your app" }, async function () { - return await self.appRunner.start(); + await self.appRunner.start(); }); if (! self.quiet && ! self.stopped) { runLog.log("Started your app.", { arrow: true }); diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js index 99f558b686..6f0f83ce48 100644 --- a/tools/runners/run-app.js +++ b/tools/runners/run-app.js @@ -78,7 +78,6 @@ Object.assign(AppProcess.prototype, { // Call to start the process. start: async function () { console.log("started process"); - debugger var self = this; if (self.proc) { @@ -89,6 +88,7 @@ Object.assign(AppProcess.prototype, { self.proc = await self._spawn(); eachline(self.proc.stdout, async function (line) { + console.log("Raw line: " + line + "\n") if (line.match(/^LISTENING\s*$/)) { // This is the child process telling us that it's ready to receive // connections. (It does this because we told it to with @@ -487,7 +487,7 @@ Object.assign(AppRunner.prototype, { throw new Error("makeBeforeStartPromise called twice?"); } this._beforeStartPromise = this._makePromise("beforeStart"); - return this._promiseResolvers["beforeStart"]; + return () => this._resolvePromise("beforeStart"); }, // Run the program once, wait for it to exit, and then return. The @@ -725,7 +725,7 @@ Object.assign(AppRunner.prototype, { // just in case it's still defined. await self.runPromise; self.runPromise = self._makePromise("run"); - var runPromise = self.runPromise + var runPromise = self.runPromise; var listenPromise = self._makePromise("listen"); console.log('Mde more promises'); @@ -773,15 +773,13 @@ Object.assign(AppRunner.prototype, { console.log("Done? processing?"); if (options.firstRun && self._beforeStartPromise) { - console.log("Here?"); var [stopped] = await self._beforeStartPromise; if (stopped) { - throw stopped + return stopped } } - console.log("stated proccess?"); await appProcess.start(); - console.log("running? proccess?"); + console.log("started app"); function maybePrintLintWarnings(bundleResult) { if (! (self.projectContext.lintAppAndLocalPackages && @@ -811,7 +809,6 @@ Object.assign(AppRunner.prototype, { // hashes and lists of matching files in each directory. var serverWatcher; var clientWatcher; - console.log("shell ?"); appProcess.proc.onMessage("shell-server", message => { if (message && message.command === "reload") { @@ -909,6 +906,10 @@ Object.assign(AppRunner.prototype, { Console.enableProgressDisplay(false); console.log("before race"); + console.log("will call listen?"); + await listenPromise + console.log("Called listen"); + console.log("before race"); const promList = [runPromise, listenPromise]; await Promise.race(promList) diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js index 312b055405..910e8b638f 100644 --- a/tools/runners/run-mongo.js +++ b/tools/runners/run-mongo.js @@ -581,6 +581,7 @@ var launchMongo = async function(options) { // Invoke the outer onExit callback. await onExit(code, signal, stderrOutput, detectedErrors); }); + console.log(typeof procExitHandler, "Run mongo"); proc.on('exit', procExitHandler); var listening = false; @@ -924,6 +925,7 @@ Object.assign(MRp, { // shouldn't annoy the user by telling it that we couldn't start up. self.suppressExitMessage = true; } + console.log("before launch"); self.handle = await launchMongo({ projectLocalDir: self.projectLocalDir, port: self.port, From 4be8120ac50e4d513b4ff1ff91488879e6d3ce21 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Mon, 27 Feb 2023 15:41:36 -0300 Subject: [PATCH 16/29] wip --- packages/webapp/webapp_server.js | 13 ++++++------- tools/runners/run-app.js | 16 +++++----------- tools/runners/run-mongo.js | 4 +++- tools/static-assets/server/boot.js | 7 ++++++- tools/utils/processes.ts | 8 +++++--- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js index 219765488f..21bddac11c 100644 --- a/packages/webapp/webapp_server.js +++ b/packages/webapp/webapp_server.js @@ -1494,12 +1494,11 @@ WebAppInternals.getBoilerplate = getBoilerplate; WebAppInternals.additionalStaticJs = additionalStaticJs; // TODO[fibers]: change this when we have TLA -async function main() { - await runWebAppServer() -} -main() +runWebAppServer() + .then(_ => _) .catch(e => { - console.log("error", e); - console.error(e.stack); - }); + + console.error(e.stack); + process.exit(1); +}) diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js index 6f0f83ce48..27837f65f2 100644 --- a/tools/runners/run-app.js +++ b/tools/runners/run-app.js @@ -84,11 +84,11 @@ Object.assign(AppProcess.prototype, { throw new Error("already started?"); } + debugger; // Start the app! self.proc = await self._spawn(); eachline(self.proc.stdout, async function (line) { - console.log("Raw line: " + line + "\n") if (line.match(/^LISTENING\s*$/)) { // This is the child process telling us that it's ready to receive // connections. (It does this because we told it to with @@ -100,6 +100,7 @@ Object.assign(AppProcess.prototype, { }); eachline(self.proc.stderr, async function (line) { + debugger; await runLog.logAppOutput(line, true); }); @@ -727,11 +728,10 @@ Object.assign(AppRunner.prototype, { self.runPromise = self._makePromise("run"); var runPromise = self.runPromise; var listenPromise = self._makePromise("listen"); - console.log('Mde more promises'); + debugger; // Run the program options.beforeRun && options.beforeRun(); - console.log("will run app?"); var appProcess = new AppProcess({ projectContext: self.projectContext, bundlePath: bundlePath, @@ -752,6 +752,8 @@ Object.assign(AppRunner.prototype, { }, inspect: self.inspect, onListen: function () { + debugger; + console.log("started listening"); self.proxy.setMode("proxy"); if (self.hmrServer) { self.hmrServer.setAppState("okay"); @@ -762,7 +764,6 @@ Object.assign(AppRunner.prototype, { self._resolvePromise("start"); self._resolvePromise("listen"); console.log("Resolved"); - }, nodeOptions: getNodeOptionsFromEnvironment(), settings: settings, @@ -770,7 +771,6 @@ Object.assign(AppRunner.prototype, { autoRestart: self.autoRestart, hmrSecret: self.hmrSecret }); - console.log("Done? processing?"); if (options.firstRun && self._beforeStartPromise) { var [stopped] = await self._beforeStartPromise; @@ -779,7 +779,6 @@ Object.assign(AppRunner.prototype, { } } await appProcess.start(); - console.log("started app"); function maybePrintLintWarnings(bundleResult) { if (! (self.projectContext.lintAppAndLocalPackages && @@ -872,7 +871,6 @@ Object.assign(AppRunner.prototype, { } async function runPostStartupCallbacks(bundleResult) { - console.log("started running"); const callbacks = bundleResult.postStartupCallbacks; if (! callbacks) return; @@ -904,11 +902,7 @@ Object.assign(AppRunner.prototype, { } Console.enableProgressDisplay(false); - console.log("before race"); - console.log("will call listen?"); - await listenPromise - console.log("Called listen"); console.log("before race"); const promList = [runPromise, listenPromise]; await Promise.race(promList) diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js index 910e8b638f..857230de8c 100644 --- a/tools/runners/run-mongo.js +++ b/tools/runners/run-mongo.js @@ -561,6 +561,7 @@ var launchMongo = async function(options) { function stop() { if (proc) { + console.log(typeof proc); proc.removeListener('exit', procExitHandler); proc.kill('SIGINT'); proc = null; @@ -581,7 +582,6 @@ var launchMongo = async function(options) { // Invoke the outer onExit callback. await onExit(code, signal, stderrOutput, detectedErrors); }); - console.log(typeof procExitHandler, "Run mongo"); proc.on('exit', procExitHandler); var listening = false; @@ -596,6 +596,8 @@ var launchMongo = async function(options) { listening && (noOplog || replSetReadyToBeInitiated || replSetReady) ) { + console.log(typeof proc.stdout); + proc.stdout.removeListener('data', stdoutOnData); resolve(); resolve = null; diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js index 32dc5b5362..0800438de7 100644 --- a/tools/static-assets/server/boot.js +++ b/tools/static-assets/server/boot.js @@ -223,7 +223,6 @@ var specialArgPaths = { var loadServerBundles = Profile("Load server bundles", async function () { var infos = []; var nonLocalNodeModulesPaths = new Set(); - for (const fileInfo of serverJson.load) { var code = fs.readFileSync(path.resolve(serverDir, fileInfo.path)); @@ -498,9 +497,15 @@ var runMain = Profile("Run main()", async function () { await Profile.run('Server startup', function() { return global.asyncLocalStorage.run({}, async () => { + console.log('loaded bundle?'); + debugger; await loadServerBundles(); + console.log('done bundle'); await callStartupHooks(); + console.log('Hooks done'); await runMain(); + console.log('done'); + }); }); })().catch(e => { diff --git a/tools/utils/processes.ts b/tools/utils/processes.ts index 3bc2032f6d..cf362596bd 100644 --- a/tools/utils/processes.ts +++ b/tools/utils/processes.ts @@ -48,7 +48,7 @@ type ExecFileOptions = { * status and signal. * @param command The command to run * @param args List of string arguments - * @param options + * @param options * @returns The stdout from the command */ export function execFileSync( @@ -67,7 +67,7 @@ export function execFileSync( * the error will contain fields pid, stderr, stdout, status and signal. * @param command The command to run * @param args List of string arguments - * @param options + * @param options */ export function execFileAsync( command: string, @@ -96,7 +96,7 @@ export function execFileAsync( const exitEvent = options.waitForClose ? 'close' : 'exit'; return new Promise((resolve, reject) => { - let child: ReturnType; + let child: ReturnType; const spawnArgs: ReadonlyArray = Array.isArray(args) ? args : []; const { cwd, env, stdio } = options; @@ -132,6 +132,7 @@ export function execFileAsync( const errorCallback = (error: NodeJS.ErrnoException) => { // Make sure we only receive one type of callback + console.log(child); child.removeListener(exitEvent, exitCallback); // Trim captured output to get rid of excess whitespace @@ -156,6 +157,7 @@ export function execFileAsync( const exitCallback = (code: number, signal: string) => { // Make sure we only receive one type of callback + console.log(child); child.removeListener('error', errorCallback); // Trim captured output to get rid of excess whitespace From 275338421e9510861e58fece986e1dabcb966632 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 28 Feb 2023 10:23:24 -0300 Subject: [PATCH 17/29] wip --- .../.npm/package/npm-shrinkwrap.json | 40 ++++++++----------- packages/babel-compiler/package.js | 2 +- scripts/dev-bundle-tool-package.js | 2 +- tools/isobuild/bundler.js | 2 +- tools/static-assets/server/boot.js | 6 --- 5 files changed, 20 insertions(+), 32 deletions(-) diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json index f96fa62a6b..cac4867fba 100644 --- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json +++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json @@ -467,14 +467,13 @@ "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==" }, "@meteorjs/babel": { - "version": "7.18.0-beta.5", - "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.18.0-beta.5.tgz", - "integrity": "sha512-OWtjVxsaOgMc1PAzRXEicYc7ZDwTFQDAJ3C8UfwIPGhSojVj3OiLz8vZMZGeAiEac8IxZffiskirsc7NwresyQ==" + "version": "7.19.0-beta.1", + "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.19.0-beta.1.tgz", + "integrity": "sha512-4dy7oSXEo6Eb2PHfPkMX0VVnkQJ9Kb6Qv6/ssiXOqQRtTRpBAgeWeMzUd42u/8VzxG6l8NoNqIhPSOHZjC2usg==" }, "@meteorjs/reify": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@meteorjs/reify/-/reify-0.23.0.tgz", - "integrity": "sha512-sHQCbZHoM+PxT+pWvkJDsaOpJP+tMQ31Mr2t1T0YcXl18eScb0bQNafe8TugNCc4pngByppfscVX4ppr84MzDw==", + "version": "https://github.com/meteor/reify/tarball/5078da9d0827cc17741504762f3a7f71c3b01448", + "integrity": "sha512-LEdx+3A7wV8XeTFWrfkOu0PtX+Vjgl28b4mW8bsM3lZPWIqx0PXTfpbXfDy61MgmmYXR7/cWjVJ8xqgSunF3Mg==", "dependencies": { "semver": { "version": "5.7.1", @@ -489,14 +488,9 @@ "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==" }, "acorn": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", - "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==" - }, - "acorn-dynamic-import": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", - "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==" + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==" }, "ansi-styles": { "version": "3.2.1", @@ -686,9 +680,9 @@ "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==" }, "caniuse-lite": { - "version": "1.0.30001457", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001457.tgz", - "integrity": "sha512-SDIV6bgE1aVbK6XyxdURbUE89zY7+k1BBBaOwYwkNCglXlel/E7mELiHC64HQ+W0xSKlqWhV9Wh7iHxUjMs4fA==" + "version": "1.0.30001458", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz", + "integrity": "sha512-lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w==" }, "chalk": { "version": "2.4.2", @@ -711,9 +705,9 @@ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" }, "core-js-compat": { - "version": "3.28.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.28.0.tgz", - "integrity": "sha512-myzPgE7QodMg4nnd3K1TDoES/nADRStM8Gpz0D6nhkwbmwEnE0ZGJgoWsvQ722FR8D7xS0n0LV556RcEicjTyg==" + "version": "3.29.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.29.0.tgz", + "integrity": "sha512-ScMn3uZNAFhK2DGoEfErguoiAHhV2Ju+oJo/jK08p7B3f3UhocUrCCkTvnZaiS+edl5nlIoiBXKcwMc6elv4KQ==" }, "debug": { "version": "4.3.4", @@ -721,9 +715,9 @@ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==" }, "electron-to-chromium": { - "version": "1.4.310", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.310.tgz", - "integrity": "sha512-/xlATgfwkm5uDDwLw5nt/MNEf7c1oazLURMZLy39vOioGYyYzLWIDT8fZMJak6qTiAJ7udFTy7JG7ziyjNutiA==" + "version": "1.4.312", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.312.tgz", + "integrity": "sha512-e7g+PzxzkbiCD1aNhdj+Tx3TLlfrQF/Lf+LAaUdoLvB1kCxf9wJimqXdWEqnoiYjFtxIR1hGBmoHsBIcCBNOMA==" }, "escalade": { "version": "3.1.1", diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index fcc03ec750..35d75764be 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -5,7 +5,7 @@ Package.describe({ }); Npm.depends({ - '@meteorjs/babel': '7.18.0-beta.5', + '@meteorjs/babel': '7.19.0-beta.1', // '@meteorjs/babel': 'file:///../../../../npm-packages/meteor-babel', 'json5': '2.1.1', 'semver': '7.3.8' diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index 19d102c50c..7944ad2d75 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -18,7 +18,7 @@ var packageJson = { "@meteorjs/babel": "7.18.0-beta.5", // Keep the versions of these packages consistent with the versions // found in dev-bundle-server-package.js. - "@meteorjs/reify": "0.24.0", + "@meteorjs/reify": "git+https://github.com/meteor/reify.git#d01c7b2470e7e1cddec8aa3110b39a1108008f2d", // So that Babel can emit require("@babel/runtime/helpers/...") calls. "@babel/runtime": "7.15.3", // For backwards compatibility with isopackets that still depend on diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js index 759a0e4003..d7d2327a19 100644 --- a/tools/isobuild/bundler.js +++ b/tools/isobuild/bundler.js @@ -2269,7 +2269,7 @@ class JsImage { if (ret['core-runtime']) { var promise = ret['core-runtime'].waitUntilAllLoaded(); if (promise) { - promise.await(); + await promise } } diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js index 0800438de7..8f768807b1 100644 --- a/tools/static-assets/server/boot.js +++ b/tools/static-assets/server/boot.js @@ -497,15 +497,9 @@ var runMain = Profile("Run main()", async function () { await Profile.run('Server startup', function() { return global.asyncLocalStorage.run({}, async () => { - console.log('loaded bundle?'); - debugger; await loadServerBundles(); - console.log('done bundle'); await callStartupHooks(); - console.log('Hooks done'); await runMain(); - console.log('done'); - }); }); })().catch(e => { From bdc2ff478a448720697d2ffa715a2d1785bd4461 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 1 Mar 2023 09:53:25 -0300 Subject: [PATCH 18/29] wip on tla --- packages/webapp/webapp_server.js | 9 ++------- tools/runners/run-all.js | 2 +- tools/runners/run-app.js | 24 +++++++++++++++--------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js index 21bddac11c..38836f6695 100644 --- a/packages/webapp/webapp_server.js +++ b/packages/webapp/webapp_server.js @@ -1494,11 +1494,6 @@ WebAppInternals.getBoilerplate = getBoilerplate; WebAppInternals.additionalStaticJs = additionalStaticJs; // TODO[fibers]: change this when we have TLA -runWebAppServer() - .then(_ => _) - .catch(e => { - - console.error(e.stack); - process.exit(1); -}) +await runWebAppServer() + diff --git a/tools/runners/run-all.js b/tools/runners/run-all.js index 5e7f1fe1b3..e58e4b306d 100644 --- a/tools/runners/run-all.js +++ b/tools/runners/run-all.js @@ -213,7 +213,7 @@ class Runner { if (! self.stopped) { console.log("before start"); await buildmessage.enterJob({ title: "starting your app" }, async function () { - await self.appRunner.start(); + await self.appRunner.start(); }); if (! self.quiet && ! self.stopped) { runLog.log("Started your app.", { arrow: true }); diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js index 27837f65f2..df43d6ebb0 100644 --- a/tools/runners/run-app.js +++ b/tools/runners/run-app.js @@ -13,7 +13,7 @@ import { pluginVersionsFromStarManifest } from '../cordova/index.js'; import { closeAllWatchers } from "../fs/safe-watcher"; import { eachline } from "../utils/eachline"; import { loadIsopackage } from '../tool-env/isopackets.js'; -import { once , EventEmitter} from "events" +import { once , EventEmitter, on } from "events" // Parse out s as if it were a bash command line. var bashParse = function (s) { if (s.search("\"") !== -1 || s.search("'") !== -1) { @@ -415,6 +415,19 @@ Object.assign(AppRunner.prototype, { self.startPromise = null; }, + _findCachedEE: function (name) { + if (!this._promiseResolvers[name]) { + this._promiseResolvers[name] = new EventEmitter(); + } + return this._promiseResolvers[name]; + }, + + _makeIterable : function (name) { + var self = this; + const ee = self._findCachedEE(name); + return on(ee, name); + }, + /** * @param name * @return {Promise<[any]>} @@ -422,14 +435,8 @@ Object.assign(AppRunner.prototype, { */ _makePromise: function (name) { var self = this; - const ee = new EventEmitter(); - self._promiseResolvers[name] = ee; - + const ee = self._findCachedEE(name); return once(ee, name); - // var self = this; - // return new Promise(function (resolve) { - // self._promiseResolvers[name] = resolve; - // }); }, _resolvePromise: function (name, value) { @@ -728,7 +735,6 @@ Object.assign(AppRunner.prototype, { self.runPromise = self._makePromise("run"); var runPromise = self.runPromise; var listenPromise = self._makePromise("listen"); - debugger; // Run the program options.beforeRun && options.beforeRun(); From 98a09e6be56e427536ee55d4dcfd77dc7d344cde Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 1 Mar 2023 09:56:35 -0300 Subject: [PATCH 19/29] Revert "Merge remote-tracking branch 'origin/fix/core-runtime-weak-deps' into release-3.0-test-command" This reverts commit d5fb29d78cfd1a5f7eeab54a71d6d617421d2b35, reversing changes made to c615639de20271ccaedbe2cb674c8281b3652b22. --- tools/isobuild/compiler-plugin.js | 20 ++++---------------- tools/isobuild/linker.js | 20 ++++++++++++-------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js index 22a2852cd6..3f368886c9 100644 --- a/tools/isobuild/compiler-plugin.js +++ b/tools/isobuild/compiler-plugin.js @@ -1072,10 +1072,7 @@ export class PackageSourceBatch { // depends on something). self.importedSymbolToPackageName = {}; // map from symbol to supplying package name - - // List of packages (including weak) that need to load before - // this unibuild - self.orderedDeps = new Set(); + self.deps = []; } async init() { @@ -1098,26 +1095,17 @@ export class PackageSourceBatch { skipDebugOnly: true, skipProdOnly: true, skipTestOnly: true, - }, (depUnibuild) => { + }, (depUnibuild, { weak, unordered }) => { let packageName = depUnibuild.pkg.name; - self.orderedDeps.add(packageName); - _.each(depUnibuild.declaredExports, function (symbol) { // Slightly hacky implementation of test-only exports. if (! symbol.testOnly || self.unibuild.pkg.isTest) { self.importedSymbolToPackageName[symbol.name] = packageName; } }); - }); - // At this point we can't easily know all weak dependencies - // that are actually used to pass them to eachUsedUnibuild. - // So instead we loop over the packages again to add them. - self.unibuild.uses.forEach(uses => { - if (uses.weak) { - self.orderedDeps.add(uses.package); - } + self.deps.push({ package: packageName, weak, unordered }); }); self.useMeteorInstall = @@ -1712,7 +1700,7 @@ export class PackageSourceBatch { imports: self.importedSymbolToPackageName, // XXX report an error if there is a package called global-imports includeSourceMapInstructions: isWeb, - orderedDeps: Array.from(self.orderedDeps) + deps: self.deps }; const fileHashes = []; diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js index 984ac94e9a..31d6ed990e 100644 --- a/tools/isobuild/linker.js +++ b/tools/isobuild/linker.js @@ -941,8 +941,12 @@ var getHeader = function (options) { var isApp = options.name === null; var chunks = []; - let orderedDeps = options.orderedDeps.map(packageName => { - return JSON.stringify(packageName); + let orderedDeps = []; + + options.deps.forEach(dep => { + if (!dep.unordered) { + orderedDeps.push(JSON.stringify(dep.package)) + } }); chunks.push( @@ -1136,9 +1140,9 @@ export var fullLink = Profile("linker.fullLink", async function (inputFiles, { // how to use them in a browser. includeSourceMapInstructions, - // List of packages this bundle directly uses that need to load - // first. Includes weak dependencies. - orderedDeps + // List of packages this bundle directly uses, or is implied by the packages + // it uses + deps }) { buildmessage.assertInJob(); @@ -1155,7 +1159,7 @@ export var fullLink = Profile("linker.fullLink", async function (inputFiles, { // we can be sure the runtime will be available // The main situations it is not available is the core-runtime // package itself, or any build plugins with no dependencies - let hasRuntime = orderedDeps.length > 0; + let hasRuntime = deps.some(entry => entry.unordered !== true); _.each(inputFiles, file => module.addFile(file)); @@ -1190,7 +1194,7 @@ export var fullLink = Profile("linker.fullLink", async function (inputFiles, { imports, packageVariables: [], hasRuntime, - orderedDeps + deps }); let footer = getFooter({ name: null, @@ -1251,7 +1255,7 @@ export var fullLink = Profile("linker.fullLink", async function (inputFiles, { imports, packageVariables: _.union(assignedVariables, declaredExports), hasRuntime, - orderedDeps + deps }); var footer = getFooter({ From 41a415d8b9224afc349c68762d9a5b2b0d31c7d7 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 1 Mar 2023 09:56:51 -0300 Subject: [PATCH 20/29] removed wrong awaits --- tools/isobuild/bundler.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js index d7d2327a19..7801df02e8 100644 --- a/tools/isobuild/bundler.js +++ b/tools/isobuild/bundler.js @@ -3256,7 +3256,7 @@ async function bundle({ var packageSource = new PackageSource(); packageSource.initFromAppDir(projectContext, exports.ignoreFiles); - var makeClientTarget = await Profile( + var makeClientTarget = Profile( "bundler.bundle..makeClientTarget", async function (app, webArch, options) { var client = new ClientTarget({ bundlerCacheDir, @@ -3280,7 +3280,7 @@ async function bundle({ return client; }); - var makeServerTarget = await Profile( + var makeServerTarget = Profile( "bundler.bundle..makeServerTarget", async function (app, clientArchs) { const server = new ServerTarget({ bundlerCacheDir, From 3e00b7e44afd92837fa5ebe8edb8672d55b615ae Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Wed, 1 Mar 2023 09:58:40 -0300 Subject: [PATCH 21/29] removed some logs --- tools/runners/run-app.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js index df43d6ebb0..19b8f229eb 100644 --- a/tools/runners/run-app.js +++ b/tools/runners/run-app.js @@ -84,7 +84,6 @@ Object.assign(AppProcess.prototype, { throw new Error("already started?"); } - debugger; // Start the app! self.proc = await self._spawn(); @@ -100,7 +99,6 @@ Object.assign(AppProcess.prototype, { }); eachline(self.proc.stderr, async function (line) { - debugger; await runLog.logAppOutput(line, true); }); @@ -758,15 +756,11 @@ Object.assign(AppRunner.prototype, { }, inspect: self.inspect, onListen: function () { - debugger; - console.log("started listening"); self.proxy.setMode("proxy"); if (self.hmrServer) { self.hmrServer.setAppState("okay"); } - console.log("here before listen"); options.onListen && options.onListen(); - console.log("here afther listen listen"); self._resolvePromise("start"); self._resolvePromise("listen"); console.log("Resolved"); From 33b2941815a7a4d6d83d698be788a1fb5e7ac43b Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 3 Mar 2023 15:20:12 -0300 Subject: [PATCH 22/29] rolled back packageJson for tools --- scripts/dev-bundle-tool-package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index 7944ad2d75..19d102c50c 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -18,7 +18,7 @@ var packageJson = { "@meteorjs/babel": "7.18.0-beta.5", // Keep the versions of these packages consistent with the versions // found in dev-bundle-server-package.js. - "@meteorjs/reify": "git+https://github.com/meteor/reify.git#d01c7b2470e7e1cddec8aa3110b39a1108008f2d", + "@meteorjs/reify": "0.24.0", // So that Babel can emit require("@babel/runtime/helpers/...") calls. "@babel/runtime": "7.15.3", // For backwards compatibility with isopackets that still depend on From 79f21f0475260d811cb0a30ac60b47fdc2cf083e Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 3 Mar 2023 15:20:26 -0300 Subject: [PATCH 23/29] chore: removed console.log for run-all.js --- tools/runners/run-all.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/runners/run-all.js b/tools/runners/run-all.js index e58e4b306d..bd4640ac77 100644 --- a/tools/runners/run-all.js +++ b/tools/runners/run-all.js @@ -211,7 +211,6 @@ class Runner { } if (! self.stopped) { - console.log("before start"); await buildmessage.enterJob({ title: "starting your app" }, async function () { await self.appRunner.start(); }); @@ -219,7 +218,6 @@ class Runner { runLog.log("Started your app.", { arrow: true }); } } - console.log("Died :<("); if (! self.stopped && ! self.quiet) { runLog.log(""); From 6eef40a4ddcf647d38cad7827ef7522b4d42f8d0 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 3 Mar 2023 15:20:39 -0300 Subject: [PATCH 24/29] removed logs for run-app.js --- tools/runners/run-app.js | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js index 19b8f229eb..2a756c393c 100644 --- a/tools/runners/run-app.js +++ b/tools/runners/run-app.js @@ -77,7 +77,6 @@ var AppProcess = function (options) { Object.assign(AppProcess.prototype, { // Call to start the process. start: async function () { - console.log("started process"); var self = this; if (self.proc) { @@ -233,7 +232,6 @@ Object.assign(AppProcess.prototype, { // Spawn the server process and return the handle from child_process.spawn. _spawn: async function () { var self = this; - console.log('server?'); // Path conversions var entryPoint = files.convertToOSPath( @@ -406,9 +404,7 @@ Object.assign(AppRunner.prototype, { self.startPromise = self._makePromise("start"); self.isRunning = true; - console.log("here ?"); - await self._runApp() // BREAKES here - console.log("before startPromise ?"); + self._runApp() await self.startPromise; self.startPromise = null; }, @@ -448,7 +444,6 @@ Object.assign(AppRunner.prototype, { _cleanUpPromises: function () { if (this._promiseResolvers) { _.each(this._promiseResolvers, (resolve) => { - console.log("clean up", resolve); resolve && this._promiseResolvers[resolve]?.emit(resolve, false); }); this._promiseResolvers = null; @@ -473,10 +468,8 @@ Object.assign(AppRunner.prototype, { // The existence of this promise makes the fiber break out of its loop. self.exitPromise = self._makePromise("exit"); - console.log("exited?"); self._resolvePromise("run", { outcome: 'stopped' }); self._resolvePromise("watch"); - console.log(self._beforeStartPromise); if (self._beforeStartPromise) { // If we stopped before mongod started (eg, due to mongod startup // failure), unblock the runner fiber from waiting for mongod to start. @@ -499,7 +492,6 @@ Object.assign(AppRunner.prototype, { // Run the program once, wait for it to exit, and then return. The // return value is same as onRunEnd. _runOnce: async function (options) { - console.log("run once?"); var self = this; options = options || {}; var firstRun = options.firstRun; @@ -593,7 +585,6 @@ Object.assign(AppRunner.prototype, { projectContext: self.projectContext }); } - console.log("bundleResult once?"); var bundleResult = await Profile.run((firstRun?"B":"Reb")+"uild App", async function() { return await bundler.bundle({ @@ -640,7 +631,6 @@ Object.assign(AppRunner.prototype, { watchSet.merge(br.clientWatchSet); return watchSet; }; - console.log("will bundle app?"); var bundleResult; var bundleResultOrRunResult = await bundleApp(); if (bundleResultOrRunResult.runResult) { @@ -648,7 +638,6 @@ Object.assign(AppRunner.prototype, { } bundleResult = bundleResultOrRunResult.bundleResult; - console.log("bundled app?"); firstRun = false; // Read the settings file, if any @@ -726,7 +715,6 @@ Object.assign(AppRunner.prototype, { return { outcome: 'stopped' }; } - console.log('waiting in run promise'); // We should have reset self.runPromise to null by now, but await it // just in case it's still defined. await self.runPromise; @@ -746,7 +734,6 @@ Object.assign(AppRunner.prototype, { oplogUrl: self.oplogUrl, mobileServerUrl: self.mobileServerUrl, onExit: function (code, signal) { - console.log("resolved?"); self._resolvePromise("run", { outcome: 'terminated', code: code, @@ -763,7 +750,6 @@ Object.assign(AppRunner.prototype, { options.onListen && options.onListen(); self._resolvePromise("start"); self._resolvePromise("listen"); - console.log("Resolved"); }, nodeOptions: getNodeOptionsFromEnvironment(), settings: settings, @@ -811,7 +797,6 @@ Object.assign(AppRunner.prototype, { appProcess.proc.onMessage("shell-server", message => { if (message && message.command === "reload") { - console.log("run gbsdhtglasfkd"); self._resolvePromise("run", { outcome: "changed" }); } else { return Promise.reject("Unsupported shell command: " + message); @@ -822,7 +807,6 @@ Object.assign(AppRunner.prototype, { serverWatcher = new watch.Watcher({ watchSet: serverWatchSet, onChange: function () { - console.log("watcher changed"); self._resolvePromise("run", { outcome: 'changed' }); @@ -903,22 +887,17 @@ Object.assign(AppRunner.prototype, { Console.enableProgressDisplay(false); - console.log("before race"); const promList = [runPromise, listenPromise]; await Promise.race(promList) const postStartupResult = await runPostStartupCallbacks(bundleResult) - console.log("afhter promOfResult", {postStartupResult}); if (postStartupResult) return postStartupResult; // Wait for either the process to exit, or (if watchForChanges) a // source file to change. Or, for stop() to be called. - console.log("before runPromise"); var [ret] = await runPromise; - console.log("afhter runPromise"); - try { while (ret.outcome === 'changed-refreshable') { if (! canRefreshClient) { @@ -928,7 +907,6 @@ Object.assign(AppRunner.prototype, { // We stay in this loop as long as only refreshable assets have changed. // When ret.refreshable becomes false, we restart the server. bundleResultOrRunResult = await bundleApp(); - console.log("afhter bundleApp"); if (bundleResultOrRunResult.runResult) { return bundleResultOrRunResult.runResult; From ff657148ea6b1026d508e95f8ea1b3e3ba35c56a Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 3 Mar 2023 15:20:59 -0300 Subject: [PATCH 25/29] chore: removed logs for run-mongo --- tools/runners/run-mongo.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js index 857230de8c..4c0b166b08 100644 --- a/tools/runners/run-mongo.js +++ b/tools/runners/run-mongo.js @@ -561,7 +561,6 @@ var launchMongo = async function(options) { function stop() { if (proc) { - console.log(typeof proc); proc.removeListener('exit', procExitHandler); proc.kill('SIGINT'); proc = null; @@ -596,7 +595,6 @@ var launchMongo = async function(options) { listening && (noOplog || replSetReadyToBeInitiated || replSetReady) ) { - console.log(typeof proc.stdout); proc.stdout.removeListener('data', stdoutOnData); resolve(); @@ -927,7 +925,6 @@ Object.assign(MRp, { // shouldn't annoy the user by telling it that we couldn't start up. self.suppressExitMessage = true; } - console.log("before launch"); self.handle = await launchMongo({ projectLocalDir: self.projectLocalDir, port: self.port, From f02961dfe388ede72230614ccfd68d5690771d72 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 3 Mar 2023 15:21:10 -0300 Subject: [PATCH 26/29] removed log for utils/processes.ts --- tools/utils/processes.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/utils/processes.ts b/tools/utils/processes.ts index cf362596bd..73a7993be8 100644 --- a/tools/utils/processes.ts +++ b/tools/utils/processes.ts @@ -132,7 +132,6 @@ export function execFileAsync( const errorCallback = (error: NodeJS.ErrnoException) => { // Make sure we only receive one type of callback - console.log(child); child.removeListener(exitEvent, exitCallback); // Trim captured output to get rid of excess whitespace @@ -157,7 +156,6 @@ export function execFileAsync( const exitCallback = (code: number, signal: string) => { // Make sure we only receive one type of callback - console.log(child); child.removeListener('error', errorCallback); // Trim captured output to get rid of excess whitespace From af4948f2e0a3629328a8ec1d4fa49c067b3f7318 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 3 Mar 2023 15:24:25 -0300 Subject: [PATCH 27/29] removed TLA comment --- packages/webapp/webapp_server.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js index 38836f6695..c609c37aad 100644 --- a/packages/webapp/webapp_server.js +++ b/packages/webapp/webapp_server.js @@ -1493,7 +1493,6 @@ WebAppInternals.addStaticJs = function(contents) { WebAppInternals.getBoilerplate = getBoilerplate; WebAppInternals.additionalStaticJs = additionalStaticJs; -// TODO[fibers]: change this when we have TLA await runWebAppServer() From 18358d511cd1825a6ddd188a55e2248b252b0650 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 3 Mar 2023 15:26:59 -0300 Subject: [PATCH 28/29] reverted changes in webapp --- packages/webapp/webapp_server.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js index c609c37aad..bb1b1f5263 100644 --- a/packages/webapp/webapp_server.js +++ b/packages/webapp/webapp_server.js @@ -1493,6 +1493,4 @@ WebAppInternals.addStaticJs = function(contents) { WebAppInternals.getBoilerplate = getBoilerplate; WebAppInternals.additionalStaticJs = additionalStaticJs; -await runWebAppServer() - - +await runWebAppServer(); From 2154c6e80219e4283cf28b5b8e91deb8dd6e0b8b Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Fri, 3 Mar 2023 15:27:29 -0300 Subject: [PATCH 29/29] adjusting whitespace --- packages/webapp/webapp_server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js index bb1b1f5263..b75849fd6c 100644 --- a/packages/webapp/webapp_server.js +++ b/packages/webapp/webapp_server.js @@ -1494,3 +1494,4 @@ WebAppInternals.getBoilerplate = getBoilerplate; WebAppInternals.additionalStaticJs = additionalStaticJs; await runWebAppServer(); +