From 0fe0c454d30417539396244a651ddaf0401af732 Mon Sep 17 00:00:00 2001
From: Jamie Wong <jamie.lf.wong@gmail.com>
Date: Mon, 8 Oct 2018 09:49:15 -0700
Subject: [PATCH] 1.2.0

---
 CHANGELOG.md |  8 +++++++-
 package.json | 26 +++++---------------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e335fec47..2e957c08a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## Unreleased
 
+## [1.2.0] - 2018-10-08
+
+### Added
+
+* Add import of v8 heap allocation profile [#170] (by @vmarchaud)
+
 ## [1.1.0] - 2018-09-26
 
 ### Added
@@ -24,7 +30,7 @@
 
 * Allow optional CR before LF when probing collapsed stacks files [#154]
 * Fix import for Firefox 63 [#156]
-* Change time formatting for minutes from 1.50min to 1:30 [#153]
+* Change time formatting for minutes from 1.50min to 1:30 [#153] (by @Alex-Diez)
 
 ## [1.0.1] - 2018-08-23
 
diff --git a/package.json b/package.json
index 223d569cd..d670f8798 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "speedscope",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "",
   "repository": "jlfwong/speedscope",
   "main": "index.js",
@@ -17,15 +17,8 @@
     "test": "tsc --noEmit && npm run lint && npm run coverage",
     "serve": "parcel assets/index.html --open --no-autoinstall"
   },
-  "files": [
-    "bin/cli.js",
-    "dist/release/**",
-    "!*.map"
-  ],
-  "browserslist": [
-    "last 2 Chrome versions",
-    "last 2 Firefox versions"
-  ],
+  "files": ["bin/cli.js", "dist/release/**", "!*.map"],
+  "browserslist": ["last 2 Chrome versions", "last 2 Firefox versions"],
   "author": "",
   "license": "MIT",
   "devDependencies": {
@@ -58,17 +51,8 @@
       "^.+\\.tsx?$": "ts-jest"
     },
     "testRegex": "\\.test\\.tsx?$",
-    "collectCoverageFrom": [
-      "**/*.{ts,tsx}",
-      "!**/*.d.{ts,tsx}"
-    ],
-    "moduleFileExtensions": [
-      "ts",
-      "tsx",
-      "js",
-      "jsx",
-      "json"
-    ]
+    "collectCoverageFrom": ["**/*.{ts,tsx}", "!**/*.d.{ts,tsx}"],
+    "moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json"]
   },
   "dependencies": {
     "opn": "5.3.0"