Skip to content

Commit

Permalink
Merge pull request #357 from marp-team/v2-prerelease
Browse files Browse the repository at this point in the history
Prepare for v2 major update
  • Loading branch information
yhatt authored Jun 3, 2022
2 parents 2013872 + 38e57e1 commit 97eefa9
Show file tree
Hide file tree
Showing 19 changed files with 12,489 additions and 7,505 deletions.
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ commands:
default: []
steps:
- run: node --version
- run: sudo npm install -g npm

- restore_cache:
keys:
Expand Down
25 changes: 19 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,29 @@ jobs:
github-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Parse pre-release flag for vsce
id: vsce-prerelease
run: echo "::set-output name=prerelease::$(cat package.json | jq '.vsce.preRelease')"

- uses: marp-team/actions@v1
with:
task: release
token: ${{ secrets.GITHUB_TOKEN }}
preRelease: ${{ steps.vsce-prerelease.outputs.prerelease == 'true' }}

upload-vsix:
needs: github-release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Detect Node version from .nvmrc
id: node_version
run: echo "::set-output name=nvmrc::$(cat .nvmrc)"

- uses: actions/setup-node@v1
- uses: actions/setup-node@v3
with:
node-version: ${{ steps.node_version.outputs.nvmrc }}

Expand All @@ -43,7 +49,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
files: ${{ steps.vsix.outputs.name }}

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: vsix
path: ${{ steps.vsix.outputs.name }}
Expand All @@ -52,7 +58,13 @@ jobs:
needs: upload-vsix
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v2
- uses: actions/checkout@v3

- name: Parse pre-release flag for vsce
id: vsce-prerelease
run: echo "::set-output name=prerelease::$(cat package.json | jq '.vsce.preRelease')"

- uses: actions/download-artifact@v3
with:
name: vsix
path: ~/vsix
Expand All @@ -62,11 +74,12 @@ jobs:
run: echo "::set-output name=path::$(find ~/vsix -maxdepth 1 -name '*.vsix' -printf '%p\n' | head -n 1)"

- name: Publish to Open VSX Registry
uses: HaaLeo/publish-vscode-extension@v0
uses: HaaLeo/publish-vscode-extension@v1
with:
pat: ${{ secrets.OPEN_VSX_PAT }}
extensionFile: ${{ steps.vsix.outputs.path }}
packagePath: ''
preRelease: ${{ steps.vsce-prerelease.outputs.prerelease == 'true' }}
# Workaround: Uploading to Open VSX takes a long minutes, and does not respond even if uploaded successfully :(
timeout-minutes: 30
continue-on-error: true
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

## [Unreleased]

> **This is pre-released version of the major update. Try it and ready for [the next new core](https://marp.app/blog/202205-ecosystem-update)!**
### ⚡️ Breaking

- VS Code >= 1.63 is now required ([#357](https://github.com/marp-team/marp-vscode/pull/357))
- Upgrade Marp Core to [v3.2.0](https://github.com/marp-team/marp-core/releases/tag/v3.2.0) ([#357](https://github.com/marp-team/marp-vscode/pull/357))
- This is the first version of using v3 core. Refer to [the article of ecosystem update](https://marp.app/blog/202205-ecosystem-update). ([Major changes in Marp Core v3.0.0](https://github.com/marp-team/marp-core/releases/tag/v3.0.0))
- Changed the default of `markdown.marp.mathTypesetting` to `mathjax` ([#357](https://github.com/marp-team/marp-vscode/pull/357))

### Changed

- Upgrade Marp CLI to [v2.0.1](https://github.com/marp-team/marp-cli/releases/tag/v2.0.1) ([#357](https://github.com/marp-team/marp-vscode/pull/357))
- Upgrade dependent packages to the latest version ([#357](https://github.com/marp-team/marp-vscode/pull/357))

## v1.5.2 - 2022-04-22

### Fixed
Expand Down
2 changes: 2 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const esModules = [
'micromark-util-character',
'micromark-util-combine-extensions',
'micromark',
'nanoid',
'parse-entities',
'property-information',
'rehype-parse',
Expand All @@ -30,6 +31,7 @@ const esModules = [
'unist-util-visit',
'vfile',
'web-namespaces',
'yaml',
]

module.exports = {
Expand Down
2 changes: 1 addition & 1 deletion jest.setup.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { TextEncoder, TextDecoder } from 'util'

// TextEncoder and TextDecoder are exposed to global in Node.js and the browser.
// Jest VM for testing seems not to expose them.
// Jest VM for testing seems not to expose them to JSDOM.
// https://github.com/jsdom/jsdom/issues/2524#issuecomment-902027138
global.TextEncoder = TextEncoder
global.TextDecoder = TextDecoder
Loading

0 comments on commit 97eefa9

Please sign in to comment.