From 458aadcbef981fd7183cf37591544332e015e43d Mon Sep 17 00:00:00 2001 From: Elio Struyf Date: Sun, 21 Jul 2024 20:15:28 +0200 Subject: [PATCH 1/3] Add os and vscode info to diagnostic logging --- src/commands/Diagnostics.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/commands/Diagnostics.ts b/src/commands/Diagnostics.ts index 147c063c..d11530a0 100644 --- 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 From 380bc804fdcae6b339f7235f5e55d53c9b6fa072 Mon Sep 17 00:00:00 2001 From: Elio Struyf Date: Sun, 21 Jul 2024 20:37:43 +0200 Subject: [PATCH 2/3] Update beta script --- scripts/beta-release.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/beta-release.js b/scripts/beta-release.js index 782ee92c..f606cd04 100644 --- a/scripts/beta-release.js +++ b/scripts/beta-release.js @@ -5,13 +5,13 @@ 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]}`; 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 +20,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 +38,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); \ No newline at end of file +fs.writeFileSync(ignoreFilePath, vscodeignore); From 36e0ef017187bf3a907006e3092f8237a7024665 Mon Sep 17 00:00:00 2001 From: Elio Struyf Date: Sun, 21 Jul 2024 20:41:10 +0200 Subject: [PATCH 3/3] Substring update --- scripts/beta-release.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/beta-release.js b/scripts/beta-release.js index f606cd04..ea64fb1b 100644 --- a/scripts/beta-release.js +++ b/scripts/beta-release.js @@ -5,7 +5,9 @@ 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]}`; +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.displayName = `${packageJson.displayName} (BETA)`;