Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix TS2322 and update @typescript-eslint/* #479

Merged
merged 8 commits into from
May 7, 2023
Merged

fix TS2322 and update @typescript-eslint/* #479

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f36048d
feat: add branch 'master'
dimaslanjaka May 2, 2023
87303a4
chore: remove lock file
dimaslanjaka May 2, 2023
22faf4f
fix(ts): error TS2322
dimaslanjaka May 3, 2023
4154ca3
refactor: dimaslanjaka/hexo-cli/pull/1
dimaslanjaka May 6, 2023
5a2aa80
chore(deps-dev): update typescript-eslint/*
dimaslanjaka May 6, 2023
a1a4cc6
chore: restore lock file from hexojs/hexo-cli
dimaslanjaka May 6, 2023
d4f25a7
chore(deps): reinstall using `npm@8`
dimaslanjaka May 6, 2023
c472981
Merge branch 'master' into master
yoshinorin May 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "assets"]
path = assets
url = https:/hexojs/hexo-starter.git
branch = master
6 changes: 3 additions & 3 deletions lib/console/version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ async function versionConsole() {

console.log('hexo-cli:', pkg.version);

let osInfo = '';
let osInfo: string | void | Buffer;
if (platform === 'darwin') osInfo = await spawn('sw_vers', '-productVersion');
else if (platform === 'linux') {
const v = await spawn('cat', '/etc/os-release');
const distro = (v || '').match(/NAME="(.+)"/);
const versionInfo = (v || '').match(/VERSION="(.+)"/) || ['', ''];
const distro = String(v || '').match(/NAME="(.+)"/);
const versionInfo = String(v || '').match(/VERSION="(.+)"/) || ['', ''];
const versionStr = versionInfo !== null ? versionInfo[1] : '';
osInfo = `${distro[1]} ${versionStr}`.trim() || '';
}
Expand Down
Loading