Skip to content

Commit

Permalink
Merge pull request #186 from marp-team/upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade development Node LTS and dependent packages to the latest version
  • Loading branch information
yhatt committed Dec 5, 2020
2 parents 3041623 + db115bf commit 0cce510
Show file tree
Hide file tree
Showing 6 changed files with 1,075 additions and 1,045 deletions.
10 changes: 10 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ jobs:
steps:
- test

unit-electron11:
executor:
name: node
version: '12.18.3'
steps:
- test

workflows:
test:
jobs:
Expand All @@ -113,3 +120,6 @@ workflows:
- unit-electron9:
requires:
- audit
- unit-electron11:
requires:
- audit
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.18.2
14.15.1
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

## [Unreleased]

### Changed

- Upgrade to [Marp Core v1.4.0](https://github.com/marp-team/marp-core/releases/v1.4.0) ([#186](https://github.com/marp-team/marp-vscode/pull/186))
- Stopped the confusable auto-detection of syntax highlight for code block
- Added support for more emoji shorthands
- Upgrade to [Marp CLI v0.23.0](https://github.com/marp-team/marp-cli/releases/v0.23.0) ([#186](https://github.com/marp-team/marp-vscode/pull/186))
- Export into PDF/image is working with Apple Silicon
- Auto-detection of Chromium browser for export has supported Microsoft Edge for Linux
- No longer required restarting VS Code after changing `markdown.marp.chromePath` configuration
- Upgrade development Node LTS to 14 ([#186](https://github.com/marp-team/marp-vscode/pull/186))
- Upgrade dependent packages to the latest version ([#186](https://github.com/marp-team/marp-vscode/pull/186))

## v0.16.0 - 2020-10-19

### Fixed
Expand Down
46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"markdown.marp.chromePath": {
"type": "string",
"default": "",
"description": "Sets the custom path for Chrome or Chromium-based browser to export PDF, PPTX, and image. If it's empty, Marp will find out the installed Google Chrome / Chromium / Microsoft Edge. Changes may require a restart to apply."
"description": "Sets the custom path for Chrome or Chromium-based browser to export PDF, PPTX, and image. If it's empty, Marp will find out the installed Google Chrome / Chromium / Microsoft Edge."
},
"markdown.marp.enableHtml": {
"type": "boolean",
Expand Down Expand Up @@ -219,50 +219,50 @@
"watch": "rollup -w -c ./rollup.config.js"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^15.1.0",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^9.0.0",
"@rollup/plugin-typescript": "^6.0.0",
"@types/jest": "^26.0.14",
"@rollup/plugin-node-resolve": "^11.0.0",
"@rollup/plugin-typescript": "^8.0.0",
"@types/jest": "^26.0.16",
"@types/lodash.debounce": "^4.0.6",
"@types/markdown-it": "^10.0.2",
"@types/markdown-it": "^10.0.3",
"@types/vscode": "~1.43.0",
"@types/yaml": "^1.9.7",
"@typescript-eslint/eslint-plugin": "^4.4.1",
"@typescript-eslint/parser": "^4.4.1",
"@typescript-eslint/eslint-plugin": "^4.9.0",
"@typescript-eslint/parser": "^4.9.0",
"builtin-modules": "^3.1.0",
"codecov": "^3.8.0",
"codecov": "^3.8.1",
"dedent": "^0.7.0",
"eslint": "^7.11.0",
"eslint-config-prettier": "^6.13.0",
"eslint": "^7.15.0",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-typescript": "^2.3.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "^24.1.0",
"jest": "^26.6.0",
"eslint-plugin-jest": "^24.1.3",
"jest": "^26.6.3",
"jest-junit": "^12.0.0",
"lodash.debounce": "^4.0.8",
"markdown-it": "^12.0.1",
"nanoid": "^3.1.12",
"markdown-it": "^12.0.2",
"nanoid": "^3.1.20",
"npm-run-all": "^4.1.5",
"prettier": "^2.1.2",
"prettier": "^2.2.1",
"rehype-parse": "^7.0.1",
"remark-parse": "^8.0.3",
"rimraf": "^3.0.2",
"rollup": "^2.32.0",
"rollup": "^2.34.1",
"rollup-plugin-terser": "^7.0.2",
"stylelint": "^13.7.2",
"stylelint": "^13.8.0",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-standard": "^20.0.0",
"ts-jest": "^26.4.1",
"ts-jest": "^26.4.4",
"tslib": "^2.0.3",
"typescript": "^4.0.3",
"typescript": "^4.1.2",
"unified": "^9.2.0",
"unist-util-visit": "^2.0.3",
"yaml": "^1.10.0"
},
"dependencies": {
"@marp-team/marp-cli": "^0.22.0",
"@marp-team/marp-core": "^1.3.0",
"axios": "^0.20.0"
"@marp-team/marp-cli": "^0.23.0",
"@marp-team/marp-core": "^1.4.0",
"axios": "^0.21.0"
}
}
3 changes: 1 addition & 2 deletions src/marp-cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ export default async function runMarpCli(...argv: string[]): Promise<void> {
if (process.platform === 'linux')
browsers.push('[Chromium](https://www.chromium.org/)')

if (process.platform !== 'linux')
browsers.push('[Microsoft Edge](https://www.microsoft.com/edge)')
browsers.push('[Microsoft Edge](https://www.microsoft.com/edge)')

throw new MarpCLIError(
`It requires to install ${browsers
Expand Down
Loading

0 comments on commit 0cce510

Please sign in to comment.