Skip to content

Commit

Permalink
Upgrade dependent packages to the latest version (#167)
Browse files Browse the repository at this point in the history
* Upgrade dependent packages to the latest version

* Bump @marp-team/marpit to v1.6.2

* Update cache key for CircleCI

* Setup globalThis shim

* Revert "Setup globalThis shim"

This reverts commit 805ed16.

* Apply workaround for JSDOM with Node 10

* Re-run `yarn upgrade --latest`

* Downgrade JSDOM for Jest environment to 15

Use Jest built-in jsdom environment if jsdom/jsdom#2961 was fixed.

* [ci skip] Update CHANGELOG.md

* [ci skip] Update CHANGELOG.md
  • Loading branch information
yhatt committed Jun 8, 2020
1 parent af5bcea commit 9133832
Show file tree
Hide file tree
Showing 6 changed files with 1,601 additions and 1,086 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ commands:

- restore_cache:
keys:
- v2.2-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
- v2.2-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-
- v2.2-dependencies-{{ .Environment.CIRCLE_JOB }}-
- v2.3-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
- v2.3-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-
- v2.3-dependencies-{{ .Environment.CIRCLE_JOB }}-

- run: yarn install
- steps: << parameters.postinstall >>

- save_cache:
key: v2.2-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
key: v2.3-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
paths:
- ~/.cache/yarn

Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,15 @@

### Added

- Transform Unicode 13.0 emojis into SVG images ([#167](https://github.com/marp-team/marp-core/pull/167))
- Add MathJax v3 support to math plugin ([#164](https://github.com/marp-team/marp-core/issues/164), [#165](https://github.com/marp-team/marp-core/pull/165) by [@nzt](https://github.com/nzt), [#166](https://github.com/marp-team/marp-core/pull/166))
- Add sandbox directory to make easy to develop core ([#157](https://github.com/marp-team/marp-core/pull/157))

### Changed

- Upgrade Marpit to [v1.6.2](https://github.com/marp-team/marpit/releases/v1.6.2) and Marpit SVG polyfill to [v1.3.0](https://github.com/marp-team/marpit-svg-polyfill/releases/v1.3.0) ([#167](https://github.com/marp-team/marp-core/pull/167))
- Upgrade dependent packages to the latest version ([#167](https://github.com/marp-team/marp-core/pull/167))

## v1.1.1 - 2020-04-18

### Changed
Expand Down
61 changes: 31 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,60 +66,61 @@
},
"devDependencies": {
"@marp-team/marp-cli": "^0.17.4",
"@rollup/plugin-alias": "^3.1.0",
"@rollup/plugin-commonjs": "^11.1.0",
"@rollup/plugin-json": "^4.0.2",
"@rollup/plugin-node-resolve": "^7.1.3",
"@rollup/plugin-typescript": "^4.1.1",
"@types/cheerio": "^0.22.17",
"@types/jest": "^25.2.1",
"@rollup/plugin-alias": "^3.1.1",
"@rollup/plugin-commonjs": "^13.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.0.1",
"@rollup/plugin-typescript": "^4.1.2",
"@types/cheerio": "^0.22.18",
"@types/jest": "^25.2.3",
"@types/jest-plugin-context": "^2.9.3",
"autoprefixer": "^9.7.6",
"autoprefixer": "^9.8.0",
"cheerio": "^1.0.0-rc.3",
"codecov": "^3.6.1",
"codecov": "^3.7.0",
"github-markdown-css": "^4.0.0",
"jest": "^25.3.0",
"jest": "^26.0.1",
"jest-environment-jsdom-fifteen": "^1.0.2",
"jest-junit": "^10.0.0",
"jest-plugin-context": "^2.9.0",
"markdown-it": "^10.0.0",
"markdown-it": "^11.0.0",
"mkdirp": "^1.0.4",
"node-sass-package-importer": "^5.3.2",
"nodemon": "^2.0.3",
"nodemon": "^2.0.4",
"npm-run-all": "^4.1.5",
"postcss-url": "^8.0.0",
"prettier": "^2.0.4",
"prettier": "^2.0.5",
"rimraf": "^3.0.2",
"rollup": "^2.6.1",
"rollup-plugin-postcss": "^2.6.4",
"rollup": "^2.15.0",
"rollup-plugin-postcss": "^3.1.2",
"rollup-plugin-string": "^3.0.0",
"rollup-plugin-terser": "^5.3.0",
"sass": "^1.26.3",
"rollup-plugin-terser": "^6.1.0",
"sass": "^1.26.8",
"self-closing-tags": "^1.0.1",
"stylelint": "^13.3.2",
"stylelint": "^13.6.0",
"stylelint-config-prettier": "^8.0.1",
"stylelint-config-standard": "^20.0.0",
"stylelint-scss": "^3.17.0",
"ts-jest": "25.4.0",
"tslib": "^1.11.1",
"tslint": "^6.1.1",
"stylelint-scss": "^3.17.2",
"ts-jest": "26.1.0",
"tslib": "^2.0.0",
"tslint": "^6.1.2",
"tslint-config-airbnb": "^5.11.2",
"tslint-config-prettier": "^1.17.0",
"typescript": "^3.8.3"
"typescript": "^3.9.5"
},
"dependencies": {
"@marp-team/marpit": "^1.5.2",
"@marp-team/marpit-svg-polyfill": "^1.2.0",
"emoji-regex": "^8.0.0",
"highlight.js": "^9.18.1",
"@marp-team/marpit": "^1.6.2",
"@marp-team/marpit-svg-polyfill": "^1.3.0",
"emoji-regex": "^9.0.0",
"highlight.js": "^10.0.3",
"katex": "^0.11.1",
"markdown-it-emoji": "^1.4.0",
"mathjax-full": "^3.0.5",
"postcss": "^7.0.27",
"postcss": "^7.0.32",
"postcss-minify-params": "^4.0.2",
"postcss-minify-selectors": "^4.0.2",
"postcss-normalize-whitespace": "^4.0.2",
"twemoji": "^12.1.5",
"xss": "^1.0.6"
"twemoji": "^13.0.0",
"xss": "^1.0.7"
},
"publishConfig": {
"access": "public"
Expand Down
3 changes: 2 additions & 1 deletion test/browser.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @jest-environment jsdom */
/** @jest-environment jsdom-fifteen */
// TODO: Use Jest built-in jsdom environment if https://github.com/jsdom/jsdom/issues/2961 was fixed
import browser, { observer } from '../src/browser'
import fittingObserver from '../src/fitting/observer'

Expand Down
3 changes: 2 additions & 1 deletion test/fitting/observer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @jest-environment jsdom */
/** @jest-environment jsdom-fifteen */
// TODO: Use Jest built-in jsdom environment if https://github.com/jsdom/jsdom/issues/2961 was fixed
import Marp from '../../src/marp'
import fittingObserver from '../../src/fitting/observer'

Expand Down

0 comments on commit 9133832

Please sign in to comment.