Merge pull request #1244 from Microsoft/octogonz/pnpm-3

Upgrade to PNPM 3.1.1 and Rush 5.7.0

.gitattributes

@@ -39,7 +39,6 @@
 *.jpg             binary
 *.js              text eol=crlf
 *.json            text eol=crlf
-*.json            linguist-language=JSON5
 *.less            text eol=crlf
 *.map             text eol=lf
 *.md              text eol=crlf
@@ -65,6 +64,15 @@
 
 # Don't allow people to merge changes to these generated files, because the result
 # may be invalid.  You need to run "rush update" again.
+pnpm-lock.yaml               merge=binary
 shrinkwrap.yaml              merge=binary
 npm-shrinkwrap.json          merge=binary
 yarn.lock                    merge=binary
+
+# Rush's JSON config files use JavaScript-style code comments.  The rule below prevents pedantic
+# syntax highlighters such as GitHub's from highlighting these comments as errors.  Your text editor
+# may also require a special configuration to allow comments in JSON.
+#
+# For more information, see this issue: https://github.com/Microsoft/web-build-tools/issues/1088
+#
+*.json            linguist-language=JSON-with-Comments

common/config/rush/command-line.json

@@ -21,20 +21,20 @@
     //    * The set of projects can be restricted e.g. using the "--to" or "--from" parameters.
     //    */
     //   "commandKind": "bulk",
-    //
+    // 
     //   /**
     //    * (Required) The name that will be typed as part of the command line.  This is also the name
     //    * of the "scripts" hook in the project's package.json file.
     //    * The name should be comprised of lower case words separated by hyphens.
     //    */
     //   "name": "my-bulk-command",
-    //
+    // 
     //   /**
     //    * (Required) A short summary of the custom command to be shown when printing command line
     //    * help, e.g. "rush --help".
     //    */
     //   "summary": "Example bulk custom command",
-    //
+    // 
     //   /**
     //    * A detailed description of the command to be shown when printing command line
     //    * help (e.g. "rush --help my-command").
@@ -44,33 +44,45 @@
     //    * documentation can make a big difference for the developer experience in your repo.
     //    */
     //   "description": "This is an example custom command that runs separately for each project",
-    //
+    // 
+    //   /**
+    //    * By default, Rush operations acquire a lock file which prevents multiple commands from executing simultaneously
+    //    * in the same repo folder.  (For example, it would be a mistake to run "rush install" and "rush build" at the
+    //    * same time.)  If your command makes sense to run concurrently with other operations,
+    //    * set "safeForSimultaneousRushProcesses" to true to disable this protection.
+    //    *
+    //    * In particular, this is needed for custom scripts that invoke other Rush commands.
+    //    */
+    //   "safeForSimultaneousRushProcesses": false,
+    // 
     //   /**
     //    * (Required) If true, then this command is safe to be run in parallel, i.e. executed
     //    * simultaneously for multiple projects.  Similar to "rush build", regardless of parallelism
     //    * projects will not start processing until their dependencies have completed processing.
     //    */
     //   "enableParallelism": false,
-    //
+    // 
     //   /**
     //    * Normally Rush requires that each project's package.json has a "scripts" entry matching
     //    * the custom command name.  To disable this check, set "ignoreMissingScript" to true;
     //    * projects with a missing definition will be skipped.
     //    */
     //   "ignoreMissingScript": false
     // },
-    //
+    // 
     // {
     //   /**
     //    * (Required) Determines the type of custom command.
     //    * Rush's "global" commands are invoked once for the entire repo.
     //    */
     //   "commandKind": "global",
-    //
+    // 
     //   "name": "my-global-command",
     //   "summary": "Example global custom command",
     //   "description": "This is an example custom command that runs once for the entire repo",
-    //
+    // 
+    //   "safeForSimultaneousRushProcesses": false,
+    // 
     //   /**
     //    * A script that will be invoked using the OS shell. The working directory will be the folder
     //    * that contains rush.json.  If custom parameters are associated with this command, their
@@ -91,12 +103,12 @@
     //    * A "flag" is a custom command-line parameter whose presence acts as an on/off switch.
     //    */
     //   "parameterKind": "flag",
-    //
+    // 
     //   /**
     //    * (Required) The long name of the parameter.  It must be lower-case and use dash delimiters.
     //    */
     //   "longName": "--my-flag",
-    //
+    // 
     //   /**
     //    * An optional alternative short name for the parameter.  It must be a dash followed by a single
     //    * lower-case or upper-case letter, which is case-sensitive.
@@ -107,22 +119,22 @@
     //    * a short name if you expect the parameter to be needed very often in everyday operations.
     //    */
     //   "shortName": "-m",
-    //
+    // 
     //   /**
     //    * (Required) A long description to be shown in the command-line help.
     //    *
     //    * Whenever you introduce commands/parameters, taking a little time to write meaningful
     //    * documentation can make a big difference for the developer experience in your repo.
     //    */
     //   "description": "A custom flag parameter that is passed to the scripts that are invoked when building projects",
-    //
+    // 
     //   /**
     //    * (Required) A list of custom commands and/or built-in Rush commands that this parameter may
     //    * be used with.  The parameter will be appended to the shell command that Rush invokes.
     //    */
     //    "associatedCommands": [ "build", "rebuild" ]
     // },
-    //
+    // 
     // {
     //   /**
     //    * (Required) Determines the type of custom parameter.
@@ -131,17 +143,17 @@
     //   "parameterKind": "choice",
     //   "longName": "--my-choice",
     //   "description": "A custom choice parameter for the \"my-global-command\" custom command",
-    //
+    // 
     //   "associatedCommands": [ "my-global-command" ],
-    //
+    // 
     //   /**
     //    * Normally if a parameter is omitted from the command line, it will not be passed
     //    * to the shell command. this value will be inserted by default.  Whereas if a "defaultValue"
     //    * is defined, the parameter will always be passed to the shell command, and will use the
     //    * default value if unspecified.  The value must be one of the defined alternatives.
     //    */
     //   "defaultValue": "vanilla",
-    //
+    // 
     //   /**
     //    * (Required) A list of alternative argument values that can be chosen for this parameter.
     //    */
@@ -152,7 +164,7 @@
     //        * e.g. "vanilla" in "--flavor vanilla".
     //        */
     //       "name": "vanilla",
-    //
+    // 
     //       /**
     //        * A detailed description for the alternative that can be shown in the command-line help.
     //        *
@@ -161,12 +173,12 @@
     //        */
     //       "description": "Use the vanilla flavor (the default)"
     //     },
-    //
+    // 
     //     {
     //       "name": "chocolate",
     //       "description": "Use the chocolate flavor"
     //     },
-    //
+    // 
     //     {
     //       "name": "strawberry",
     //       "description": "Use the strawberry flavor"