lots of cleanup

Author: thebigredgeek

.babelrc

@@ -1,7 +1,7 @@
 # editorconfig.org
 root = true
 
-[*.js]
+[*.ts]
 indent_style = space
 indent_size = 2
 end_of_line = lf

.editorconfig

@@ -36,18 +36,13 @@
     "deepmerge": "^3.0.0"
   },
   "devDependencies": {
-    "babel-cli": "6.26.0",
-    "babel-core": "6.26.3",
-    "babel-eslint": "7.2.3",
-    "babel-plugin-transform-object-rest-spread": "6.26.0",
-    "babel-preset-env": "1.7.0",
-    "babel-register": "6.26.0",
     "bluebird": "3.5.4",
     "chai": "3.5.0",
     "eslint": "3.19.0",
     "eslint-plugin-babel": "3.3.0",
     "express": "4.16.4",
     "graphql-server-express": "0.6.0",
+    "jest": "^25.1.0",
     "mocha": "3.5.3",
     "rimraf": "2.6.3",
     "sinon": "1.17.7",

package.json

@@ -1,6 +1,4 @@
-import { createResolver, ResultFunction, ErrorFunction, Resolver } from "./resolver";
 import * as merge from "deepmerge";
-import { isFunction } from "./util";
 
 // Helper function to combine multiple resolver definition hashes into a single hash for consumption by Apollostack's graphql-server
 export const combineResolvers = (resolvers = []) => resolvers

src/helper.ts

@@ -1,8 +1,6 @@
 import { getPromise } from './promise';
 import { isFunction, Promisify, isNotNullOrUndefined } from './util';
 
-const Promise = getPromise();
-
 export interface ResultFunction<ResulType> {
   (root, args, context, info): Promise<ResulType> | ResulType | void
 }

src/resolver.ts

@@ -2,10 +2,9 @@ import { expect } from 'chai';
 import { stub } from 'sinon';
 
 import {
-  combineResolvers, and, or, compose, composable
+  combineResolvers, and, or
 } from '../../dist/helper';
 import { createResolver } from '../../dist/resolver';
-import { resolveAll } from 'jspm-config';
 
 describe('(unit) src/helper.js', () => {
   describe('combineResolvers', () => {

test/integration/promise_spec.js

@@ -1,4 +1,5 @@
 import { expect } from 'chai';
+import Bluebird from 'bluebird';
 
 import {
   usePromise
@@ -7,6 +8,16 @@ import {
 describe('(unit) dist/promise.js', () => {
   after(() => usePromise(Promise));
   describe('usePromise', () => {
+    context('with Bluebird', () => {
+      it('does not throw', () => {
+        usePromise(Bluebird);
+      });
+    });
+    context('with ES6 Promise', () => {
+      it('does not throw', () => {
+        usePromise(Promise);
+      });
+    });
     context('with another valid promise lib', () => {
       it('does not throw', () => {
         class FakePromiseLib {

test/unit/helper_spec.js

@@ -1,11 +1,7 @@
 import { expect } from 'chai';
 import { stub } from 'sinon';
-import Bluebird from 'bluebird';
 
 import { createResolver } from '../../dist/resolver';
-import { usePromise } from '../../dist/promise';
-
-let originalPromise = Promise;
 
 describe('(unit) dist/resolver.js', () => {
   describe('createResolver', () => {