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 and dependent packages to the latest version #153

Merged
merged 4 commits into from
Mar 15, 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
13 changes: 6 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,24 @@ commands:
default: []
yarn:
type: string
default: 1.21.1
default: 1.22.4
steps:
- run:
name: Upgrade yarn for current user
command: cd ~ && yarn policies set-version << parameters.yarn >>

- restore_cache:
keys:
- v2.1-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
- v2.1-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-
- v2.1-dependencies-{{ .Environment.CIRCLE_JOB }}-
- 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 }}-

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

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

audit:
Expand Down Expand Up @@ -100,7 +99,7 @@ jobs:
test-node12:
executor:
name: node
version: '12.14.1' # Specify LTS version for development
version: '12.16.1' # Specify LTS version for development
steps:
- test

Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.14.1
12.16.1
File renamed without changes.
4 changes: 4 additions & 0 deletions .stylelintrc → .stylelintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ rules:
- null
scss/at-rule-no-unknown:
- true
value-keyword-case:
- lower
- ignoreProperties:
- /^--/
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## [Unreleased]

### Changed

- Upgrade Marpit to [v1.5.1](https://github.com/marp-team/marpit/releases/v1.5.1) ([#153](https://github.com/marp-team/marp-core/pull/153))
- Upgrade Node and dependent packages to the latest version ([#153](https://github.com/marp-team/marp-core/pull/153))

## v1.0.1 - 2020-01-17

### Fixed
Expand Down
54 changes: 27 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,56 +55,56 @@
"watch": "rollup -w -c"
},
"devDependencies": {
"@rollup/plugin-alias": "^3.0.0",
"@rollup/plugin-commonjs": "^11.0.1",
"@rollup/plugin-json": "^4.0.1",
"@rollup/plugin-node-resolve": "^7.0.0",
"@rollup/plugin-typescript": "^2.1.0",
"@types/cheerio": "^0.22.15",
"@types/jest": "^24.0.25",
"@rollup/plugin-alias": "^3.0.1",
"@rollup/plugin-commonjs": "^11.0.2",
"@rollup/plugin-json": "^4.0.2",
"@rollup/plugin-node-resolve": "^7.1.1",
"@rollup/plugin-typescript": "^4.0.0",
"@types/cheerio": "^0.22.16",
"@types/jest": "^25.1.4",
"@types/jest-plugin-context": "^2.9.2",
"autoprefixer": "^9.7.3",
"autoprefixer": "^9.7.4",
"cheerio": "^1.0.0-rc.3",
"codecov": "^3.6.1",
"github-markdown-css": "^3.0.1",
"jest": "^24.9.0",
"github-markdown-css": "^4.0.0",
"jest": "^25.1.0",
"jest-junit": "^10.0.0",
"jest-plugin-context": "^2.9.0",
"markdown-it": "^10.0.0",
"node-sass-package-importer": "^5.3.2",
"npm-run-all": "^4.1.5",
"postcss-url": "^8.0.0",
"prettier": "^1.19.1",
"rimraf": "^3.0.0",
"rollup": "^1.29.0",
"rollup-plugin-postcss": "^2.0.3",
"rimraf": "^3.0.2",
"rollup": "^2.0.6",
"rollup-plugin-postcss": "^2.4.1",
"rollup-plugin-string": "^3.0.0",
"rollup-plugin-terser": "^5.2.0",
"sass": "^1.24.4",
"rollup-plugin-terser": "^5.3.0",
"sass": "^1.26.3",
"self-closing-tags": "^1.0.1",
"stylelint": "^13.0.0",
"stylelint-config-prettier": "^8.0.0",
"stylelint-config-standard": "^19.0.0",
"stylelint-scss": "^3.13.0",
"ts-jest": "24.3.0",
"tslib": "^1.10.0",
"tslint": "^5.20.1",
"stylelint": "^13.2.1",
"stylelint-config-prettier": "^8.0.1",
"stylelint-config-standard": "^20.0.0",
"stylelint-scss": "^3.14.2",
"ts-jest": "25.2.1",
"tslib": "^1.11.1",
"tslint": "^6.1.0",
"tslint-config-airbnb": "^5.11.2",
"tslint-config-prettier": "^1.17.0",
"typescript": "^3.7.4"
"typescript": "^3.8.3"
},
"dependencies": {
"@marp-team/marpit": "^1.5.0",
"@marp-team/marpit": "^1.5.1",
"@marp-team/marpit-svg-polyfill": "^1.2.0",
"emoji-regex": "^8.0.0",
"highlight.js": "^9.17.1",
"highlight.js": "^9.18.1",
"katex": "^0.11.1",
"markdown-it-emoji": "^1.4.0",
"postcss": "^7.0.26",
"postcss": "^7.0.27",
"postcss-minify-params": "^4.0.2",
"postcss-minify-selectors": "^4.0.2",
"postcss-normalize-whitespace": "^4.0.2",
"twemoji": "^12.1.4",
"twemoji": "^12.1.5",
"xss": "^1.0.6"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const plugins = [
},
],
}),
typescript({ resolveJsonModule: false }),
typescript(),
postcss({
inject: false,
minimize: {
Expand Down
7 changes: 0 additions & 7 deletions scripts/postcss-optimize-default-theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@ const plugin = postcss.plugin('postcss-optimize-default-theme', () => css => {
rule.remove()
}
})

// Remove unused web fonts
css.walkAtRules('font-face', rule => {
rule.walkDecls('font-family', decl => {
if (decl.value === 'octicons-link') rule.remove()
})
})
})

export default plugin
4 changes: 2 additions & 2 deletions src/script/script.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ interface ScriptOptionsInternal {

export interface ScriptOptions extends Partial<ScriptOptionsInternal> {}

const defaultOptions: ScriptOptionsInternal = { source: 'inline' }
const defaultOptions = { source: 'inline' } as const

export function markdown(md): void {
const marp: Marp = md.marpit
const opts = (() => {
const opts = ((): false | ScriptOptionsInternal => {
if (marp.options.script === false) return false
if (marp.options.script === true) return defaultOptions

Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"compilerOptions": {
"esModuleInterop": true,
"lib": ["es2016", "dom"],
"module": "commonjs",
"module": "esnext",
"moduleResolution": "node",
"noImplicitAny": false,
"outDir": "lib",
"resolveJsonModule": true,
"rootDir": ".",
"sourceMap": true,
Expand Down
Loading