vscode-apollo 2.6.0 → 2.6.1

package/.github/workflows/release.yml

@@ -42,10 +42,10 @@ jobs:
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-      - name: Setup Node.js 18.x
+      - name: Setup Node.js 24.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 24.x
 
       - name: Install dependencies
         run: npm ci

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 2.6.1
+
+### Patch Changes
+
+- [`a88eea8`](https://github.com/apollographql/vscode-graphql/commit/a88eea86b4a38af6b2edc8d82361b301e051e424) Thanks [@phryneas](https://github.com/phryneas)! - Adjust publish command and trigger re-publish
+
 ## 2.6.0
 
 ### Minor Changes

package/package.json

@@ -2,7 +2,7 @@
   "name": "vscode-apollo",
   "displayName": "Apollo GraphQL",
   "description": "Rich editor support for GraphQL client and server development that seamlessly integrates with the Apollo platform",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "referenceID": "87197759-7617-40d0-b32e-46d378e907c7",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
@@ -16,7 +16,7 @@
   "types": "lib/index.d.ts",
   "scripts": {
     "build": "node ./src/build.js",
-    "build:full": "npm run typecheck && rimraf lib  && npm run build -- && npm run build:textmate",
+    "build:full": "npm run typecheck && rimraf lib && npm run build:textmate && npm run build --",
     "build:production": "npm run build:full -- --production",
     "build:textmate": "node ./syntaxes/build.ts",
     "watch": "rimraf lib; npm-run-all -p watch:*",
@@ -25,7 +25,7 @@
     "watch:textmate-yaml": "npm run build:textmate -- --debug --watch",
     "sampleWorkspace:run": "node src/__e2e__/mockServer.js",
     "changeset-version": "changeset version && npm i",
-    "changeset-publish": "npm run build -- --production && changeset publish",
+    "changeset-publish": "npm run build:production && changeset publish",
     "typecheck": "tsc --noEmit",
     "lint": "eslint src --ext .ts",
     "format": "prettier --write .",

package/syntaxes/publish.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+set -x
+
+if ! git diff --cached --exit-code; then
+  echo "There are uncommitted changes. Please commit or stash them before running this script."
+  exit 1
+fi
+
+CURRENT=$(git branch --show-current)
+CURRENT_HASH="ba347def950c46bc84971ae4aa47ab7622b2bbf6" #$(git rev-parse HEAD)
+
+git remote add --no-tags publish-docs git@github.com:apollographql/docs-rewrite -t main || true
+#git fetch publish-docs --depth 1
+git switch -C publish-docs/$CURRENT_HASH publish-docs/main
+
+update_file(){
+
+  if ! diff -q <(jq . <(git show $CURRENT_HASH:$1)) <(jq '.|del(._source)' < $2); then
+    echo "connectors.mapping.json has changed, updating..."
+    jq '{"_source":"https://github.com/apollographql/vscode-graphql/blob/'${CURRENT_HASH}'/'$1'"} + .' <(git show $CURRENT_HASH:$1) > $2
+    git add $2
+  else
+    echo "connectors.mapping.json is up to date."
+  fi
+}
+
+update_file syntaxes/connectors.mapping.json src/code-highlighting/grammars/connectors.mapping.json
+
+git diff --cached --shortstat
+update_file syntaxes/graphql.connectors.json src/code-highlighting/grammars/graphql.connectors.json
+update_file syntaxes/graphql.json src/code-highlighting/grammars/graphql.json
+
+git diff --cached --shortstat
+
+if ! git diff --cached --exit-code; then
+  git commit -m "Update Syntax Highlighting\n source: https://github.com/apollographql/vscode-graphql/blob/${CURRENT_HASH}"
+  git push -u publish-docs publish-docs/$CURRENT_HASH:sync-vscode-graphql/$CURRENT_HASH
+  gh -R apollographql/docs-rewrite pr create --head sync-vscode-graphql/$CURRENT_HASH --title "Update Syntax Highlighting" --body "This PR updates the syntax highlighting files to match the latest changes in the vscode-graphql repository."
+else
+  echo "No changes to commit."
+fi
+
+git switch $CURRENT