Merge branch 'dev' of github.com:estruyf/vscode-front-matter into dev

estruyf · Jul 24, 2024 · 78d42ac · 78d42ac
2 parents 73e00a7 + 36e0ef0
commit 78d42ac
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/scripts/beta-release.js b/scripts/beta-release.js
@@ -5,13 +5,15 @@ const core = require('@actions/core');
 const packageJson = require('../package.json');
 const version = packageJson.version.split('.');
 
-packageJson.version = `${version[0]}.${version[1]}.${process.argv[process.argv.length-1].substr(0, 7)}`;
+packageJson.version = `${version[0]}.${version[1]}.${process.argv[
+  process.argv.length - 1
+].substring(0, 9)}`;
 packageJson.preview = true;
-packageJson.name = "vscode-front-matter-beta";
+packageJson.name = 'vscode-front-matter-beta';
 packageJson.displayName = `${packageJson.displayName} (BETA)`;
 packageJson.description = `BETA Version of Front Matter. ${packageJson.description}`;
-packageJson.icon = "assets/frontmatter-beta.png";
-packageJson.homepage = "https://beta.frontmatter.codes";
+packageJson.icon = 'assets/frontmatter-beta.png';
+packageJson.homepage = 'https://beta.frontmatter.codes';
 
 console.log(packageJson.version);
 
@@ -20,13 +22,16 @@ core.summary.addHeading(`Version info`).addRaw(`Version: ${packageJson.version}`
 const scripts = packageJson.scripts;
 for (const key in scripts) {
   if (key.startsWith(`prod:`)) {
-    scripts[key] = scripts[key].replace("production", "development");
+    scripts[key] = scripts[key].replace('production', 'development');
   }
 }
 
 console.log(JSON.stringify(packageJson.scripts, null, 2));
 
-fs.writeFileSync(path.join(path.resolve('.'), 'package.json'), JSON.stringify(packageJson, null, 2));
+fs.writeFileSync(
+  path.join(path.resolve('.'), 'package.json'),
+  JSON.stringify(packageJson, null, 2)
+);
 
 let readme = fs.readFileSync(path.join(__dirname, '../README.beta.md'), 'utf8');
 fs.writeFileSync(path.join(__dirname, '../README.md'), readme);
@@ -35,4 +40,4 @@ fs.writeFileSync(path.join(__dirname, '../README.md'), readme);
 const ignoreFilePath = path.join(path.resolve('.'), '.vscodeignore');
 let vscodeignore = fs.readFileSync(ignoreFilePath, 'utf8');
 vscodeignore = vscodeignore.replace(`**/*.map`, '');
-fs.writeFileSync(ignoreFilePath, vscodeignore);
+fs.writeFileSync(ignoreFilePath, vscodeignore);
diff --git a/src/commands/Diagnostics.ts b/src/commands/Diagnostics.ts
@@ -1,5 +1,5 @@
 import { Folders } from './Folders';
-import { ViewColumn, commands, workspace } from 'vscode';
+import { ViewColumn, commands, version, workspace } from 'vscode';
 import ContentProvider from '../providers/ContentProvider';
 import { join } from 'path';
 import { ContentFolder } from '../models';
@@ -37,6 +37,8 @@ export class Diagnostics {
 
 Beta: \`${Extension.getInstance().isBetaVersion()}\`
 Version: \`${Extension.getInstance().version}\`
+OS: \`${process.platform}\`
+VSCode version: \`${version}\`
     
 ## Project name