Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Node LTS and dependent packages to the latest version #237

Merged
merged 4 commits into from
Jun 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
executor:
name: node
browser: true
version: '12.18.0' # Specify LTS version for development
version: '12.18.1' # Specify LTS version for development
steps:
- test

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
matrix:
node-version:
- '^10.17.0'
- '12.18.0'
- '12.18.1'

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.18.0
12.18.1
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

### Changed

- Upgrade Node and dependent packages to the latest version ([#237](https://github.com/marp-team/marp-cli/pull/237))

## v0.18.1 - 2020-06-13

### Added
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.18.0-alpine
FROM node:12.18.1-alpine
LABEL maintainer "Marp team"

RUN apk update && apk upgrade && \
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,21 @@
"devDependencies": {
"@rollup/plugin-commonjs": "^13.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.0.1",
"@rollup/plugin-node-resolve": "^8.1.0",
"@rollup/plugin-replace": "^2.3.3",
"@rollup/plugin-typescript": "^4.1.2",
"@rollup/plugin-typescript": "^5.0.0",
"@rollup/plugin-url": "^5.0.1",
"@types/cheerio": "^0.22.18",
"@types/express": "^4.17.6",
"@types/jest": "^26.0.0",
"@types/jest": "^26.0.3",
"@types/jest-plugin-context": "^2.9.3",
"@types/node": "~12.12.47",
"@types/pug": "^2.0.4",
"@types/puppeteer": "^3.0.0",
"@types/puppeteer": "^3.0.1",
"@types/supertest": "^2.0.9",
"@types/ws": "^7.2.5",
"@types/yargs": "^15.0.5",
"autoprefixer": "^9.8.0",
"autoprefixer": "^9.8.4",
"bespoke": "bespokejs/bespoke",
"builtin-modules": "^3.1.0",
"chalk": "^4.1.0",
Expand All @@ -91,9 +91,9 @@
"image-size": "^0.8.3",
"import-from": "^3.0.0",
"is-wsl": "^2.2.0",
"jest": "^26.0.1",
"jest": "^26.1.0",
"jest-environment-jsdom-fifteen": "^1.0.2",
"jest-junit": "^10.0.0",
"jest-junit": "^11.0.1",
"jest-plugin-context": "^2.9.0",
"mkdirp": "^1.0.4",
"nanoid": "^3.1.10",
Expand All @@ -106,20 +106,20 @@
"prettier": "^2.0.5",
"pug": "^3.0.0",
"rimraf": "^3.0.2",
"rollup": "^2.16.0",
"rollup": "^2.18.1",
"rollup-plugin-postcss": "^3.1.2",
"rollup-plugin-pug": "^1.1.1",
"rollup-plugin-terser": "^6.1.0",
"sass": "^1.26.8",
"sass": "^1.26.9",
"screenfull": "^5.0.2",
"strip-ansi": "^6.0.0",
"stylelint": "^13.6.0",
"stylelint-config-prettier": "^8.0.1",
"stylelint": "^13.6.1",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-standard": "^20.0.0",
"stylelint-scss": "^3.17.2",
"stylelint-scss": "^3.18.0",
"supertest": "^4.0.2",
"tar-stream": "^2.1.2",
"ts-jest": "^26.1.0",
"ts-jest": "^26.1.1",
"ts-keycode-enum": "^1.0.6",
"tslib": "^2.0.0",
"tslint": "^6.1.2",
Expand All @@ -140,7 +140,7 @@
"express": "^4.17.1",
"globby": "^11.0.1",
"pptxgenjs": "^3.2.1",
"puppeteer-core": "~3.3.0",
"puppeteer-core": "~4.0.1",
"serve-index": "^1.9.1",
"tmp": "^0.2.1",
"v8-compile-cache": "^2.1.1",
Expand Down
6 changes: 5 additions & 1 deletion test/__mocks__/path.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ const pathMock: any = {
reset: () => (mode = undefined),
}

module.exports = new Proxy(pathMock, {
const pathProxy = new Proxy(pathMock, {
get: (target, prop) => {
if (prop === '__esModule') return true
if (prop === 'default') return pathProxy
if (prop in target) return target[prop]
return mode === undefined ? path[prop] : path[mode][prop]
},
})

module.exports = pathProxy

afterEach(() => pathMock.reset())
2 changes: 1 addition & 1 deletion test/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ describe('Preview', () => {

describe('#fileToURI', () => {
context('with passing file', () => {
const { posix, win32 } = <any>path
const { posix, win32 } = path as any

context('in posix file system', () => {
it('returns file schema URI', () => {
Expand Down
Loading