From 15759f0db51be940836ae3864fb875ff60a9931a Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Mon, 7 May 2018 14:15:06 -0400
Subject: [PATCH] Normalize package naming

---
 ts/protobuf/index.ts             | 3 +++
 ts/styleguide/StyleGuideUtil.ts  | 2 +-
 ts/test/types/Attachment_test.ts | 2 +-
 ts/types/Attachment.ts           | 6 +++---
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 ts/protobuf/index.ts

diff --git a/ts/protobuf/index.ts b/ts/protobuf/index.ts
new file mode 100644
index 0000000000..b1b81f2ce9
--- /dev/null
+++ b/ts/protobuf/index.ts
@@ -0,0 +1,3 @@
+import { signalservice as SignalService } from './SignalService';
+
+export { SignalService };
diff --git a/ts/styleguide/StyleGuideUtil.ts b/ts/styleguide/StyleGuideUtil.ts
index 6a0fc160b5..1b8167c699 100644
--- a/ts/styleguide/StyleGuideUtil.ts
+++ b/ts/styleguide/StyleGuideUtil.ts
@@ -21,7 +21,7 @@ import * as HTML from '../html';
 
 import * as Attachment from '../../ts/types/Attachment';
 import * as MIME from '../../ts/types/MIME';
-import { signalservice as SignalService } from '../../ts/protobuf/SignalService';
+import { SignalService } from '../../ts/protobuf';
 
 // TypeScript wants two things when you import:
 //   1) a normal typescript file
diff --git a/ts/test/types/Attachment_test.ts b/ts/test/types/Attachment_test.ts
index 49e1621e3a..14b0cdcee7 100644
--- a/ts/test/types/Attachment_test.ts
+++ b/ts/test/types/Attachment_test.ts
@@ -6,7 +6,7 @@ import { assert } from 'chai';
 
 import * as Attachment from '../../types/Attachment';
 import * as MIME from '../../types/MIME';
-import { signalservice as SignalService } from '../../protobuf/SignalService';
+import { SignalService } from '../../protobuf';
 // @ts-ignore
 import { stringToArrayBuffer } from '../../../js/modules/string_to_array_buffer';
 
diff --git a/ts/types/Attachment.ts b/ts/types/Attachment.ts
index 6ed7f54234..e4e58ffe84 100644
--- a/ts/types/Attachment.ts
+++ b/ts/types/Attachment.ts
@@ -2,10 +2,10 @@ import is from '@sindresorhus/is';
 import moment from 'moment';
 
 import * as GoogleChrome from '../util/GoogleChrome';
-import { saveURLAsFile } from '../util/saveURLAsFile';
-import { arrayBufferToObjectURL } from '../util/arrayBufferToObjectURL';
 import * as MIME from './MIME';
-import { signalservice as SignalService } from '../protobuf/SignalService';
+import { arrayBufferToObjectURL } from '../util/arrayBufferToObjectURL';
+import { saveURLAsFile } from '../util/saveURLAsFile';
+import { SignalService } from '../protobuf';
 
 export type Attachment = {
   fileName?: string | null;