From e71cfe866fdb067be796d7363caf6c0db175b929 Mon Sep 17 00:00:00 2001 From: "Eugene Sypachev (@Axblade)" Date: Thu, 25 May 2017 15:56:23 +0300 Subject: [PATCH 1/3] make & flow --- .flowconfig | 22 ++++++++++++++++++++++ Makefile | 15 +++++++++++++++ flow-typed/api.js | 3 +-- package.json | 3 ++- 4 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 .flowconfig create mode 100644 Makefile diff --git a/.flowconfig b/.flowconfig new file mode 100644 index 0000000..8f6d502 --- /dev/null +++ b/.flowconfig @@ -0,0 +1,22 @@ +[ignore] +.*/node_modules/babel-.* +.*/node_modules/fbjs/.* +.*/node_modules/json5/.* +.*/node_modules/systemjs-builder/.* +.*/node_modules/.tmp/.* +.*/node_modules/invariant/* + +[include] +src + +[options] +esproposal.decorators=ignore +esproposal.class_static_fields=enable +esproposal.class_instance_fields=enable +module.name_mapper='.+css$' -> 'CSSModule' +strip_root=true +module.system=haste +module.system.node.resolve_dirname=node_modules +module.system.node.resolve_dirname=src +unsafe.enable_getters_and_setters=true +suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..95c6fb1 --- /dev/null +++ b/Makefile @@ -0,0 +1,15 @@ +.DEFAULT_GOAL := build + +setup: clean + yarn --pure-lockfile + +build: + yarn build + +clean: + rm -rf ./node_modules && rm -rf ./lib/* + +test: build + yarn flow + +.PHONY: setup build clean test diff --git a/flow-typed/api.js b/flow-typed/api.js index f624f8f..5bc20f2 100644 --- a/flow-typed/api.js +++ b/flow-typed/api.js @@ -1,8 +1,7 @@ - declare module '@foxcomm/api-js' { declare type StringDict = {[name: string]: string}; - declare type AbortablePromise = Promise & { + declare type AbortablePromise = Promise<*> & { abort(): void; }; diff --git a/package.json b/package.json index b24478e..c85069a 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "test": "mocha test", "build": "babel src -d lib", "docs": "APIARY_DOCS_PATH=../phoenix-scala/docs/api/docs/objects node ./bin/import-docs.js && node ./bin/make-docs.js", - "prepublish": "npm run build" + "prepublish": "npm run build", + "flow": "flow check" }, "repository": { "type": "git", From ff09d5bcbaabf1d6836c4f4ea3b2216e8ca9d070 Mon Sep 17 00:00:00 2001 From: "Eugene Sypachev (@Axblade)" Date: Thu, 25 May 2017 16:00:58 +0300 Subject: [PATCH 2/3] test push --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 95c6fb1..d19fbb2 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,8 @@ build: yarn build clean: - rm -rf ./node_modules && rm -rf ./lib/* + rm -rf ./node_modules + rm -rf ./lib/* test: build yarn flow From a2fa8acc924b558c892dad7929e750fa78628c17 Mon Sep 17 00:00:00 2001 From: "Eugene Sypachev (@Axblade)" Date: Thu, 25 May 2017 16:04:11 +0300 Subject: [PATCH 3/3] install local flow --- package.json | 3 ++- yarn.lock | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c85069a..7869e60 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "build": "babel src -d lib", "docs": "APIARY_DOCS_PATH=../phoenix-scala/docs/api/docs/objects node ./bin/import-docs.js && node ./bin/make-docs.js", "prepublish": "npm run build", - "flow": "flow check" + "flow": "./node_modules/.bin/flow check" }, "repository": { "type": "git", @@ -40,6 +40,7 @@ "babel-preset-es2015": "^6.9.0", "babel-preset-stage-1": "^6.5.0", "escape-html": "^1.0.3", + "flow-bin": "^0.46.0", "leafdoc": "github:anru/Leafdoc#v1.1", "mkdirp": "^0.5.1", "mocha": "^2.5.2", diff --git a/yarn.lock b/yarn.lock index 05fb675..48c0459 100644 --- a/yarn.lock +++ b/yarn.lock @@ -952,6 +952,10 @@ fill-range@^2.1.0: repeat-element "^1.1.2" repeat-string "^1.5.2" +flow-bin@^0.46.0: + version "0.46.0" + resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.46.0.tgz#06ad7fe19dddb1042264438064a2a32fee12b872" + for-in@^0.1.5: version "0.1.6" resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"