Skip to content

Commit

Permalink
Merge pull request airbnb#224 from hshoff/harry-axis-ptypes
Browse files Browse the repository at this point in the history
[internal] fix travis builds, vx text test, bump axis prop-types dep
  • Loading branch information
hshoff authored Jan 10, 2018
2 parents 4f2d718 + 7352aeb commit 4c6f297
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 35 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ node_js:
cache:
directories:
- node_modules
script: travis_wait 30 npm test
after_script: "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls"
26 changes: 7 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,20 @@
"description": "Low-level visualization components",
"main": "index.js",
"scripts": {
"test": "lerna clean --yes && lerna bootstrap && lerna exec npm run test",
"test": "lerna bootstrap && lerna exec npm run test",
"docs": "node ./scripts/docs/index.js",
"prepare-release": "git checkout master && git pull --rebase origin master && npm run docs && lerna updated",
"prepare-release":
"git checkout master && git pull --rebase origin master && npm run docs && lerna updated",
"release": "npm run prepare-release && lerna publish --exact"
},
"jest": {
"projects": [
"<rootDir>/packages/*"
],
"projects": ["<rootDir>/packages/*"],
"collectCoverage": true,
"coverageDirectory": "<rootDir>/coverage",
"coveragePathIgnorePatterns": [
"/node_modules/"
],
"coverageReporters": [
"text",
"lcov"
]
"coveragePathIgnorePatterns": ["/node_modules/"],
"coverageReporters": ["text", "lcov"]
},
"keywords": [
"react",
"d3",
"visualization",
"vx",
"charts"
],
"keywords": ["react", "d3", "visualization", "vx", "charts"],
"author": "@hshoff",
"license": "MIT",
"devDependencies": {
Expand Down
19 changes: 4 additions & 15 deletions packages/vx-axis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,12 @@
"prepublish": "make build SRC=./src",
"test": "jest"
},
"files": [
"build"
],
"files": ["build"],
"repository": {
"type": "git",
"url": "git+https://github.com/hshoff/vx.git"
},
"keywords": [
"vx",
"react",
"d3",
"visualizations",
"charts"
],
"keywords": ["vx", "react", "d3", "visualizations", "charts"],
"author": "@hshoff",
"license": "MIT",
"bugs": {
Expand All @@ -33,7 +25,7 @@
"@vx/point": "0.0.143",
"@vx/shape": "0.0.147",
"classnames": "^2.2.5",
"prop-types": "15.5.10"
"prop-types": "^15.6.0"
},
"devDependencies": {
"babel-jest": "^21.2.0",
Expand All @@ -55,9 +47,6 @@
"access": "public"
},
"jest": {
"setupFiles": [
"raf/polyfill",
"<rootDir>/test/enzyme-setup.js"
]
"setupFiles": ["raf/polyfill", "<rootDir>/test/enzyme-setup.js"]
}
}
2 changes: 1 addition & 1 deletion packages/vx-vx/test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ describe('vx', () => {
});

test('it should export @vx/text', () => {
expect(vx.TextOutline).toBeDefined();
expect(vx.Text).toBeDefined();
});

test('it should export @vx/tooltip', () => {
Expand Down

0 comments on commit 4c6f297

Please sign in to comment.