Skip to content

Commit 3449cbf

Browse files
jquenseKyleAMathews
authored andcommitted
use workspaces (gatsbyjs#2308)
* use workspaces * Update ignore file
1 parent 5728fff commit 3449cbf

File tree

7 files changed

+239
-426
lines changed

7 files changed

+239
-426
lines changed

.travis.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ node_js:
66
os: [linux]
77
dist: trusty
88
sudo: required
9+
cache:
10+
yarn: true
911

1012
before_install:
11-
- npm i -g yarn@latest
13+
- curl -o- -L https://yarnpkg.com/install.sh | bash
14+
- export PATH=$HOME/.yarn/bin:$PATH
1215

1316
install:
1417
- yarn run bootstrap

CONTRIBUTING.md

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ lerna and yarn to configure the repository for active development.
1818
You can install the latest version of Gatsby by following these steps:
1919

2020
* Clone the repo, navigate to its directory.
21+
* ensure you have the latest version of yarn installed (>= 1.0.2) https://yarnpkg.com/en/docs/install
2122
* Install dependencies using `yarn run bootstrap` in the root of the repo.
2223

2324
The usual contributing steps are:

lerna.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"packages": [
55
"packages/*"
66
],
7-
"hoist": true,
8-
"version": "independent"
7+
"version": "independent",
8+
"useWorkspaces": true
99
}

package.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
"rimraf": "^2.6.1"
3737
},
3838
"private": true,
39+
"engines": {
40+
"yarn": "^1.0.2"
41+
},
3942
"scripts": {
4043
"check-versions": "babel-node scripts/check-versions.js",
4144
"format": "npm run format-packages && npm run format-cache-dir && npm run format-www && npm run format-examples && npm run format-scripts",
@@ -48,7 +51,7 @@
4851
"lint": "npm run check-versions && eslint --ext .js,.jsx --ignore-path .gitignore .",
4952
"lint:flow": "babel-node scripts/flow-check.js",
5053
"plop": "plop",
51-
"bootstrap": "yarn && npm run check-versions && lerna bootstrap",
54+
"bootstrap": "yarn && npm run check-versions && lerna run prepublish",
5255
"publish": "lerna publish",
5356
"publish-canary": "lerna publish --canary --yes",
5457
"publish-next": "lerna publish --npm-tag=next",
@@ -58,5 +61,8 @@
5861
"test:watch": "jest --watch",
5962
"test_bkup": "npm run lint && npm run test-node && npm run test-integration",
6063
"watch": "lerna run watch --no-sort --stream --concurrency 999"
61-
}
64+
},
65+
"workspaces": [
66+
"packages/*"
67+
]
6268
}

packages/gatsby-link/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"license": "MIT",
1818
"devDependencies": {
1919
"babel-cli": "^6.26.0",
20-
"cross-env": "^5.0.5"
20+
"cross-env": "^5.0.5",
21+
"react-router-dom": "^4.2.2"
2122
},
2223
"dependencies": {
2324
"babel-runtime": "^6.26.0",
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
/*.js
2-
!index.js
32
yarn.lock

0 commit comments

Comments
 (0)