Skip to content

Commit cbccf2f

Browse files
committed
Fix flow type cross-module export/import
1 parent 1035270 commit cbccf2f

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

.babelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"env": {
3-
"cjs": {
3+
"development": {
44
"presets": ["es2015"],
55
"plugins": [
66
"syntax-async-functions",
@@ -16,7 +16,7 @@
1616
"transform-regenerator",
1717
"transform-class-properties",
1818
"transform-object-rest-spread",
19-
"transform-flow-comments",
19+
"transform-flow-strip-types",
2020
]
2121
}
2222
}

.flowconfig

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
11
[ignore]
2-
.*/es/.*
32
.*/__tests__/.*
4-
.*/lib/.*
5-
.*/dist/.*
3+
.*/__mocks__/.*
64
.*/coverage/.*
75
.*/resources/.*
8-
.*/node_modules/graphql/.*
96

107
[include]
11-
../graphql-compose/src
12-
../graphql-js/src
138

149
[libs]
1510

1611
[options]
1712
esproposal.class_instance_fields=enable
1813
suppress_comment= \\(.\\|\n\\)*\\$FlowFixMe
19-
module.name_mapper='^graphql-compose/lib/definition.js$' -> '/Users/nod/www/_npm/graphql-compose/src/definition.js'
20-
module.name_mapper='^graphql-compose\(.*\)$' -> '/Users/nod/www/_npm/graphql-compose/src\1'
21-
module.name_mapper='^graphql$' -> '/Users/nod/www/_npm/graphql-js/src'
22-
module.name_mapper='^graphql/type/definition.js$' -> '/Users/nod/www/_npm/graphql-js/src/type/definition.js'
2314

2415
[version]
2516
0.28.0

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"babel-eslint": "6.1.0",
3535
"babel-plugin-syntax-async-functions": "6.8.0",
3636
"babel-plugin-transform-class-properties": "6.10.2",
37-
"babel-plugin-transform-flow-comments": "6.8.0",
3837
"babel-plugin-transform-flow-strip-types": "6.8.0",
3938
"babel-plugin-transform-object-rest-spread": "6.8.0",
4039
"babel-plugin-transform-regenerator": "6.9.0",
@@ -55,12 +54,13 @@
5554
"sane": "1.3.4"
5655
},
5756
"scripts": {
58-
"build": "npm run build-cjs && npm run build-es",
59-
"build-cjs": "rimraf lib && BABEL_ENV=cjs babel src --ignore __tests__,__mocks__ -d lib && cp src/definition.js lib/definition.js",
60-
"build-es": "rimraf es && BABEL_ENV=es babel src --ignore __tests__,__mocks__ -d es && cp src/definition.js es/definition.js",
57+
"build": "npm run build-cjs && npm run build-flow && npm run build-es",
58+
"build-cjs": "rimraf lib && babel src --ignore __tests__,__mocks__ -d lib",
59+
"build-es": "rimraf es && BABEL_ENV=es babel src --ignore __tests__,__mocks__ -d es",
60+
"build-flow": "find ./src -name '*.js' -not -path '*/__*' | while read filepath; do cp $filepath `echo $filepath | sed 's/\\\/src\\\//\\\/lib\\\//g'`.flow; done",
6161
"lint": "eslint src test *.js",
6262
"prepublish": "npm run build",
63-
"test": "BABEL_ENV=cjs babel-node ./node_modules/.bin/_mocha --compilers js:babel-core/register --reporter dot --require ./resources/mocha-bootload src/**/__tests__/**/*-test.js",
64-
"watch": "BABEL_ENV=cjs babel-node ./resources/watch.js"
63+
"test": "babel-node ./node_modules/.bin/_mocha --compilers js:babel-core/register --reporter dot --require ./resources/mocha-bootload src/**/__tests__/**/*-test.js",
64+
"watch": "babel-node ./resources/watch.js"
6565
}
6666
}

0 commit comments

Comments
 (0)