Proactively fix up some dependency inconsistencies found by implicitPreferredVersions=false

octogonz · octogonz · commit 685c2c280343 · 2019-11-07T00:14:50.000-08:00
diff --git a/apps/api-extractor-model/package.json b/apps/api-extractor-model/package.json
@@ -23,7 +23,6 @@
     "@rushstack/eslint-config": "0.4.1",
     "@types/jest": "23.3.11",
     "@types/node": "8.10.54",
-    "gulp": "~4.0.2",
-    "tslint-microsoft-contrib": "~5.2.1"
+    "gulp": "~4.0.2"
   }
 }
diff --git a/apps/rush-lib/package.json b/apps/rush-lib/package.json
@@ -61,6 +61,7 @@
     "@types/semver": "5.3.33",
     "@types/tar": "4.0.0",
     "@types/z-schema": "3.16.31",
-    "gulp": "~4.0.2"
+    "gulp": "~4.0.2",
+    "jest": "~23.6.0"
   }
 }
diff --git a/build-tests/web-library-build-test/package.json b/build-tests/web-library-build-test/package.json
@@ -14,6 +14,7 @@
     "@microsoft/web-library-build": "7.3.5",
     "@types/jest": "23.3.11",
     "gulp": "~4.0.2",
+    "jest": "~23.6.0",
     "ts-jest": "~22.4.6"
   }
 }
diff --git a/common/config/rush/nonbrowser-approved-packages.json b/common/config/rush/nonbrowser-approved-packages.json
@@ -6,10 +6,6 @@
       "name": "@microsoft/api-documenter",
       "allowedCategories": [ "libraries", "tests" ]
     },
-    {
-      "name": "timsort",
-      "allowedCategories": [ "libraries" ]
-    },
     {
       "name": "@microsoft/api-extractor",
       "allowedCategories": [ "libraries", "tests" ]
@@ -384,7 +380,7 @@
     },
     {
       "name": "jest",
-      "allowedCategories": [ "libraries" ]
+      "allowedCategories": [ "libraries", "tests" ]
     },
     {
       "name": "jest-cli",
@@ -526,6 +522,10 @@
       "name": "through2",
       "allowedCategories": [ "libraries" ]
     },
+    {
+      "name": "timsort",
+      "allowedCategories": [ "libraries" ]
+    },
     {
       "name": "true-case-path",
       "allowedCategories": [ "libraries" ]
diff --git a/core-build/gulp-core-build-mocha/package.json b/core-build/gulp-core-build-mocha/package.json
@@ -21,6 +21,7 @@
     "gulp-mocha": "~6.0.0"
   },
   "devDependencies": {
+    "@microsoft/node-library-build": "6.3.2",
     "@microsoft/rush-stack-compiler-3.4": "0.3.2",
     "@rushstack/eslint-config": "0.4.1",
     "@types/glob": "5.0.30",
diff --git a/core-build/gulp-core-build-typescript/package.json b/core-build/gulp-core-build-typescript/package.json
@@ -30,7 +30,6 @@
     "@types/glob": "5.0.30",
     "@types/resolve": "0.0.8",
     "gulp": "~4.0.2",
-    "tslint-microsoft-contrib": "~5.2.1",
     "typescript": "~3.2.4"
   }
 }
diff --git a/core-build/gulp-core-build/package.json b/core-build/gulp-core-build/package.json
@@ -28,6 +28,7 @@
     "end-of-stream": "~1.1.0",
     "glob-escape": "~0.0.1",
     "globby": "~5.0.0",
+    "glob": "~7.0.5",
     "gulp": "~4.0.2",
     "gulp-flatten": "~0.2.0",
     "gulp-if": "^2.0.1",
diff --git a/webpack/resolve-chunk-plugin/package.json b/webpack/resolve-chunk-plugin/package.json
@@ -20,6 +20,7 @@
     "@microsoft/rush-stack-compiler-3.4": "0.3.5",
     "@rushstack/eslint-config": "0.4.1",
     "@types/mocha": "5.2.5",
+    "@types/node": "8.10.54",
     "chai": "~3.5.0",
     "gulp": "~4.0.2",
     "mocha": "^5.2.0"

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`"@rushstack/eslint-config": "0.4.1",`
`24`	`24`	`"@types/jest": "23.3.11",`
`25`	`25`	`"@types/node": "8.10.54",`
`26`		`- "gulp": "~4.0.2",`
`27`		`- "tslint-microsoft-contrib": "~5.2.1"`
	`26`	`+ "gulp": "~4.0.2"`
`28`	`27`	`}`
`29`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@`
`61`	`61`	`"@types/semver": "5.3.33",`
`62`	`62`	`"@types/tar": "4.0.0",`
`63`	`63`	`"@types/z-schema": "3.16.31",`
`64`		`- "gulp": "~4.0.2"`
	`64`	`+ "gulp": "~4.0.2",`
	`65`	`+ "jest": "~23.6.0"`
`65`	`66`	`}`
`66`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`"@microsoft/web-library-build": "7.3.5",`
`15`	`15`	`"@types/jest": "23.3.11",`
`16`	`16`	`"gulp": "~4.0.2",`
	`17`	`+ "jest": "~23.6.0",`
`17`	`18`	`"ts-jest": "~22.4.6"`
`18`	`19`	`}`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@`
`30`	`30`	`"@types/glob": "5.0.30",`
`31`	`31`	`"@types/resolve": "0.0.8",`
`32`	`32`	`"gulp": "~4.0.2",`
`33`		`- "tslint-microsoft-contrib": "~5.2.1",`
`34`	`33`	`"typescript": "~3.2.4"`
`35`	`34`	`}`
`36`	`35`	`}`