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 dependent package versions to latest #8

Merged
merged 5 commits into from
Sep 2, 2018
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- Add `--html` option ([#7](https://github.com/marp-team/marp-cli/pull/7))

### Changed

- Upgrade dependent package versions to latest ([#8](https://github.com/marp-team/marp-cli/pull/8))

## v0.0.5 - 2018-08-29

### Added
Expand Down
17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
"@babel/core": "^7.0.0",
"@types/get-stdin": "^5.0.1",
"@types/jest": "^23.3.1",
"@types/node": "^10.9.3",
"@types/node": "^10.9.4",
"@types/pug": "^2.0.4",
"@types/puppeteer": "^1.6.0",
"@types/puppeteer": "^1.6.1",
"@types/yargs": "^11.1.1",
"autoprefixer": "^9.1.3",
"bespoke": "^1.1.0",
Expand All @@ -69,29 +69,28 @@
"rollup-plugin-node-resolve": "^3.3.0",
"rollup-plugin-postcss": "^1.6.2",
"rollup-plugin-pug": "^0.1.6",
"rollup-plugin-terser": "^2.0.2",
"rollup-plugin-typescript": "^0.8.1",
"rollup-plugin-uglify": "^4.0.0",
"stylelint": "^9.5.0",
"stylelint-config-prettier": "^4.0.0",
"stylelint-config-standard": "^18.2.0",
"stylelint-scss": "^3.3.0",
"ts-jest": "^23.1.4",
"ts-keycode-enum": "^1.0.6",
"tslint": "^5.11.0",
"tslint-config-airbnb": "^5.10.0",
"tslint-config-airbnb": "^5.11.0",
"tslint-config-prettier": "^1.15.0",
"typescript": "^3.0.1",
"uglify-es": "^3.3.9"
"typescript": "^3.0.3"
},
"dependencies": {
"@marp-team/marp-core": "^0.0.4",
"@marp-team/marpit": "^0.0.13",
"@marp-team/marp-core": "^0.0.5",
"@marp-team/marpit": "^0.0.14",
"chalk": "^2.4.1",
"chrome-launcher": "^0.10.2",
"get-stdin": "^6.0.0",
"globby": "^8.0.1",
"is-wsl": "^1.1.0",
"os-locale": "^3.0.0",
"os-locale": "^3.0.1",
"puppeteer-core": "^1.7.0",
"yargs": "^12.0.1"
}
Expand Down
5 changes: 2 additions & 3 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ import json from 'rollup-plugin-json'
import nodeResolve from 'rollup-plugin-node-resolve'
import postcss from 'rollup-plugin-postcss'
import pugPlugin from 'rollup-plugin-pug'
import { terser } from 'rollup-plugin-terser'
import typescriptPlugin from 'rollup-plugin-typescript'
import { uglify } from 'rollup-plugin-uglify'
import typescript from 'typescript'
import { minify } from 'uglify-es'
import { dependencies } from './package.json'

const external = [
Expand All @@ -32,7 +31,7 @@ const plugins = [
plugins: [autoprefixer(), cssnano({ preset: 'default' })],
}),
pugPlugin(),
!process.env.ROLLUP_WATCH && uglify({}, minify),
!process.env.ROLLUP_WATCH && terser(),
]

export default [
Expand Down
2 changes: 1 addition & 1 deletion src/templates/bespoke/progress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const query = '.bespoke-progress-parent > .bespoke-progress-bar'
export default function basepokeProgress(deck) {
deck.on('activate', e => {
document.querySelectorAll<HTMLElement>(query).forEach(bar => {
bar.style.flexBasis = (e.index * 100) / (deck.slides.length - 1) + '%'
bar.style.flexBasis = `${(e.index * 100) / (deck.slides.length - 1)}%`
})
})
}
2 changes: 1 addition & 1 deletion src/templates/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { MarpitOptions, MarpitRenderResult, Element } from '@marp-team/marpit'
import fs from 'fs'
import path from 'path'
import barePug from './bare/bare.pug'
import bareScss from './bare/bare.scss'
import bespokePug from './bespoke/bespoke.pug'
import bespokeScss from './bespoke/bespoke.scss'
import { MarpitOptions, MarpitRenderResult, Element } from '@marp-team/marpit'

export interface TemplateOptions {
lang: string
Expand Down
Loading