Upgrade all dependencies, export typescript interfaces, switch to yarn

steveukx · steveukx · commit 4dd50f23da6b · 2018-09-17T08:36:25.000+01:00
diff --git a/.editorconfig b/.editorconfig
@@ -1,16 +1,14 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
 root = true
 
-# Unix-style newlines with a newline ending every file
 [*]
 end_of_line = lf
 insert_final_newline = true
 indent_style = space
 indent_size = 3
 trim_trailing_whitespace = true
 
-# but not for markdown files since there it can be a line break
+[*.json]
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,10 @@
 language: node_js
 
 node_js:
- - "6"
+ - "8"
 
 install:
- - npm install
-
-before_script:
- - npm install grunt-cli -g
+ - yarn install
 
 script:
  - grunt test
diff --git a/GruntFile.js b/GruntFile.js
diff --git a/package.json b/package.json
@@ -10,16 +10,11 @@
     }
   ],
   "dependencies": {
-    "debug": "^3.1.0"
+    "debug": "^4.0.1"
   },
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-contrib-clean": "^1.0.0",
-    "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-nodeunit": "^0.4.1",
-    "grunt-release-steps": "~0.3.7",
-    "nodeunit": "^0.9.1",
-    "sinon": "^1.15.4"
+    "nodeunit": "^0.11.3",
+    "sinon": "^6.3.3"
   },
   "keywords": [
     "git",
@@ -28,9 +23,17 @@
   ],
   "license": "MIT",
   "repository": "git://github.com/steveukx/git-js.git",
-  "main": "src/index.js",
-  "bin": {},
+  "main": "./src/index.js",
+  "types": "./typings/promise/index.d.ts",
+  "files": [
+    "src/",
+    "typings/"
+  ],
   "scripts": {
-    "test": "node node_modules/nodeunit/bin/nodeunit test/unit/"
+    "test": "nodeunit test/**/test*.js ",
+    "test:unit": "nodeunit test/unit/test*.js",
+    "test:integration": "nodeunit test/integration/test*.js",
+    "preversion": "npm test",
+    "postversion": "git push && git push --tags"
   }
 }
diff --git a/test/unit/test-branch.js b/test/unit/test-branch.js
@@ -26,7 +26,7 @@ function testBranchDelete (test, options, err, branchSummary) {
 
 exports.setUp = function (done) {
    restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-catfile.js b/test/unit/test-catfile.js
@@ -8,7 +8,7 @@ var git, sandbox;
 
 exports.setUp = function (done) {
    setup.restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-check-is-repo.js b/test/unit/test-check-is-repo.js
@@ -7,7 +7,7 @@ let git, sandbox;
 
 exports.setUp = function (done) {
    restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    sandbox.stub(console, 'error');
    done();
 };
diff --git a/test/unit/test-clean.js b/test/unit/test-clean.js
@@ -7,7 +7,7 @@ let git, sandbox;
 
 exports.setUp = function (done) {
    restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-clone.js b/test/unit/test-clone.js
@@ -7,7 +7,7 @@ var git, sandbox;
 
 exports.setUp = function (done) {
    restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-commands.js b/test/unit/test-commands.js
@@ -9,7 +9,7 @@ const {Instance, childProcessEmits, closeWith, errorWith, theCommandRun, theEnvi
    require('./include/setup');
 
 exports.setUp = function (done) {
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.createSandbox();
     restore();
     done();
 };
diff --git a/test/unit/test-commit.js b/test/unit/test-commit.js
@@ -10,7 +10,7 @@ var CommitSummary = require('../../src/responses/CommitSummary');
 
 exports.setUp = function (done) {
    setup.restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-cwd.js b/test/unit/test-cwd.js
@@ -7,7 +7,7 @@ let git, sandbox;
 
 exports.setUp = function (done) {
    restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-fetch.js b/test/unit/test-fetch.js
@@ -8,7 +8,7 @@ var git, sandbox;
 
 exports.setUp = function (done) {
    setup.restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-git.js b/test/unit/test-git.js
@@ -8,7 +8,7 @@ var git, sandbox;
 
 exports.setUp = function (done) {
    restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-log.js b/test/unit/test-log.js
@@ -10,7 +10,7 @@ let git, sandbox;
 
 exports.setUp = function (done) {
    restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    sandbox.stub(console, 'warn');
    done();
 };
diff --git a/test/unit/test-merge.js b/test/unit/test-merge.js
@@ -8,7 +8,7 @@ var git, sandbox;
 
 exports.setUp = function (done) {
    restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    sandbox.stub(console, 'error');
    done();
 };
diff --git a/test/unit/test-mv.js b/test/unit/test-mv.js
@@ -10,7 +10,7 @@ const renaming = (from, to) => `Renaming ${from} to ${to}`;
 
 exports.setUp = function (done) {
    restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-pull.js b/test/unit/test-pull.js
@@ -8,7 +8,7 @@ var git, sandbox;
 
 exports.setUp = function (done) {
    restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-push.js b/test/unit/test-push.js
@@ -7,7 +7,7 @@ var git, sandbox;
 
 exports.setUp = function (done) {
    setup.restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-raw.js b/test/unit/test-raw.js
@@ -7,7 +7,7 @@ let git, sandbox;
 
 exports.setUp = function (done) {
    restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    sandbox.stub(console, 'warn');
    done();
 };
diff --git a/test/unit/test-rebase.js b/test/unit/test-rebase.js
@@ -7,7 +7,7 @@ var git, sandbox;
 
 exports.setUp = function (done) {
    setup.restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-remote.js b/test/unit/test-remote.js
@@ -7,7 +7,7 @@ let git, sandbox;
 
 exports.setUp = function (done) {
    restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    sandbox.stub(console, 'error');
    done();
 };
diff --git a/test/unit/test-revert.js b/test/unit/test-revert.js
@@ -7,7 +7,7 @@ var git, sandbox;
 
 exports.setUp = function (done) {
    setup.restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-stash-list.js b/test/unit/test-stash-list.js
@@ -8,7 +8,7 @@ let git, sandbox;
 
 exports.setUp = function (done) {
    restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-stash.js b/test/unit/test-stash.js
@@ -7,7 +7,7 @@ var git, sandbox;
 
 exports.setUp = function (done) {
    setup.restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-status.js b/test/unit/test-status.js
@@ -8,7 +8,7 @@ var git, sandbox;
 
 exports.setUp = function (done) {
    setup.restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/test/unit/test-tags.js b/test/unit/test-tags.js
@@ -8,7 +8,7 @@ var git, sandbox;
 
 exports.setUp = function (done) {
    setup.restore();
-   sandbox = sinon.sandbox.create();
+   sandbox = sinon.createSandbox();
    done();
 };
 
diff --git a/typings/response.d.ts b/typings/response.d.ts
@@ -97,10 +97,10 @@ export interface RemoteWithoutRefs {
    name: string;
 }
 
-interface RemoteWithRefs extends RemoteWithoutRefs {
+export interface RemoteWithRefs extends RemoteWithoutRefs {
    refs: {
-      fetch: string
-      push: string
+      fetch: string;
+      push: string;
    }
 }
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,10 @@ export interface RemoteWithoutRefs {`
`97`	`97`	`name: string;`
`98`	`98`	`}`
`99`	`99`
`100`		`-interface RemoteWithRefs extends RemoteWithoutRefs {`
	`100`	`+export interface RemoteWithRefs extends RemoteWithoutRefs {`
`101`	`101`	`refs: {`
`102`		`- fetch: string`
`103`		`- push: string`
	`102`	`+ fetch: string;`
	`103`	`+ push: string;`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`