Skip to content

Commit bd2b5e6

Browse files
jquenseKyleAMathews
authored andcommitted
clean up dup packages and use yarn as client (gatsbyjs#1939)
* 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
1 parent 7014bc5 commit bd2b5e6

File tree

72 files changed

+7778
-1649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+7778
-1649
lines changed

.travis.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ dist: trusty
88
sudo: required
99

1010
before_install:
11-
- npm i -g npm@latest
11+
- npm i -g yarn@latest
1212

1313
install:
14-
- npm install
14+
- yarn install
15+
- yarn run lerna bootstrap
1516

1617
script:
1718
- npm test

.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--install.ignore-engines true

appveyor.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ platform:
33

44
cache:
55
- '%AppData%/npm-cache'
6+
- "%LOCALAPPDATA%/Yarn"
67
- C:\Users\appveyor\AppData\Roaming\npm\node_modules\windows-build-tools
78

89
skip_branch_with_pr: true
@@ -46,23 +47,24 @@ install:
4647
}
4748
- ps: Install-Product node $env:nodejs_version $env:platform
4849
- ps: npm install -g windows-build-tools
49-
- npm install -g gatsby-dev-cli@canary
50+
- choco install yarn --ignore-dependencies
51+
- refreshenv
5052
- echo we are running on %PLATFORM%
51-
- npm install
53+
- yarn global add gatsby-dev-cli@canary
54+
- yarn install
5255
- node --version
53-
- npm --version
54-
- npm test
56+
- yarn test
5557

5658
# Build gatsby head
5759
before_build:
58-
- npm run build
60+
- yarn run build
5961

6062
build_script:
6163
- cd examples/%example%
62-
- npm install
64+
- yarn install
6365
- gatsby-dev --set-path-to-repo ../..
6466
- gatsby-dev --scan-once
65-
- npm run build
67+
- yarn run build
6668

6769
artifacts:
6870
- path: examples/$(example)

lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lerna": "2.1.1",
3-
"npmClient": "npm",
3+
"npmClient": "yarn",
44
"packages": [
55
"packages/*"
66
],

packages/gatsby-1-config-css-modules/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"babel-runtime": "^6.26.0"
1717
},
1818
"devDependencies": {
19-
"babel-cli": "^6.24.1"
19+
"babel-cli": "^6.26.0"
2020
}
2121
}

packages/gatsby-cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"gatsby": "./index.js"
88
},
99
"dependencies": {
10-
"babel-runtime": "^6.25.0",
10+
"babel-runtime": "^6.26.0",
1111
"commander": "^2.11.0",
1212
"core-js": "^2.5.0",
1313
"fs-extra": "^4.0.1",
@@ -17,7 +17,7 @@
1717
"tracer": "^0.8.9"
1818
},
1919
"devDependencies": {
20-
"babel-cli": "^6.24.1"
20+
"babel-cli": "^6.26.0"
2121
},
2222
"keywords": [
2323
"gatsby"

packages/gatsby-dev-cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"babel-runtime": "^6.23.0",
3+
"babel-runtime": "^6.26.0",
44
"chokidar": "^1.7.0",
55
"configstore": "^3.1.0",
66
"fs-extra": "^3.0.1",
@@ -13,7 +13,7 @@
1313
"description": "CLI helpers for contributors working on Gatsby",
1414
"main": "index.js",
1515
"devDependencies": {
16-
"babel-cli": "^6.24.1"
16+
"babel-cli": "^6.26.0"
1717
},
1818
"bin": {
1919
"gatsby-dev": "./dist/index.js"

packages/gatsby-link/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"author": "Kyle Mathews <[email protected]>",
1616
"license": "MIT",
1717
"devDependencies": {
18-
"babel-cli": "^6.24.1"
18+
"babel-cli": "^6.26.0"
1919
},
2020
"dependencies": {
21-
"babel-runtime": "6.26.0",
21+
"babel-runtime": "^6.26.0",
2222
"prop-types": "^15.5.8",
2323
"ric": "^1.3.0"
2424
}

0 commit comments

Comments
 (0)