From d3ea93fce935a883880cf64cbb08902cdb300518 Mon Sep 17 00:00:00 2001 From: zodern Date: Thu, 8 Oct 2020 18:39:06 +0000 Subject: [PATCH 01/43] Document EnvironmentVariable --- packages/meteor/dynamics_nodejs.js | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/packages/meteor/dynamics_nodejs.js b/packages/meteor/dynamics_nodejs.js index 963d146b06..2b91322fcb 100644 --- a/packages/meteor/dynamics_nodejs.js +++ b/packages/meteor/dynamics_nodejs.js @@ -12,12 +12,24 @@ Meteor._nodeCodeMustBeInFiber = function () { } }; +/** + * @memberOf Meteor + * @summary Constructor for EnvironmentVariable + * @locus server + * @class + */ Meteor.EnvironmentVariable = function () { this.slot = nextSlot++; }; var EVp = Meteor.EnvironmentVariable.prototype; +/** + * @summary Return value of environment variable if available + * @locus server + * @method get + * @memberof Meteor.EnvironmentVariable + */ EVp.get = function () { Meteor._nodeCodeMustBeInFiber(); @@ -44,6 +56,15 @@ EVp.getOrNullIfOutsideFiber = function () { return this.get(); }; +/** + * @summary Set the environment variable to the given value while a function is run + * @locus server + * @method withValue + * @memberof Meteor.EnvironmentVariable + * @param {Any} value Value the environment variable should be set to + * @param {Function} func The function to run + * @return {Any} Return value of function + */ EVp.withValue = function (value, func) { Meteor._nodeCodeMustBeInFiber(); @@ -79,6 +100,16 @@ EVp.withValue = function (value, func) { // an exception. If it is a string, it should be a description of the // callback, and when an exception is raised a debug message will be // printed with the description. +/** + * @summary Stores the current Meteor environment variables and wraps the + * function to run in a fiber with the environment variables restored + * @locus server + * @memberOf Meteor + * @param {Function} func Function that is wrapped + * @param {Function} onException + * @param {Object} _this Optional `this` object against which the original function will be invoked + * @return {Function} The wrapped function + */ Meteor.bindEnvironment = function (func, onException, _this) { Meteor._nodeCodeMustBeInFiber(); From 2306644d906bc6949e69ccbb0346a65a7d67c358 Mon Sep 17 00:00:00 2001 From: denyhs Date: Mon, 12 Jul 2021 06:05:35 -0400 Subject: [PATCH 02/43] #639 - Push to Deploy - We should have a user able to deploy to any account --- tools/cli/commands.js | 8 +++++-- tools/meteor-services/deploy.js | 40 ++++++++++++++++++++++++--------- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/tools/cli/commands.js b/tools/cli/commands.js index ae383e8c1a..8a11dcd550 100644 --- a/tools/cli/commands.js +++ b/tools/cli/commands.js @@ -1472,7 +1472,9 @@ main.registerCommand({ 'build-only': { type: Boolean }, free: { type: Boolean }, plan: { type: String }, - mongo: { type: Boolean } + 'deploy-token': { type: String }, + mongo: { type: Boolean }, + owner: { type: String } }, allowUnrecognizedOptions: true, requiresApp: function (options) { @@ -1503,7 +1505,7 @@ function deployCommand(options, { rawOptions }) { } const loggedIn = auth.isLoggedIn(); - if (! loggedIn) { + if (! loggedIn && !options["deploy-token"]) { Console.error( "You must be logged in to deploy, just enter your email address."); Console.error(); @@ -1559,6 +1561,8 @@ function deployCommand(options, { rawOptions }) { site, settingsFile: options.settings, free: options.free, + deployToken: options['deploy-token'], + owner: options.owner, mongo: options.mongo, buildOptions: buildOptions, plan, diff --git a/tools/meteor-services/deploy.js b/tools/meteor-services/deploy.js index 80e4a37237..c1f89eec41 100644 --- a/tools/meteor-services/deploy.js +++ b/tools/meteor-services/deploy.js @@ -89,8 +89,12 @@ function deployRpc(options) { if (options.headers.cookie) { throw new Error("sorry, can't combine cookie headers yet"); } - options.qs = Object.assign({}, options.qs, - {capabilities: CAPABILITIES.slice()}); + options.qs = Object.assign( + {}, + options.qs, + { capabilities: CAPABILITIES.slice() }, + options.deployWithTokenProps || {} + ); // If we are waiting for deploy, we let Galaxy know so it can // use that information to send us the right deploy message response. if (options.waitForDeploy) { @@ -351,13 +355,13 @@ function canonicalizeSite(site) { // Executes the poll to check for deployment success and outputs proper messages // to user about the status of their app during the polling process -async function pollForDeploymentSuccess(versionId, deployPollTimeout, result, site) { +async function pollForDeploymentSuccess(versionId, deployPollTimeout, result, site, deployWithTokenProps) { // Create a default polling configuration for polling for deploy / build // In the future, we may change this to be user-configurable or smart // The user can only currently configure the polling timeout via a flag const pollingState = new PollingState(deployPollTimeout); await sleepForMilliseconds(pollingState.initialWaitTimeMs); - const deploymentPollResult = await pollForDeploy(pollingState, versionId, site); + const deploymentPollResult = await pollForDeploy(pollingState, versionId, site, deployWithTokenProps); if (deploymentPollResult && deploymentPollResult.isActive) { return 0; } @@ -398,7 +402,7 @@ class PollingState { // messages pertaining to the status of the version, which will then be reported // directly to the user. When the poll is complete, it will return an object // with information about the final state of the version and the app. -async function pollForDeploy(pollingState, versionId, site) { +async function pollForDeploy(pollingState, versionId, site, deployWithTokenProps) { const { deadline, pollIntervalMs, @@ -413,6 +417,7 @@ async function pollForDeploy(pollingState, versionId, site) { operand: versionId, expectPayload: ['message', 'finishStatus'], printDeployURL: false, + deployWithTokenProps }); // Check the details of the Version Status response and compare message to last call @@ -437,7 +442,7 @@ async function pollForDeploy(pollingState, versionId, site) { } else if (new Date() < deadline) { Console.warn(`Error checking deploy status; will retry: ${errorMessage}`); await sleepForMilliseconds(pollIntervalMs); - return await pollForDeploy(pollingState, versionId, site); + return await pollForDeploy(pollingState, versionId, site, deployWithTokenProps); } } @@ -446,7 +451,7 @@ async function pollForDeploy(pollingState, versionId, site) { if(new Date() < deadline && !finishStatus.isFinished) { // Wait for a set interval and then poll again await sleepForMilliseconds(pollIntervalMs); - return await pollForDeploy(pollingState, versionId, site); + return await pollForDeploy(pollingState, versionId, site, deployWithTokenProps); } else if (!finishStatus.isFinished) { Console.info(`Polling timed out. To check the status of your app, visit ${versionStatusResult.payload.galaxyUrl}. To wait longer, pass a timeout @@ -516,7 +521,14 @@ export async function bundleAndDeploy(options) { site: site, preflight: true, promptIfAuthFails: promptIfAuthFails, - qs: options.rawOptions, + qs: Object.assign( + {}, + options.rawOptions, + { + deployToken: options.deployToken, + owner: options.owner, + } + ), printDeployURL: true }); @@ -628,6 +640,11 @@ export async function bundleAndDeploy(options) { return 0; } + const deployWithTokenProps = { + deployToken: options.deployToken, + owner: options.owner + }; + Console.info('Preparing to upload your app...'); const result = buildmessage.enterJob({ title: "uploading" @@ -643,7 +660,8 @@ export async function bundleAndDeploy(options) { { free: options.free, plan: options.plan, - mongo: options.mongo + mongo: options.mongo, + ...deployWithTokenProps, }, ), bodyStream: createTarGzStream(pathJoin(buildDir, 'bundle')), @@ -676,7 +694,9 @@ export async function bundleAndDeploy(options) { result.payload.newVersionId, options.deployPollingTimeoutMs, result, - site); + site, + deployWithTokenProps, + ); } return 0; }; From 01916834e9e9d7b8e7b98ea90835df02e5b734ee Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Tue, 3 Aug 2021 04:51:51 +0200 Subject: [PATCH 03/43] Update mongodb to 3.6.10 --- History.md | 3 +++ packages/npm-mongo/package.js | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/History.md b/History.md index 617e2b590c..8595f789b0 100644 --- a/History.md +++ b/History.md @@ -23,6 +23,9 @@ * `less@4.0.0` - Updated `less` to v4.1.1 - Fixed tests + +* `npm-mongo@3.9.1` + - `mongodb@3.6.10` ## v2.3.4, 2021-08-03 diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index cf7ae2e01d..600d277450 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,12 +3,12 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: "3.9.0", + version: "3.9.1", documentation: null }); Npm.depends({ - mongodb: "3.6.6" + mongodb: "3.6.10" }); Package.onUse(function (api) { From 39ab32f6038b36e680cb3bfb46bec2ee3310a844 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Tue, 3 Aug 2021 20:09:13 +0200 Subject: [PATCH 04/43] Published npm-mongo@3.9.1 --- .../npm-mongo/.npm/package/npm-shrinkwrap.json | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json index 0e37721b14..3f30a25eaa 100644 --- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json +++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json @@ -37,14 +37,14 @@ "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" }, "mongodb": { - "version": "3.6.6", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.6.tgz", - "integrity": "sha512-WlirMiuV1UPbej5JeCMqE93JRfZ/ZzqE7nJTwP85XzjAF4rRSeq2bGCb1cjfoHLOF06+HxADaPGqT0g3SbVT1w==" + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.10.tgz", + "integrity": "sha512-fvIBQBF7KwCJnDZUnFFy4WqEFP8ibdXeFANnylW19+vOwdjOAvqIzPdsNCEMT6VKTHnYu4K64AWRih0mkFms6Q==" }, "optional-require": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.0.3.tgz", - "integrity": "sha512-RV2Zp2MY2aeYK5G+B/Sps8lW5NHAzE5QClbFP15j+PWmP+T9PxlJXBOOLoSAdgwFvS4t0aMR4vpedMkbHfh0nA==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.1.1.tgz", + "integrity": "sha512-EnUe33GTAltyZlIsQ2l93KzBC9zi8BsxLvKP3wxALOsz/YIakVojyuZsv5PFFk8y8e6r+SbaPIsNmyPoSK0OHw==" }, "process-nextick-args": { "version": "2.0.1", @@ -63,6 +63,11 @@ } } }, + "require-at": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/require-at/-/require-at-1.0.6.tgz", + "integrity": "sha512-7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g==" + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", From 7787fc10220d330f8f22df0ed823fc51fc74c27b Mon Sep 17 00:00:00 2001 From: Sudhanshu Date: Fri, 6 Aug 2021 16:46:00 +0530 Subject: [PATCH 05/43] Create index on `services.password.enroll.when` --- packages/accounts-base/accounts_server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js index 740ed9eefc..cc4afc4014 100644 --- a/packages/accounts-base/accounts_server.js +++ b/packages/accounts-base/accounts_server.js @@ -1610,4 +1610,5 @@ const setupUsersCollection = users => { users._ensureIndex("services.resume.loginTokens.when", { sparse: true }); // For expiring password tokens users._ensureIndex('services.password.reset.when', { sparse: true }); + users._ensureIndex('services.password.enroll.when', { sparse: true }); }; From 9c1e11f00771f81880017295770970aa4e3c0b8d Mon Sep 17 00:00:00 2001 From: zodern Date: Sat, 7 Aug 2021 03:09:23 +0000 Subject: [PATCH 06/43] Document using EnvirnomentVariable on the client --- packages/meteor/dynamics_nodejs.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/meteor/dynamics_nodejs.js b/packages/meteor/dynamics_nodejs.js index 2b91322fcb..051ebedb17 100644 --- a/packages/meteor/dynamics_nodejs.js +++ b/packages/meteor/dynamics_nodejs.js @@ -15,7 +15,7 @@ Meteor._nodeCodeMustBeInFiber = function () { /** * @memberOf Meteor * @summary Constructor for EnvironmentVariable - * @locus server + * @locus Anywhere * @class */ Meteor.EnvironmentVariable = function () { @@ -26,7 +26,7 @@ var EVp = Meteor.EnvironmentVariable.prototype; /** * @summary Return value of environment variable if available - * @locus server + * @locus Anywhere * @method get * @memberof Meteor.EnvironmentVariable */ @@ -58,7 +58,7 @@ EVp.getOrNullIfOutsideFiber = function () { /** * @summary Set the environment variable to the given value while a function is run - * @locus server + * @locus Anywhere * @method withValue * @memberof Meteor.EnvironmentVariable * @param {Any} value Value the environment variable should be set to @@ -101,9 +101,10 @@ EVp.withValue = function (value, func) { // callback, and when an exception is raised a debug message will be // printed with the description. /** - * @summary Stores the current Meteor environment variables and wraps the - * function to run in a fiber with the environment variables restored - * @locus server + * @summary Stores the current Meteor environment variables, and wraps the + * function to run with the environment variables restored. On the server, the + * function is wrapped within a fiber. + * @locus Anywhere * @memberOf Meteor * @param {Function} func Function that is wrapped * @param {Function} onException From d44725564a3cdae6854f7449e4a885fd9fd19de8 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Mon, 9 Aug 2021 15:14:14 +0200 Subject: [PATCH 07/43] Allow usage of http packages v1 and v2 in affected packages --- packages/facebook-oauth/package.js | 4 ++-- packages/github-oauth/package.js | 4 ++-- packages/google-oauth/package.js | 4 ++-- packages/meetup-oauth/package.js | 4 ++-- packages/meteor-developer-oauth/package.js | 2 +- packages/oauth1/package.js | 4 ++-- packages/weibo-oauth/package.js | 3 ++- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js index d583cfef79..ac7beb5991 100644 --- a/packages/facebook-oauth/package.js +++ b/packages/facebook-oauth/package.js @@ -1,13 +1,13 @@ Package.describe({ summary: "Facebook OAuth flow", - version: "1.9.0" + version: "1.9.1" }); Package.onUse(api => { api.use('ecmascript', ['client', 'server']); api.use('oauth2', ['client', 'server']); api.use('oauth', ['client', 'server']); - api.use('http', ['server']); + api.use('http@1.4.4 || 2.0.0', ['server']); api.use('random', 'client'); api.use('service-configuration', ['client', 'server']); diff --git a/packages/github-oauth/package.js b/packages/github-oauth/package.js index 0960e5a135..c9ca612e01 100644 --- a/packages/github-oauth/package.js +++ b/packages/github-oauth/package.js @@ -1,13 +1,13 @@ Package.describe({ summary: 'GitHub OAuth flow', - version: '1.3.0' + version: '1.3.1' }); Package.onUse(api => { api.use('ecmascript', ['client', 'server']); api.use('oauth2', ['client', 'server']); api.use('oauth', ['client', 'server']); - api.use('http', 'server'); + api.use('http@1.4.4 || 2.0.0', 'server'); api.use('random', 'client'); api.use('service-configuration', ['client', 'server']); diff --git a/packages/google-oauth/package.js b/packages/google-oauth/package.js index 6e7d4588ba..8243b3b71f 100644 --- a/packages/google-oauth/package.js +++ b/packages/google-oauth/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Google OAuth flow", - version: "1.4.0", + version: "1.4.1", }); Cordova.depends({ @@ -11,7 +11,7 @@ Package.onUse(api => { api.use("ecmascript"); api.use('oauth2', ['client', 'server']); api.use('oauth', ['client', 'server']); - api.use('http', ['server']); + api.use('http@1.4.4 || 2.0.0', ['server']); api.use('service-configuration'); api.use('random', 'client'); diff --git a/packages/meetup-oauth/package.js b/packages/meetup-oauth/package.js index c648033da1..83df9f74a3 100644 --- a/packages/meetup-oauth/package.js +++ b/packages/meetup-oauth/package.js @@ -1,13 +1,13 @@ Package.describe({ summary: 'Meetup OAuth flow', - version: '1.1.0' + version: '1.1.1' }); Package.onUse(api => { api.use('ecmascript'); api.use('oauth2', ['client', 'server']); api.use('oauth', ['client', 'server']); - api.use('http', 'server'); + api.use('http@1.4.4 || 2.0.0', 'server'); api.use('random', 'client'); api.use('service-configuration', ['client', 'server']); diff --git a/packages/meteor-developer-oauth/package.js b/packages/meteor-developer-oauth/package.js index 13b2e6e419..8225f0ae49 100644 --- a/packages/meteor-developer-oauth/package.js +++ b/packages/meteor-developer-oauth/package.js @@ -6,7 +6,7 @@ Package.describe({ Package.onUse(api => { api.use('oauth2', ['client', 'server']); api.use('oauth', ['client', 'server']); - api.use('http', ['server']); + api.use('http@1.4.4 || 2.0.0', ['server']); api.use(['ecmascript', 'service-configuration'], ['client', 'server']); api.use('random', 'client'); diff --git a/packages/oauth1/package.js b/packages/oauth1/package.js index e970b88e29..7cf976b8ee 100644 --- a/packages/oauth1/package.js +++ b/packages/oauth1/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Common code for OAuth1-based login services", - version: "1.4.0", + version: "1.4.1", }); Package.onUse(api => { @@ -10,7 +10,7 @@ Package.onUse(api => { api.use('oauth', ['client', 'server']); api.use([ 'check', - 'http' + 'http@1.4.4 || 2.0.0' ], 'server'); api.use('mongo'); diff --git a/packages/weibo-oauth/package.js b/packages/weibo-oauth/package.js index c0a91db9b0..02cea0b9c6 100644 --- a/packages/weibo-oauth/package.js +++ b/packages/weibo-oauth/package.js @@ -1,12 +1,13 @@ Package.describe({ summary: "Weibo OAuth flow", - version: "1.3.0", + version: "1.3.1", }); Package.onUse(api => { api.use('oauth1', ['client', 'server']); api.use('oauth', ['client', 'server']); api.use('random', 'client'); + api.use('http@1.4.4 || 2.0.0', 'server'); api.use(['service-configuration', 'ecmascript'], ['client', 'server']); api.addFiles('weibo_client.js', 'client'); From 5e512eb03168197187a69afe1de7882714b2a6c3 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Wed, 11 Aug 2021 10:59:22 +0200 Subject: [PATCH 08/43] Published accounts-base@2.0.1 --- History.md | 4 ++++ packages/accounts-base/package.js | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/History.md b/History.md index 8595f789b0..ee0f32d36c 100644 --- a/History.md +++ b/History.md @@ -26,6 +26,10 @@ * `npm-mongo@3.9.1` - `mongodb@3.6.10` + +* `accounts-base@2.0.1` + - Create index on `services.password.enroll.when` + - Blaze weak dependency updated to v2.5.0 ## v2.3.4, 2021-08-03 diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 7207afac1b..97a60e4904 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,9 +1,10 @@ Package.describe({ summary: "A user account system", - version: "2.0.0", + version: "2.0.1", }); Package.onUse(api => { + api.versionsFrom('2.3'); api.use('ecmascript', ['client', 'server']); api.use('ddp-rate-limiter'); api.use('localstorage', 'client'); @@ -28,7 +29,7 @@ Package.onUse(api => { // If the 'blaze' package is loaded, we'll define some helpers like // {{currentUser}}. If not, no biggie. - api.use('blaze@2.3.4', 'client', {weak: true}); + api.use('blaze@2.5.0', 'client', {weak: true}); // Allow us to detect 'autopublish', and publish some Meteor.users fields if // it's loaded. From b565a4968a55729b2b4491ac34c8c129a0c54a0f Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Wed, 11 Aug 2021 11:04:38 +0200 Subject: [PATCH 09/43] Add changes to history --- History.md | 23 +++++++++++++++++++++- packages/meteor-developer-oauth/package.js | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/History.md b/History.md index ee0f32d36c..e3eee3ddf6 100644 --- a/History.md +++ b/History.md @@ -29,7 +29,28 @@ * `accounts-base@2.0.1` - Create index on `services.password.enroll.when` - - Blaze weak dependency updated to v2.5.0 + - Blaze weak dependency updated to v2.5.0 + +* `facebook-oauth@1.9.1` + - Allow usage of `http` package both v1 and v2 for backward compatibility + +* `github-oauth@1.3.1` + - Allow usage of `http` package both v1 and v2 for backward compatibility + +* `google-oauth@1.3.1` + - Allow usage of `http` package both v1 and v2 for backward compatibility + +* `meetup-oauth@1.1.1` + - Allow usage of `http` package both v1 and v2 for backward compatibility + +* `meteor-developer-oauth@1.3.1` + - Allow usage of `http` package both v1 and v2 for backward compatibility + +* `weibo-oauth@1.3.1` + - Allow usage of `http` package both v1 and v2 for backward compatibility + +* `oauth1@1.4.1` + - Allow usage of `http` package both v1 and v2 for backward compatibility ## v2.3.4, 2021-08-03 diff --git a/packages/meteor-developer-oauth/package.js b/packages/meteor-developer-oauth/package.js index 8225f0ae49..b1463542d5 100644 --- a/packages/meteor-developer-oauth/package.js +++ b/packages/meteor-developer-oauth/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Meteor developer accounts OAuth flow', - version: '1.3.0' + version: '1.3.1' }); Package.onUse(api => { From 5c462382c9babaa265b6cbaf43cc37b5fb760902 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Wed, 11 Aug 2021 11:12:32 +0200 Subject: [PATCH 10/43] Remove versionsFrom account-base --- packages/accounts-base/package.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 97a60e4904..9a15ea3df3 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -4,7 +4,6 @@ Package.describe({ }); Package.onUse(api => { - api.versionsFrom('2.3'); api.use('ecmascript', ['client', 'server']); api.use('ddp-rate-limiter'); api.use('localstorage', 'client'); From 593011035c4e25205de10932fbb2d8717afbc703 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Tue, 3 Aug 2021 05:28:50 +0200 Subject: [PATCH 11/43] Update Typescript to 4.3.5 --- packages/babel-compiler/package.js | 4 ++-- packages/ecmascript/package.js | 2 +- packages/typescript/package.js | 2 +- scripts/dev-bundle-tool-package.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 2de69842fd..4b3bda8058 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,11 +6,11 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '7.6.2' + version: '7.7.0-beta240.7' }); Npm.depends({ - '@meteorjs/babel': '7.11.1', + '@meteorjs/babel': '7.12.0', 'json5': '2.1.1' }); diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index a9a6e42ca5..005d0bcc21 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.15.2', + version: '0.15.3-beta240.7', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/typescript/package.js b/packages/typescript/package.js index 4a6e6742a7..16c50495fd 100644 --- a/packages/typescript/package.js +++ b/packages/typescript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "typescript", - version: "4.3.2", + version: "4.3.5-beta240.7", summary: "Compiler plugin that compiles TypeScript and ECMAScript in .ts and .tsx files", documentation: "README.md" }); diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index 66623e6f6d..e3c7137079 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -14,8 +14,8 @@ var packageJson = { pacote: "https://github.com/meteor/pacote/tarball/a81b0324686e85d22c7688c47629d4009000e8b8", "node-gyp": "8.0.0", "node-pre-gyp": "0.15.0", - typescript: "4.3.2", - "@meteorjs/babel": "7.11.1", + typescript: "4.3.5", + "@meteorjs/babel": "7.12.0", // Keep the versions of these packages consistent with the versions // found in dev-bundle-server-package.js. "meteor-promise": "0.9.0", From 593190fc6522d5670de37422849e29946a88e5c9 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Tue, 3 Aug 2021 11:12:14 +0200 Subject: [PATCH 12/43] Fix ecmascript test --- .../.npm/package/npm-shrinkwrap.json | 479 +++++++++--------- packages/ecmascript/transpilation-tests.js | 2 +- 2 files changed, 243 insertions(+), 238 deletions(-) diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json index 42d1625ade..6c318ac31b 100644 --- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json +++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json @@ -2,19 +2,19 @@ "lockfileVersion": 1, "dependencies": { "@babel/code-frame": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", - "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", + "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==" }, "@babel/compat-data": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz", - "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==" + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.9.tgz", + "integrity": "sha512-p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw==" }, "@babel/core": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.3.tgz", - "integrity": "sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg==", + "version": "7.14.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz", + "integrity": "sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==", "dependencies": { "json5": { "version": "2.2.0", @@ -24,34 +24,34 @@ } }, "@babel/generator": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz", - "integrity": "sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==" + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz", + "integrity": "sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA==" }, "@babel/helper-annotate-as-pure": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz", - "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz", + "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==" }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz", - "integrity": "sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz", + "integrity": "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==" }, "@babel/helper-compilation-targets": { - "version": "7.13.16", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz", - "integrity": "sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz", + "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==" }, "@babel/helper-create-class-features-plugin": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.3.tgz", - "integrity": "sha512-BnEfi5+6J2Lte9LeiL6TxLWdIlEv9Woacc1qXzXBgbikcOzMRM2Oya5XGg/f/ngotv1ej2A/b+3iJH8wbS1+lQ==" + "version": "7.14.8", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz", + "integrity": "sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ==" }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.3.tgz", - "integrity": "sha512-JIB2+XJrb7v3zceV2XzDhGIB902CmKGSpSl4q2C6agU9SNLG/2V1RtFRGPG1Ajh9STj3+q6zJMOC+N/pp2P9DA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz", + "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==" }, "@babel/helper-define-polyfill-provider": { "version": "0.2.3", @@ -59,134 +59,139 @@ "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==" }, "@babel/helper-explode-assignable-expression": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz", - "integrity": "sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz", + "integrity": "sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==" }, "@babel/helper-function-name": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz", - "integrity": "sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz", + "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==" }, "@babel/helper-get-function-arity": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz", - "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz", + "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==" + }, + "@babel/helper-hoist-variables": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz", + "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==" }, "@babel/helper-member-expression-to-functions": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz", - "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==" + "version": "7.14.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz", + "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==" }, "@babel/helper-module-imports": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz", - "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz", + "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==" }, "@babel/helper-module-transforms": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz", - "integrity": "sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA==" + "version": "7.14.8", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz", + "integrity": "sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==" }, "@babel/helper-optimise-call-expression": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz", - "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz", + "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==" }, "@babel/helper-plugin-utils": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz", - "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz", + "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==" }, "@babel/helper-remap-async-to-generator": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz", - "integrity": "sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz", + "integrity": "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==" }, "@babel/helper-replace-supers": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz", - "integrity": "sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz", + "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==" }, "@babel/helper-simple-access": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz", - "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==" + "version": "7.14.8", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz", + "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==" }, "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz", - "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz", + "integrity": "sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==" }, "@babel/helper-split-export-declaration": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz", - "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz", + "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==" }, "@babel/helper-validator-identifier": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz", - "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==" + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", + "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==" }, "@babel/helper-validator-option": { - "version": "7.12.17", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz", - "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", + "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==" }, "@babel/helper-wrap-function": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz", - "integrity": "sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz", + "integrity": "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==" }, "@babel/helpers": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz", - "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==" + "version": "7.14.8", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz", + "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==" }, "@babel/highlight": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz", - "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", + "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==" }, "@babel/parser": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.3.tgz", - "integrity": "sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ==" + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz", + "integrity": "sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==" }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz", - "integrity": "sha512-b1AM4F6fwck4N8ItZ/AtC4FP/cqZqmKRQ4FaTDutwSYyjuhtvsGEMLK4N/ztV/ImP40BjIDyMgBQAeAMsQYVFQ==" + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz", + "integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==" }, "@babel/plugin-proposal-class-properties": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz", - "integrity": "sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz", + "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==" }, "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.2.tgz", - "integrity": "sha512-1JAZtUrqYyGsS7IDmFeaem+/LJqujfLZ2weLR9ugB0ufUPjzf8cguyVT1g5im7f7RXxuLq1xUxEzvm68uYRtGg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz", + "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==" }, "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz", - "integrity": "sha512-ebR0zU9OvI2N4qiAC38KIAK75KItpIPTpAtd2r4OZmMFeKbKJpUFLYP2EuDut82+BmYi8sz42B+TfTptJ9iG5Q==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz", + "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==" }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.2.tgz", - "integrity": "sha512-hBIQFxwZi8GIp934+nj5uV31mqclC1aYDhctDu5khTi9PCCUOczyy0b34W0oE9U/eJXiqQaKyVsmjeagOaSlbw==" + "version": "7.14.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz", + "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==" }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz", - "integrity": "sha512-XtkJsmJtBaUbOxZsNk0Fvrv8eiqgneug0A6aqLFZ4TSkar2L5dSXWcnUKHgmjJt49pyB/6ZHvkr3dPgl9MOWRQ==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz", + "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==" }, "@babel/plugin-proposal-optional-chaining": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz", - "integrity": "sha512-qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz", + "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==" }, "@babel/plugin-syntax-async-generators": { "version": "7.8.4", @@ -204,9 +209,9 @@ "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==" }, "@babel/plugin-syntax-jsx": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz", - "integrity": "sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz", + "integrity": "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==" }, "@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", @@ -234,164 +239,164 @@ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==" }, "@babel/plugin-transform-arrow-functions": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz", - "integrity": "sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz", + "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==" }, "@babel/plugin-transform-async-to-generator": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz", - "integrity": "sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz", + "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==" }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz", - "integrity": "sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz", + "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==" }, "@babel/plugin-transform-block-scoping": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz", - "integrity": "sha512-neZZcP19NugZZqNwMTH+KoBjx5WyvESPSIOQb4JHpfd+zPfqcH65RMu5xJju5+6q/Y2VzYrleQTr+b6METyyxg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz", + "integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==" }, "@babel/plugin-transform-classes": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.2.tgz", - "integrity": "sha512-7oafAVcucHquA/VZCsXv/gmuiHeYd64UJyyTYU+MPfNu0KeNlxw06IeENBO8bJjXVbolu+j1MM5aKQtH1OMCNg==" + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz", + "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==" }, "@babel/plugin-transform-computed-properties": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz", - "integrity": "sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz", + "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==" }, "@babel/plugin-transform-destructuring": { - "version": "7.13.17", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz", - "integrity": "sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA==" + "version": "7.14.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz", + "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==" }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz", - "integrity": "sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz", + "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==" }, "@babel/plugin-transform-for-of": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz", - "integrity": "sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz", + "integrity": "sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==" }, "@babel/plugin-transform-literals": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz", - "integrity": "sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz", + "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==" }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz", - "integrity": "sha512-EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz", + "integrity": "sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==" }, "@babel/plugin-transform-object-super": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz", - "integrity": "sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz", + "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==" }, "@babel/plugin-transform-parameters": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz", - "integrity": "sha512-NxoVmA3APNCC1JdMXkdYXuQS+EMdqy0vIwyDHeKHiJKRxmp1qGSdb0JLEIoPRhkx6H/8Qi3RJ3uqOCYw8giy9A==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz", + "integrity": "sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==" }, "@babel/plugin-transform-property-literals": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz", - "integrity": "sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz", + "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==" }, "@babel/plugin-transform-react-display-name": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.2.tgz", - "integrity": "sha512-zCubvP+jjahpnFJvPaHPiGVfuVUjXHhFvJKQdNnsmSsiU9kR/rCZ41jHc++tERD2zV+p7Hr6is+t5b6iWTCqSw==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz", + "integrity": "sha512-07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ==" }, "@babel/plugin-transform-react-jsx": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.3.tgz", - "integrity": "sha512-uuxuoUNVhdgYzERiHHFkE4dWoJx+UFVyuAl0aqN8P2/AKFHwqgUC5w2+4/PjpKXJsFgBlYAFXlUmDQ3k3DUkXw==" + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz", + "integrity": "sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==" }, "@babel/plugin-transform-react-jsx-development": { - "version": "7.12.17", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz", - "integrity": "sha512-BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz", + "integrity": "sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==" }, "@babel/plugin-transform-react-pure-annotations": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz", - "integrity": "sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz", + "integrity": "sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==" }, "@babel/plugin-transform-regenerator": { - "version": "7.13.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz", - "integrity": "sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz", + "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==" }, "@babel/plugin-transform-runtime": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.3.tgz", - "integrity": "sha512-t960xbi8wpTFE623ef7sd+UpEC5T6EEguQlTBJDEO05+XwnIWVfuqLw/vdLWY6IdFmtZE+65CZAfByT39zRpkg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz", + "integrity": "sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg==" }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz", - "integrity": "sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz", + "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==" }, "@babel/plugin-transform-spread": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz", - "integrity": "sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==" + "version": "7.14.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz", + "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==" }, "@babel/plugin-transform-sticky-regex": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz", - "integrity": "sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz", + "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==" }, "@babel/plugin-transform-template-literals": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz", - "integrity": "sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz", + "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==" }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz", - "integrity": "sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz", + "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==" }, "@babel/plugin-transform-unicode-regex": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz", - "integrity": "sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz", + "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==" }, "@babel/preset-react": { - "version": "7.13.13", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.13.13.tgz", - "integrity": "sha512-gx+tDLIE06sRjKJkVtpZ/t3mzCDOnPG+ggHZG9lffUbX8+wC739x20YQc9V35Do6ZAxaUc/HhVHIiOzz5MvDmA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz", + "integrity": "sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==" }, "@babel/runtime": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz", - "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==" + "version": "7.14.8", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz", + "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==" }, "@babel/template": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz", - "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", + "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==" }, "@babel/traverse": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.2.tgz", - "integrity": "sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==" + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz", + "integrity": "sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==" }, "@babel/types": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.2.tgz", - "integrity": "sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==" + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", + "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==" }, "@meteorjs/babel": { - "version": "7.11.1", - "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.11.1.tgz", - "integrity": "sha512-5WZZ3v7F2B5KpKBSOYe3kh83ijrj6o7oenCadqH59Lp9ONorZGJePQQg1OotepKzwNflBiw60cy9eFgi+/qhsw==" + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.12.0.tgz", + "integrity": "sha512-IwWZxEwH7cLzC63Mwu2g4qiJYLkKx9kRa4qulyEbyxxp2YbR7dUD646Z0UZWe7ZzAVXiBUo3fEQPfrN2O0ZLew==" }, "acorn": { "version": "6.4.2", @@ -509,9 +514,9 @@ "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==" }, "babel-plugin-polyfill-corejs3": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz", - "integrity": "sha512-l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A==" + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz", + "integrity": "sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ==" }, "babel-plugin-polyfill-regenerator": { "version": "0.2.2", @@ -594,9 +599,9 @@ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==" }, "caniuse-lite": { - "version": "1.0.30001230", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz", - "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==" + "version": "1.0.30001248", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz", + "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==" }, "chalk": { "version": "2.4.2", @@ -619,14 +624,14 @@ "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==" }, "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==" }, "core-js-compat": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.13.0.tgz", - "integrity": "sha512-jhbI2zpVskgfDC9mGRaDo1gagd0E0i/kYW0+WvibL/rafEHKAHO653hEXIxJHqRlRLITluXtRH3AGTL5qJmifQ==", + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.0.tgz", + "integrity": "sha512-5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q==", "dependencies": { "semver": { "version": "7.0.0", @@ -636,9 +641,9 @@ } }, "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==" + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==" }, "define-properties": { "version": "1.1.3", @@ -646,9 +651,9 @@ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==" }, "electron-to-chromium": { - "version": "1.3.741", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.741.tgz", - "integrity": "sha512-4i3T0cwnHo1O4Mnp9JniEco8bZiXoqbm3PhW5hv7uu8YLg35iajYrRnNyKFaN8/8SSTskU2hYqVTeYVPceSpUA==" + "version": "1.3.793", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.793.tgz", + "integrity": "sha512-l9NrGV6Mr4ov5mayYPvIWcwklNw5ROmy6rllzz9dCACw9nKE5y+s5uQk+CBJMetxrWZ6QJFsvEfG6WDcH2IGUg==" }, "escalade": { "version": "3.1.1", @@ -701,9 +706,9 @@ "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" }, "is-core-module": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz", - "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==" + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz", + "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==" }, "js-tokens": { "version": "4.0.0", @@ -751,9 +756,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node-releases": { - "version": "1.1.72", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz", - "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==" + "version": "1.1.73", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz", + "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==" }, "object-keys": { "version": "1.1.1", @@ -781,9 +786,9 @@ "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==" }, "regenerator-runtime": { - "version": "0.13.7", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", - "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" }, "regenerator-transform": { "version": "0.14.5", @@ -813,9 +818,9 @@ } }, "reify": { - "version": "0.20.12", - "resolved": "https://registry.npmjs.org/reify/-/reify-0.20.12.tgz", - "integrity": "sha512-4BzKwDWyJJbukwI6xIJRh+BDTitoGzxdgYPiQQ1zbcTZW6I8xgHPw1DnVuEs/mEZQlYm1e09DcFSApb4UaR5bQ==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/reify/-/reify-0.22.0.tgz", + "integrity": "sha512-UrQ9IOSz6/dDRrvCZ6thk/c0b6uD8W7O8FWG4X6/t1bThvVdu+ppiOFaNRUwiVOAOoeMwKPdUiWZsJ7bIrBP8A==", "dependencies": { "semver": { "version": "5.7.1", @@ -860,9 +865,9 @@ "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" }, "typescript": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz", - "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==" + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==" }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", diff --git a/packages/ecmascript/transpilation-tests.js b/packages/ecmascript/transpilation-tests.js index e7fff88d48..0ae3495460 100644 --- a/packages/ecmascript/transpilation-tests.js +++ b/packages/ecmascript/transpilation-tests.js @@ -40,7 +40,7 @@ Tinytest.add("ecmascript - transpilation - class methods", (test) => { test.isTrue(contains(output, 'Foo.staticMethod = function staticMethod(')); test.isTrue(contains(output, '.prototypeMethod = function prototypeMethod(')); - test.isTrue(contains(output, '[computedMethod] = function (')); + test.isTrue(contains(output, '[_computedMethod] = function (')); test.isFalse(contains(output, 'createClass')); }); From 56f5114b25996696aba95903556490fd9e9b5b13 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Wed, 11 Aug 2021 13:20:13 +0200 Subject: [PATCH 13/43] Update versions for 2.3.5 --- History.md | 28 +++++++++++++++++++++++++++- packages/babel-compiler/package.js | 4 ++-- packages/ecmascript/package.js | 2 +- packages/typescript/package.js | 2 +- scripts/dev-bundle-tool-package.js | 2 +- 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/History.md b/History.md index ee0f32d36c..d2bcb57c14 100644 --- a/History.md +++ b/History.md @@ -29,7 +29,33 @@ * `accounts-base@2.0.1` - Create index on `services.password.enroll.when` - - Blaze weak dependency updated to v2.5.0 + - Blaze weak dependency updated to v2.5.0 + +## v2.3.5, 2021-08-11 + +#### Highlights + +* Node.js updated to [`v14.`]() +* Typescript updated to [v4.3.5](https://github.com/Microsoft/TypeScript/releases/tag/v4.3.5) + +#### Meteor Version Release + +* `meteor-tool@2.3.5` + - Typescript updated to [v4.3.5](https://github.com/Microsoft/TypeScript/releases/tag/v4.3.5) + - `@meteorjs/babel@7.12.0` + + +* `@meteorjs/babel@7.12.0` && `@meteorjs/babel@7.13.0` + - Dependencies updated to their latest versions + +* `babel-compile@7.7.0` + - `@meteorjs/babel@7.12.0` + +* `ecmascript@0.15.3` + - Typescript and Babel version bump + +* `typescript@4.3.5` + - [`typescript@4.3.5`](https://github.com/Microsoft/TypeScript/releases/tag/v4.3.5) ## v2.3.4, 2021-08-03 diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 4b3bda8058..084fd87152 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,11 +6,11 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '7.7.0-beta240.7' + version: '7.7.0-beta235.0' }); Npm.depends({ - '@meteorjs/babel': '7.12.0', + '@meteorjs/babel': '7.13.0', 'json5': '2.1.1' }); diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index 005d0bcc21..82296c8daa 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.15.3-beta240.7', + version: '0.15.3-beta235.0', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/typescript/package.js b/packages/typescript/package.js index 16c50495fd..842e3e3626 100644 --- a/packages/typescript/package.js +++ b/packages/typescript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "typescript", - version: "4.3.5-beta240.7", + version: "4.3.5-beta235.0", summary: "Compiler plugin that compiles TypeScript and ECMAScript in .ts and .tsx files", documentation: "README.md" }); diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index e3c7137079..f498381318 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -15,7 +15,7 @@ var packageJson = { "node-gyp": "8.0.0", "node-pre-gyp": "0.15.0", typescript: "4.3.5", - "@meteorjs/babel": "7.12.0", + "@meteorjs/babel": "7.13.0", // Keep the versions of these packages consistent with the versions // found in dev-bundle-server-package.js. "meteor-promise": "0.9.0", From 14582d91fcdeeceeaf75c7dceb403afe5f6aa52b Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Wed, 11 Aug 2021 13:21:18 +0200 Subject: [PATCH 14/43] Dev bundle 14.17.4.5 --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index 7827d36dc8..9e4b0716c5 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=14.17.4.2 +BUNDLE_VERSION=14.17.4.5 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From 999db946d8b0993d609a0ac81bbbc622b64006f6 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Wed, 11 Aug 2021 13:24:01 +0200 Subject: [PATCH 15/43] Meteor 2.3.5-beta.0 --- .../.npm/package/npm-shrinkwrap.json | 144 +++++++++--------- packages/meteor-tool/package.js | 2 +- .../admin/meteor-release-experimental.json | 2 +- 3 files changed, 74 insertions(+), 74 deletions(-) diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json index 6c318ac31b..9e36d0da87 100644 --- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json +++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json @@ -7,14 +7,14 @@ "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==" }, "@babel/compat-data": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.9.tgz", - "integrity": "sha512-p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", + "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==" }, "@babel/core": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz", - "integrity": "sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz", + "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==", "dependencies": { "json5": { "version": "2.2.0", @@ -24,9 +24,9 @@ } }, "@babel/generator": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz", - "integrity": "sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz", + "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==" }, "@babel/helper-annotate-as-pure": { "version": "7.14.5", @@ -39,14 +39,14 @@ "integrity": "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==" }, "@babel/helper-compilation-targets": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz", - "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz", + "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==" }, "@babel/helper-create-class-features-plugin": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz", - "integrity": "sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz", + "integrity": "sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q==" }, "@babel/helper-create-regexp-features-plugin": { "version": "7.14.5", @@ -79,9 +79,9 @@ "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==" }, "@babel/helper-member-expression-to-functions": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz", - "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz", + "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==" }, "@babel/helper-module-imports": { "version": "7.14.5", @@ -89,9 +89,9 @@ "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==" }, "@babel/helper-module-transforms": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz", - "integrity": "sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz", + "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==" }, "@babel/helper-optimise-call-expression": { "version": "7.14.5", @@ -109,9 +109,9 @@ "integrity": "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==" }, "@babel/helper-replace-supers": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz", - "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz", + "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==" }, "@babel/helper-simple-access": { "version": "7.14.8", @@ -144,9 +144,9 @@ "integrity": "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==" }, "@babel/helpers": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz", - "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==" + "version": "7.15.3", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz", + "integrity": "sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==" }, "@babel/highlight": { "version": "7.14.5", @@ -154,9 +154,9 @@ "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==" }, "@babel/parser": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz", - "integrity": "sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==" + "version": "7.15.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz", + "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==" }, "@babel/plugin-proposal-async-generator-functions": { "version": "7.14.9", @@ -254,9 +254,9 @@ "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==" }, "@babel/plugin-transform-block-scoping": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz", - "integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==" + "version": "7.15.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz", + "integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==" }, "@babel/plugin-transform-classes": { "version": "7.14.9", @@ -289,9 +289,9 @@ "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==" }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz", - "integrity": "sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz", + "integrity": "sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==" }, "@babel/plugin-transform-object-super": { "version": "7.14.5", @@ -309,9 +309,9 @@ "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==" }, "@babel/plugin-transform-react-display-name": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz", - "integrity": "sha512-07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ==" + "version": "7.15.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz", + "integrity": "sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q==" }, "@babel/plugin-transform-react-jsx": { "version": "7.14.9", @@ -334,9 +334,9 @@ "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==" }, "@babel/plugin-transform-runtime": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz", - "integrity": "sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz", + "integrity": "sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==" }, "@babel/plugin-transform-shorthand-properties": { "version": "7.14.5", @@ -374,9 +374,9 @@ "integrity": "sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==" }, "@babel/runtime": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz", - "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==" + "version": "7.15.3", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz", + "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==" }, "@babel/template": { "version": "7.14.5", @@ -384,19 +384,19 @@ "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==" }, "@babel/traverse": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz", - "integrity": "sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz", + "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==" }, "@babel/types": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", - "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==" }, "@meteorjs/babel": { - "version": "7.12.0", - "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.12.0.tgz", - "integrity": "sha512-IwWZxEwH7cLzC63Mwu2g4qiJYLkKx9kRa4qulyEbyxxp2YbR7dUD646Z0UZWe7ZzAVXiBUo3fEQPfrN2O0ZLew==" + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.13.0.tgz", + "integrity": "sha512-7GJ6UN//6B8bIkrOk+5ADUIMxe9pacnUQopHx2NqBnRiZ2IVgWPWn59TAPmh8SxAR5uaIZsdMFOTk3eNofc/aA==" }, "acorn": { "version": "6.4.2", @@ -589,9 +589,9 @@ "integrity": "sha512-1IajDumYOAPYImkHbrKeiN5AKKP9iOmRoO2IPbIuVp0j2iuCcj0n7P260z38siKMZZ+85d3mJZdtW8IgOv+Tzg==" }, "browserslist": { - "version": "4.16.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", - "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==" + "version": "4.16.7", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz", + "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==" }, "call-bind": { "version": "1.0.2", @@ -599,9 +599,9 @@ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==" }, "caniuse-lite": { - "version": "1.0.30001248", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz", - "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==" + "version": "1.0.30001249", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz", + "integrity": "sha512-vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw==" }, "chalk": { "version": "2.4.2", @@ -619,9 +619,9 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz", + "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==" }, "convert-source-map": { "version": "1.8.0", @@ -629,9 +629,9 @@ "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==" }, "core-js-compat": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.0.tgz", - "integrity": "sha512-5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q==", + "version": "3.16.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.1.tgz", + "integrity": "sha512-NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ==", "dependencies": { "semver": { "version": "7.0.0", @@ -651,9 +651,9 @@ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==" }, "electron-to-chromium": { - "version": "1.3.793", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.793.tgz", - "integrity": "sha512-l9NrGV6Mr4ov5mayYPvIWcwklNw5ROmy6rllzz9dCACw9nKE5y+s5uQk+CBJMetxrWZ6QJFsvEfG6WDcH2IGUg==" + "version": "1.3.802", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.802.tgz", + "integrity": "sha512-dXB0SGSypfm3iEDxrb5n/IVKeX4uuTnFHdve7v+yKJqNpEP0D4mjFJ8e1znmSR+OOVlVC+kDO6f2kAkTFXvJBg==" }, "escalade": { "version": "3.1.1", @@ -756,9 +756,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node-releases": { - "version": "1.1.73", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz", - "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==" + "version": "1.1.74", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.74.tgz", + "integrity": "sha512-caJBVempXZPepZoZAPCWRTNxYQ+xtG/KAi4ozTA5A+nJ7IU+kLQCbqaUjb5Rwy14M9upBWiQ4NutcmW04LJSRw==" }, "object-keys": { "version": "1.1.1", diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 5e913c6a83..23942a63cc 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '2.3.4' + version: '2.3.5-beta.0' }); Package.includeTool(); diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index ef97903f39..3ca2bf2369 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "2.3.3-rc.0", + "version": "2.3.5-beta.0", "recommended": false, "official": false, "description": "Meteor" From 7d455c732da10072ebac992d167dde15f7a94acc Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Wed, 11 Aug 2021 18:56:09 +0200 Subject: [PATCH 16/43] Update to Node 14.17.5 --- meteor | 2 +- scripts/build-dev-bundle-common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meteor b/meteor index 9e4b0716c5..235117b1d3 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=14.17.4.5 +BUNDLE_VERSION=14.17.5.0 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh index 135253baaf..8bf690f97b 100644 --- a/scripts/build-dev-bundle-common.sh +++ b/scripts/build-dev-bundle-common.sh @@ -5,7 +5,7 @@ set -u UNAME=$(uname) ARCH=$(uname -m) -NODE_VERSION=14.17.4 +NODE_VERSION=14.17.5 MONGO_VERSION_64BIT=4.4.4 MONGO_VERSION_32BIT=3.2.22 NPM_VERSION=6.14.13 From cb5f08ca45f1038cf9cb21046e0339ebcc7a0605 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Wed, 11 Aug 2021 19:01:26 +0200 Subject: [PATCH 17/43] Adjust history per release of 2.2.3 --- History.md | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/History.md b/History.md index d2bcb57c14..b982bfffd6 100644 --- a/History.md +++ b/History.md @@ -35,27 +35,17 @@ #### Highlights -* Node.js updated to [`v14.`]() -* Typescript updated to [v4.3.5](https://github.com/Microsoft/TypeScript/releases/tag/v4.3.5) +* Updated Node.js per the [August security release](https://nodejs.org/en/blog/vulnerability/aug-2021-security-releases/) +* Includes same improvements as in Meteor v2.2.3 + - Typescript updated to [v4.3.5](https://github.com/Microsoft/TypeScript/releases/tag/v4.3.5) + - `@meteorjs/babel@7.12.0` #### Meteor Version Release * `meteor-tool@2.3.5` + - Node.js updated to [v14.17.5](https://nodejs.org/en/blog/release/v14.17.5/) - Typescript updated to [v4.3.5](https://github.com/Microsoft/TypeScript/releases/tag/v4.3.5) - `@meteorjs/babel@7.12.0` - - -* `@meteorjs/babel@7.12.0` && `@meteorjs/babel@7.13.0` - - Dependencies updated to their latest versions - -* `babel-compile@7.7.0` - - `@meteorjs/babel@7.12.0` - -* `ecmascript@0.15.3` - - Typescript and Babel version bump - -* `typescript@4.3.5` - - [`typescript@4.3.5`](https://github.com/Microsoft/TypeScript/releases/tag/v4.3.5) ## v2.3.4, 2021-08-03 @@ -323,6 +313,33 @@ * `react-fast-refresh@0.1.1` - Fixed the package to work in IE11 +## v2.2.3, 2021-08-11 + +#### Highlights + +* Security update to Node.js [12.22.5](https://nodejs.org/en/blog/release/v12.22.5/) +* Typescript updated to [v4.3.5](https://github.com/Microsoft/TypeScript/releases/tag/v4.3.5) +* This release includes a backport of upgrade from `meteor-babel` to `@meteorjs/babel` + +#### Meteor Version Release + +* `meteor-tool@2.3.3` + - Updated Node.js to 12.22.5 per [Node security update](https://nodejs.org/en/blog/vulnerability/aug-2021-security-releases/) + - Typescript updated to [v4.3.5](https://github.com/Microsoft/TypeScript/releases/tag/v4.3.5) + - `@meteorjs/babel@7.12.0` + +* `@meteorjs/babel@7.12.0` && `@meteorjs/babel@7.13.0` + - Dependencies updated to their latest versions + +* `babel-compile@7.7.0` + - `@meteorjs/babel@7.12.0` + +* `ecmascript@0.15.3` + - Typescript and Babel version bump + +* `typescript@4.3.5` + - [`typescript@4.3.5`](https://github.com/Microsoft/TypeScript/releases/tag/v4.3.5) + ## v2.2.2, 2021-08-02 #### Highlights From 7df1dca55427915fc3f996e067e1c903decfd128 Mon Sep 17 00:00:00 2001 From: Beretta1979 <10073962+Beretta1979@users.noreply.github.com> Date: Thu, 12 Aug 2021 11:23:00 +0200 Subject: [PATCH 18/43] Fixes #11583 Do not add ROOT_URLto sourceMappingURL for base64 encoded urls --- tools/isobuild/bundler.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js index 2eb8aff68c..d49b3b1c84 100644 --- a/tools/isobuild/bundler.js +++ b/tools/isobuild/bundler.js @@ -2834,7 +2834,8 @@ var writeFile = Profile("bundler writeFile", function (file, builder, options) { } if (options && options.sourceMapUrl) { - data = addSourceMappingURL(data, options.sourceMapUrl); + const url = (process.env.ROOT_URL || "") + options.sourceMapUrl; + data = addSourceMappingURL(data, url); } else if (!options || !options.leaveSourceMapUrls) { // If we do not have an options.sourceMapUrl to append, then we still // want to remove any existing //# sourceMappingURL comments. @@ -2890,7 +2891,7 @@ function addSourceMappingURL(data, url, targetPath) { parts.push( newLineBuffer, - Buffer.from("//# sourceMappingURL=" + (process.env.ROOT_URL || "") + url, "utf8"), + Buffer.from("//# sourceMappingURL=" + url, "utf8"), newLineBuffer // trailing newline ); From 9abe31def2ff3ed9d0052782ea9149d8d30401ba Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Thu, 12 Aug 2021 16:38:15 +0200 Subject: [PATCH 19/43] 2.3.5-rc.0 --- History.md | 1 + packages/babel-compiler/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/typescript/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/History.md b/History.md index 99fd48ad41..cf94fc492e 100644 --- a/History.md +++ b/History.md @@ -68,6 +68,7 @@ - Node.js updated to [v14.17.5](https://nodejs.org/en/blog/release/v14.17.5/) - Typescript updated to [v4.3.5](https://github.com/Microsoft/TypeScript/releases/tag/v4.3.5) - `@meteorjs/babel@7.12.0` + - Fix broken source maps in VSCode - [PR](https://github.com/meteor/meteor/pull/11584) ## v2.3.4, 2021-08-03 diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 084fd87152..de83831112 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '7.7.0-beta235.0' + version: '7.7.0' }); Npm.depends({ diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index 82296c8daa..8536dd4b27 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.15.3-beta235.0', + version: '0.15.3', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 23942a63cc..f3b182d11b 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '2.3.5-beta.0' + version: '2.3.5-rc.0' }); Package.includeTool(); diff --git a/packages/typescript/package.js b/packages/typescript/package.js index 842e3e3626..1231b23e36 100644 --- a/packages/typescript/package.js +++ b/packages/typescript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "typescript", - version: "4.3.5-beta235.0", + version: "4.3.5", summary: "Compiler plugin that compiles TypeScript and ECMAScript in .ts and .tsx files", documentation: "README.md" }); diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 3ca2bf2369..62477ea7bb 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "2.3.5-beta.0", + "version": "2.3.5-rc.0", "recommended": false, "official": false, "description": "Meteor" From 9bc1bfdc73b148f3ed91b000ce6fd381b5bd1cbd Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Thu, 12 Aug 2021 19:28:03 +0200 Subject: [PATCH 20/43] Update dates in history --- History.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/History.md b/History.md index cf94fc492e..52db6b16c5 100644 --- a/History.md +++ b/History.md @@ -53,7 +53,7 @@ - Allow usage of `http` package both v1 and v2 for backward compatibility - Blaze weak dependency updated to v2.5.0 -## v2.3.5, 2021-08-11 +## v2.3.5, 2021-08-12 #### Highlights @@ -336,13 +336,12 @@ * `react-fast-refresh@0.1.1` - Fixed the package to work in IE11 -## v2.2.3, 2021-08-11 +## v2.2.3, 2021-08-12 #### Highlights * Security update to Node.js [12.22.5](https://nodejs.org/en/blog/release/v12.22.5/) * Typescript updated to [v4.3.5](https://github.com/Microsoft/TypeScript/releases/tag/v4.3.5) -* This release includes a backport of upgrade from `meteor-babel` to `@meteorjs/babel` #### Meteor Version Release From 56568881ae5d7677c317e3d91fa42e54e3145088 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Thu, 12 Aug 2021 21:34:13 +0200 Subject: [PATCH 21/43] Meteor 2.3.5 --- packages/meteor-tool/package.js | 2 +- scripts/admin/meteor-release-official.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index f3b182d11b..4df4c3f42b 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '2.3.5-rc.0' + version: '2.3.5' }); Package.includeTool(); diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json index 4fbe1ca896..efbc7b414d 100644 --- a/scripts/admin/meteor-release-official.json +++ b/scripts/admin/meteor-release-official.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "2.3.4", + "version": "2.3.5", "recommended": false, "official": true, "description": "The Official Meteor Distribution" From dd13980b938873d3550ab6f92cf26d9d6195b724 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Thu, 12 Aug 2021 23:19:11 +0200 Subject: [PATCH 22/43] Prepare npm installer for official release --- npm-packages/meteor-installer/config.js | 2 +- npm-packages/meteor-installer/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js index b82f006ee0..d213f02261 100644 --- a/npm-packages/meteor-installer/config.js +++ b/npm-packages/meteor-installer/config.js @@ -1,6 +1,6 @@ const path = require('path'); -const METEOR_LATEST_VERSION = '2.3.4'; +const METEOR_LATEST_VERSION = '2.3.5'; const localAppData = process.env.LOCALAPPDATA; diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json index 944aced191..384193d293 100644 --- a/npm-packages/meteor-installer/package.json +++ b/npm-packages/meteor-installer/package.json @@ -1,6 +1,6 @@ { "name": "meteor", - "version": "2.3.4", + "version": "2.3.5", "description": "Install Meteor on Windows", "main": "install.js", "scripts": { From b5946dc94d816b74ccf0f78c986a387c55318f13 Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Wed, 18 Aug 2021 11:16:55 -0300 Subject: [PATCH 23/43] Add support for linux and mac os on npm meteor installer --- npm-packages/meteor-installer/cli.js | 0 npm-packages/meteor-installer/config.js | 11 +++-- npm-packages/meteor-installer/extract.js | 8 +++- npm-packages/meteor-installer/install.js | 52 ++++++++++++++++------ npm-packages/meteor-installer/meteor.bat | 6 --- npm-packages/meteor-installer/package.json | 1 - 6 files changed, 53 insertions(+), 25 deletions(-) mode change 100644 => 100755 npm-packages/meteor-installer/cli.js delete mode 100644 npm-packages/meteor-installer/meteor.bat diff --git a/npm-packages/meteor-installer/cli.js b/npm-packages/meteor-installer/cli.js old mode 100644 new mode 100755 diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js index d213f02261..8f375a6a73 100644 --- a/npm-packages/meteor-installer/config.js +++ b/npm-packages/meteor-installer/config.js @@ -1,19 +1,22 @@ const path = require('path'); +const os = require('os'); const METEOR_LATEST_VERSION = '2.3.5'; const localAppData = process.env.LOCALAPPDATA; +const PLATFORM = os.platform(); +const rootPath = PLATFORM === 'win32' ? localAppData : os.homedir(); -if (!localAppData) { +if (PLATFORM === 'win32' && !localAppData) { throw new Error('LOCALAPPDATA env var is not set.'); } const meteorLocalFolder = '.meteor'; -const meteorPath = path.resolve(localAppData, meteorLocalFolder); +const meteorPath = path.resolve(rootPath, meteorLocalFolder); module.exports = { - extractPath: localAppData, + extractPath: rootPath, meteorPath, release: process.env.INSTALL_METEOR_VERSION || METEOR_LATEST_VERSION, - startedPath: path.resolve(localAppData, '.meteor-install-started.txt'), + startedPath: path.resolve(rootPath, '.meteor-install-started.txt'), } diff --git a/npm-packages/meteor-installer/extract.js b/npm-packages/meteor-installer/extract.js index 560e02d292..37ba5252d5 100644 --- a/npm-packages/meteor-installer/extract.js +++ b/npm-packages/meteor-installer/extract.js @@ -3,6 +3,7 @@ const sevenBin = require('7zip-bin'); const Seven = require('node-7z'); const fs = require('fs'); const { resolve, dirname } = require('path'); +const child_process = require('child_process'); function extractWith7Zip (tarPath, destination, onProgress) { return new Promise((resolve, reject) => { @@ -17,7 +18,7 @@ function extractWith7Zip (tarPath, destination, onProgress) { stream.on('error', function (err) { return reject(err); }); - + stream.on('end', function () { return resolve(); }); @@ -46,6 +47,10 @@ function createSymlinks(symlinks, baseDir) { }) } +function extractWithNativeTar (tarPath, destination, onProgress) { + child_process.execSync(`tar -xzf "${tarPath}" -C "${destination}" -o`) +} + function extractWithTar (tarPath, destination, onProgress) { let symlinks = []; @@ -107,4 +112,5 @@ function extractWithTar (tarPath, destination, onProgress) { module.exports = { extractWithTar, extractWith7Zip, + extractWithNativeTar } diff --git a/npm-packages/meteor-installer/install.js b/npm-packages/meteor-installer/install.js index 5a5875512b..6b61418f57 100644 --- a/npm-packages/meteor-installer/install.js +++ b/npm-packages/meteor-installer/install.js @@ -4,21 +4,18 @@ const Seven = require('node-7z'); const path = require('path'); const sevenBin = require('7zip-bin'); const fs = require('fs'); +const child_process = require('child_process'); +const fsPromises = fs.promises; const tmp = require('tmp'); const os = require('os'); const { meteorPath, release, startedPath, extractPath } = require('./config.js'); const { uninstall } = require('./uninstall'); -const { extractWithTar, extractWith7Zip } = require('./extract.js'); +const { extractWithTar, extractWith7Zip, extractWithNativeTar } = require('./extract.js'); process.on('unhandledRejection', (err) => { throw err; }); -if (os.platform() !== 'win32') { - console.error('Can only install on Windows'); - process.exit(1); -} - if (os.arch() !== 'x64') { console.error('The current architecture is not supported:', os.arch()); process.exit(1); @@ -35,10 +32,6 @@ if (fs.existsSync(startedPath)) { console.log('It seems the previous installation of Meteor did not succeed.'); uninstall(); console.log(''); -} else if (fs.existsSync(meteorPath) ) { - console.log('Meteor is already installed at', meteorPath); - console.log('If you want to reinstall, delete that folder and run this command again'); - process.exit(); } // Creating symlinks requires running as an administrator or @@ -63,7 +56,6 @@ try { console.log('Assuming unable to create symlinks'); } } - download(); function download() { @@ -74,7 +66,9 @@ function download() { }, cliProgress.Presets.shades_classic); downloadProgress.start(100, 0); - const url = `https://packages.meteor.com/bootstrap-link?arch=os.windows.x86_64&release=${release}` + const url = os.platform() === 'linux' || os.platform() === 'darwin' ? + `https://s3.amazonaws.com/com.meteor.static/packages-bootstrap/${release}/meteor-bootstrap-os.${os.platform()}.x86_64.tar.gz` : + `https://packages.meteor.com/bootstrap-link?arch=os.${os.platform()}.x86_64&release=${release}` const dl = new DownloaderHelper(url, tempPath, { retry: { maxRetries: 5, delay: 5000 }, override: true, @@ -95,7 +89,24 @@ function download() { throw new Error('meteor.tar.gz does not exist'); } - decompress(); + if(os.platform() === 'linux' || os.platform() === 'darwin'){ + fs.writeFileSync(startedPath, 'Meteor install started'); + const decompressProgress = new cliProgress.SingleBar({ + format: 'Decompressing |{bar}| {percentage}%', + clearOnComplete: true, + }, cliProgress.Presets.shades_classic); + decompressProgress.start(100, 0); + const start = Date.now(); + extractWithNativeTar(path.resolve(tempPath, tarGzName), extractPath); + const end = Date.now(); + decompressProgress.update(100); + decompressProgress.stop(); + console.log(`=> Meteor Decompressed in ${(end - start) / 1000}s`); + + setup(); + }else { + decompress(); + } }); dl.start(); @@ -155,9 +166,22 @@ async function extract() { decompressProgress.stop(); const end = Date.now(); console.log(`=> Meteor Extracted ${(end - start) / 1000}s`); + await setup(); +} +async function setup(){ fs.unlinkSync(startedPath); + await setupExecPath() showGettingStarted(); } +async function setupExecPath(){ + if(os.platform() === 'darwin' || os.platform() === 'linux') { + const bashrcFile = process.env.SHELL && process.env.SHELL.includes("zsh") ? ".zshrc" : ".bashrc"; + await fsPromises.appendFile(`${os.homedir()}/${bashrcFile}`, `export PATH=$PATH:${meteorPath}\n`); + return; + } + + await child_process.execSync(`setx path "%path%;${meteorPath}`); +} function showGettingStarted() { const message = ` @@ -165,6 +189,8 @@ function showGettingStarted() { Meteor has been installed! +*You might need to open a new terminal windows to have access to the meteor command.* + To get started fast: $ meteor create ~/my_cool_app diff --git a/npm-packages/meteor-installer/meteor.bat b/npm-packages/meteor-installer/meteor.bat deleted file mode 100644 index 78c38bf709..0000000000 --- a/npm-packages/meteor-installer/meteor.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -SETLOCAL -SET METEOR_INSTALLATION=%LOCALAPPDATA%\.meteor -"%METEOR_INSTALLATION%\meteor.bat" %* -ENDLOCAL -EXIT /b %ERRORLEVEL% diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json index 384193d293..ab79388afa 100644 --- a/npm-packages/meteor-installer/package.json +++ b/npm-packages/meteor-installer/package.json @@ -18,7 +18,6 @@ "tmp": "^0.1.0" }, "bin": { - "meteor": "meteor.bat", "meteor-installer": "cli.js" } } From 8b708f36e943e414f9f9e1f94023a8a98d43075c Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Wed, 18 Aug 2021 13:56:08 -0300 Subject: [PATCH 24/43] Add support for linux and mac os on npm meteor installer - fix windows installer --- npm-packages/meteor-installer/install.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/npm-packages/meteor-installer/install.js b/npm-packages/meteor-installer/install.js index 6b61418f57..7ec575217e 100644 --- a/npm-packages/meteor-installer/install.js +++ b/npm-packages/meteor-installer/install.js @@ -66,9 +66,13 @@ function download() { }, cliProgress.Presets.shades_classic); downloadProgress.start(100, 0); - const url = os.platform() === 'linux' || os.platform() === 'darwin' ? - `https://s3.amazonaws.com/com.meteor.static/packages-bootstrap/${release}/meteor-bootstrap-os.${os.platform()}.x86_64.tar.gz` : - `https://packages.meteor.com/bootstrap-link?arch=os.${os.platform()}.x86_64&release=${release}` + const downloadPlatform = { + "win32" : "windows", + "darwin": "osx", + "linux": "linux" + } + + const url = `https://packages.meteor.com/bootstrap-link?arch=os.${downloadPlatform[os.platform()]}.x86_64&release=${release}` const dl = new DownloaderHelper(url, tempPath, { retry: { maxRetries: 5, delay: 5000 }, override: true, @@ -180,7 +184,7 @@ async function setupExecPath(){ return; } - await child_process.execSync(`setx path "%path%;${meteorPath}`); + child_process.execSync(`setx path "${meteorPath}/;%path%`); } function showGettingStarted() { From bc5e7e9c0c061b48d6cee266f98e2f081e8572ee Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Wed, 18 Aug 2021 14:08:48 -0300 Subject: [PATCH 25/43] Meteor installer on linux/mac - mac adjustments --- npm-packages/meteor-installer/install.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/npm-packages/meteor-installer/install.js b/npm-packages/meteor-installer/install.js index 7ec575217e..70e6faa644 100644 --- a/npm-packages/meteor-installer/install.js +++ b/npm-packages/meteor-installer/install.js @@ -32,8 +32,13 @@ if (fs.existsSync(startedPath)) { console.log('It seems the previous installation of Meteor did not succeed.'); uninstall(); console.log(''); +} else if (fs.existsSync(meteorPath) ) { + console.log('Meteor is already installed at', meteorPath); + console.log('If you want to reinstall, delete that folder and run this command again'); + process.exit(); } + // Creating symlinks requires running as an administrator or // for developer mode to be enabled let canCreateSymlinks = false; @@ -95,6 +100,7 @@ function download() { if(os.platform() === 'linux' || os.platform() === 'darwin'){ fs.writeFileSync(startedPath, 'Meteor install started'); + console.log("=> Extracting the tarball, this may take some time") const decompressProgress = new cliProgress.SingleBar({ format: 'Decompressing |{bar}| {percentage}%', clearOnComplete: true, @@ -105,7 +111,7 @@ function download() { const end = Date.now(); decompressProgress.update(100); decompressProgress.stop(); - console.log(`=> Meteor Decompressed in ${(end - start) / 1000}s`); + console.log(`=> Meteor extracted in ${(end - start) / 1000}s`); setup(); }else { From 64052035bc1d7bf1d19618f7c38fa1926645771e Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Thu, 19 Aug 2021 15:54:32 -0300 Subject: [PATCH 26/43] Prettify, simplify conditionals and add sudo case for npm installer --- npm-packages/meteor-installer/config.js | 13 +- npm-packages/meteor-installer/install.js | 153 ++++++++++++++--------- 2 files changed, 105 insertions(+), 61 deletions(-) diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js index 8f375a6a73..d6f57191b9 100644 --- a/npm-packages/meteor-installer/config.js +++ b/npm-packages/meteor-installer/config.js @@ -4,10 +4,13 @@ const os = require('os'); const METEOR_LATEST_VERSION = '2.3.5'; const localAppData = process.env.LOCALAPPDATA; -const PLATFORM = os.platform(); -const rootPath = PLATFORM === 'win32' ? localAppData : os.homedir(); +const isWindows = () => os.platform === 'win32'; +const rootPath = isWindows() ? localAppData : os.homedir(); +function isRoot() { + return process.getuid && process.getuid() === 0; +} -if (PLATFORM === 'win32' && !localAppData) { +if (isWindows() && !localAppData) { throw new Error('LOCALAPPDATA env var is not set.'); } @@ -19,4 +22,6 @@ module.exports = { meteorPath, release: process.env.INSTALL_METEOR_VERSION || METEOR_LATEST_VERSION, startedPath: path.resolve(rootPath, '.meteor-install-started.txt'), -} + isWindows, + isRoot, +}; diff --git a/npm-packages/meteor-installer/install.js b/npm-packages/meteor-installer/install.js index 70e6faa644..2219808225 100644 --- a/npm-packages/meteor-installer/install.js +++ b/npm-packages/meteor-installer/install.js @@ -8,11 +8,22 @@ const child_process = require('child_process'); const fsPromises = fs.promises; const tmp = require('tmp'); const os = require('os'); -const { meteorPath, release, startedPath, extractPath } = require('./config.js'); +const { + meteorPath, + release, + startedPath, + extractPath, + isWindows, +} = require('./config.js'); const { uninstall } = require('./uninstall'); -const { extractWithTar, extractWith7Zip, extractWithNativeTar } = require('./extract.js'); +const { + extractWithTar, + extractWith7Zip, + extractWithNativeTar, +} = require('./extract.js'); +const { isRoot } = require('./config'); -process.on('unhandledRejection', (err) => { +process.on('unhandledRejection', err => { throw err; }); @@ -21,6 +32,16 @@ if (os.arch() !== 'x64') { process.exit(1); } +const downloadPlatform = { + win32: 'windows', + darwin: 'osx', + linux: 'linux', +}; + +const url = `https://packages.meteor.com/bootstrap-link?arch=os.${ + downloadPlatform[os.platform()] +}.x86_64&release=${release}`; + const tempPath = tmp.dirSync().name; const tarGzName = 'meteor.tar.gz'; const tarName = 'meteor.tar'; @@ -49,8 +70,8 @@ try { fs.writeFileSync(target, ''); fs.symlinkSync(target, symlinkPath, 'file'); - fs.unlinkSync(symlinkPath) - fs.unlinkSync(target) + fs.unlinkSync(symlinkPath); + fs.unlinkSync(target); canCreateSymlinks = true; } catch (e) { if (e.code === 'EPERM') { @@ -65,27 +86,23 @@ download(); function download() { const start = Date.now(); - const downloadProgress = new cliProgress.SingleBar({ - format: 'Downloading |{bar}| {percentage}%', - clearOnComplete: true, - }, cliProgress.Presets.shades_classic); + const downloadProgress = new cliProgress.SingleBar( + { + format: 'Downloading |{bar}| {percentage}%', + clearOnComplete: true, + }, + cliProgress.Presets.shades_classic + ); downloadProgress.start(100, 0); - const downloadPlatform = { - "win32" : "windows", - "darwin": "osx", - "linux": "linux" - } - - const url = `https://packages.meteor.com/bootstrap-link?arch=os.${downloadPlatform[os.platform()]}.x86_64&release=${release}` const dl = new DownloaderHelper(url, tempPath, { retry: { maxRetries: 5, delay: 5000 }, override: true, - fileName: tarGzName + fileName: tarGzName, }); dl.on('progress', ({ progress }) => { - downloadProgress.update(progress) + downloadProgress.update(progress); }); dl.on('end', () => { downloadProgress.update(100); @@ -93,30 +110,34 @@ function download() { const end = Date.now(); console.log(`=> Meteor Downloaded in ${(end - start) / 1000}s`); - const exists = fs.existsSync(path.resolve(tempPath, tarGzName)) + const exists = fs.existsSync(path.resolve(tempPath, tarGzName)); if (!exists) { throw new Error('meteor.tar.gz does not exist'); } - if(os.platform() === 'linux' || os.platform() === 'darwin'){ - fs.writeFileSync(startedPath, 'Meteor install started'); - console.log("=> Extracting the tarball, this may take some time") - const decompressProgress = new cliProgress.SingleBar({ + if (isWindows()) { + decompress(); + return; + } + + fs.writeFileSync(startedPath, 'Meteor install started'); + console.log("=> Extracting the tarball, this may take some time")const decompressProgress = new cliProgress.SingleBar( + { format: 'Decompressing |{bar}| {percentage}%', clearOnComplete: true, - }, cliProgress.Presets.shades_classic); - decompressProgress.start(100, 0); - const start = Date.now(); - extractWithNativeTar(path.resolve(tempPath, tarGzName), extractPath); - const end = Date.now(); - decompressProgress.update(100); - decompressProgress.stop(); - console.log(`=> Meteor extracted in ${(end - start) / 1000}s`); - - setup(); - }else { - decompress(); - } + }, + cliProgress.Presets.shades_classic + ); + decompressProgress.start(100, 0); + const extractStart = Date.now(); + extractWithNativeTar(path.resolve(tempPath, tarGzName), extractPath); + const extractEnd = Date.now(); + decompressProgress.update(100); + decompressProgress.stop(); + console.log( + `=> Meteor extracted in ${(extractEnd - extractStart) / 1000}s` + ); + setup(); }); dl.start(); @@ -124,21 +145,24 @@ function download() { function decompress() { const start = Date.now(); - const decompressProgress = new cliProgress.SingleBar({ - format: 'Decompressing |{bar}| {percentage}%', - clearOnComplete: true, - }, cliProgress.Presets.shades_classic); + const decompressProgress = new cliProgress.SingleBar( + { + format: 'Decompressing |{bar}| {percentage}%', + clearOnComplete: true, + }, + cliProgress.Presets.shades_classic + ); decompressProgress.start(100, 0); const myStream = Seven.extract(path.resolve(tempPath, tarGzName), tempPath, { $progress: true, $bin: sevenBin.path7za, }); - myStream.on('progress', function (progress) { - decompressProgress.update(progress.percent) + myStream.on('progress', function(progress) { + decompressProgress.update(progress.percent); }); - myStream.on('end', function () { + myStream.on('end', function() { decompressProgress.update(100); decompressProgress.stop(); const end = Date.now(); @@ -151,12 +175,15 @@ async function extract() { const start = Date.now(); fs.writeFileSync(startedPath, 'Meteor install started'); - const decompressProgress = new cliProgress.SingleBar({ - format: 'Extracting |{bar}| {percentage}% - {fileCount} files completed', - clearOnComplete: true, - }, cliProgress.Presets.shades_classic); + const decompressProgress = new cliProgress.SingleBar( + { + format: 'Extracting |{bar}| {percentage}% - {fileCount} files completed', + clearOnComplete: true, + }, + cliProgress.Presets.shades_classic + ); decompressProgress.start(100, 0, { - fileCount: 0 + fileCount: 0, }); let tarPath = path.resolve(tempPath, tarName); @@ -165,11 +192,11 @@ async function extract() { // is done in extractWithTar if (canCreateSymlinks) { await extractWith7Zip(tarPath, extractPath, ({ percent, fileCount }) => { - decompressProgress.update(percent, { fileCount }) + decompressProgress.update(percent, { fileCount }); }); } else { await extractWithTar(tarPath, extractPath, ({ percent, fileCount }) => { - decompressProgress.update(percent, { fileCount }) + decompressProgress.update(percent, { fileCount }); }); } @@ -178,19 +205,31 @@ async function extract() { console.log(`=> Meteor Extracted ${(end - start) / 1000}s`); await setup(); } -async function setup(){ +async function setup() { fs.unlinkSync(startedPath); - await setupExecPath() + await setupExecPath(); showGettingStarted(); } -async function setupExecPath(){ - if(os.platform() === 'darwin' || os.platform() === 'linux') { - const bashrcFile = process.env.SHELL && process.env.SHELL.includes("zsh") ? ".zshrc" : ".bashrc"; - await fsPromises.appendFile(`${os.homedir()}/${bashrcFile}`, `export PATH=$PATH:${meteorPath}\n`); +async function setupExecPath() { + if (isWindows()) { + child_process.execSync(`setx path "${meteorPath}/;%path%`); return; } + const bashrcFile = + process.env.SHELL && process.env.SHELL.includes('zsh') + ? '.zshrc' + : '.bashrc'; + await fsPromises.appendFile( + `${os.homedir()}/${bashrcFile}`, + `export PATH=$PATH:${meteorPath}\n` + ); + if (!isRoot()) { + return; + } + // if we identified sudo is being used, we need to change the ownership of the meteorpath folder + const user = process.env.SUDO_USER; + child_process.execSync(`chown -R "${meteorPath}" ${user}` ); - child_process.execSync(`setx path "${meteorPath}/;%path%`); } function showGettingStarted() { From da71213637a4424a57d6fadd94d5c9deca8a594c Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Thu, 19 Aug 2021 15:59:48 -0300 Subject: [PATCH 27/43] Fixes rebase issue. --- npm-packages/meteor-installer/install.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/npm-packages/meteor-installer/install.js b/npm-packages/meteor-installer/install.js index 2219808225..8451c03d93 100644 --- a/npm-packages/meteor-installer/install.js +++ b/npm-packages/meteor-installer/install.js @@ -53,13 +53,14 @@ if (fs.existsSync(startedPath)) { console.log('It seems the previous installation of Meteor did not succeed.'); uninstall(); console.log(''); -} else if (fs.existsSync(meteorPath) ) { +} else if (fs.existsSync(meteorPath)) { console.log('Meteor is already installed at', meteorPath); - console.log('If you want to reinstall, delete that folder and run this command again'); + console.log( + 'If you want to reinstall, delete that folder and run this command again' + ); process.exit(); } - // Creating symlinks requires running as an administrator or // for developer mode to be enabled let canCreateSymlinks = false; @@ -121,7 +122,8 @@ function download() { } fs.writeFileSync(startedPath, 'Meteor install started'); - console.log("=> Extracting the tarball, this may take some time")const decompressProgress = new cliProgress.SingleBar( + console.log('=> Extracting the tarball, this may take some time'); + const decompressProgress = new cliProgress.SingleBar( { format: 'Decompressing |{bar}| {percentage}%', clearOnComplete: true, @@ -228,8 +230,7 @@ async function setupExecPath() { } // if we identified sudo is being used, we need to change the ownership of the meteorpath folder const user = process.env.SUDO_USER; - child_process.execSync(`chown -R "${meteorPath}" ${user}` ); - + child_process.execSync(`chown -R "${meteorPath}" ${user}`); } function showGettingStarted() { From 5da5212e3037529b7cb299d74b04ed8b14a79c7f Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Thu, 19 Aug 2021 16:00:53 -0300 Subject: [PATCH 28/43] Reverse chown command order --- npm-packages/meteor-installer/install.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm-packages/meteor-installer/install.js b/npm-packages/meteor-installer/install.js index 8451c03d93..692e31a6d0 100644 --- a/npm-packages/meteor-installer/install.js +++ b/npm-packages/meteor-installer/install.js @@ -230,7 +230,7 @@ async function setupExecPath() { } // if we identified sudo is being used, we need to change the ownership of the meteorpath folder const user = process.env.SUDO_USER; - child_process.execSync(`chown -R "${meteorPath}" ${user}`); + child_process.execSync(`chown -R ${user} "${meteorPath}"`); } function showGettingStarted() { From 6fe13a87ba349ccbfc091f57ee9c20225671219c Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Fri, 20 Aug 2021 17:49:41 +0200 Subject: [PATCH 29/43] Fix sending test metadata TEST_METADATA is by default "{}", so the check there is always true, even though it was intended to be false when the env var is not set. --- packages/ddp-server/stream_server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ddp-server/stream_server.js b/packages/ddp-server/stream_server.js index b39373f2f9..49c0f1385d 100644 --- a/packages/ddp-server/stream_server.js +++ b/packages/ddp-server/stream_server.js @@ -119,7 +119,7 @@ StreamServer = function () { // only to send a message after connection on tests, useful for // socket-stream-client/server-tests.js - if (process.env.TEST_METADATA) { + if (process.env.TEST_METADATA && process.env.TEST_METADATA !== "{}") { socket.send(JSON.stringify({ testMessageOnConnect: true })); } From 7c2aa59cf7be408d1e04f0e86635d897a223bf9d Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Fri, 20 Aug 2021 18:05:08 +0200 Subject: [PATCH 30/43] Bump ddp-server patch version --- packages/ddp-server/package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 88830fddb5..55fc6478d7 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '2.4.0', + version: '2.4.1', documentation: null }); From 1e9fd05200eed45abf1f2fa45e2a3201220b7d8a Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Fri, 20 Aug 2021 20:51:14 +0200 Subject: [PATCH 31/43] Published ddp-server@2.4.1 --- History.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/History.md b/History.md index 52db6b16c5..8ca52385a6 100644 --- a/History.md +++ b/History.md @@ -53,6 +53,9 @@ - Allow usage of `http` package both v1 and v2 for backward compatibility - Blaze weak dependency updated to v2.5.0 +* `ddp-server@2.4.1` + - Fix a bug where `testMessageOnConnect` has always been sent + ## v2.3.5, 2021-08-12 #### Highlights From 8fb65770d31e62cd0e3c35284b422d04aac2b1f9 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Mon, 23 Aug 2021 17:20:05 +0200 Subject: [PATCH 32/43] accounts-password use isEnroll --- History.md | 3 +++ packages/accounts-password/package.js | 4 ++-- packages/accounts-password/password_server.js | 12 ++++++------ .../packages/custom-minifier/plugin/minify.js | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/History.md b/History.md index 8ca52385a6..a32f8606f4 100644 --- a/History.md +++ b/History.md @@ -56,6 +56,9 @@ * `ddp-server@2.4.1` - Fix a bug where `testMessageOnConnect` has always been sent +* `accounts-password@2.0.1` + - Fix use of `isEnroll` in reset password + ## v2.3.5, 2021-08-12 #### Highlights diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index a443df6e55..24c9097d54 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -5,12 +5,12 @@ Package.describe({ // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2 // through -beta.5 and -rc.0 have already been published. - version: "2.0.0" + version: "2.0.1" }); Npm.depends({ 'bcrypt': '5.0.1' -}) +}); Package.onUse(api => { diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js index bd851ac1dd..4ee3468791 100644 --- a/packages/accounts-password/password_server.js +++ b/packages/accounts-password/password_server.js @@ -526,7 +526,7 @@ Accounts.generateResetToken = (userId, email, reason, extraTokenData) => { if (extraTokenData) { Object.assign(tokenRecord, extraTokenData); - } + } // if this method is called from the enroll account work-flow then // store the token record in 'services.password.enroll' db field // else store the token record in in 'services.password.reset' db field @@ -722,7 +722,7 @@ Meteor.methods({resetPassword: function (...args) { emails: 1, }} ); - + let isEnroll = false; // if token is in services.password.reset db field implies // this method is was not called from enroll account workflow @@ -746,9 +746,9 @@ Meteor.methods({resetPassword: function (...args) { } else { tokenRecord = user.services.password.reset; } - const { when, reason, email } = tokenRecord; + const { when, email } = tokenRecord; let tokenLifetimeMs = Accounts._getPasswordResetTokenLifetimeMs(); - if (reason === "enroll") { + if (isEnroll) { tokenLifetimeMs = Accounts._getPasswordEnrollTokenLifetimeMs(); } const currentTimeMs = Date.now(); @@ -760,7 +760,7 @@ Meteor.methods({resetPassword: function (...args) { error: new Meteor.Error(403, "Token has invalid email address") }; - const hashed = hashPassword(newPassword); + const hashed = hashPassword(newPassword); // NOTE: We're about to invalidate tokens on the user, who we might be // logged in as. Make sure to avoid logging ourselves out if this @@ -778,7 +778,7 @@ Meteor.methods({resetPassword: function (...args) { // - Verifying their email, since they got the password reset via email. let affectedRecords = {}; // if reason is enroll then check services.password.enroll.token field for affected records - if(reason === 'enroll') { + if(isEnroll) { affectedRecords = Meteor.users.update( { _id: user._id, diff --git a/tools/tests/apps/custom-minifier/packages/custom-minifier/plugin/minify.js b/tools/tests/apps/custom-minifier/packages/custom-minifier/plugin/minify.js index 45f7585f4a..7b2839f4e4 100644 --- a/tools/tests/apps/custom-minifier/packages/custom-minifier/plugin/minify.js +++ b/tools/tests/apps/custom-minifier/packages/custom-minifier/plugin/minify.js @@ -14,7 +14,7 @@ Plugin.registerMinifier({ function CustomMinifier(type) { this.type = type; -}; +} CustomMinifier.prototype.processFilesForBundle = function (files, options) { var self = this; From 3427057e07e77d8763545472232b0b9fbd9f2f16 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Wed, 25 Aug 2021 14:26:58 +0200 Subject: [PATCH 33/43] mdg:geolocation & mdg:reload-on-resume patch updates for history --- History.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/History.md b/History.md index a32f8606f4..e1bb5bd96c 100644 --- a/History.md +++ b/History.md @@ -59,6 +59,12 @@ * `accounts-password@2.0.1` - Fix use of `isEnroll` in reset password +* `mdg:geolocation@1.3.1` + - Fixed API to work with Meteor 2.3+ + +* `mdg:reload-on-resume@1.0.5` + - Fixed API to work with Meteor 2.3+ + ## v2.3.5, 2021-08-12 #### Highlights From 1dff251b4db63defee0446d41d7df82d75878529 Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Thu, 26 Aug 2021 16:51:32 -0300 Subject: [PATCH 34/43] Add support for linux and mac os on npm meteor installer - fix windows wsdl2 installer --- npm-packages/meteor-installer/config.js | 12 ++++++---- npm-packages/meteor-installer/extract.js | 9 +++++++- npm-packages/meteor-installer/install.js | 27 ++++++++-------------- npm-packages/meteor-installer/package.json | 2 +- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js index d6f57191b9..b04cdd59ed 100644 --- a/npm-packages/meteor-installer/config.js +++ b/npm-packages/meteor-installer/config.js @@ -2,13 +2,15 @@ const path = require('path'); const os = require('os'); const METEOR_LATEST_VERSION = '2.3.5'; - -const localAppData = process.env.LOCALAPPDATA; -const isWindows = () => os.platform === 'win32'; -const rootPath = isWindows() ? localAppData : os.homedir(); +const sudoUser = process.env.SUDO_USER || ''; function isRoot() { return process.getuid && process.getuid() === 0; } +const localAppData = process.env.LOCALAPPDATA; +const isWindows = () => os.platform() === 'win32'; +const rootPath = isWindows() + ? localAppData + : `${isRoot() ? `/home/${sudoUser}` : os.homedir()}`; if (isWindows() && !localAppData) { throw new Error('LOCALAPPDATA env var is not set.'); @@ -21,6 +23,8 @@ module.exports = { extractPath: rootPath, meteorPath, release: process.env.INSTALL_METEOR_VERSION || METEOR_LATEST_VERSION, + rootPath, + sudoUser, startedPath: path.resolve(rootPath, '.meteor-install-started.txt'), isWindows, isRoot, diff --git a/npm-packages/meteor-installer/extract.js b/npm-packages/meteor-installer/extract.js index 37ba5252d5..cf40639478 100644 --- a/npm-packages/meteor-installer/extract.js +++ b/npm-packages/meteor-installer/extract.js @@ -48,7 +48,13 @@ function createSymlinks(symlinks, baseDir) { } function extractWithNativeTar (tarPath, destination, onProgress) { - child_process.execSync(`tar -xzf "${tarPath}" -C "${destination}" -o`) + child_process.execSync(`tar -xf "${tarPath}" --checkpoint-action=ttyout="#%u: %T \r" -C "${destination}"`, { + cwd: process.cwd(), + env: process.env, + stdio: [process.stdin, process.stdout, process.stderr], + encoding: 'utf-8' + }) + } function extractWithTar (tarPath, destination, onProgress) { @@ -70,6 +76,7 @@ function extractWithTar (tarPath, destination, onProgress) { return new Promise((resolve, reject) => { tar.x({ file: tarPath, + preservePaths: true, cwd: destination, filter(path, entry) { if (entry.type === 'SymbolicLink') { diff --git a/npm-packages/meteor-installer/install.js b/npm-packages/meteor-installer/install.js index 692e31a6d0..afe59690bf 100644 --- a/npm-packages/meteor-installer/install.js +++ b/npm-packages/meteor-installer/install.js @@ -14,6 +14,9 @@ const { startedPath, extractPath, isWindows, + isRoot, + rootPath, + sudoUser, } = require('./config.js'); const { uninstall } = require('./uninstall'); const { @@ -21,7 +24,6 @@ const { extractWith7Zip, extractWithNativeTar, } = require('./extract.js'); -const { isRoot } = require('./config'); process.on('unhandledRejection', err => { throw err; @@ -105,7 +107,7 @@ function download() { dl.on('progress', ({ progress }) => { downloadProgress.update(progress); }); - dl.on('end', () => { + dl.on('end', async () => { downloadProgress.update(100); downloadProgress.stop(); const end = Date.now(); @@ -123,23 +125,13 @@ function download() { fs.writeFileSync(startedPath, 'Meteor install started'); console.log('=> Extracting the tarball, this may take some time'); - const decompressProgress = new cliProgress.SingleBar( - { - format: 'Decompressing |{bar}| {percentage}%', - clearOnComplete: true, - }, - cliProgress.Presets.shades_classic - ); - decompressProgress.start(100, 0); const extractStart = Date.now(); - extractWithNativeTar(path.resolve(tempPath, tarGzName), extractPath); + await extractWithNativeTar(path.resolve(tempPath, tarGzName), extractPath); const extractEnd = Date.now(); - decompressProgress.update(100); - decompressProgress.stop(); console.log( `=> Meteor extracted in ${(extractEnd - extractStart) / 1000}s` ); - setup(); + await setup(); }); dl.start(); @@ -222,15 +214,14 @@ async function setupExecPath() { ? '.zshrc' : '.bashrc'; await fsPromises.appendFile( - `${os.homedir()}/${bashrcFile}`, - `export PATH=$PATH:${meteorPath}\n` + `${rootPath}/${bashrcFile}`, + `export PATH=${meteorPath}:$PATH\n` ); if (!isRoot()) { return; } // if we identified sudo is being used, we need to change the ownership of the meteorpath folder - const user = process.env.SUDO_USER; - child_process.execSync(`chown -R ${user} "${meteorPath}"`); + child_process.execSync(`chown -R ${sudoUser} "${meteorPath}"`); } function showGettingStarted() { diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json index ab79388afa..7baaf17332 100644 --- a/npm-packages/meteor-installer/package.json +++ b/npm-packages/meteor-installer/package.json @@ -1,6 +1,6 @@ { "name": "meteor", - "version": "2.3.5", + "version": "2.3.6-beta4", "description": "Install Meteor on Windows", "main": "install.js", "scripts": { From 401170853130a0e70db865ceda8ed4b3b173a6e1 Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Thu, 26 Aug 2021 17:37:02 -0300 Subject: [PATCH 35/43] Add support for linux and mac os on npm meteor installer - fix windows wsdl2 installer --- npm-packages/meteor-installer/config.js | 2 + npm-packages/meteor-installer/extract.js | 85 ++++++++++++---------- npm-packages/meteor-installer/package.json | 2 +- 3 files changed, 48 insertions(+), 41 deletions(-) diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js index b04cdd59ed..2b618fc9ea 100644 --- a/npm-packages/meteor-installer/config.js +++ b/npm-packages/meteor-installer/config.js @@ -8,6 +8,7 @@ function isRoot() { } const localAppData = process.env.LOCALAPPDATA; const isWindows = () => os.platform() === 'win32'; +const isMac = () => os.platform() === 'darwin'; const rootPath = isWindows() ? localAppData : `${isRoot() ? `/home/${sudoUser}` : os.homedir()}`; @@ -27,5 +28,6 @@ module.exports = { sudoUser, startedPath: path.resolve(rootPath, '.meteor-install-started.txt'), isWindows, + isMac, isRoot, }; diff --git a/npm-packages/meteor-installer/extract.js b/npm-packages/meteor-installer/extract.js index cf40639478..e2abe6ae8a 100644 --- a/npm-packages/meteor-installer/extract.js +++ b/npm-packages/meteor-installer/extract.js @@ -4,77 +4,80 @@ const Seven = require('node-7z'); const fs = require('fs'); const { resolve, dirname } = require('path'); const child_process = require('child_process'); +const { isMac } = require('./config.js') -function extractWith7Zip (tarPath, destination, onProgress) { +function extractWith7Zip(tarPath, destination, onProgress) { return new Promise((resolve, reject) => { const stream = Seven.extractFull(tarPath, destination, { $progress: true, $bin: sevenBin.path7za, }); - stream.on('progress', function (progress) { + stream.on('progress', function(progress) { onProgress(progress); }); - stream.on('error', function (err) { + stream.on('error', function(err) { return reject(err); }); - stream.on('end', function () { + stream.on('end', function() { return resolve(); }); - }) + }); } function createSymlinks(symlinks, baseDir) { symlinks.forEach(({ path, linkPath }) => { try { - let resolveBase = resolve(baseDir, dirname(path)) + let resolveBase = resolve(baseDir, dirname(path)); const result = fs.statSync(resolve(resolveBase, linkPath)); if (result.isDirectory()) { fs.symlinkSync(linkPath, path, 'junction'); } else { - fs.copyFileSync( - resolve(resolveBase, linkPath), - resolve(baseDir, path), - ) + fs.copyFileSync(resolve(resolveBase, linkPath), resolve(baseDir, path)); } } catch (e) { console.log(path, linkPath); console.error(e); throw new Error('Unable to create symlink'); } - }) + }); } -function extractWithNativeTar (tarPath, destination, onProgress) { - child_process.execSync(`tar -xf "${tarPath}" --checkpoint-action=ttyout="#%u: %T \r" -C "${destination}"`, { - cwd: process.cwd(), - env: process.env, - stdio: [process.stdin, process.stdout, process.stderr], - encoding: 'utf-8' - }) - +function extractWithNativeTar(tarPath, destination, onProgress) { + child_process.execSync( + `tar -xf "${tarPath}" ${ + !isMac() ? `--checkpoint-action=ttyout="#%u: %T \r"` : `` + } -C "${destination}"`, + { + cwd: process.cwd(), + env: process.env, + stdio: [process.stdin, process.stdout, process.stderr], + encoding: 'utf-8', + } + ); } -function extractWithTar (tarPath, destination, onProgress) { - let symlinks = []; +function extractWithTar(tarPath, destination, onProgress) { + let symlinks = []; - let total = 0; - // This takes a few seconds, but lets us show the progress - tar.t({ - sync: true, - file: tarPath, - onentry() { - total += 1; - } - }); + let total = 0; + // This takes a few seconds, but lets us show the progress + tar.t({ + sync: true, + file: tarPath, + onentry() { + total += 1; + }, + }); - let started = 0; - let timeout = null; + let started = 0; + let timeout = null; - return new Promise((resolve, reject) => { - tar.x({ + return new Promise((resolve, reject) => { + tar.x( + { file: tarPath, preservePaths: true, cwd: destination, @@ -101,8 +104,9 @@ function extractWithTar (tarPath, destination, onProgress) { }); }, 300); } - } - }, (err) => { + }, + }, + err => { if (timeout) { clearTimeout(timeout); } @@ -112,12 +116,13 @@ function extractWithTar (tarPath, destination, onProgress) { } createSymlinks(symlinks, destination); resolve(); - }); - }); + } + ); + }); } module.exports = { extractWithTar, extractWith7Zip, - extractWithNativeTar -} + extractWithNativeTar, +}; diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json index 7baaf17332..72b2e1c2a1 100644 --- a/npm-packages/meteor-installer/package.json +++ b/npm-packages/meteor-installer/package.json @@ -1,6 +1,6 @@ { "name": "meteor", - "version": "2.3.6-beta4", + "version": "2.3.6-beta6", "description": "Install Meteor on Windows", "main": "install.js", "scripts": { From a4a1e368c370e3b2697637839cc6052226d7d1eb Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Thu, 26 Aug 2021 18:12:27 -0300 Subject: [PATCH 36/43] Add support for linux and mac os on npm meteor installer - fix instructions --- npm-packages/meteor-installer/install.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/npm-packages/meteor-installer/install.js b/npm-packages/meteor-installer/install.js index afe59690bf..4fc74938b1 100644 --- a/npm-packages/meteor-installer/install.js +++ b/npm-packages/meteor-installer/install.js @@ -58,7 +58,11 @@ if (fs.existsSync(startedPath)) { } else if (fs.existsSync(meteorPath)) { console.log('Meteor is already installed at', meteorPath); console.log( - 'If you want to reinstall, delete that folder and run this command again' +`If you want to reinstall it, run: + + $ meteor-installer uninstall + $ meteor-installer install +` ); process.exit(); } From f70237bd0740046fe24111b6276d7d10d0cfa43e Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Fri, 27 Aug 2021 11:03:19 -0300 Subject: [PATCH 37/43] Add support for linux and mac os on npm meteor installer - fix instructions --- npm-packages/meteor-installer/README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/npm-packages/meteor-installer/README.md b/npm-packages/meteor-installer/README.md index 45d1913654..60004d52be 100644 --- a/npm-packages/meteor-installer/README.md +++ b/npm-packages/meteor-installer/README.md @@ -1,8 +1,8 @@ -## Windows Meteor Installer +## Meteor Installer Requires [Node.js](https://nodejs.org/) 12 or newer. -Install Meteor on Windows by running: +Install Meteor by running: ```bash npm install -g meteor @@ -17,9 +17,10 @@ meteor-installer uninstall npm uninstall -g meteor ``` -The installer runs faster when [Windows Developer Mode](https://docs.microsoft.com/en-us/windows/apps/get-started/enable-your-device-for-development) is enabled. The installation extracts a large number of small files, which Windows Defender can cause to be very slow. +On Windows,The installer runs faster when [Windows Developer Mode](https://docs.microsoft.com/en-us/windows/apps/get-started/enable-your-device-for-development) is enabled. The installation extracts a large number of small files, which Windows Defender can cause to be very slow. -It is not recommended to run the installer and `meteor` as administrator. Otherwise, if the administrator is a separate user the `meteor` command might not always be found. +It is not recommended running the installer and `meteor` as administrator. Otherwise, if the administrator is a separate user the `meteor` command might not always be found. If your current setup needs administrator rights to use npm install -g (sudo), you will need to run it with "sudo npm install -g meteor --unsafe-perm". +We strongly advise against this. You can always change your npm modules permissions to your current user, more info [here](https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally): If you use a node version manager that uses a separate global `node_modules` folder for each Node version, you will need to re-install the `meteor` npm package when changing to a Node version for the first time. Otherwise, the `meteor` command will no longer be found. @@ -32,3 +33,6 @@ If you use a node version manager that uses a separate global `node_modules` fol | 2.3.2 | 2.3.1 | | 2.3.3 | 2.3.2 | | 2.3.4 | 2.3.4 | +| 2.3.5 | 2.3.5 | +| 2.3.6 | 2.3.5 | + From 88cb83fec848f78acc2f2d22a1ab5c365f5de8be Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Fri, 27 Aug 2021 11:16:19 -0300 Subject: [PATCH 38/43] Add support for linux and mac os on npm meteor installer - fix instructions --- README.md | 14 +++++++------- tools/README.md | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 75e9a8b15f..fd322c5f93 100644 --- a/README.md +++ b/README.md @@ -25,13 +25,7 @@ Are you looking for examples? Check this [meteor/examples](https://github.com/me ## Quick Start -On Linux/macOS, use this line: - -```bash -curl https://install.meteor.com/ | sh -``` - -On Windows, use this line: +On Linux/macOS/Windows, use this line: ```bash npm install -g meteor @@ -39,6 +33,12 @@ npm install -g meteor Visit the official [install page](https://www.meteor.com/developers/install) to learn more. +Alternatively, on macOS and Linux you can use: + +```bash +curl https://install.meteor.com/ | sh +``` + Create a project: ```bash diff --git a/tools/README.md b/tools/README.md index 46b8a18009..c8c68fdb8c 100644 --- a/tools/README.md +++ b/tools/README.md @@ -140,8 +140,7 @@ The entry-point of the tools code is in `index.js`. The Meteor Tool code has two modes of running: - from local checkout for development -- from a production release installed by running -`curl -L https://install.meteor.com | sh` or a Windows installer. +- from a production release installed by running `npm install -g meteor`. There are two different `meteor` / `meteor.bat` starting scripts in development and production. The production one is written by the packaging code. From ccb978df3ab6c0c88b2c4b2ed6ac8eb9bd8f73ce Mon Sep 17 00:00:00 2001 From: Renan Castro Date: Mon, 30 Aug 2021 16:57:27 -0300 Subject: [PATCH 39/43] Add support for linux and mac os on npm meteor installer - main channel publish --- npm-packages/meteor-installer/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json index 72b2e1c2a1..e625bee07b 100644 --- a/npm-packages/meteor-installer/package.json +++ b/npm-packages/meteor-installer/package.json @@ -1,6 +1,6 @@ { "name": "meteor", - "version": "2.3.6-beta6", + "version": "2.3.6", "description": "Install Meteor on Windows", "main": "install.js", "scripts": { From b6586a2e478e39205c6fa969d056f2aa3e84cde9 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Tue, 31 Aug 2021 18:48:59 +0200 Subject: [PATCH 40/43] Node 14.17.6 & dev bundle 14.17.6.0 --- meteor | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- scripts/build-dev-bundle-common.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meteor b/meteor index 235117b1d3..bfa3eca628 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=14.17.5.0 +BUNDLE_VERSION=14.17.6.0 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 62477ea7bb..dc307d860b 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "2.3.5-rc.0", + "version": "2.3.6-rc.0", "recommended": false, "official": false, "description": "Meteor" diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh index 8bf690f97b..9ff42125a8 100644 --- a/scripts/build-dev-bundle-common.sh +++ b/scripts/build-dev-bundle-common.sh @@ -5,10 +5,10 @@ set -u UNAME=$(uname) ARCH=$(uname -m) -NODE_VERSION=14.17.5 +NODE_VERSION=14.17.6 MONGO_VERSION_64BIT=4.4.4 MONGO_VERSION_32BIT=3.2.22 -NPM_VERSION=6.14.13 +NPM_VERSION=6.14.15 # If we built Node from source on Jenkins, this is the build number. NODE_BUILD_NUMBER= From 95c34eaa0e5636e491888892a0bc1d654a39cdb4 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Tue, 31 Aug 2021 19:05:07 +0200 Subject: [PATCH 41/43] 2.3.6-rc.0 --- History.md | 11 +++++++++++ packages/meteor-tool/package.js | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index e1bb5bd96c..6d856544ac 100644 --- a/History.md +++ b/History.md @@ -65,6 +65,17 @@ * `mdg:reload-on-resume@1.0.5` - Fixed API to work with Meteor 2.3+ +## v2.3.6, 2021-09-01 + +#### Highlights + +* Updated Node.js per [August 31st security release](https://nodejs.org/en/blog/vulnerability/aug-2021-security-releases2/) + +#### Meteor Version Release + +* `meteor-tool@2.3.6` + - Node.js updated to [v14.17.6](https://nodejs.org/en/blog/release/v14.17.6/) + ## v2.3.5, 2021-08-12 #### Highlights diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 4df4c3f42b..ebaa227ac2 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '2.3.5' + version: '2.3.6-rc.0' }); Package.includeTool(); From 7c29380421837095bee9dff616172e6a244211f4 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Tue, 31 Aug 2021 19:19:19 +0200 Subject: [PATCH 42/43] Update npm in dev bundle tool package --- 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 f498381318..c3e6d42e7a 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -10,7 +10,7 @@ var packageJson = { dependencies: { // Explicit dependency because we are replacing it with a bundled version // and we want to make sure there are no dependencies on a higher version - npm: "6.14.13", + npm: "6.14.15", pacote: "https://github.com/meteor/pacote/tarball/a81b0324686e85d22c7688c47629d4009000e8b8", "node-gyp": "8.0.0", "node-pre-gyp": "0.15.0", From d047d655b38e4d5d277e652577a94b5058d78666 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Thu, 2 Sep 2021 08:15:08 +0200 Subject: [PATCH 43/43] Release 2.3.6 --- History.md | 28 +++++++++++----------- npm-packages/meteor-installer/README.md | 1 + npm-packages/meteor-installer/config.js | 2 +- npm-packages/meteor-installer/package.json | 2 +- packages/meteor-tool/package.js | 2 +- scripts/admin/meteor-release-official.json | 2 +- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/History.md b/History.md index 6d856544ac..9b3b1cd305 100644 --- a/History.md +++ b/History.md @@ -5,17 +5,28 @@ * `meteor-tool@2.4` - `meteor show` now reports if a package is deprecated +## v2.3.6, 2021-09-02 + +#### Highlights + +* Updated Node.js per [August 31st security release](https://nodejs.org/en/blog/vulnerability/aug-2021-security-releases2/) + +#### Meteor Version Release + +* `meteor-tool@2.3.6` + - Node.js updated to [v14.17.6](https://nodejs.org/en/blog/release/v14.17.6/) + #### Independent Releases * `minifier-js@2.6.1` - Terser updated to [4.8.0](https://github.com/terser/terser/blob/master/CHANGELOG.md#v480) - + * `routepolicy@1.1.1` - Removed `underscore` dependency since it was not used in the package - + * `email@2.1.1` - Updated `nodemailer` to v6.6.3 - + * `callback-hook@1.3.1` - Modernized the code - Fixed a variable assignment bug in `dontBindEnvironment` function @@ -65,17 +76,6 @@ * `mdg:reload-on-resume@1.0.5` - Fixed API to work with Meteor 2.3+ -## v2.3.6, 2021-09-01 - -#### Highlights - -* Updated Node.js per [August 31st security release](https://nodejs.org/en/blog/vulnerability/aug-2021-security-releases2/) - -#### Meteor Version Release - -* `meteor-tool@2.3.6` - - Node.js updated to [v14.17.6](https://nodejs.org/en/blog/release/v14.17.6/) - ## v2.3.5, 2021-08-12 #### Highlights diff --git a/npm-packages/meteor-installer/README.md b/npm-packages/meteor-installer/README.md index 60004d52be..b2604ba2b7 100644 --- a/npm-packages/meteor-installer/README.md +++ b/npm-packages/meteor-installer/README.md @@ -35,4 +35,5 @@ If you use a node version manager that uses a separate global `node_modules` fol | 2.3.4 | 2.3.4 | | 2.3.5 | 2.3.5 | | 2.3.6 | 2.3.5 | +| 2.3.7 | 2.3.6 | diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js index 2b618fc9ea..9fa3561905 100644 --- a/npm-packages/meteor-installer/config.js +++ b/npm-packages/meteor-installer/config.js @@ -1,7 +1,7 @@ const path = require('path'); const os = require('os'); -const METEOR_LATEST_VERSION = '2.3.5'; +const METEOR_LATEST_VERSION = '2.3.6'; const sudoUser = process.env.SUDO_USER || ''; function isRoot() { return process.getuid && process.getuid() === 0; diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json index e625bee07b..56c901c563 100644 --- a/npm-packages/meteor-installer/package.json +++ b/npm-packages/meteor-installer/package.json @@ -1,6 +1,6 @@ { "name": "meteor", - "version": "2.3.6", + "version": "2.3.7", "description": "Install Meteor on Windows", "main": "install.js", "scripts": { diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index ebaa227ac2..768bc5ad96 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '2.3.6-rc.0' + version: '2.3.6' }); Package.includeTool(); diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json index efbc7b414d..98b7f048ef 100644 --- a/scripts/admin/meteor-release-official.json +++ b/scripts/admin/meteor-release-official.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "2.3.5", + "version": "2.3.6", "recommended": false, "official": true, "description": "The Official Meteor Distribution"