Merge branch 'devel' into release-2.8.1

tools/cli/commands-cordova.js

@@ -57,7 +57,7 @@ function doAddPlatform(options) {
       return;
     }
 
-    // Only write the new platform list when we have succesfully synchronized
+    // Only write the new platform list when we have successfully synchronized.
     projectContext.platformList.write(installedPlatforms);
 
     for (var platform of platformsToAdd) {

tools/cli/commands-packages-query.js

@@ -278,7 +278,7 @@ var PkgImplies = function (pkgDeps) {
       var archName = (r.arch === "os") ? "server" : r.arch;
       architectures.push(archName);
     });
-    // Sort architecures alphabetically.
+    // Sort architectures alphabetically.
     architectures.sort();
     if (! _.isEmpty(architectures)) {
       self.data.push({ name: name, architectures: architectures });

tools/cli/commands-packages.js

@@ -1243,7 +1243,7 @@ main.registerCommand({
       if (showJson) {
         if (expandedAlready) {
           // on expanded packages we only want to add minimal information to
-          // keep the json file compact, so we make the value a stirng
+          // keep the json file compact, so we make the value a string
           if (topLevelSet.has(packageName)) {
             parent[packageName] = `${packageToPrint.version}-${suffixes.topLevel}`
           } else {
@@ -2425,7 +2425,7 @@ main.registerCommand({
 
   // Log that we removed the constraints. It is possible that there are
   // constraints that we officially removed that the project still 'depends' on,
-  // which is why we do this in addition to dislpaying the PackageMapDelta.
+  // which is why we do this in addition to displaying the PackageMapDelta.
   _.each(packagesToRemove, function (packageName) {
     Console.info(packageName + ": removed dependency");
   });

tools/cli/default-npm-deps.js

@@ -16,7 +16,7 @@ export function install(appDir, options) {
     // NOTE we need skel-minimal to pull in jQuery which right now is required for Blaze
     const { dependencies } = require("../static-assets/skel-blaze/package.json");
 
-    // Write a minimial package.json with the same dependencies as the
+    // Write a minimal package.json with the same dependencies as the
     // default new-app package.json file.
     writeFile(
       packageJsonPath,

tools/cli/help.txt

@@ -209,10 +209,10 @@ conflicts with other packages in the app.
 Passing the --patch argument will update to the latest patch, if such exists.
 Patch releases contain very minor changes, usually bug fixes. Updating to
 the latest patch is always recommended. This will try to not update non-core
-packages unless strictly nessessary.
+packages unless strictly necessary.
 
 Passing the --release argument will force update to a specific release of
-meteor.  This will not update non-core packages unless strictly nessessary. It
+meteor.  This will not update non-core packages unless strictly necessary. It
 is also possible that some packages cannot be updated to be compatible with the
 new release. If that happens, the app will not build until dependencies on those
 packages are removed.

tools/console/console.js

@@ -13,7 +13,7 @@
 ///
 /// Sometimes, there is a phrase that shouldn't be split up over multiple
 /// lines (for example, 'meteor update'). When applicable, please use the
-/// following functions (Some of them add aditional formatting, especially when
+/// following functions (Some of them add additional formatting, especially when
 /// pretty-print is turned on):
 ///
 ///    - Console.command: things to enter on the command-line, such as
@@ -714,7 +714,7 @@ class Console extends ConsoleBase {
   // Passing in both options will offset the bulletPoint by the indentation,
   // like so:
   //  "  this message is indented by two."
-  //  "  => this mesage indented by two and
+  //  "  => this message indented by two and
   //        and also starts with an arrow."
   //
   options(o) {

tools/cordova/builder.js

@@ -133,9 +133,9 @@ export class CordovaBuilder {
         ios: {},
         android: {
           "AndroidXEnabled": true,
-          // we still use a port based on appId on iOS to avoid conflits on local webserver
-          // we dont need it on android, but the contentUrl can only be one, and we set this
-          // here to be able to intercept these calls
+          // We still use a port based on appId on iOS to avoid conflits on local webserver.
+          // We don't need it on android, but the contentUrl can only be one, and we set this
+          // here to be able to intercept these calls.
           "hostname": `localhost:${cordovaServerPort}`,
           "AndroidInsecureFileModeEnabled": true
         }
@@ -867,7 +867,7 @@ configuration. The key may be deprecated.`);
      * [Cordova documentation](http://cordova.apache.org/docs/en/7.x/config_ref/index.html#resource-file).
      * @param {String} src The project resource path.
      * @param {String} target Resource destination in build.
-     * @param {String} [platform] Optional. A platform name (either `ios` or `android`, both if ommited) to add a resource-file entry.
+     * @param {String} [platform] Optional. A platform name (either `ios` or `android`, both if omitted) to add a resource-file entry.
      * @memberOf App
      */
     addResourceFile: function (src, target, platform) {

tools/fs/files.ts

@@ -993,7 +993,7 @@ Profile("files.writeFileAtomically", function (filename: string, contents: strin
   rename(tmpFile, filename);
 });
 
-// Like fs.symlinkSync, but creates a temporay link and renames it over the
+// Like fs.symlinkSync, but creates a temporary link and renames it over the
 // file; this means it works even if the file already exists.
 // Do not use this function on Windows, it won't work.
 export function symlinkOverSync(linkText: string, file: string) {
@@ -1018,7 +1018,7 @@ export function symlinkOverSync(linkText: string, file: string) {
 // files.FancySyntaxError, from which you may read 'message', 'file',
 // 'line', and 'column' attributes ... v8 is normally reluctant to
 // reveal this information but will write it to stderr if you pass it
-// an undocumented flag. Unforunately though node doesn't have dup2 so
+// an undocumented flag. Unfortunately though node doesn't have dup2 so
 // we can't intercept the write. So instead we use a completely
 // different parser with a better error handling API. Ah well.  The
 // underlying V8 issue is:

tools/fs/watch.ts

@@ -726,9 +726,9 @@ export class Watcher {
     return stat;
   }
 
-  // Iterates over the array, calling handleItem for each item
-  // When this._async is true, it pauses ocassionally to avoid blocking for too long
-  // Stops iterating after watcher is stopped
+  // Iterates over the array, calling handleItem for each item.
+  // When this._async is true, it pauses occasionally to avoid blocking for too long.
+  // Stops iterating after watcher is stopped.
   private processBatches<T>(
     array: T[],
     handleItem: (item: T) => any,

tools/isobuild/builder.js

@@ -63,7 +63,7 @@ export default class Builder {
     outputPath,
     previousBuilder,
     // Even though in-place builds are disabled by default on some
-    // platforms (Windows), they can be forcibly reenabled with this
+    // platforms (Windows), they can be forcibly re-enabled with this
     // option, in cases where it's safe and/or necessary to avoid
     // clobbering existing files.
     forceInPlaceBuild = false,

tools/isobuild/bundler.js

@@ -474,7 +474,7 @@ class NodeModulesDirectory {
 
       if (start >= parts.length) {
         // If "node_modules" is the final part, then there's nothing
-        // futher to examine, yet.
+        // further to examine, yet.
         return true;
       }
 
@@ -833,7 +833,7 @@ class Target {
 
   // Top-level entry point for building a target. Generally to build a
   // target, you create with 'new', call make() to specify its sources
-  // and build options and actually do the work of buliding the
+  // and build options and actually do the work of building the
   // target, and finally you retrieve the build product with a
   // target-type-dependent function such as write() or toJsImage().
   //
@@ -1040,7 +1040,7 @@ class Target {
             buildmessage.error(
               "circular dependency between packages " +
                 unibuild.pkg.name + " and " + usedUnibuild.pkg.name);
-            // recover by not enforcing one of the depedencies
+            // recover by not enforcing one of the dependencies
             return;
           }
           onStack[usedUnibuild.id] = true;
@@ -2855,7 +2855,7 @@ var writeFile = Profile("bundler writeFile", function (file, builder, options) {
 // return the provided buffer without modification.
 function removeSourceMappingURLs(data) {
   if (Buffer.isBuffer(data)) {
-    // Unfortuantely there is no way to search a Buffer using a RegExp, so
+    // Unfortunately there is no way to search a Buffer using a RegExp, so
     // there's a chance of false positives here, which could lead to
     // unnecessarily stringifying and re-Buffer.from-ing the data, though
     // that should not cause any logical problems.
@@ -3088,7 +3088,7 @@ Find out more about Meteor at meteor.com.
     builder.complete();
 
     // Now, go and "fix up" the outputPath properties of the sub-builders.
-    // Since the sub-builders originally were targetted at a temporary
+    // Since the sub-builders originally were targeted at a temporary
     // buildPath of the main builder, their outputPath properties need to
     // be adjusted so we can later pass them as previousBuilder's
     Object.keys(builders).forEach(name => {
@@ -3392,7 +3392,7 @@ function bundle({
           // Tell the webapp package to pause responding to requests from
           // clients that use this arch, because we're about to write a
           // new version of this bundle to disk. If the message fails
-          // becuase the child process exited, proceed with writing the
+          // because the child process exited, proceed with writing the
           // target anyway.
           await pauseClient(arch).catch(ignoreHarmlessErrors);
 

tools/isobuild/compiler.js

@@ -516,7 +516,7 @@ var compileUnibuild = Profile(function (options) {
       // addAssets or putting it in the public/private directories in an app.
       //
       // This is a backwards-incompatible change, but it doesn't affect
-      // previously-published packages (because the check is occuring in the
+      // previously-published packages (because the check is occurring in the
       // compiler), and it doesn't affect apps (where random files outside of
       // private/public never end up in the source list anyway).
       //

tools/isobuild/js-analyze.js

@@ -297,7 +297,7 @@ export function findAssignedGlobals(source, hash) {
   programScope.implicit.left.forEach(entry => {
     if (entry.identifier &&
         entry.identifier.type === "Identifier" &&
-        // Only consider identifers that are assigned a value.
+        // Only consider identifiers that are assigned a value.
         entry.writeExpr) {
       assignedGlobals[entry.identifier.name] = true;
     }

tools/isobuild/package-source.js

@@ -506,7 +506,7 @@ Object.assign(PackageSource.prototype, {
     var initFromPackageDirOptions = options;
 
     // If we know what package we are initializing, we pass in a
-    // name. Otherwise, we are intializing the base package specified by 'name:'
+    // name. Otherwise, we are initializing the base package specified by 'name:'
     // field in Package.Describe. In that case, it is clearly not a test
     // package. (Though we could be initializing a specific package without it
     // being a test, for a variety of reasons).
@@ -1419,7 +1419,7 @@ Object.assign(PackageSource.prototype, {
           // subdirectories, so that we know whether we need to descend
           // further. If sources is still empty after we handle everything
           // else in dir, then nothing in this node_modules subdir can be
-          // imported by anthing outside of it, so we can ignore it.
+          // imported by anything outside of it, so we can ignore it.
           nodeModulesDir = subdir;
 
           // A "local" node_modules directory is one that's managed by the

tools/isobuild/resolver.ts

@@ -127,7 +127,7 @@ export default class Resolver {
 
   // Resolve the given module identifier to an object { path, stat } or
   // null, relative to an absolute parent path. The _seenDirPaths
-  // parameter is for internal use only and should be ommitted.
+  // parameter is for internal use only and should be omitted.
   public resolve(
     id: string,
     absParentPath: string,

tools/meteor-services/deploy.js

@@ -488,7 +488,7 @@ export async function bundleAndDeploy(options) {
   let preflightPassword = null;
 
   if (options.isBuildOnly) {
-    Console.info('Skipping pre authentication as the option --build-only was provded.');
+    Console.info('Skipping pre authentication as the option --build-only was provided.');
   } else {
     site = options.site && canonicalizeSite(options.site)
     if (! site) {

tools/meteor-services/service-connection.js

@@ -69,7 +69,7 @@ var ServiceConnection = function (endpointUrl, options) {
   self.connection._stream.on('disconnect', function (error) {
     self.connected = false;
     if (error && error.errorType === "DDP.ForcedReconnectError") {
-      // OK, we requested this, probably due to version negotation failure.
+      // OK, we requested this, probably due to version negotiation failure.
       //
       // This ought to have happened before we successfully connect, unless
       // somebody adds other calls to forced reconnect to Meteor...

tools/packaging/warehouse.js

@@ -6,7 +6,7 @@
 //
 // Because of this, we do have to be careful that the files used by this code
 // and the files used by tropohouse.js (the modern version of the warehouse)
-// don't overlap. tropohouse does not use tools or releases directorys, and
+// don't overlap. tropohouse does not use tools or releases directories, and
 // while they both have packages directories with similar structures, the
 // version names should not overlap: warehouse versions are SHAs and tropohouse
 // versions are semvers.  Additionally, while they do both use the 'meteor'

tools/runners/run-mongo.js

@@ -8,7 +8,7 @@ var _ = require('underscore');
 import { loadIsopackage } from '../tool-env/isopackets.js';
 var Console = require('../console/console.js').Console;
 
-// Given a Mongo URL, open an interative Mongo shell on this terminal
+// Given a Mongo URL, open an interactive Mongo shell on this terminal
 // on that database.
 var runMongoShell = function(url) {
   var mongoPath = files.pathJoin(

tools/tests/cordova-plugins.js

@@ -264,7 +264,7 @@ selftest.define("add cordova plugins", ["slow", "cordova"], function () {
 
   checkUserPlugins(s, ["com.example.plugin"]);
 
-  // This should fail beacuse the plugin does not exists at the specified path
+  // This should fail because the plugin does not exists at the specified path.
   run = s.run("build", '../a', "--server", "localhost:3000");
   run.waitSecs(30);
   run.expectExit(1);

tools/tool-testing/galaxy-utils.js

@@ -44,8 +44,8 @@ exports.sanityCheck = selftest.markStack(function () {
 
 // Login to Galaxy with environment-variable credentials passed in by the user.
 //
-// Unlike the normal `meteor deploy` Galaxy is not yet publically available, so
-// we don't want to use the publically-accessible test account here.
+// Unlike the normal `meteor deploy` Galaxy is not yet publicly available, so
+// we don't want to use the publicly-accessible test account here.
 exports.loginToGalaxy = selftest.markStack(function (sandbox) {
   var user = GALAXY_USERNAME;
   var pass = GALAXY_PASSWORD;
@@ -99,7 +99,7 @@ exports.createAndDeployApp =  selftest.markStack(function (sandbox, options) {
   var settings = options.settings;
   var appName = options.appName || testUtils.randomAppName();
 
-  // The simple app contains standart app packages and some small bits of code
+  // The simple app contains standard app packages and some small bits of code
   // so that we can check that it is being served correctly. Let's use that as
   // our default.
   var templateApp = options.templateApp || 'simple-app';

tools/tool-testing/sandbox.js

@@ -283,7 +283,7 @@ export default class Sandbox {
   }
 
   // Write to a file in the sandbox, overwriting its current contents
-  // if any. 'filename' is a path intepreted relative to the Sandbox's
+  // if any. 'filename' is a path interpreted relative to the Sandbox's
   // cwd. 'contents' is a string (utf8 is assumed).
   write(filename, contents) {
     files.writeFile(files.pathJoin(this.cwd, filename), contents, 'utf8');
@@ -295,7 +295,7 @@ export default class Sandbox {
   }
 
   // Reads a file in the sandbox as a utf8 string. 'filename' is a
-  // path intepreted relative to the Sandbox's cwd.  Returns null if
+  // path interpreted relative to the Sandbox's cwd.  Returns null if
   // file does not exist.
   read(filename) {
     const file = files.pathJoin(this.cwd, filename);

tools/utils/buildmessage.js

@@ -7,7 +7,7 @@ var Progress = require('../console/progress').Progress;
 var debugBuild = !!process.env.METEOR_DEBUG_BUILD;
 
 // A job is something like "building package foo". It contains the set
-// of messages generated by tha job. A given build run could contain
+// of messages generated by the job. A given build run could contain
 // several jobs. Each job has an (absolute) path associated with
 // it. Filenames in messages within a job are to be interpreted
 // relative to that path.

tools/utils/parse-stack.ts

@@ -25,7 +25,7 @@ type ParsedStackFrame = {
  * More recently called functions appear first.
  * 
  * Accomplishes this by parsing the text representation of the stack
- * with regular expressions. Unlikey to work anywhere but v8.
+ * with regular expressions. Unlikely to work anywhere but v8.
  * 
  * If a function on the stack has been marked with mark(), will not
  * return anything past that function. We call this the "user portion"