Skip to content

Commit 26290a8

Browse files
authored
Merge pull request #295 from AArnott/fix293
Update to latest dev dependencies
2 parents 2b81b0b + de1bec1 commit 26290a8

File tree

5 files changed

+1420
-658
lines changed

5 files changed

+1420
-658
lines changed

build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ try {
3636

3737
if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "gulp")) {
3838
cd "$PSScriptRoot\src\nerdbank-gitversioning.npm"
39-
npm run build
39+
yarn run build
4040
if ($LASTEXITCODE -ne 0) {
4141
throw "Node build failed"
4242
}

init.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ try {
1616
Write-Host "Restoring NPM packages..." -ForegroundColor Yellow
1717
Push-Location "$PSScriptRoot\src\nerdbank-gitversioning.npm"
1818
try {
19-
if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "npm install")) {
20-
npm install --loglevel error
19+
if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "yarn install")) {
20+
yarn install --loglevel error
2121
}
2222
} finally {
2323
Pop-Location

src/nerdbank-gitversioning.npm/gulpfile.js

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ gulp.task('tsc', function () {
1818
var tsResult = gulp.src(['*.ts', 'ts/**/*.ts', 'node_modules/@types/**/index.d.ts'])
1919
// .pipe(tslint())
2020
.pipe(sourcemaps.init())
21-
.pipe(ts(tsProject));
21+
.pipe(tsProject());
2222

2323
return merge([
2424
tsResult.dts.pipe(gulp.dest(outDir)),
@@ -28,46 +28,47 @@ gulp.task('tsc', function () {
2828
]);
2929
});
3030

31-
gulp.task('copyPackageContents', ['tsc'], function () {
31+
gulp.task('copyPackageContents', gulp.series('tsc', function () {
3232
return gulp
3333
.src([
3434
'package.json',
3535
'README.md',
3636
'../../LICENSE.txt'
3737
])
3838
.pipe(gulp.dest(outDir));
39-
});
39+
}));
4040

41-
gulp.task('setPackageVersion', ['copyPackageContents'], function () {
41+
gulp.task('setPackageVersion', gulp.series('copyPackageContents', function () {
4242
var nbgv = require(`./${outDir}`);
4343
return nbgv.setPackageVersion(outDir, '.');
44-
});
44+
}));
4545

46-
gulp.task('package', ['setPackageVersion'], function () {
46+
gulp.task('package', gulp.series('setPackageVersion', function () {
4747
var afs = require('./out/asyncio');
4848
var binDir = '../../bin/js';
4949
return afs.mkdirIfNotExistAsync(binDir)
5050
.then(function () {
5151
var ap = require('./out/asyncprocess');
5252
return ap.execAsync(`npm pack "${path.join(__dirname, outDir)}"`, { cwd: binDir });
5353
});
54-
});
54+
}));
5555

5656
gulp.task('clean', function () {
5757
return del([
5858
outDir
5959
])
6060
});
6161

62-
gulp.task('default', ['package'], function () {
63-
});
62+
gulp.task('default', gulp.series('package', function (done) {
63+
done();
64+
}));
6465

65-
gulp.task('watch', ['tsc'], function () {
66+
gulp.task('watch', gulp.series('tsc', function () {
6667
return gulp.watch('**/*.ts', ['tsc']);
67-
});
68+
}));
6869

69-
gulp.task('test', ['tsc'], async function () {
70+
gulp.task('test', gulp.series('tsc', async function () {
7071
var nbgv = require('./out');
7172
var v = await nbgv.getVersion();
7273
console.log(v);
73-
});
74+
}));

src/nerdbank-gitversioning.npm/package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@
2020
"versioning"
2121
],
2222
"devDependencies": {
23-
"@types/node": "^10.12.0",
24-
"del": "^2.2.0",
25-
"gulp": "^3.9.1",
26-
"gulp-sourcemaps": "1.6.0",
27-
"gulp-typescript": "2.13.6",
28-
"gulp-util": "^3.0.7",
29-
"merge2": "1.0.2",
23+
"@types/node": "^10.12.21",
24+
"del": "^3.0.0",
25+
"gulp": "^4.0.0",
26+
"gulp-cli": "^2.0.1",
27+
"gulp-sourcemaps": "2.6.4",
28+
"gulp-typescript": "5.0.0",
29+
"gulp-util": "^3.0.8",
30+
"merge2": "1.2.3",
3031
"path": "^0.12.7",
31-
"typescript": "^2.9.2"
32+
"typescript": "^3.3.1"
3233
},
3334
"dependencies": {
3435
"camel-case": "^3.0.0"

0 commit comments

Comments
 (0)