Skip to content

Commit

Permalink
clean up dup packages and use yarn as client (gatsbyjs#1939)
Browse files Browse the repository at this point in the history
* clean up dup packages and use yarn as client

* appveyor config

* appveyor again

* appveyor again

* try appveyor trick

* clean up versions

* more appveyor

* don'
t double install node

* AGAIN

* Remove lerna_backup files + update yarn.lock
  • Loading branch information
jquense authored and KyleAMathews committed Aug 30, 2017
1 parent 7014bc5 commit bd2b5e6
Show file tree
Hide file tree
Showing 72 changed files with 7,778 additions and 1,649 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ dist: trusty
sudo: required

before_install:
- npm i -g npm@latest
- npm i -g yarn@latest

install:
- npm install
- yarn install
- yarn run lerna bootstrap

script:
- npm test
1 change: 1 addition & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--install.ignore-engines true
16 changes: 9 additions & 7 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ platform:

cache:
- '%AppData%/npm-cache'
- "%LOCALAPPDATA%/Yarn"
- C:\Users\appveyor\AppData\Roaming\npm\node_modules\windows-build-tools

skip_branch_with_pr: true
Expand Down Expand Up @@ -46,23 +47,24 @@ install:
}
- ps: Install-Product node $env:nodejs_version $env:platform
- ps: npm install -g windows-build-tools
- npm install -g gatsby-dev-cli@canary
- choco install yarn --ignore-dependencies
- refreshenv
- echo we are running on %PLATFORM%
- npm install
- yarn global add gatsby-dev-cli@canary
- yarn install
- node --version
- npm --version
- npm test
- yarn test

# Build gatsby head
before_build:
- npm run build
- yarn run build

build_script:
- cd examples/%example%
- npm install
- yarn install
- gatsby-dev --set-path-to-repo ../..
- gatsby-dev --scan-once
- npm run build
- yarn run build

artifacts:
- path: examples/$(example)
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "2.1.1",
"npmClient": "npm",
"npmClient": "yarn",
"packages": [
"packages/*"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-1-config-css-modules/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"babel-runtime": "^6.26.0"
},
"devDependencies": {
"babel-cli": "^6.24.1"
"babel-cli": "^6.26.0"
}
}
4 changes: 2 additions & 2 deletions packages/gatsby-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"gatsby": "./index.js"
},
"dependencies": {
"babel-runtime": "^6.25.0",
"babel-runtime": "^6.26.0",
"commander": "^2.11.0",
"core-js": "^2.5.0",
"fs-extra": "^4.0.1",
Expand All @@ -17,7 +17,7 @@
"tracer": "^0.8.9"
},
"devDependencies": {
"babel-cli": "^6.24.1"
"babel-cli": "^6.26.0"
},
"keywords": [
"gatsby"
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby-dev-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"babel-runtime": "^6.23.0",
"babel-runtime": "^6.26.0",
"chokidar": "^1.7.0",
"configstore": "^3.1.0",
"fs-extra": "^3.0.1",
Expand All @@ -13,7 +13,7 @@
"description": "CLI helpers for contributors working on Gatsby",
"main": "index.js",
"devDependencies": {
"babel-cli": "^6.24.1"
"babel-cli": "^6.26.0"
},
"bin": {
"gatsby-dev": "./dist/index.js"
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby-link/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"author": "Kyle Mathews <[email protected]>",
"license": "MIT",
"devDependencies": {
"babel-cli": "^6.24.1"
"babel-cli": "^6.26.0"
},
"dependencies": {
"babel-runtime": "6.26.0",
"babel-runtime": "^6.26.0",
"prop-types": "^15.5.8",
"ric": "^1.3.0"
}
Expand Down
Loading

0 comments on commit bd2b5e6

Please sign in to comment.