Skip to content

Commit 35137d2

Browse files
authored
Merge pull request #1083 from form8ion/renovate/master-hosted-git-info-6.x
2 parents 8f294db + 2304cda commit 35137d2

File tree

6 files changed

+119
-28
lines changed

6 files changed

+119
-28
lines changed

.github/workflows/node-ci.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ jobs:
3030
strategy:
3131
matrix:
3232
node:
33-
- 16.0.0
34-
- 16
33+
- 16.13.0
3534
steps:
3635
- uses: actions/checkout@v3
3736
- name: Setup node ${{ matrix.node_version }}

package-lock.json

+106-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,18 @@
44
"license": "MIT",
55
"version": "0.0.0-semantically-released",
66
"engines": {
7-
"node": "^16"
7+
"node": "^16.13.0"
88
},
99
"author": "Matt Travi <[email protected]> (https://matt.travi.org/)",
10+
"contributors": [
11+
"Trevor Richardson <[email protected]> (https://trevorrichardson.me)"
12+
],
1013
"repository": "form8ion/project",
1114
"bugs": "https://github.com/form8ion/project/issues",
1215
"homepage": "https://npm.im/@form8ion/project",
16+
"funding": {
17+
"url": "https://github.com/sponsors/travi"
18+
},
1319
"exports": {
1420
"require": "./lib/index.js",
1521
"import": "./lib/index.mjs"
@@ -63,7 +69,7 @@
6369
"@travi/cli-messages": "1.0.5",
6470
"deepmerge": "^4.2.2",
6571
"filedirname": "^2.7.0",
66-
"hosted-git-info": "^5.0.0",
72+
"hosted-git-info": "^6.0.0",
6773
"joi": "^17.1.1",
6874
"mustache": "4.2.0",
6975
"spdx-license-list": "6.6.0",
@@ -105,11 +111,5 @@
105111
"sinon": "14.0.1",
106112
"testdouble": "3.16.6",
107113
"unist-util-find": "1.0.2"
108-
},
109-
"contributors": [
110-
"Trevor Richardson <[email protected]> (https://trevorrichardson.me)"
111-
],
112-
"funding": {
113-
"url": "https://github.com/sponsors/travi"
114114
}
115-
}
115+
}

src/vcs/git-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {promises} from 'fs';
44
import any from '@travi/any';
55
import sinon from 'sinon';
66
import {assert} from 'chai';
7-
import * as hostedGitInfo from '../../thirdparty-wrappers/hosted-git-info';
7+
import hostedGitInfo from 'hosted-git-info';
88
import * as prompts from '../prompts/questions';
99
import {questionNames} from '../prompts/question-names';
1010
import {initialize, scaffold} from './git';

src/vcs/git.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Remote as gitRemote, Repository as gitRepository} from '@form8ion/nodegi
22
import {promises} from 'fs';
33
import {directoryExists} from '@form8ion/core';
44
import {info, warn} from '@travi/cli-messages';
5-
import {fromUrl} from '../../thirdparty-wrappers/hosted-git-info';
5+
import hostedGitInfo from 'hosted-git-info';
66
import {promptForVcsHostDetails} from '../prompts/questions';
77
import {questionNames} from '../prompts/question-names';
88

@@ -65,7 +65,7 @@ export async function initialize(
6565

6666
const repository = await gitRepository.open(projectRoot);
6767
const remoteOrigin = await gitRemote.lookup(repository, 'origin');
68-
const {user, project, type} = fromUrl(remoteOrigin.url());
68+
const {user, project, type} = hostedGitInfo.fromUrl(remoteOrigin.url());
6969

7070
return {owner: user, name: project, host: type};
7171
}

thirdparty-wrappers/hosted-git-info.js

-5
This file was deleted.

0 commit comments

Comments
 (0)