Skip to content

Commit 6cfc6f5

Browse files
btfordIgorMinar
authored andcommitted
build(npm): upgrade to npm v3
Closes angular#3193
1 parent 47a3b4d commit 6cfc6f5

12 files changed

+5141
-5101
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ addons:
6060
firefox: "38.0"
6161

6262
before_install:
63+
- npm install -g npm@3.5.2
6364
- node tools/analytics/build-analytics start ci job
6465
- node tools/analytics/build-analytics start ci before_install
6566
- echo ${TSDRC} > .tsdrc
@@ -77,7 +78,9 @@ install:
7778
# Check the size of caches
7879
- du -sh ./node_modules || true
7980
# Install npm dependecies
80-
- npm install
81+
# check-node-modules will exit(1) if we don't need to install
82+
# we need to manually kick off the postinstall script if check-node-modules exit(0)s
83+
- node tools/npm/check-node-modules --purge && npm install || npm run postinstall
8184
- node tools/analytics/build-analytics success ci install
8285

8386
before_script:

gulpfile.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// THIS CHECK SHOULD BE THE FIRST THING IN THIS FILE
44
// This is to ensure that we catch env issues before we error while requiring other dependencies.
55
require('./tools/check-environment')(
6-
{requiredNpmVersion: '>=2.14.7 <3.0.0', requiredNodeVersion: '>=4.2.1 <5.0.0'});
6+
{requiredNpmVersion: '>=3.5.2 <4.0.0', requiredNodeVersion: '>=4.2.1 <5.0.0'});
77

88

99
var del = require('del');
@@ -327,7 +327,9 @@ gulp.task('lint', ['build.tools'], function() {
327327
"requireParameterType": true,
328328
"requireReturnType": true,
329329
"semicolon": true,
330-
"variable-name": [true, "ban-keywords"]
330+
331+
// TODO: find a way to just screen for reserved names
332+
"variable-name": false
331333
}
332334
};
333335
return gulp.src(['modules/angular2/src/**/*.ts', '!modules/angular2/src/testing/**'])

0 commit comments

Comments
 (0)