From 9c3915a4c6b7914794878e9d6fcdc134f4bae1e8 Mon Sep 17 00:00:00 2001 From: John Hann Date: Sat, 7 Mar 2020 11:13:43 -0500 Subject: [PATCH 1/3] Update test to include some recent syntax updates. - New explicit inext object syntax - Test fails: Syntax error (cherry picked from commit 1ac823ca630a412d58e89784a2f1cec72aaf1e41) --- test/expected.js | 4 ++++ test/source.js | 3 +++ 2 files changed, 7 insertions(+) diff --git a/test/expected.js b/test/expected.js index 03b4d71..ba4aa93 100644 --- a/test/expected.js +++ b/test/expected.js @@ -6,6 +6,9 @@ var someModule = require('some-module'); /* */ +const myClass = + options => new MyClass(options.value); + class MyClass extends someModule.SomeClass { @@ -20,4 +23,5 @@ class MyClass extends someModule.SomeClass { } +exports.myClass = myClass; exports.MyClass = MyClass; diff --git a/test/source.js b/test/source.js index 103bf76..ba476cb 100644 --- a/test/source.js +++ b/test/source.js @@ -3,6 +3,9 @@ import { SomeClass } from 'some-module' import type { SomeInterface } from 'some-module' +export const myClass: ({ value: T, ... }) => MyClass = + options => new MyClass(options.value) + export class MyClass extends SomeClass implements SomeInterface { value: T From f84fcc4fad4ef124c841f225362f88460deee643 Mon Sep 17 00:00:00 2001 From: John Hann Date: Sat, 7 Mar 2020 11:15:19 -0500 Subject: [PATCH 2/3] Update to recent (2.119.1) flow-remove-types. - Most recent (2.120.1) seems to fail on basic class syntax, so opted for 2.119.1 (cherry picked from commit b486be801dbc303f6f2eea536c8974f378dc4f3f) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ac2767e..d59f9a8 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "strip" ], "dependencies": { - "flow-remove-types": "^1.1.0", + "flow-remove-types": "^2.119.1", "rollup-pluginutils": "^1.5.1" }, "devDependencies": { From c17a8b2020a127b0339ccc0d76511f94bfd38b22 Mon Sep 17 00:00:00 2001 From: Evan Jacobs Date: Mon, 31 Aug 2020 20:49:50 -0400 Subject: [PATCH 3/3] [breaking] bump required node version to 10+, update underlying lib --- .travis.yml | 7 ++-- package.json | 5 ++- yarn.lock | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 yarn.lock diff --git a/.travis.yml b/.travis.yml index ca75b25..acf72d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: node_js node_js: - - "7" - - "6" - - "4" - - "0.12" + - "10" + - "12" + - "14" diff --git a/package.json b/package.json index d59f9a8..1aae808 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,13 @@ "strip" ], "dependencies": { - "flow-remove-types": "^2.119.1", + "flow-remove-types": "~2.119.1", "rollup-pluginutils": "^1.5.1" }, "devDependencies": { "rollup": "^0.36.0" + }, + "engines": { + "node": ">= 10" } } diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000..b910e69 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,91 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +estree-walker@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e" + integrity sha1-va/oCVOD2EFNXcLs9MkXO225QS4= + +flow-parser@^0.119.1: + version "0.119.1" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.119.1.tgz#c120c402e164c7e9379a8d84b2c838adaaa0e610" + integrity sha512-yFd4z6ZBXq//TJo/gtSzGKhz6wEVeI2m+6JB25JzXuRAOhM5Ze4xFkc3FSIStbYjrAx4H1IUiUTI/yy30oKp8A== + +flow-remove-types@~2.119.1: + version "2.119.1" + resolved "https://registry.yarnpkg.com/flow-remove-types/-/flow-remove-types-2.119.1.tgz#0bcf21d1b9e4092056f02f8924fd74dbedb4751e" + integrity sha512-PjPcdfyizk8/+IQL8pKInPkneRVzkJSV7Eqgl/8oHIWtEdQMkqrioxwSc1H38zIRzyALpgSdvcDvFHY28FUqLQ== + dependencies: + flow-parser "^0.119.1" + pirates "^3.0.2" + vlq "^0.2.1" + +minimatch@^3.0.2: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +node-modules-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" + integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= + +pirates@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-3.0.2.tgz#7e6f85413fd9161ab4e12b539b06010d85954bb9" + integrity sha512-c5CgUJq6H2k6MJz72Ak1F5sN9n9wlSlJyEnwvpm9/y3WB4E3pHBDT2c6PEiS1vyJvq2bUxUAIu0EGf8Cx4Ic7Q== + dependencies: + node-modules-regexp "^1.0.0" + +rollup-pluginutils@^1.5.1: + version "1.5.2" + resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408" + integrity sha1-HhVud4+UtyVb+hs9AXi+j1xVJAg= + dependencies: + estree-walker "^0.2.1" + minimatch "^3.0.2" + +rollup@^0.36.0: + version "0.36.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.36.4.tgz#a224494c5386c1d73d38f7bb86f69f5eb011a3d2" + integrity sha1-oiRJTFOGwdc9OPe7hvafXrARo9I= + dependencies: + source-map-support "^0.4.0" + +source-map-support@^0.4.0: + version "0.4.18" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" + integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== + dependencies: + source-map "^0.5.6" + +source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +vlq@^0.2.1: + version "0.2.3" + resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" + integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==