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

* feat: add branch 'master' * chore: remove lock file * fix(ts): error TS2322 Type 'string | void | Buffer' is not assignable to type 'string'. Type 'void' is not assignable to type 'string'. * chore(deps-dev): update typescript-eslint/* - @typescript-eslint/[email protected] - @typescript-eslint/[email protected] * chore: restore lock file from hexojs/hexo-cli * chore(deps): reinstall using `npm@8` --------- Co-authored-by: yoshinorin <[email protected]>
hexojs · May 7, 2023 · ee1535a · ee1535a
1 parent 40cdf2a
commit ee1535a
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 412 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "assets"]
 	path = assets
 	url = https://github.com/hexojs/hexo-starter.git
+	branch = master
diff --git a/lib/console/version.ts b/lib/console/version.ts
@@ -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() || '';
   }