build: standardize peerdeps on devkit packages

filipesilva · hansl · commit 0bbeb0947a4a · 2018-06-05T17:55:17.000-07:00
diff --git a/packages/_/devkit/package.json b/packages/_/devkit/package.json
@@ -7,7 +7,7 @@
   },
   "schematics": "./collection.json",
   "private": true,
-  "peerDependencies": {
+  "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0"
   }
diff --git a/packages/_/devkit/package/project-files/__path__/package.json b/packages/_/devkit/package/project-files/__path__/package.json
@@ -11,8 +11,6 @@
   ],
   "license": "MIT",
   "dependencies": {
-  },
-  "peerDependencies": {
     "@angular-devkit/core": "0.0.0"
   }
 }
diff --git a/packages/angular/pwa/package.json b/packages/angular/pwa/package.json
@@ -12,11 +12,9 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
+    "@angular-devkit/core": "0.0.0",
+    "@angular-devkit/schematics": "0.0.0",
     "@schematics/angular": "0.0.0",
     "typescript": "~2.6.2"
-  },
-  "peerDependencies": {
-    "@angular-devkit/core": "0.0.0",
-    "@angular-devkit/schematics": "0.0.0"
   }
-}
+}
diff --git a/packages/angular_devkit/architect/package.json b/packages/angular_devkit/architect/package.json
@@ -8,9 +8,7 @@
     "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
   },
   "dependencies": {
+    "@angular-devkit/core": "0.0.0",
     "rxjs": "^6.0.0-beta.3"
-  },
-  "peerDependencies": {
-    "@angular-devkit/core": "0.0.0"
   }
 }
diff --git a/packages/angular_devkit/schematics/package.json b/packages/angular_devkit/schematics/package.json
@@ -16,10 +16,8 @@
     "schematics"
   ],
   "dependencies": {
+    "@angular-devkit/core": "0.0.0",
     "@ngtools/json-schema": "^1.1.0",
     "rxjs": "^6.0.0-beta.3"
-  },
-  "peerDependencies": {
-    "@angular-devkit/core": "0.0.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
@@ -25,11 +25,11 @@
     "npm": ">= 5.5.1"
   },
   "dependencies": {
+    "@angular-devkit/core": "0.0.0",
     "tree-kill": "^1.0.0",
     "webpack-sources": "^1.1.0"
   },
   "peerDependencies": {
-    "@angular-devkit/core": "0.0.0",
     "typescript": "~2.5.0 || ~2.6.0 || ~2.7.0",
     "webpack": "^4.0.0"
   }
diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
@@ -12,10 +12,8 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "typescript": "~2.6.2"
-  },
-  "peerDependencies": {
     "@angular-devkit/core": "0.0.0",
-    "@angular-devkit/schematics": "0.0.0"
+    "@angular-devkit/schematics": "0.0.0",
+    "typescript": "~2.6.2"
   }
 }
diff --git a/packages/schematics/package_update/package.json b/packages/schematics/package_update/package.json
@@ -13,12 +13,10 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
+    "@angular-devkit/core": "0.0.0",
+    "@angular-devkit/schematics": "0.0.0",
     "semver": "^5.3.0",
     "semver-intersect": "^1.1.2",
     "rxjs": "^6.0.0-beta.3"
-  },
-  "peerDependencies": {
-    "@angular-devkit/core": "0.0.0",
-    "@angular-devkit/schematics": "0.0.0"
   }
-}
+}
diff --git a/packages/schematics/schematics/package.json b/packages/schematics/schematics/package.json
@@ -12,7 +12,7 @@
     "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
   },
   "schematics": "./collection.json",
-  "peerDependencies": {
+  "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0"
   }
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
@@ -13,12 +13,10 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
+    "@angular-devkit/core": "0.0.0",
+    "@angular-devkit/schematics": "0.0.0",
     "semver": "^5.3.0",
     "semver-intersect": "^1.1.2",
     "rxjs": "^6.0.0-beta.3"
-  },
-  "peerDependencies": {
-    "@angular-devkit/core": "0.0.0",
-    "@angular-devkit/schematics": "0.0.0"
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`},`
`8`	`8`	`"schematics": "./collection.json",`
`9`	`9`	`"private": true,`
`10`		`- "peerDependencies": {`
	`10`	`+ "dependencies": {`
`11`	`11`	`"@angular-devkit/core": "0.0.0",`
`12`	`12`	`"@angular-devkit/schematics": "0.0.0"`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`	`],`
`12`	`12`	`"license": "MIT",`
`13`	`13`	`"dependencies": {`
`14`		`- },`
`15`		`- "peerDependencies": {`
`16`	`14`	`"@angular-devkit/core": "0.0.0"`
`17`	`15`	`}`
`18`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,7 @@`
`8`	`8`	`"preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"`
`9`	`9`	`},`
`10`	`10`	`"dependencies": {`
	`11`	`+ "@angular-devkit/core": "0.0.0",`
`11`	`12`	`"rxjs": "^6.0.0-beta.3"`
`12`		`- },`
`13`		`- "peerDependencies": {`
`14`		`- "@angular-devkit/core": "0.0.0"`
`15`	`13`	`}`
`16`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,8 @@`
`16`	`16`	`"schematics"`
`17`	`17`	`],`
`18`	`18`	`"dependencies": {`
	`19`	`+ "@angular-devkit/core": "0.0.0",`
`19`	`20`	`"@ngtools/json-schema": "^1.1.0",`
`20`	`21`	`"rxjs": "^6.0.0-beta.3"`
`21`		`- },`
`22`		`- "peerDependencies": {`
`23`		`- "@angular-devkit/core": "0.0.0"`
`24`	`22`	`}`
`25`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,8 @@`
`12`	`12`	`},`
`13`	`13`	`"schematics": "./collection.json",`
`14`	`14`	`"dependencies": {`
`15`		`- "typescript": "~2.6.2"`
`16`		`- },`
`17`		`- "peerDependencies": {`
`18`	`15`	`"@angular-devkit/core": "0.0.0",`
`19`		`- "@angular-devkit/schematics": "0.0.0"`
	`16`	`+ "@angular-devkit/schematics": "0.0.0",`
	`17`	`+ "typescript": "~2.6.2"`
`20`	`18`	`}`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"`
`13`	`13`	`},`
`14`	`14`	`"schematics": "./collection.json",`
`15`		`- "peerDependencies": {`
	`15`	`+ "dependencies": {`
`16`	`16`	`"@angular-devkit/core": "0.0.0",`
`17`	`17`	`"@angular-devkit/schematics": "0.0.0"`
`18`	`18`	`}`