Merge pull request microsoft#3678 from dmichon-msft/pnpm-config-environment

dmichon-msft · web-flow · commit a1afb32e5e6b · 2022-10-06T15:30:58.000-07:00
[rush] environmentVariables in pnpm-config schema
diff --git a/common/changes/@microsoft/rush/pnpm-config-environment_2022-10-06-21-55.json b/common/changes/@microsoft/rush/pnpm-config-environment_2022-10-06-21-55.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Add missing \"environmentVariables\" property to \"pnpm-config.json\" schema to restore feature parity with \"rush.json\" \"pnpmOptions\" field.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}
diff --git a/libraries/rush-lib/src/logic/pnpm/test/PnpmOptionsConfiguration.test.ts b/libraries/rush-lib/src/logic/pnpm/test/PnpmOptionsConfiguration.test.ts
@@ -37,6 +37,13 @@ describe(PnpmOptionsConfiguration.name, () => {
       'bar@^2.1.0': '3.0.0',
       'qar@1>zoo': '2'
     });
+
+    expect(pnpmConfiguration.environmentVariables).toEqual({
+      NODE_OPTIONS: {
+        value: '--max-old-space-size=4096',
+        override: false
+      }
+    });
   });
 
   it('loads packageExtensions', () => {
diff --git a/libraries/rush-lib/src/logic/pnpm/test/jsonFiles/pnpm-config-overrides.json b/libraries/rush-lib/src/logic/pnpm/test/jsonFiles/pnpm-config-overrides.json
@@ -4,5 +4,12 @@
     "quux": "npm:@myorg/quux@^1.0.0",
     "bar@^2.1.0": "3.0.0",
     "qar@1>zoo": "2"
+  },
+
+  "environmentVariables": {
+    "NODE_OPTIONS": {
+      "value": "--max-old-space-size=4096",
+      "override": false
+    }
   }
 }
diff --git a/libraries/rush-lib/src/schemas/pnpm-config.schema.json b/libraries/rush-lib/src/schemas/pnpm-config.schema.json
@@ -26,6 +26,23 @@
       "enum": ["local", "global"]
     },
 
+    "environmentVariables": {
+      "description": "Environment variables for PNPM invocation",
+      "type": "object",
+      "additionalProperties": {
+        "type": "object",
+        "properties": {
+          "value": {
+            "type": "string"
+          },
+          "override": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      }
+    },
+
     "preventManualShrinkwrapChanges": {
       "description": "If true, then \"rush install\" will report an error if manual modifications were made to the PNPM shrinkwrap file without running `rush update` afterwards. To temporarily disable this validation when invoking \"rush install\", use the \"--bypassPolicy\" command-line parameter. The default value is false.",
       "type": "boolean"

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,12 @@`
`4`	`4`	`"quux": "npm:@myorg/quux@^1.0.0",`
`5`	`5`	`"bar@^2.1.0": "3.0.0",`
`6`	`6`	`"qar@1>zoo": "2"`
	`7`	`+ },`
	`8`	`+`
	`9`	`+ "environmentVariables": {`
	`10`	`+ "NODE_OPTIONS": {`
	`11`	`+ "value": "--max-old-space-size=4096",`
	`12`	`+ "override": false`
	`13`	`+ }`
`7`	`14`	`}`
`8`	`15`	`}`