2.6.5

- update changelog
- fixes publish commands to work with yarn v4

Author: phoenisx

.nvmrc

@@ -0,0 +1 @@
+v20.18

.vscodeignore

@@ -21,3 +21,4 @@ babel.config.js
 coverage
 jest.config.js
 TASKS.md
+temp

CHANGELOG.md

@@ -4,9 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.6.4](https://github.com/willofindie/vscode-cssvar/compare/v2.6.3...2.6.4) - 2023-10-12
+## [2.6.5](https://github.com/willofindie/vscode-cssvar/compare/v2.6.4..v2.6.5) - 2025-01-14
+### Features
+-  upgrade dependencies
+-  use yarn v4
+### Fixes
+-  [#119](https://github.com/willofindie/vscode-cssvar/issues/119) replace ext notification with logger
+
+
+## [2.6.4](https://github.com/willofindie/vscode-cssvar/compare/v2.6.3...v2.6.4) - 2023-10-12
 ### Fixes
--  #110(https://github.com/willofindie/vscode-cssvar/issues/110) Failed to parse CSS variable with @layer declaration
+-  [#110](https://github.com/willofindie/vscode-cssvar/issues/110) Failed to parse CSS variable with @layer declaration
 
 
 ## [2.6.3](https://github.com/willofindie/vscode-cssvar/compare/v2.6.2...v2.6.3) - 2023-07-02

CONTRIBUTING.md

@@ -29,8 +29,33 @@ If the generated content is copied to clipboard we can use that content to modif
 
 Once we are satisfied with the updated CHANGELOG, we can commit the changes and create a new release on Github
 
+> Note we can either create a tag ourself manually or release the previous commit using github and create a tag
+> remotely and then creating this changelog with the remote tag.
+
+Follow up commands (not necessary)
+```sh
+yarn version patch
+# Commit changes
+git tag -a v2.6.5
+git push origin main --follow-tags
+```
+
 **`src/scripts/publish.js`**
 
 Publishing our release to VSCode/OVSX extension marketplaces.
 We need the private tokens for both these marketplaces for this command to work.
+
+Before running this script the following steps are necessary:
+- [Learn how to publish extension on VSCode marketplace](https://code.visualstudio.com/api/working-with-extensions/publishing-extension)
+- [Publishing Extension on OVSX Marketplace](https://github.com/eclipse/openvsx/wiki/Publishing-Extensions)
+- Install following CLI tools: `vsce` and `ovsx`
+
 Running this script will than auto publish our changes to both these marketplaces.
+
+```sh
+vsce login {publisher} # Required
+OVSX_KEY={token} ./src/scripts/publish.js
+```
+
+The above command requires everything to be packaged into a single script using `esbuild`, since I am using `yarn` v4 (berry) and `vsce` has issues with yarn v2+
+Ref: https://github.com/microsoft/vscode-vsce/issues/517

package.json

@@ -20,7 +20,7 @@
 		"typescript"
 	],
 	"description": "Intellisense support for CSS Variables",
-	"version": "2.6.4",
+	"version": "2.6.5",
 	"publisher": "phoenisx",
 	"license": "MIT",
 	"homepage": "https://github.com/willofindie/vscode-cssvar",
@@ -33,7 +33,7 @@
 	},
 	"icon": "img/icon.png",
 	"engines": {
-		"vscode": "^1.53.0"
+		"vscode": "^1.93.0"
 	},
 	"categories": [
 		"Other"
@@ -417,7 +417,8 @@
 		"lint": "eslint src",
 		"lint:fix": "eslint src --fix",
 		"test": "concurrently \"tsc --project ./tsconfig.json --noEmit\" \"jest\"",
-		"jest": "jest"
+		"jest": "jest",
+		"list": "src/scripts/yarn-berry-list.js"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.25.2",

src/scripts/create-changelog.js

@@ -47,16 +47,16 @@ const processCommitMsg = (/** @type {string[]} */ msgTokens) => {
     return token
       .trim()
       .replace(
-        /(\[?#(\d+)\]?)/,
-        "$1(https://github.com/willofindie/vscode-cssvar/issues/$2)"
+        /\[?(#(\d+))\]?/,
+        "[$1](https://github.com/willofindie/vscode-cssvar/issues/$2)"
       );
   });
 };
 
 (async () => {
   try {
     const log = await gitLog();
-    const [, releaseTag] = compareString.split("...");
+    const [, releaseTag] = compareString.split(/\.\.\.?/);
     const filtered = log
       .split("\n")
       .filter(line => /\d{4}-\d{2}-\d{2}/.test(line))
@@ -102,9 +102,7 @@ const processCommitMsg = (/** @type {string[]} */ msgTokens) => {
       }
     }
     console.log(
-      `## [${releaseTag.substring(
-        1
-      )}](https://github.com/willofindie/vscode-cssvar/compare/${compareString}) - ${lastReleaseDate}`
+      `## [${releaseTag}](https://github.com/willofindie/vscode-cssvar/compare/${compareString}) - ${lastReleaseDate}`
     );
     if (changelogs.feature.length > 0) {
       console.log("### Features");

src/scripts/publish.js

@@ -24,8 +24,14 @@ Promise.all([spawnAsync("yarn", "test"), spawnAsync("yarn", "build")])
   .then(([c1, c2]) => {
     console.log("Results: ", c1, c2);
     return Promise.allSettled([
-      spawnAsync("vsce", "publish"),
-      spawnAsync("ovsx", "publish", "-p", process.env.OVSX_KEY),
+      // spawnAsync("vsce", "publish", "--no-dependencies"),
+      spawnAsync(
+        "ovsx",
+        "publish",
+        "-p",
+        process.env.OVSX_KEY,
+        "--no-dependencies"
+      ),
     ]);
   })
   .catch(reason => {

src/scripts/yarn-berry-list.js

@@ -0,0 +1,36 @@
+#!/usr/bin/env node
+/* eslint-disable no-undef */
+/* eslint-disable @typescript-eslint/no-require-imports */
+
+const { spawn } = require("node:child_process");
+
+async function yarnV2List() {
+  return new Promise((res, rej) => {
+    const contents = [];
+    /** @type {import("node:child_process").ChildProcessWithoutNullStreams} */
+    const git = spawn("yarn", ["info", "--recursive --json"]);
+    git.stdout.on("data", function (buf) {
+      contents.push(buf.toString());
+    });
+
+    git.stderr.on("data", data => {
+      rej(new Error(data.toString()));
+    });
+
+    git.on("close", code => {
+      if (code !== 0) {
+        rej(new Error(`Exited with ${code}:  Failed to complete git shortlog`));
+      }
+      res(contents.join(""));
+    });
+  });
+}
+
+(async () => {
+  try {
+    const log = await yarnV2List();
+    console.log(log);
+  } catch (e) {
+    console.error(e);
+  }
+})();