Skip to content

Commit 05c3336

Browse files
chore(dependencies): USE YARN (and node 6)
1 parent d1e4f57 commit 05c3336

23 files changed

+6849
-26612
lines changed

.nvmrc

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
4
2-
1+
6

.travis.yml

+5-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22
sudo: false
33
node_js:
4-
- '4.4'
4+
- '6'
55

66
cache:
77
directories:
@@ -36,19 +36,12 @@ addons:
3636
packages:
3737
- g++-4.8
3838

39-
install:
40-
# Check the size of caches
41-
- du -sh ./node_modules ./bower_components/ ./docs/bower_components/ || true
42-
# - npm config set registry http://23.251.144.68
43-
# Disable the spinner, it looks bad on Travis
44-
- npm config set spin false
45-
# Log HTTP requests
46-
- npm config set loglevel http
47-
#- npm install -g [email protected]
48-
# Install npm dependencies and ensure that npm cache is not stale
49-
- npm install
39+
before_install:
40+
- curl -o- -L https://raw.githubusercontent.com/yarnpkg/yarn/2a0afc73210c7a82082585283e518eeb88ca19ae/scripts/install-latest.sh | bash -s -- --version 0.17.9
41+
- export PATH=$HOME/.yarn/bin:$PATH
5042

5143
before_script:
44+
- du -sh ./node_modules ./bower_components/ ./docs/bower_components/ || true
5245
- ./scripts/travis/before_build.sh
5346

5447
script:

Gruntfile.js

+3-7
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,9 @@ module.exports = function(grunt) {
292292
},
293293

294294
shell: {
295-
'npm-install': {
296-
command: 'node scripts/npm/check-node-modules.js'
295+
'install-node-dependencies': {
296+
command: 'yarn'
297297
},
298-
299298
'promises-aplus-tests': {
300299
options: {
301300
stdout: false,
@@ -322,13 +321,10 @@ module.exports = function(grunt) {
322321
}
323322
});
324323

325-
// global beforeEach task
326324
if (!process.env.TRAVIS) {
327-
grunt.task.run('shell:npm-install');
325+
grunt.task.run('shell:install-node-dependencies');
328326
}
329327

330-
331-
332328
//alias tasks
333329
grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['eslint', 'package', 'test:unit', 'test:promises-aplus', 'tests:docs', 'test:protractor']);
334330
grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);

changelog.js

-208
This file was deleted.

changelog.spec.js

-108
This file was deleted.

check-size.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

3-
grunt minify
3+
node_modules/.bin/grunt minify
44
gzip -c < build/angular.min.js > build/angular.min.js.gzip
55
ls -l build/angular.min.*

0 commit comments

Comments
 (0)