From 0ba96adbbca7975d6608deb5eb467684210d3faf Mon Sep 17 00:00:00 2001
From: Tim Perry <pimterry@gmail.com>
Date: Thu, 11 Jan 2018 10:22:26 +0100
Subject: [PATCH 1/2] Fix breakage in deploy command from recent TS conversion

Change-Type: patch
---
 lib/utils/logger.ts  |  4 +++-
 lib/utils/streams.ts | 10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/utils/logger.ts b/lib/utils/logger.ts
index f14c699e..31b0e983 100644
--- a/lib/utils/logger.ts
+++ b/lib/utils/logger.ts
@@ -3,7 +3,7 @@ import _ = require('lodash');
 import chalk from 'chalk';
 import { StreamLogger } from 'resin-stream-logger';
 
-export class Logger {
+class Logger {
 	public streams: {
 		build: NodeJS.ReadWriteStream;
 		info: NodeJS.ReadWriteStream;
@@ -62,3 +62,5 @@ export class Logger {
 		return this.streams.error.write(msg + eol);
 	}
 }
+
+export = Logger;
diff --git a/lib/utils/streams.ts b/lib/utils/streams.ts
index eac69779..c06a2e4d 100644
--- a/lib/utils/streams.ts
+++ b/lib/utils/streams.ts
@@ -1,10 +1,10 @@
-export async function buffer(
+import Promise = require('bluebird');
+import fs = require('fs');
+
+export function buffer(
 	stream: NodeJS.ReadableStream,
 	bufferFile: string,
-) {
-	const Promise = await import('bluebird');
-	const fs = await import('fs');
-
+): Promise<NodeJS.ReadableStream> {
 	const fileWriteStream = fs.createWriteStream(bufferFile);
 
 	return new Promise(function(resolve, reject) {

From 77529ef3b1ad2a278ebefe9f37526e7fde5ea227 Mon Sep 17 00:00:00 2001
From: "resin-io-versionbot[bot]"
 <resin-io-versionbot[bot]@users.noreply.github.com>
Date: Thu, 11 Jan 2018 10:16:56 +0000
Subject: [PATCH 2/2] v6.12.5

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6f45d79..229f0f57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v6.12.5 - 2018-01-11
+
+* Fix breakage in deploy command from recent TS conversion #754 [Tim Perry]
+
 ## v6.12.4 - 2018-01-10
 
 * Start using Prettier #753 [Tim Perry]
diff --git a/package.json b/package.json
index 7f3f9a6d..8daef484 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "resin-cli",
-  "version": "6.12.4",
+  "version": "6.12.5",
   "description": "The official resin.io CLI tool",
   "main": "./build/actions/index.js",
   "homepage": "https://github.com/resin-io/resin-cli",