From b7178e170466dc550e23e9b08dce9d07d9b4974c Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Fri, 30 Nov 2018 18:41:33 -0500 Subject: [PATCH] Upgrade Prettier to support BigInt syntax in TS --- js/compiler.ts | 4 ++-- js/url_search_params.ts | 4 ++-- package.json | 4 ++-- third_party | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/js/compiler.ts b/js/compiler.ts index 9ba0189328..c9fa4611ca 100644 --- a/js/compiler.ts +++ b/js/compiler.ts @@ -180,8 +180,8 @@ export class Compiler return this._moduleMetaDataMap.has(fileName) ? this._moduleMetaDataMap.get(fileName) : fileName.startsWith(ASSETS) - ? this._resolveModule(fileName, "") - : undefined; + ? this._resolveModule(fileName, "") + : undefined; } /** Given a `moduleSpecifier` and `containingFile` retrieve the cached diff --git a/js/url_search_params.ts b/js/url_search_params.ts index cf005fc16b..228c369560 100644 --- a/js/url_search_params.ts +++ b/js/url_search_params.ts @@ -117,8 +117,8 @@ export class URLSearchParams { * searchParams.sort(); */ sort(): void { - this.params = this.params.sort( - (a, b) => (a[0] === b[0] ? 0 : a[0] > b[0] ? 1 : -1) + this.params = this.params.sort((a, b) => + a[0] === b[0] ? 0 : a[0] > b[0] ? 1 : -1 ); } diff --git a/package.json b/package.json index ef21b5427d..df6ae9cfa3 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,13 @@ "devDependencies": { "@types/base64-js": "^1.2.5", "@types/flatbuffers": "^1.9.0", - "@types/prettier": "^1.13.2", + "@types/prettier": "=1.15.3", "@types/source-map-support": "^0.4.1", "@types/text-encoding": "0.0.33", "base64-js": "^1.3.0", "flatbuffers": "^1.9.0", "magic-string": "^0.22.5", - "prettier": "^1.14.0", + "prettier": "=1.15.3", "rollup": "0.67.0", "rollup-plugin-alias": "^1.4.0", "rollup-plugin-analyzer": "^2.1.0", diff --git a/third_party b/third_party index 69028eefdc..e94296a27c 160000 --- a/third_party +++ b/third_party @@ -1 +1 @@ -Subproject commit 69028eefdc6534683eb1263be0115df679dcaed1 +Subproject commit e94296a27cdaeb96bfd86e499162764409e503bc