Refactor typings

Author: Luke Sheard

package.json

@@ -11,11 +11,10 @@
     "url": "https://github.com/trueadm/inferno/issues"
   },
   "devDependencies": {
-    "@types/benchmark": "^1.0.30",
     "@types/chai": "^3.4.34",
-    "@types/core-js": "^0.9.35",
     "@types/mocha": "^2.2.33",
     "@types/node": "^6.0.51",
+    "@types/path-to-regexp": "^1.0.29",
     "@types/sinon": "^1.16.33",
     "babel-cli": "^6.18.0",
     "babel-core": "^6.20.0",
@@ -37,7 +36,7 @@
     "babel-register": "^6.18.0",
     "buble": "^0.14.3",
     "chai": "^3.5.0",
-    "concat-stream-es6": "0.0.1",
+    "concat-stream": "^1.5.2",
     "convert-source-map": "^1.3.0",
     "coveralls": "^2.11.15",
     "cross-env": "^3.1.3",
@@ -130,9 +129,8 @@
     "exclude": [
       "packages",
       "src/DOM/devtools.ts",
-      "src/inferno.d.ts",
-      "src/**/*__tests__*/**",
-      "typings"
+      "src/typings/*.d.ts",
+      "src/**/*__tests__*/**"
     ],
     "extension": [
       ".ts"

packages/inferno/src/index.js

@@ -2,7 +2,7 @@ import {
 	createVNode
 } from '../../../build/core/shapes';
 import cloneVNode from '../../../build/factories/cloneVNode';
-import { warning, NO_OP, isBrowser, EMPTY_OBJ } from '../../../build/shared';
+import { warning, NO_OP, isBrowser, EMPTY_OBJ } from '../../../build/tools/shared';
 import { render, findDOMNode, createRenderer, enableFindDOMNode } from '../../../build/DOM/rendering';
 import { disableRecycling } from '../../../build/DOM/recycling';
 import { initDevToolsHooks } from '../../../build/DOM/devtools';

src/DOM/__tests__/columnrender.spec.tsx

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { spy } from 'sinon';
 import Component from 'inferno-component';
-import { isNullOrUndef } from '../../shared';
+import { isNullOrUndef } from '../../tools/shared';
 import Inferno, { render } from 'inferno';
 Inferno; // suppress ts 'never used' error
 

src/DOM/devtools.ts

@@ -1,4 +1,4 @@
-import { isFunction, isNull, isUndefined } from '../shared';
+import { isFunction, isNull, isUndefined } from '../tools/shared';
 import { render, roots } from './rendering';
 
 export const devToolsStatus = {

src/DOM/hydration.ts

@@ -11,7 +11,7 @@ import {
 	isUndefined,
 	throwError,
 	EMPTY_OBJ,
-} from '../shared';
+} from '../tools/shared';
 import {
 	mountElement,
 	mountStatefulComponentCallbacks,

src/DOM/mounting.ts

@@ -8,7 +8,7 @@ import {
 	isUndefined,
 	throwError,
 	EMPTY_OBJ,
-} from '../shared';
+} from '../tools/shared';
 import { VNodeFlags, isVNode, copyPropsTo } from '../core/shapes';
 import {
 	appendChild,

src/DOM/patching.ts

@@ -13,7 +13,7 @@ import {
 	isStringOrNumber,
 	isUndefined,
 	throwError,
-} from '../shared';
+} from '../tools/shared';
 import {
 	VNode,
 	VNodeFlags,

src/DOM/recycling.ts

@@ -2,7 +2,7 @@ import { VNode, VNodeFlags } from '../core/shapes';
 import {
 	isNull,
 	isUndefined,
-} from '../shared';
+} from '../tools/shared';
 import {
 	patchComponent,
 	patchElement,

src/DOM/rendering.ts

@@ -6,7 +6,7 @@ import {
 	isNull,
 	isNullOrUndef,
 	throwError,
-} from '../shared';
+} from '../tools/shared';
 import {
 	devToolsStatus,
 	sendRoots,

src/DOM/unmounting.ts

@@ -6,7 +6,7 @@ import {
 	isObject,
 	throwError,
 	isNull,
-} from '../shared';
+} from '../tools/shared';
 import {
 	poolComponent,
 	poolElement,