Add semver2 support to npm

init.ps1

@@ -19,11 +19,6 @@ try {
  if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "npm install")) {
  npm install --loglevel error
  }
-
- Write-Host "Restoring Typings..." -ForegroundColor Yellow
- if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "typings install")) {
- .\node_modules\.bin\typings install
- }
  } finally {
  Pop-Location
  }

src/nerdbank-gitversioning.npm/gulpfile.js

@@ -9,10 +9,13 @@ var del = require('del');
 var path = require('path');
 
 const outDir = 'out';
-var tsProject = ts.createProject('tsconfig.json', { declarationFiles: true });
+var tsProject = ts.createProject('tsconfig.json', {
+ declarationFiles: true,
+ typescript: require('typescript'),
+});
 
-gulp.task('tsc', function() {
- var tsResult = gulp.src(['*.ts', 'ts/**/*.ts', 'typings/**/*.ts'])
+gulp.task('tsc', function () {
+ var tsResult = gulp.src(['*.ts', 'ts/**/*.ts', 'node_modules/@types/**/index.d.ts'])
  // .pipe(tslint())
  .pipe(sourcemaps.init())
  .pipe(ts(tsProject));
@@ -25,7 +28,7 @@ gulp.task('tsc', function() {
  ]);
 });
 
-gulp.task('copyPackageContents', ['tsc'], function() {
+gulp.task('copyPackageContents', ['tsc'], function () {
  return gulp
  .src([
  'package.json',
@@ -35,35 +38,35 @@ gulp.task('copyPackageContents', ['tsc'], function() {
  .pipe(gulp.dest(outDir));
 });
 
-gulp.task('setPackageVersion', ['copyPackageContents'], function() {
+gulp.task('setPackageVersion', ['copyPackageContents'], function () {
  var nbgv = require(`./${outDir}`);
  return nbgv.setPackageVersion(outDir, '.');
 });
 
-gulp.task('package', ['setPackageVersion'], function() {
+gulp.task('package', ['setPackageVersion'], function () {
  var afs = require('./out/asyncio');
- var binDir =  '../../bin/js';
+ var binDir = '../../bin/js';
  return afs.mkdirIfNotExistAsync(binDir)
- .then(function() {
+ .then(function () {
  var ap = require('./out/asyncprocess');
  return ap.execAsync(`npm pack "${path.join(__dirname, outDir)}"`, { cwd: binDir });
  });
 });
 
-gulp.task('clean', function() {
+gulp.task('clean', function () {
  return del([
  outDir
  ])
 });
 
-gulp.task('default', ['package'], function() {
+gulp.task('default', ['package'], function () {
 });
 
-gulp.task('watch', ['tsc'], function() {
+gulp.task('watch', ['tsc'], function () {
  return gulp.watch('**/*.ts', ['tsc']);
 });
 
-gulp.task('test', ['tsc'], async function() {
+gulp.task('test', ['tsc'], async function () {
  var nbgv = require('./out');
  var v = await nbgv.getVersion();
  console.log(v);

src/nerdbank-gitversioning.npm/package.json

@@ -20,15 +20,15 @@
  "versioning"
  ],
  "devDependencies": {
+ "@types/node": "^10.12.0",
  "del": "^2.2.0",
  "gulp": "^3.9.1",
  "gulp-sourcemaps": "1.6.0",
  "gulp-typescript": "2.13.6",
  "gulp-util": "^3.0.7",
  "merge2": "1.0.2",
  "path": "^0.12.7",
- "typescript": "1.8.10",
- "typings": "1.3.3"
+ "typescript": "^2.9.2"
  },
  "dependencies": {
  "camel-case": "^3.0.0"

src/nerdbank-gitversioning.npm/ts/index.ts

@@ -1,9 +1,8 @@
 'use strict';
 
-import * as fs from 'fs';
 import * as path from 'path';
 var camelCase = require('camel-case')
-import {execAsync} from './asyncprocess';
+import { execAsync } from './asyncprocess';
 
 const nbgvPath = 'nbgv.cli';
 
@@ -61,13 +60,15 @@ export async function getVersion(projectDirectory?: string): Promise<IGitVersion
  * Sets an NPM package version based on the git height and version.json.
  * @param packageDirectory The directory of the package about to be published.
  * @param srcDirectory The directory of the source code behind the package, if different than the packageDirectory.
+ * @param semVer The version of semver to use in the package versioning.
  */
-export async function setPackageVersion(packageDirectory?: string, srcDirectory?: string) {
+export async function setPackageVersion(packageDirectory?: string, srcDirectory?: string, semVer: 1 | 2 = 1) {
  packageDirectory = packageDirectory || '.';
  srcDirectory = srcDirectory || packageDirectory;
  const gitVersion = await getVersion(srcDirectory);
- console.log(`Setting package version to ${gitVersion.semVer1}`);
- var result = await execAsync(`npm version ${gitVersion.semVer1} --no-git-tag-version`, { cwd: packageDirectory });
+ const version = semVer === 1 ? gitVersion.semVer1 : gitVersion.semVer2;
+ console.log(`Setting package version to ${version}`);
+ var result = await execAsync(`npm version ${version} --no-git-tag-version`, { cwd: packageDirectory });
  if (result.stderr) {
  console.log(result.stderr);
  }

src/nerdbank-gitversioning.npm/tsconfig.json

@@ -1,14 +1,18 @@
 {
- "compilerOptions": {
- "target": "es6",
- "declaration": true,
- "module": "commonjs",
- "sourceMap": true,
- "noImplicitAny": false,
- "outDir": "js"
- },
- "exclude": [
- "node_modules",
- "js"
- ]
+ "compilerOptions": {
+ "target": "es6",
+ "declaration": true,
+ "module": "commonjs",
+ "moduleResolution": "node",
+ "sourceMap": true,
+ "noImplicitAny": false,
+ "outDir": "js"
+ },
+ "types": [
+ "node"
+ ],
+ "exclude": [
+ "node_modules",
+ "js"
+ ]
 }