Skip to content

Commit f0e161d

Browse files
committed
chore(build): Switch from npm to yarn
1 parent f9cd763 commit f0e161d

File tree

4 files changed

+6258
-20
lines changed

4 files changed

+6258
-20
lines changed

README.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ image::https://api.travis-ci.org/spinnaker/deck.svg?branch=master["Build Status"
44

55
== Prerequisites
66

7-
Make sure that node and npm are installed on your system (http://nodejs.org/download/[download]). The minimum versions for each are listed in package.json.
7+
Make sure that http://nodejs.org/download/[node] and https://yarnpkg.com/en/docs/install[yarn] are installed on your system. The minimum versions for each are listed in package.json.
88

99
== Quick Start
1010

1111
Run the following commands (in the deck directory) to get all dependencies installed in deck and to start the server:
1212

13-
* `npm install`
14-
* `npm start`
13+
* `yarn`
14+
* `yarn run start`
1515

1616
The app will start up on localhost:9000.
1717

@@ -28,25 +28,25 @@ The following external resources can be specified with environment variables:
2828
* `API_HOST` overrides the default Spinnaker API host.
2929
* `AUTH_ENABLED` determines whether Deck will attempt to authenticate users via Gate.
3030

31-
For example, `API_HOST=http://spinnaker.prod.netflix.net npm start` will run Deck with `http://spinnaker.prod.netflix.net` as the API host.
31+
For example, `API_HOST=http://spinnaker.prod.netflix.net yarn run start` will run Deck with `http://spinnaker.prod.netflix.net` as the API host.
3232

3333
== Testing
3434

35-
To run the tests within the application, run `npm test`.
35+
To run the tests within the application, run `yarn run test`.
3636

3737
[[NOTE]]
3838
====
3939
Developing things locally? You will want to run https://github.com/spinnaker/gate[gate] locally (which runs on port 8084) as well. It's the gateway to clouddriver. Then run deck like this:
4040
4141
```
42-
API_HOST=http://localhost:8084 npm start
42+
API_HOST=http://localhost:8084 yarn run start
4343
```
4444
====
4545

4646

4747
== Building & Deploying
4848

49-
To build the application, run `npm run build`. The built application lives in `build/`.
49+
To build the application, run `yarn run build`. The built application lives in `build/`.
5050

5151
== Conventions
5252

build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
}
1111
dependencies {
1212
classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.12.0'
13-
classpath 'com.moowork.gradle:gradle-node-plugin:0.11'
13+
classpath 'com.moowork.gradle:gradle-node-plugin:1.1.1'
1414
}
1515
}
1616

@@ -35,6 +35,7 @@ node {
3535

3636
version = packageJson.engines.node
3737
npmVersion = packageJson.engines.npm
38+
yarnVersion = packageJson.engines.yarn
3839

3940
// Enabled the automatic download. False is the default (for now).
4041
download = true
@@ -70,8 +71,8 @@ task generateVersionFile << {
7071

7172
webpack.outputs.dir file('build/webpack')
7273

73-
npmInstall.dependsOn 'generateVersionFile'
74-
webpack.dependsOn 'npmInstall'
74+
yarn.dependsOn 'generateVersionFile'
75+
webpack.dependsOn 'yarn'
7576
karma.dependsOn 'webpack'
7677
test.dependsOn 'karma'
7778
buildDeb.dependsOn 'test'

package.json

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
},
1313
"engines": {
1414
"node": "7.0.0",
15-
"npm": "3.10.8"
15+
"npm": "3.10.8",
16+
"yarn": "0.21.3"
1617
},
1718
"scripts": {
1819
"clean": "rimraf .awcache .happypack build coverage node_modules transpiled",
@@ -65,7 +66,7 @@
6566
"source-sans-pro": "^2.0.10",
6667
"spin.js": "git://github.com/fgnass/spin.js.git#2.3.1",
6768
"ui-select": "^0.19.6",
68-
"zone.js": "^0.7.6"
69+
"zone.js": "^0.8.5"
6970
},
7071
"devDependencies": {
7172
"@types/angular": "1.5.20",
@@ -80,7 +81,7 @@
8081
"@types/node": "7.0.5",
8182
"@types/webpack": "^2.2.4",
8283
"@types/webpack-env": "^1.13.0",
83-
"angular-loader": "./angular-loader",
84+
"angular-loader": "file:./angular-loader",
8485
"angular-mocks": "1.5.8",
8586
"angulartics": "^1.1.2",
8687
"angulartics-google-analytics": "^0.2.0",
@@ -89,7 +90,7 @@
8990
"babel-loader": "^6.2.10",
9091
"babel-preset-es2015": "^6.18.0",
9192
"codelyzer": "2.0.0",
92-
"css-loader": "^0.26.1",
93+
"css-loader": "^0.27.3",
9394
"envify": "^1.2.1",
9495
"envify-loader": "^0.1.0",
9596
"eslint": "^3.17.0",
@@ -98,10 +99,11 @@
9899
"expose-loader": "^0.7.1",
99100
"file-loader": "^0.10.0",
100101
"happypack": "^3.0.3",
101-
"html-loader": "0.4.0",
102+
"html-loader": "0.4.5",
102103
"html-webpack-plugin": "^2.28.0",
103104
"imports-loader": "^0.7.0",
104105
"istanbul-instrumenter-loader": "^2.0.0",
106+
"jasmine-core": "^2.5.2",
105107
"json-loader": "^0.5.4",
106108
"karma": "^1.4.1",
107109
"karma-chrome-launcher": "^2.0.0",
@@ -112,16 +114,16 @@
112114
"karma-sourcemap-loader": "^0.3.7",
113115
"karma-webpack": "^2.0.2",
114116
"less": "^2.7.2",
115-
"less-loader": "^2.2.3",
116-
"loader-utils": "^0.2.16",
117+
"less-loader": "^4.0.2",
118+
"loader-utils": "^1.1.0",
117119
"ng-annotate-loader": "0.2.0",
118120
"ng-annotate-webpack-plugin": "^0.2.1-pre",
119121
"ngtemplate-loader": "^1.3.1",
120-
"node-libs-browser": "^0.5.2",
122+
"node-libs-browser": "^2.0.0",
121123
"octicons": "^2.2.0",
122-
"protractor": "^2.2.0",
124+
"protractor": "^5.1.1",
123125
"rimraf": "^2.5.4",
124-
"style-loader": "^0.13.1",
126+
"style-loader": "^0.16.0",
125127
"ts-helpers": "^1.1.2",
126128
"tslint": "^4.5.1",
127129
"tslint-loader": "^3.4.3",

0 commit comments

Comments
 (0)