fix: resolving mismatched peerDeps

HomecareHomebase · Apr 4, 2019 · eca4e13 · eca4e13
1 parent b78f418
commit eca4e13
Show file tree

Hide file tree

Showing 20 changed files with 2,764 additions and 253 deletions.
diff --git a/arm-helper/package-lock.json b/arm-helper/package-lock.json
diff --git a/arm-helper/package.json b/arm-helper/package.json
@@ -24,15 +24,13 @@
   },
   "peerDependencies": {
     "@azbake/core": "0.*",
-    "@azure/arm-resources": "0.*"
+    "@azure/arm-resources": "1.*"
   },
   "devDependencies": {
+    "@azbake/core": "0.*",
+    "@azure/arm-resources": "1.*",
     "@types/node": "^10.12.18"
   },
-  "dependencies": {
-    "@azbake/core": "^0.1.30",
-    "@azure/arm-resources": "^1.0.1"
-  },
   "publishConfig": {
     "access": "public"
   },

diff --git a/core/package-lock.json b/core/package-lock.json
diff --git a/core/package.json b/core/package.json
@@ -26,14 +26,12 @@
     "test": "mocha --timeout 30000 -r ts-node/register test/**/*.ts"
   },
   "peerDependencies": {
-    "@azure/ms-rest-nodeauth": "0.*",
-    "colors": "^1.3.3"
-  },
-  "dependencies": {
-    "@azure/ms-rest-nodeauth": "^0.9.1",
+    "@azure/ms-rest-nodeauth": "0.9.2",
     "colors": "^1.3.3"
   },
   "devDependencies": {
+    "@azure/ms-rest-nodeauth": "0.9.2",
+    "colors": "^1.3.3",
     "@types/node": "^10.12.18",
     "standard-version": "^4.4.0"
   },

diff --git a/core/src/deployment-context.ts b/core/src/deployment-context.ts
@@ -1,10 +1,10 @@
 import { IBakePackage, IBakeRegion, IBakeConfig, IBakeEnvironment } from "./bake-interfaces";
 import { Logger } from "./logger";
-import { TokenCredentialsBase } from "@azure/ms-rest-nodeauth";
+import { ApplicationTokenCredentials } from "@azure/ms-rest-nodeauth";
 import { IIngredient } from ".";
 
 export class DeploymentContext {
-    constructor(auth: TokenCredentialsBase, bake : IBakePackage, 
+    constructor(auth: ApplicationTokenCredentials, bake : IBakePackage, 
         region: IBakeRegion, logger: Logger, ingredient: IIngredient = <IIngredient>{}) {
 
         this._package = bake
@@ -18,7 +18,7 @@ export class DeploymentContext {
     _ingredient: IIngredient
     _region: IBakeRegion
     _logger: Logger
-    _auth: TokenCredentialsBase
+    _auth: ApplicationTokenCredentials
 
     public get Config() : IBakeConfig {
         return this._package.Config
@@ -39,7 +39,7 @@ export class DeploymentContext {
         return this._logger
     }
 
-    public get AuthToken(): TokenCredentialsBase {
+    public get AuthToken(): ApplicationTokenCredentials {
         return this._auth
     }
 

diff --git a/ingredient-template/package.json b/ingredient-template/package.json
@@ -16,13 +16,10 @@
   },
   "peerDependencies": {
     "@azbake/core": "0.*",
-    "@azure/ms-rest-nodeauth": "0.*"
+    "@azure/ms-rest-nodeauth": "0.9.2"
   },
   "devDependencies": {
-    "@types/node": "^10.12.18"
-  },
-  "dependencies": {
-    "@azbake/core": "^0.1.21",
-    "@azure/ms-rest-nodeauth": "^0.9.1"
+    "@types/node": "^10.12.18",
+    "@azure/ms-rest-nodeauth": "0.9.2"
   }
 }
diff --git a/ingredient/ingredient-app-insights/package.json b/ingredient/ingredient-app-insights/package.json
@@ -16,11 +16,11 @@
   },
   "peerDependencies": {
     "@azbake/core": "0.*",
-    "@azure/ms-rest-nodeauth": "0.*"
+    "@azure/ms-rest-nodeauth": "0.9.2"
   },
   "devDependencies": {
     "@azbake/core": "^0.1.30",
-    "@azure/ms-rest-nodeauth": "0.*",
+    "@azure/ms-rest-nodeauth": "0.9.2",
     "@types/node": "^10.12.18"
   },
   "dependencies": {