Revert exports to match 0.6.4 TS definitions (#820)

crutchcorn · hipstersmoothie · commit f5d5167ea694 · 2019-11-26T09:00:15.000-08:00
diff --git a/packages/jimp/types/index.d.ts b/packages/jimp/types/index.d.ts
@@ -3,7 +3,7 @@
 
 declare const DepreciatedJimp: DepreciatedJimp;
 
-export default DepreciatedJimp;
+export = DepreciatedJimp;
 
 /**
  * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version
@@ -500,15 +500,15 @@ type URLOptions = {
 /**
  * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version
  */
-export interface Bitmap {
+interface Bitmap {
   data: Buffer;
   width: number;
   height: number;
 }
 /**
  * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version
  */
-export interface RGB {
+interface RGB {
   r: number;
   g: number;
   b: number;
@@ -517,7 +517,7 @@ export interface RGB {
 /**
  * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version
  */
-export interface RGBA {
+interface RGBA {
   r: number;
   g: number;
   b: number;
@@ -527,7 +527,7 @@ export interface RGBA {
 /**
  * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version
  */
-export interface FontChar {
+interface FontChar {
   id: number;
   x: number;
   y: number;
@@ -543,7 +543,7 @@ export interface FontChar {
 /**
  * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version
  */
-export interface FontInfo {
+interface FontInfo {
   face: string;
   size: number;
   bold: number;
@@ -560,7 +560,7 @@ export interface FontInfo {
 /**
  * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version
  */
-export interface FontCommon {
+interface FontCommon {
   lineHeight: number;
   base: number;
   scaleW: number;
@@ -576,7 +576,7 @@ export interface FontCommon {
 /**
  * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version
  */
-export interface Font {
+interface Font {
   chars: {
     [char: string]: FontChar;
   };
diff --git a/packages/jimp/types/test.ts b/packages/jimp/types/test.ts
@@ -1,4 +1,4 @@
-import Jimp from 'jimp';
+import * as Jimp from 'jimp';
 
 const jimpInst: Jimp = new Jimp('test');
 
diff --git a/packages/jimp/types/ts3.1/index.d.ts b/packages/jimp/types/ts3.1/index.d.ts
@@ -20,10 +20,6 @@ import pluginFn from '@jimp/plugins';
 type Types = ReturnType<typeof typeFn>;
 type Plugins = ReturnType<typeof pluginFn>;
 
-export { Bitmap, RGB, RGBA };
-
-export { FontChar, FontInfo, FontCommon, Font } from '@jimp/plugin-print';
-
 type IntersectedPluginTypes = UnionToIntersection<
   GetPluginVal<Types> | GetPluginVal<Plugins>
 >;
@@ -32,4 +28,4 @@ type Jimp = InstanceType<JimpType> & IntersectedPluginTypes;
 
 declare const Jimp: JimpConstructors & Jimp;
 
-export default Jimp;
+export = Jimp;
diff --git a/packages/jimp/types/ts3.1/test.ts b/packages/jimp/types/ts3.1/test.ts
@@ -1,4 +1,4 @@
-import Jimp from 'jimp';
+import * as Jimp from 'jimp';
 
 const jimpInst: Jimp = new Jimp('test');
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import Jimp from 'jimp';`
	`1`	`+import * as Jimp from 'jimp';`
`2`	`2`
`3`	`3`	`const jimpInst: Jimp = new Jimp('test');`
`4`	`4`