From 9a4c93550a0b8edd44f4c9d83b06709365503dd8 Mon Sep 17 00:00:00 2001 From: MatTheCat Date: Sat, 23 Sep 2023 19:36:49 +0200 Subject: [PATCH] Update grammars, themes and dependencies --- .github/workflows/publication-workflow.yaml | 7 ++-- compose.yaml | 4 +- package-lock.json | 46 ++++++++++----------- package.json | 2 +- scripts/grammar/source.css.json | 6 +-- scripts/grammar/source.shell.json | 6 +-- scripts/theme/dark_plus.json | 1 + scripts/theme/dark_vs.json | 2 + scripts/theme/light_plus.json | 1 + scripts/theme/light_vs.json | 6 ++- source/assets/code.css | 12 ++++++ 11 files changed, 56 insertions(+), 37 deletions(-) diff --git a/.github/workflows/publication-workflow.yaml b/.github/workflows/publication-workflow.yaml index 05ab6a9..7abaa3c 100644 --- a/.github/workflows/publication-workflow.yaml +++ b/.github/workflows/publication-workflow.yaml @@ -7,15 +7,16 @@ jobs: build: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false + show-progress: false - uses: actions/setup-node@v3 with: cache: npm cache-dependency-path: package-lock.json - node-version: '20.5.0' + node-version: '20.7.0' - name: install dependencies run: npm ci --no-audit --omit=dev --prefer-offline @@ -23,7 +24,7 @@ jobs: - name: compile run: node scripts/compile.js - - uses: actions/upload-pages-artifact@v1 + - uses: actions/upload-pages-artifact@v2 with: path: ./public diff --git a/compose.yaml b/compose.yaml index 08281f3..fb464db 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: caddy: - image: caddy:2.6.4-alpine + image: caddy:2.7.4-alpine ports: - 80:80 - 443:443 @@ -12,7 +12,7 @@ services: node: command: scripts/watch.js - image: node:20.5.0-alpine3.18 + image: node:20.7.0-alpine3.18 init: true user: ${HOST_UID:?} volumes: diff --git a/package-lock.json b/package-lock.json index 1ab4e5c..f4c198f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "jsdom": "^22.1.0", "mathjax-node": "^2.1.1", "onigasm": "^2.2.5", - "postcss": "^8.4.27", + "postcss": "^8.4.30", "vscode-textmate": "^9.0.0", "yargs": "^17.7.2" }, @@ -192,9 +192,9 @@ "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==" }, "node_modules/browserslist": { - "version": "4.21.9", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz", - "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==", + "version": "4.21.11", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.11.tgz", + "integrity": "sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ==", "funding": [ { "type": "opencollective", @@ -210,10 +210,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001503", - "electron-to-chromium": "^1.4.431", - "node-releases": "^2.0.12", - "update-browserslist-db": "^1.0.11" + "caniuse-lite": "^1.0.30001538", + "electron-to-chromium": "^1.4.526", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -234,9 +234,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001517", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz", - "integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==", + "version": "1.0.30001538", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz", + "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==", "funding": [ { "type": "opencollective", @@ -623,9 +623,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.477", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.477.tgz", - "integrity": "sha512-shUVy6Eawp33dFBFIoYbIwLHrX0IZ857AlH9ug2o4rvbWmpaCUdBpQ5Zw39HRrfzAFm4APJE9V+E2A/WB0YqJw==" + "version": "1.4.528", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.528.tgz", + "integrity": "sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA==" }, "node_modules/emoji-regex": { "version": "8.0.0", @@ -1306,9 +1306,9 @@ "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==" }, "node_modules/postcss": { - "version": "8.4.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz", - "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==", + "version": "8.4.30", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", + "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", "funding": [ { "type": "opencollective", @@ -2117,9 +2117,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "funding": [ { "type": "opencollective", @@ -2278,9 +2278,9 @@ } }, "node_modules/ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", + "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", "engines": { "node": ">=10.0.0" }, diff --git a/package.json b/package.json index 903513b..e7ddf7e 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "jsdom": "^22.1.0", "mathjax-node": "^2.1.1", "onigasm": "^2.2.5", - "postcss": "^8.4.27", + "postcss": "^8.4.30", "vscode-textmate": "^9.0.0", "yargs": "^17.7.2" }, diff --git a/scripts/grammar/source.css.json b/scripts/grammar/source.css.json index a498115..9e7d8ce 100644 --- a/scripts/grammar/source.css.json +++ b/scripts/grammar/source.css.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/microsoft/vscode-css/commit/3bd00206f6b0d16eb2eba53fb886462eb8c58baa", + "version": "https://github.com/microsoft/vscode-css/commit/c216f777497265700ff336f739328e5197e012cd", "name": "CSS", "scopeName": "source.css", "patterns": [ @@ -1401,7 +1401,7 @@ "property-keywords": { "patterns": [ { - "match": "(?xi) (?