Merge remote-tracking branch 'upstream/main'

.circleci/config.yml

@@ -85,27 +85,27 @@ jobs:
     steps:
       - audit
 
-  unit-electron17:
+  unit-electron19:
     executor:
       name: node
-      version: '16.13.0'
+      version: '16.14.2'
     steps:
       - test
 
-  unit-electron18:
+  unit-electron22:
     executor:
       name: node
-      version: '16.13.2'
+      version: '16.17.1'
     steps:
       - test
 
 workflows:
   test:
     jobs:
       - audit
-      - unit-electron17:
+      - unit-electron19:
           requires:
             - audit
-      - unit-electron18:
+      - unit-electron22:
           requires:
             - audit

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
 
       - name: Parse pre-release flag for vsce
         id: vsce-prerelease
-        run: echo "::set-output name=prerelease::$(cat package.json | jq '.vsce.preRelease')"
+        run: echo "prerelease=$(cat package.json | jq '.vsce.preRelease')" >> $GITHUB_OUTPUT
 
       - uses: marp-team/actions@v1
         with:
@@ -36,7 +36,7 @@ jobs:
 
       - name: Find out created VSIX
         id: vsix
-        run: echo "::set-output name=name::$(find . -maxdepth 1 -name '*.vsix' -printf '%f\n' | head -n 1)"
+        run: echo "name=$(find . -maxdepth 1 -name '*.vsix' -printf '%f\n' | head -n 1)" >> $GITHUB_OUTPUT
 
       - name: Upload VSIX to GitHub Release
         uses: marp-team/actions@v1
@@ -58,7 +58,7 @@ jobs:
 
       - name: Parse pre-release flag for vsce
         id: vsce-prerelease
-        run: echo "::set-output name=prerelease::$(cat package.json | jq '.vsce.preRelease')"
+        run: echo "prerelease=$(cat package.json | jq '.vsce.preRelease')" >> $GITHUB_OUTPUT
 
       - uses: actions/download-artifact@v3
         with:
@@ -67,7 +67,7 @@ jobs:
 
       - name: Find out downloaded VSIX
         id: vsix
-        run: echo "::set-output name=path::$(find ~/vsix -maxdepth 1 -name '*.vsix' -printf '%p\n' | head -n 1)"
+        run: echo "path=$(find ~/vsix -maxdepth 1 -name '*.vsix' -printf '%p\n' | head -n 1)" >> $GITHUB_OUTPUT
 
       - name: Publish to Open VSX Registry
         uses: HaaLeo/publish-vscode-extension@v1

.nvmrc

@@ -1 +1 @@
-16.16.0
+16.19.1

CHANGELOG.md

@@ -1,9 +1,63 @@
 # Change Log
 
-> ℹ️ **[v2.x](#v200---2022-06-03) is currently available as pre-released version. Try it and ready for [the next new core](https://marp.app/blog/202205-ecosystem-update)!**
-
 ## [Unreleased]
 
+## v2.6.0 - 2023-04-16
+
+### Added
+
+- Support named anchor links in Markdown preview and exported HTML ([#415](https://github.com/marp-team/marp-vscode/pull/415))
+
+### Changed
+
+- Upgrade Marp Core to [v3.6.0](https://github.com/marp-team/marp-core/releases/tag/v3.6.0) ([#414](https://github.com/marp-team/marp-vscode/pull/414), [#415](https://github.com/marp-team/marp-vscode/pull/415))
+- Upgrade Marp CLI to [v2.5.0](https://github.com/marp-team/marp-cli/releases/tag/v2.5.0) ([#415](https://github.com/marp-team/marp-vscode/pull/415))
+
+## v2.5.0 - 2023-02-20
+
+### Changed
+
+- Upgrade Marp Core to [v3.5.0](https://github.com/marp-team/marp-core/releases/tag/v3.5.0) ([#408](https://github.com/marp-team/marp-vscode/pull/408), [#411](https://github.com/marp-team/marp-vscode/pull/411))
+- Upgrade Marp CLI to [v2.4.0](https://github.com/marp-team/marp-cli/releases/tag/v2.4.0) ([#408](https://github.com/marp-team/marp-vscode/pull/408), [#410](https://github.com/marp-team/marp-vscode/pull/410))
+  - [Slide transitions](https://github.com/marp-team/marp-cli/blob/main/docs/bespoke-transitions/README.md) powered by [View Transition API](https://www.w3.org/TR/css-view-transitions-1/) is stably available
+- Upgrade dependent packages to the latest version ([#408](https://github.com/marp-team/marp-vscode/pull/408))
+
+### Added
+
+- Auto completion for [Marp CLI's `transition` local directive](https://github.com/marp-team/marp-cli/blob/main/docs/bespoke-transitions/README.md#transition-local-directive) ([#409](https://github.com/marp-team/marp-vscode/issues/409), [#412](https://github.com/marp-team/marp-vscode/pull/412))
+
+### Fixed
+
+- Mitigate conflicting with `express` module in other extensions while exporting ([#402](https://github.com/marp-team/marp-vscode/issues/402), [#407](https://github.com/marp-team/marp-vscode/issues/407), [#408](https://github.com/marp-team/marp-vscode/pull/408))
+
+## v2.4.1 - 2023-01-09
+
+### Changed
+
+- Upgrade Marp Core to [v3.4.2](https://github.com/marp-team/marp-core/releases/tag/v3.4.2) ([#397](https://github.com/marp-team/marp-vscode/pull/397))
+- Upgrade Marp CLI to [v2.3.0](https://github.com/marp-team/marp-cli/releases/tag/v2.3.0) ([#397](https://github.com/marp-team/marp-vscode/pull/397), [#393](https://github.com/marp-team/marp-vscode/issues/393))
+- Upgrade dependent packages to the latest version ([#397](https://github.com/marp-team/marp-vscode/pull/397))
+
+## v2.4.0 - 2022-12-11
+
+> 🆙 **This is a first stable release of v2.x!** You can see differences from v1 at [#392](https://github.com/marp-team/marp-vscode/pull/392).
+
+### Breaking
+
+- Marp for VS Code v2 has made as stable release ([#392](https://github.com/marp-team/marp-vscode/pull/392))
+- VS Code 1.72 and later required ([#390](https://github.com/marp-team/marp-vscode/pull/390))
+
+### Changed
+
+- Upgrade Marp Core to [v3.4.0](https://github.com/marp-team/marp-core/releases/tag/v3.4.0) ([#390](https://github.com/marp-team/marp-vscode/pull/390))
+- Upgrade Marp CLI to [v2.2.2](https://github.com/marp-team/marp-cli/releases/tag/v2.2.2) ([#390](https://github.com/marp-team/marp-vscode/pull/390))
+- Upgrade Node.js and dependent packages ([#390](https://github.com/marp-team/marp-vscode/pull/390))
+
+### Removed
+
+- `markdown.marp.toolbarButtonForQuickPick` setting ([#385](https://github.com/marp-team/marp-vscode/issues/385), [#391](https://github.com/marp-team/marp-vscode/pull/391))
+  - The toolbar button still can hide from VS Code user interface: https://code.visualstudio.com/updates/v1_72#_hide-actions-from-tool-bars
+
 ## v2.3.0 - 2022-09-24
 
 ### Added

README.md

@@ -217,7 +217,7 @@ You can use Marp extension in VS Code for the Web environment like [vscode.dev](
 
 The web extension has some limitations:
 
-- _Export command cannot use_ because it is depending on Marp CLI that is not designed for Web. Please use VS Code that is installed to your local environment, or [GitHub Codespaces](https://github.com/features/codespaces) if you wanted an environment working on Web.
+- _Export command cannot use_ because it is depending on Marp CLI that is not designed for Web. Please use VS Code that is installed to your local environment, or use either [VS Code Server](https://code.visualstudio.com/docs/remote/vscode-server) or [GitHub Codespaces](https://github.com/features/codespaces) if you wanted an environment working on Web.
 
 ## Contributing
 

jest.config.js

@@ -40,7 +40,6 @@ module.exports = {
   coveragePathIgnorePatterns: ['/node_modules/', '.*\\.d\\.ts'],
   coverageThreshold: { global: { lines: 95 } },
   preset: 'ts-jest/presets/js-with-babel',
-  restoreMocks: true,
   setupFiles: ['<rootDir>/jest.setup.js'],
   testEnvironment: 'node',
   transformIgnorePatterns: [`/node_modules/(?!${esModules.join('|')})`],