Merge pull request microsoft#558 from Microsoft/pgonzal/fix-types

pgonzal · web-flow · commit cf17bf79ecaf · 2018-03-12T13:00:48.000-07:00
Lock down @types versions
diff --git a/apps/api-documenter/package.json b/apps/api-documenter/package.json
@@ -29,6 +29,6 @@
     "@types/js-yaml": "3.9.1",
     "@types/node": "8.5.8",
     "gulp": "~3.9.1",
-    "@types/jest": "~21.1.8"
+    "@types/jest": "21.1.10"
   }
 }
diff --git a/apps/api-extractor/package.json b/apps/api-extractor/package.json
@@ -45,6 +45,6 @@
     "@types/lodash": "4.14.74",
     "gulp": "~3.9.1",
     "@microsoft/node-library-build": "4.3.13",
-    "@types/jest": "~21.1.8"
+    "@types/jest": "21.1.10"
   }
 }
diff --git a/build-tests/api-extractor-test-01/package.json b/build-tests/api-extractor-test-01/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@microsoft/api-extractor": "5.3.7",
-    "@types/jest": "~21.1.8",
+    "@types/jest": "21.1.10",
     "@types/node": "8.5.8",
     "fs-extra": "~0.26.7",
     "typescript": "~2.4.1"
diff --git a/build-tests/api-extractor-test-03/package.json b/build-tests/api-extractor-test-03/package.json
@@ -7,7 +7,7 @@
     "build": "node build.js"
   },
   "dependencies": {
-   "@types/jest": "~21.1.8",
+    "@types/jest": "21.1.10",
     "@types/node": "8.5.8",
     "api-extractor-test-02": "1.0.0",
     "fs-extra": "~0.26.7",
diff --git a/build-tests/web-library-build-test/package.json b/build-tests/web-library-build-test/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/chai": "3.4.34",
     "chai": "~3.5.0",
-    "@types/jest": "~21.1.8",
+    "@types/jest": "21.1.10",
     "@types/node": "8.5.8"
   },
   "dependencies": {
diff --git a/common/changes/@microsoft/api-documenter/pgonzal-fix-types_2018-03-12-19-53.json b/common/changes/@microsoft/api-documenter/pgonzal-fix-types_2018-03-12-19-53.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/api-documenter",
+      "comment": "Locked down some \"@types/\" dependency versions to avoid upgrade conflicts",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/api-documenter",
+  "email": "pgonzal@users.noreply.github.com"
+}
diff --git a/common/changes/@microsoft/api-extractor/pgonzal-fix-types_2018-03-12-19-53.json b/common/changes/@microsoft/api-extractor/pgonzal-fix-types_2018-03-12-19-53.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/api-extractor",
+      "comment": "Locked down some \"@types/\" dependency versions to avoid upgrade conflicts",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/api-extractor",
+  "email": "pgonzal@users.noreply.github.com"
+}
diff --git a/common/changes/@microsoft/gulp-core-build-webpack/pgonzal-fix-types_2018-03-12-19-53.json b/common/changes/@microsoft/gulp-core-build-webpack/pgonzal-fix-types_2018-03-12-19-53.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/gulp-core-build-webpack",
+      "comment": "Locked down some \"@types/\" dependency versions to avoid upgrade conflicts",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/gulp-core-build-webpack",
+  "email": "pgonzal@users.noreply.github.com"
+}
diff --git a/common/changes/@microsoft/loader-load-themed-styles/pgonzal-fix-types_2018-03-12-19-53.json b/common/changes/@microsoft/loader-load-themed-styles/pgonzal-fix-types_2018-03-12-19-53.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/loader-load-themed-styles",
+      "comment": "Locked down some \"@types/\" dependency versions to avoid upgrade conflicts",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/loader-load-themed-styles",
+  "email": "pgonzal@users.noreply.github.com"
+}
diff --git a/common/changes/@microsoft/resolve-chunk-plugin/pgonzal-fix-types_2018-03-12-19-53.json b/common/changes/@microsoft/resolve-chunk-plugin/pgonzal-fix-types_2018-03-12-19-53.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/resolve-chunk-plugin",
+      "comment": "Locked down some \"@types/\" dependency versions to avoid upgrade conflicts",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/resolve-chunk-plugin",
+  "email": "pgonzal@users.noreply.github.com"
+}
diff --git a/common/changes/@microsoft/set-webpack-public-path-plugin/pgonzal-fix-types_2018-03-12-19-53.json b/common/changes/@microsoft/set-webpack-public-path-plugin/pgonzal-fix-types_2018-03-12-19-53.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/set-webpack-public-path-plugin",
+      "comment": "Locked down some \"@types/\" dependency versions to avoid upgrade conflicts",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/set-webpack-public-path-plugin",
+  "email": "pgonzal@users.noreply.github.com"
+}
diff --git a/common/changes/@microsoft/ts-command-line/pgonzal-fix-types_2018-03-12-19-53.json b/common/changes/@microsoft/ts-command-line/pgonzal-fix-types_2018-03-12-19-53.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/ts-command-line",
+      "comment": "Locked down some \"@types/\" dependency versions to avoid upgrade conflicts",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/ts-command-line",
+  "email": "pgonzal@users.noreply.github.com"
+}
diff --git a/common/config/rush/shrinkwrap.yaml b/common/config/rush/shrinkwrap.yaml
diff --git a/core-build/gulp-core-build-webpack/package.json b/core-build/gulp-core-build-webpack/package.json
diff --git a/libraries/ts-command-line/package.json b/libraries/ts-command-line/package.json
diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json
diff --git a/webpack/resolve-chunk-plugin/package.json b/webpack/resolve-chunk-plugin/package.json
diff --git a/webpack/set-webpack-public-path-plugin/package.json b/webpack/set-webpack-public-path-plugin/package.json

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@`
`29`	`29`	`"@types/js-yaml": "3.9.1",`
`30`	`30`	`"@types/node": "8.5.8",`
`31`	`31`	`"gulp": "~3.9.1",`
`32`		`- "@types/jest": "~21.1.8"`
	`32`	`+ "@types/jest": "21.1.10"`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@`
`45`	`45`	`"@types/lodash": "4.14.74",`
`46`	`46`	`"gulp": "~3.9.1",`
`47`	`47`	`"@microsoft/node-library-build": "4.3.13",`
`48`		`- "@types/jest": "~21.1.8"`
	`48`	`+ "@types/jest": "21.1.10"`
`49`	`49`	`}`
`50`	`50`	`}`