update dependencies and fix lint issues

micmro · Jun 6, 2017 · 67bbbae · 67bbbae
1 parent 0e953f9
commit 67bbbae
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -41,17 +41,17 @@
     "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-uglify": "^2.3.0",
+    "grunt-contrib-uglify": "^3.0.1",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-gh-pages": "^2.0.0",
-    "grunt-run": "^0.6.0",
+    "grunt-run": "^0.7.0",
     "grunt-tslint": "^5.0.1",
     "live-server": "^1.2.0",
     "load-grunt-config": "^0.19.2",
     "tsify": "^3.0.1",
-    "tslint": "^5.2.0",
-    "tslint-eslint-rules": "^4.0.0",
-    "typescript": "^2.3.2",
+    "tslint": "^5.4.2",
+    "tslint-eslint-rules": "^4.1.1",
+    "typescript": "^2.3.4",
     "whatwg-fetch": "^2.0.3"
   },
   "dependencies": {

diff --git a/src/ts/helpers/dom.ts b/src/ts/helpers/dom.ts
@@ -76,7 +76,7 @@ export function forEachNodeList<T extends Node>(els: NodeListOf<T>, fn: (el: T,
   Array.prototype.forEach.call(els, fn);
 }
 
-interface StringOrNumberMap { [key: string]: string | number; }
+export interface StringOrNumberMap { [key: string]: string | number; }
 
 /** Sets a CSS style property, but only if property exists on `el` */
 export function safeSetStyle(el: HTMLElement | SVGElement, property: string, value: string) {

diff --git a/src/ts/transformers/har-tabs.ts b/src/ts/transformers/har-tabs.ts
@@ -42,19 +42,19 @@ export function makeTabs(entry: Entry, requestID: number, requestType: RequestTy
 /** Helper to create `WaterfallEntryTab` object literal  */
 function makeWaterfallEntryTab(title: string, content: string, tabClass: string = ""): WaterfallEntryTab {
   return {
-    title,
     content,
     tabClass,
+    title,
   };
 }
 
 /** Helper to create `WaterfallEntryTab` object literal that is evaluated lazyly at runtime (e.g. for performance) */
 function makeLazyWaterfallEntryTab(title: string, renderContent: TabRenderer,
                                    tabClass: string = ""): WaterfallEntryTab {
   return {
-    title,
     renderContent,
     tabClass,
+    title,
   };
 }
 

diff --git a/src/ts/transformers/har.ts b/src/ts/transformers/har.ts
@@ -199,8 +199,8 @@ const getUserTimimngs = (currPage: Page, options: HarTransformerOptions) => {
     if (fullName !== name && currPage[`_userTime.endTimer-${name}`]) {
       duration = currPage[`_userTime.endTimer-${name}`] - currPage[k];
       return {
-        name: `${options.showUserTimingEndMarker ? fullName : name} (${currPage[k]} - ${currPage[k] + duration} ms)`,
         duration,
+        name: `${options.showUserTimingEndMarker ? fullName : name} (${currPage[k]} - ${currPage[k] + duration} ms)`,
         startTime: currPage[k],
         // x: currPage[k],
       } as UserTiming;
@@ -289,9 +289,9 @@ const createResponseDetails = (entry: Entry, indicators: WaterfallEntryIndicator
   const statusClean = toInt(entry.response.status);
   return {
     icon: makeMimeTypeIcon(statusClean, entry.response.statusText, requestType, entry.response.redirectURL),
-    rowClass: makeRowCssClasses(statusClean),
     indicators,
     requestType,
+    rowClass: makeRowCssClasses(statusClean),
     statusCode: statusClean,
   };
 };
diff --git a/src/ts/transformers/helpers.ts b/src/ts/transformers/helpers.ts
@@ -91,13 +91,13 @@ export function createWaterfallEntry(url: string,
                                      tabs: WaterfallEntryTab[]): WaterfallEntry {
   const total = (typeof start !== "number" || typeof end !== "number") ? undefined : (end - start);
   return {
-    total,
-    url,
-    start,
     end,
-    segments,
     responseDetails,
+    segments,
+    start,
     tabs,
+    total,
+    url,
   };
 }
 
@@ -108,10 +108,10 @@ export function createWaterfallEntryTiming(type: TimingType,
   const total = (typeof start !== "number" || typeof end !== "number") ? undefined : (end - start);
   const typeClean = sanitizeAlphaNumeric(type) as TimingType;
   return {
+    end,
+    start,
     total,
     type : typeClean,
-    start,
-    end,
   };
 }
 

diff --git a/src/ts/waterfall/svg-chart.ts b/src/ts/waterfall/svg-chart.ts
@@ -57,10 +57,10 @@ function createContext(data: WaterfallData, options: ChartRenderOption,
   const diagramHeight = (entriesToShow.length + 1) * options.rowHeight;
   const context = {
     diagramHeight,
+    options,
     overlayManager: undefined,
     pubSub : new PubSub(),
     unit,
-    options,
   };
   // `overlayManager` needs the `context` reference, so it's attached later
   context.overlayManager = new OverlayManager(context);