Clean up typings file handling

example/package.json

@@ -10,14 +10,13 @@
     "phosphor-widget": "^1.0.0-rc.1"
   },
   "scripts": {
-    "build": "tsconfig -u src/tsconfig.json && tsc --project src && webpack --config webpack.conf.js",
+    "build": "tsc --project src && webpack --config webpack.conf.js",
     "clean": "rimraf build && rimraf node_modules",
     "postinstall": "npm dedupe",
     "update": "rimraf node_modules/jupyter-js-notebook && npm install"
   },
   "devDependencies": {
     "concurrently": "^2.0.0",
-    "rimraf": "^2.5.2",
-    "tsconfig-cli": "^0.1.1"
+    "rimraf": "^2.5.2"
   }
 }

example/src/tsconfig.json

@@ -6,22 +6,5 @@
         "moduleResolution": "node",
         "target": "ES5",
         "outDir": "../build"
-    },
-    "filesGlob": [
-        "../../src/typings/**/*.d.ts",
-        "index.ts"
-    ],
-    "files": [
-        "../../src/typings/codemirror/codemirror.d.ts",
-        "../../src/typings/diff-match-patch/diff-match-patch.d.ts",
-        "../../src/typings/es6-promise/es6-promise.d.ts",
-        "../../src/typings/expect.js/expect.js.d.ts",
-        "../../src/typings/marked/marked.d.ts",
-        "../../src/typings/mathjax/mathjax.d.ts",
-        "../../src/typings/mocha/mocha.d.ts",
-        "../../src/typings/require/require.d.ts",
-        "../../src/typings/sanitizer/sanitizer.d.ts",
-        "../../src/typings/transformime/transformime.d.ts",
-        "index.ts"
-    ]
-}
+    }
+}

example/src/typings.d.ts

@@ -0,0 +1 @@
+/// <reference path="../../typings/es6-promise/es6-promise.d.ts"/>

package.json

@@ -7,6 +7,7 @@
   "dependencies": {
     "codemirror": "^5.11.0",
     "diff-match-patch": "^1.0.0",
+    "file-loader": "^0.8.5",
     "jupyter-js-services": "^0.7.1",
     "jupyter-js-ui": "^0.5.1",
     "jupyter-js-utils": "^0.3.4",

src/notebook/typings.d.ts

@@ -0,0 +1,6 @@
+/// <reference path="../typings/es6-promise/es6-promise.d.ts"/>
+/// <reference path="../typings/marked/marked.d.ts"/>
+/// <reference path="../typings/sanitizer/sanitizer.d.ts"/>
+/// <reference path="../typings/codemirror/codemirror.d.ts"/>
+/// <reference path="../typings/diff-match-patch/diff-match-patch.d.ts"/>
+/// <reference path="../typings/mathjax/mathjax.d.ts"/>

test/src/notebook/tsconfig.json

@@ -7,21 +7,8 @@
         "target": "ES5",
         "outDir": "../build"
     },
-    "filesGlob": [
-        "../../src/typings/**/*.d.ts",
-        "index.ts"
-    ],
     "files": [
-        "../../src/typings/codemirror/codemirror.d.ts",
-        "../../src/typings/diff-match-patch/diff-match-patch.d.ts",
-        "../../src/typings/es6-promise/es6-promise.d.ts",
-        "../../src/typings/expect.js/expect.js.d.ts",
-        "../../src/typings/marked/marked.d.ts",
-        "../../src/typings/mathjax/mathjax.d.ts",
-        "../../src/typings/mocha/mocha.d.ts",
-        "../../src/typings/require/require.d.ts",
-        "../../src/typings/sanitizer/sanitizer.d.ts",
-        "../../src/typings/transformime/transformime.d.ts",
-        "index.ts"
+        "index.ts",
+        "typings.d.ts"
     ]
 }

test/src/notebook/typings.d.ts

@@ -0,0 +1,2 @@
+/// <reference path="../../typings/expect.js/expect.js.d.ts"/>
+/// <reference path="../../typings/mocha/mocha.d.ts"/>