Merge branch 'octogonz/ae-newlines-fix' of https://github.com/Microsoft/rushstack into octogonz/ae-newlines-fix

iclanton · iclanton · commit 092e2c9445fc · 2019-11-19T21:49:41.000-08:00
diff --git a/common/changes/@microsoft/resolve-chunk-plugin/octogonz-ae-newlines-fix_2019-11-20-04-21.json b/common/changes/@microsoft/resolve-chunk-plugin/octogonz-ae-newlines-fix_2019-11-20-04-21.json
@@ -2,7 +2,7 @@
   "changes": [
     {
       "packageName": "@microsoft/resolve-chunk-plugin",
-      "comment": "Remove `@types/webpack` from devDependencies",
+      "comment": "Convert `@types/webpack` to a peer dependency",
       "type": "patch"
     }
   ],
diff --git a/common/changes/@microsoft/set-webpack-public-path-plugin/octogonz-ae-newlines-fix_2019-11-20-04-21.json b/common/changes/@microsoft/set-webpack-public-path-plugin/octogonz-ae-newlines-fix_2019-11-20-04-21.json
@@ -2,7 +2,7 @@
   "changes": [
     {
       "packageName": "@microsoft/set-webpack-public-path-plugin",
-      "comment": "Remove `@types/webpack` from devDependencies",
+      "comment": "Convert `@types/webpack` to a peer dependency",
       "type": "patch"
     }
   ],

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"changes": [`
`3`	`3`	`{`
`4`	`4`	`"packageName": "@microsoft/resolve-chunk-plugin",`
`5`		- "comment": "Remove `@types/webpack` from devDependencies",
	`5`	+ "comment": "Convert `@types/webpack` to a peer dependency",
`6`	`6`	`"type": "patch"`
`7`	`7`	`}`
`8`	`8`	`],`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"changes": [`
`3`	`3`	`{`
`4`	`4`	`"packageName": "@microsoft/set-webpack-public-path-plugin",`
`5`		- "comment": "Remove `@types/webpack` from devDependencies",
	`5`	+ "comment": "Convert `@types/webpack` to a peer dependency",
`6`	`6`	`"type": "patch"`
`7`	`7`	`}`
`8`	`8`	`],`