From 652cd1048391b1734d6fee893698dbc5320e6801 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 30 Apr 2019 12:16:41 -0700 Subject: [PATCH] Use Node 12 (#3141) * Use Node 12 * Remove tests that don't work in Node --- .nvmrc | 2 +- test-mocha/common/datetime/format_date.ts | 6 ------ .../common/datetime/format_date_time.ts | 6 ------ test-mocha/common/datetime/format_time.ts | 6 ------ yarn.lock | 20 +++++++++---------- 5 files changed, 11 insertions(+), 29 deletions(-) diff --git a/.nvmrc b/.nvmrc index 2f76972966..40e6bd96a6 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -8.11.1 +12.1 diff --git a/test-mocha/common/datetime/format_date.ts b/test-mocha/common/datetime/format_date.ts index 9431d919ea..2ef3162799 100644 --- a/test-mocha/common/datetime/format_date.ts +++ b/test-mocha/common/datetime/format_date.ts @@ -8,10 +8,4 @@ describe("formatDate", () => { it("Formats English dates", () => { assert.strictEqual(formatDate(dateObj, "en"), "November 18, 2017"); }); - - // Node only contains intl support for english formats. This test at least ensures - // the fallback to a different locale - it("Formats other dates", () => { - assert.strictEqual(formatDate(dateObj, "fr"), "2017 M11 18"); - }); }); diff --git a/test-mocha/common/datetime/format_date_time.ts b/test-mocha/common/datetime/format_date_time.ts index 74a91d8c53..d909839b92 100644 --- a/test-mocha/common/datetime/format_date_time.ts +++ b/test-mocha/common/datetime/format_date_time.ts @@ -11,10 +11,4 @@ describe("formatDateTime", () => { "November 18, 2017, 11:12 AM" ); }); - - // Node only contains intl support for english formats. This test at least ensures - // the fallback to a different locale - it("Formats other date times", () => { - assert.strictEqual(formatDateTime(dateObj, "fr"), "2017 M11 18 11:12"); - }); }); diff --git a/test-mocha/common/datetime/format_time.ts b/test-mocha/common/datetime/format_time.ts index 84620e783a..4926e55663 100644 --- a/test-mocha/common/datetime/format_time.ts +++ b/test-mocha/common/datetime/format_time.ts @@ -8,10 +8,4 @@ describe("formatTime", () => { it("Formats English times", () => { assert.strictEqual(formatTime(dateObj, "en"), "11:12 AM"); }); - - // Node only contains intl support for english formats. This test at least ensures - // the fallback to a different locale - it("Formats other times", () => { - assert.strictEqual(formatTime(dateObj, "fr"), "11:12"); - }); }); diff --git a/yarn.lock b/yarn.lock index a0ae7e1bc2..c839a7208e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6451,12 +6451,12 @@ fs.realpath@^1.0.0: integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@^1.0.0, fsevents@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4" - integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw== + version "1.2.9" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f" + integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw== dependencies: - nan "^2.9.2" - node-pre-gyp "^0.10.0" + nan "^2.12.1" + node-pre-gyp "^0.12.0" function-bind@^1.1.1: version "1.1.1" @@ -9560,7 +9560,7 @@ mz@^2.4.0, mz@^2.6.0: object-assign "^4.0.1" thenify-all "^1.0.0" -nan@^2.9.2: +nan@^2.12.1: version "2.13.2" resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7" integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw== @@ -9685,10 +9685,10 @@ node-forge@0.7.5: util "^0.11.0" vm-browserify "0.0.4" -node-pre-gyp@^0.10.0: - version "0.10.3" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" - integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A== +node-pre-gyp@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" + integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A== dependencies: detect-libc "^1.0.2" mkdirp "^0.5.1"