Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make tests pass using Node 5 / NPM 3 #832 #840

Closed
wants to merge 22 commits into from
Closed

Make tests pass using Node 5 / NPM 3 #832 #840

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
471e489
Make tests pass using Node 5 / NPM 3 #832
Feb 15, 2016
6f19ad7
Make tests pass using Node 5 / NPM 3 #832
Feb 15, 2016
139e7d3
Make tests pass using Node 5 / NPM 3 #832
Feb 15, 2016
7dc2ada
Make tests pass using Node 5 / NPM 3 #832
Feb 15, 2016
b7e5fea
Make tests pass using Node 5 / NPM 3 #832
Feb 15, 2016
9050c55
Make tests pass using Node 5 / NPM 3 #832
Feb 15, 2016
8735f6d
Merge branch 'rainer' of https://github.com/raineroviir/relay into ra…
Feb 15, 2016
1629a6f
make npm 4 and 5 work
Feb 19, 2016
b65ce82
fix for npm 4 and 5 compatibility
Feb 19, 2016
703aaa9
babel-relay-plugin under devDeps
Feb 20, 2016
2ad94ed
fix flow error with base62 during npm test
Feb 24, 2016
e5e762a
Merge branch 'rainer' of https://github.com/raineroviir/relay into ra…
Feb 24, 2016
d94114d
Merge remote-tracking branch 'upstream/master' into rainer
Feb 24, 2016
ff4d438
fix base62 error for flow and add node 5 to travis
Feb 24, 2016
306d569
removed extraneous changes
Feb 24, 2016
2eff6a0
fix base62 error
Feb 25, 2016
441a8d7
fix flow error for node_modules/util
Feb 25, 2016
9d1ce5c
fix util flow error
Feb 25, 2016
e6ca07a
Merge remote-tracking branch 'upstream/master' into rainer
Feb 25, 2016
a918aa1
Merge remote-tracking branch 'upstream/master' into rainer
Feb 25, 2016
2380ea1
fix flow errors
Feb 25, 2016
ceffba9
fix flow errors
Feb 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
language: node_js
node_js:
- '4'
- '5'
env:
- TEST_DIR=.
- TEST_DIR=scripts/babel-relay-plugin
Expand Down
16 changes: 5 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"dependencies": {
"babel-runtime": "5.8.24",
"fbjs": "^0.7.0",
"react-static-container": "^1.0.0-alpha.1"
"react-static-container": "^1.0.0-alpha.1",
"babel-relay-plugin": "0.7.0"
},
"peerDependencies": {
"babel-relay-plugin": "0.7.0",
"react": "^0.14.0"
},
"devDependencies": {
Expand Down Expand Up @@ -61,8 +61,8 @@
"webpack-stream": "^2.1.0"
},
"devEngines": {
"node": ">=4.x",
"npm": ">=2.x"
"node": ">=5.x",
"npm": ">=3.x"
},
"jest": {
"rootDir": "",
Expand All @@ -85,13 +85,7 @@
"<rootDir>/src/"
],
"unmockedModulePathPatterns": [
"<rootDir>/node_modules/fbjs/node_modules/core-js/",
"<rootDir>/node_modules/fbjs-scripts/",
"<rootDir>/node_modules/fbjs/node_modules/promise/",
"<rootDir>/node_modules/fbjs/lib/(?!(ErrorUtils.js$|fetch.js$|fetchWithRetries.js$))",
"<rootDir>/node_modules/react/",
"<rootDir>/node_modules/react-dom/",
"<rootDir>/node_modules/react-static-container/"
"<rootDir>/node_modules/(?!(fbjs/lib/ErrorUtils.js$|fbjs/lib/fetch.js$|fbjs/lib/fetchWithRetries.js$))"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you keep the deleted lines here and just have 2 patterns and add 4 and 5 to the travis config, do the tests pass in both environments? It'd be nice to work in both if it's just adding the new patterns instead of replacing them.

Is there something that makes it difficult to keep the npm 2 patterns in this file?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only difficulty is I don't know how to. Let me see what I can do

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should be able to revert this change once I update to jest 0.9.0-fb3.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok sure! I'll be awaiting jests 0.9.0-fb3 release

]
}
}
1 change: 1 addition & 0 deletions scripts/babel-relay-plugin/src/.flowconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

[include]
../node_modules/
../../../node_modules/util/

[libs]
../interfaces
Expand Down
2 changes: 2 additions & 0 deletions src/.flowconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
.*/node_modules/graphql/.*
.*/react/node_modules/.*
.*/react-static-container/node_modules/.*
.*/babel-relay-plugin/node_modules/.*

[include]
../node_modules/fbjs/lib
../node_modules/react
../node_modules/react-static-container/lib
../node_modules/base62

[libs]
../node_modules/fbjs/flow/lib
Expand Down