Skip to content

Commit

Permalink
chore(dependencies): USE YARN (and node 6)
Browse files Browse the repository at this point in the history
  • Loading branch information
petebacondarwin committed Nov 29, 2016
1 parent d1e4f57 commit 05c3336
Show file tree
Hide file tree
Showing 23 changed files with 6,849 additions and 26,612 deletions.
3 changes: 1 addition & 2 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
4

6
17 changes: 5 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js
sudo: false
node_js:
- '4.4'
- '6'

cache:
directories:
Expand Down Expand Up @@ -36,19 +36,12 @@ addons:
packages:
- g++-4.8

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

before_script:
- du -sh ./node_modules ./bower_components/ ./docs/bower_components/ || true
- ./scripts/travis/before_build.sh

script:
Expand Down
10 changes: 3 additions & 7 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,9 @@ module.exports = function(grunt) {
},

shell: {
'npm-install': {
command: 'node scripts/npm/check-node-modules.js'
'install-node-dependencies': {
command: 'yarn'
},

'promises-aplus-tests': {
options: {
stdout: false,
Expand All @@ -322,13 +321,10 @@ module.exports = function(grunt) {
}
});

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



//alias tasks
grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['eslint', 'package', 'test:unit', 'test:promises-aplus', 'tests:docs', 'test:protractor']);
grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
Expand Down
208 changes: 0 additions & 208 deletions changelog.js

This file was deleted.

108 changes: 0 additions & 108 deletions changelog.spec.js

This file was deleted.

2 changes: 1 addition & 1 deletion check-size.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash

grunt minify
node_modules/.bin/grunt minify
gzip -c < build/angular.min.js > build/angular.min.js.gzip
ls -l build/angular.min.*
Loading

0 comments on commit 05c3336

Please sign in to comment.