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

fix: Make 'react' a peer dependency, use yarn lock file #4

Merged
merged 6 commits into from
Oct 2, 2018
Merged

fix: Make 'react' a peer dependency, use yarn lock file #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be1ac46
build(dependencies): Use yarn lock file for dependencies
jahredhope Oct 1, 2018
04c2cc7
chore: Remove react-dom from peers, update yarn.lock, cache in CI
markdalgleish Oct 2, 2018
2234e02
chore: Run Yarn integrity check before test run
markdalgleish Oct 2, 2018
39d4ab8
Merge branch 'master' into lock-file
markdalgleish Oct 2, 2018
ea453c4
chore: Update lock file
markdalgleish Oct 2, 2018
19e0430
docs: Tweak readme
markdalgleish Oct 2, 2018
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
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ node_modules/
dist/
report/
package-lock.json
yarn.lock
*.log
.DS_Store
.vscode/
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: node_js
cache: yarn
notifications:
email: false
before_script:
Expand Down
8 changes: 6 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@ export default () => (

## Local Development

This project uses [Yarn](https://yarnpkg.com) for development dependencies.

Installing with `yarn` is required to ensure dependencies match the current [yarn.lock](./yarn.lock).

```bash
$ npm install
$ npm start
$ yarn
jahredhope marked this conversation as resolved.
Show resolved Hide resolved
$ yarn start
```

## License
Expand Down
11 changes: 7 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "lib/components/index.js",
"sideEffects": false,
"scripts": {
"test": "npm run lint && CI=true npm run unit && npm run build",
"test": "yarn check --integrity && npm run lint && CI=true npm run unit && npm run build",
"unit": "sku test",
"build": "rimraf docs/dist && sku build",
"start": "sku start",
Expand Down Expand Up @@ -37,8 +37,10 @@
"dependencies": {
"basekick": "^3.0.0",
"classnames": "^2.2.6",
"prop-types": "^15.6.2",
"react": "^16.5.2"
"prop-types": "^15.6.2"
},
"peerDependencies": {
"react": "^16.0.0"
},
"devDependencies": {
"@commitlint/cli": "^7.1.2",
Expand All @@ -49,7 +51,8 @@
"deep-keys": "^0.5.0",
"husky": "^1.0.1",
"lodash": "^4.17.11",
"react-dom": "16.5.2",
"react": "^16.5.2",
"react-dom": "^16.5.2",
"react-testing-library": "^5.1.0",
"renovate-config-seek": "0.3.0",
"rimraf": "^2.6.2",
Expand Down
Loading