Use es6-shim for typing and es6-promise to polyfill the promise

mttwc · mttwc · commit 9694fde1e3aa · 2017-05-10T15:29:35.000-07:00
diff --git a/karma.conf.js b/karma.conf.js
@@ -2,14 +2,15 @@ module.exports = function (config) {
     config.set({
         frameworks: ["jasmine", "karma-typescript"],
         files: [
-            { pattern: "src/**/*.ts" }, // *.tsx for React Jsx ,
-            { pattern: "src/**/*.tsx" }, // *.tsx for React Jsx ,
-            { pattern: "test/**/*.ts" }, // *.tsx for React Jsx
-            { pattern: "test/**/*.tsx" }, // *.tsx for React Jsx
+            './node_modules/phantomjs-polyfill-find/find-polyfill.js',
+            { pattern: "src/**/*.ts" },
+            { pattern: "src/**/*.tsx" },
+            { pattern: "test/**/*.ts" },
+            { pattern: "test/**/*.tsx" },
         ],
         preprocessors: {
-            "**/*.ts": ["karma-typescript"], // *.tsx for React Jsx
-            "**/*.tsx": ["karma-typescript"], // *.tsx for React Jsx
+            "**/*.ts": ["karma-typescript"],
+            "**/*.tsx": ["karma-typescript"],
         },
         reporters: ["spec", "karma-typescript"],
         browsers: ["PhantomJS"],
@@ -18,21 +19,17 @@ module.exports = function (config) {
                 exclude: ["react/addons", "react/lib/ExecutionEnvironment", "react/lib/ReactContext"],
                 entrypoints: /\.spec\.tsx?$/,
                 compilerOptions: {
-                    jsx: "react",
-                    module: "commonjs",
                     sourceMap: true,
-                    target: "ES5",
-                    lib: ["DOM", "ES2015"]
                 },
                 include: [
-                	"src/**/*.ts",
-                	"src/**/*.tsx",
+                    "src/**/*.ts",
+                    "src/**/*.tsx",
                 ],
-                reports:
-                    {
-                        "html": "coverage",
-                        "text-summary": "",
-                    }
+                reports: {
+                    "html": "coverage",
+                    "text-summary": "",
+                },
+                tsconfig: "./tsconfig.json"
             }
         }
     });
diff --git a/package.json b/package.json
@@ -11,10 +11,10 @@
   "devDependencies": {
     "@types/classnames": "^0.0.32",
     "@types/enzyme": "^2.8.0",
+    "@types/es6-shim": "^0.31.33",
     "@types/history": "^4.5.1",
     "@types/jasmine": "^2.5.47",
     "@types/node": "^7.0.18",
-    "@types/es6-promise": "^0.0.32",
     "@types/react": "^15.0.24",
     "@types/react-dom": "^0.14.23",
     "@types/sinon": "^2.2.1",
@@ -37,6 +37,7 @@
     "karma-typescript": "^3.0.1",
     "node-sass": "^4.5.2",
     "path": "^0.12.7",
+    "phantomjs-polyfill-find": "^0.0.1",
     "postcss-browser-reporter": "^0.5.0",
     "postcss-cssnext": "^2.10.0",
     "postcss-import": "^9.1.0",
diff --git a/sampleapp/index.html b/sampleapp/index.html
@@ -8,7 +8,6 @@
 	</head>
 	<body style="min-height:100%">
 		<div id="oneNotePicker" style="width:350px;height:350px;margin:50px;overflow-y:scroll"></div>
-		<script src="dist/polyfills.js"></script>
 		<script src="dist/sample.js"></script>
 	</body>
 </html>
diff --git a/src/oneNoteDataStructures/notebookListUpdater.ts b/src/oneNoteDataStructures/notebookListUpdater.ts
@@ -87,7 +87,7 @@ class NotebookListUpdater {
 		sectionRef.pages = newPages;
 	}
 
-	private getSectionRefFromNotebooks(sectionId: string, notebooks: Notebook[]): Section | void {
+	private getSectionRefFromNotebooks(sectionId: string, notebooks: Notebook[]): Section | undefined {
 		for (let notebook of notebooks) {
 			let sectionRef = this.getSectionRefFromSectionParent(sectionId, notebook);
 			if (!!sectionRef) {
@@ -99,7 +99,7 @@ class NotebookListUpdater {
 		return undefined;
 	}
 
-	private getSectionRefFromSectionParent(sectionId: string, sectionParent: SectionParent): Section | void {
+	private getSectionRefFromSectionParent(sectionId: string, sectionParent: SectionParent): Section | undefined {
 		// Search this parent's sections for the matching id ...
 		for (let childSection of sectionParent.sections) {
 			if (childSection.id === sectionId) {
diff --git a/src/oneNoteDataStructures/section.ts b/src/oneNoteDataStructures/section.ts
@@ -4,7 +4,7 @@ interface Section {
 	id: string;
 	name: string;
 	expanded: boolean;
-	pages: Page[] | void;
+	pages: Page[] | undefined;
 }
 
 export default Section;
diff --git a/src/polyfills.ts b/src/polyfills.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "module": "commonjs",
     "target": "es5",
-    "lib": ["es6", "dom"],
+    "lib": ["es5", "dom"],
     "sourceMap": true,
     "allowJs": true,
     "jsx": "react",
diff --git a/webpack.config.js b/webpack.config.js
@@ -20,7 +20,6 @@ module.exports = {
     sample: './sampleApp/sample.tsx',
     pickerStyles: './src/oneNotePicker.scss',
     oneNotePicker: './src/oneNotePicker.tsx',
-    polyfills: './src/polyfills.ts',
   },
   output: {
     path: outPath,
@@ -110,6 +109,9 @@ module.exports = {
     ],
   },
   plugins: [
+    new webpack.ProvidePlugin({
+      Promise: 'es6-promise'
+    }),
     // new webpack.LoaderOptionsPlugin({
     //   options: {
     //     context: sourcePath,

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ interface Section {`
`4`	`4`	`id: string;`
`5`	`5`	`name: string;`
`6`	`6`	`expanded: boolean;`
`7`		`- pages: Page[] \| void;`
	`7`	`+ pages: Page[] \| undefined;`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`export default Section;`