Skip to content

Commit

Permalink
Merge branch 'main' into puppeteer-v8
Browse files Browse the repository at this point in the history
  • Loading branch information
yhatt committed Mar 13, 2021
2 parents e14f4af + f25e184 commit ecb3fdd
Show file tree
Hide file tree
Showing 5 changed files with 673 additions and 966 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = {
extends: [
'plugin:@typescript-eslint/recommended',
'plugin:import/typescript',
'prettier/@typescript-eslint',
'prettier',
],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- Optimize bespoke template for bfcache ([#323](https://github.com/marp-team/marp-cli/pull/323))

### Changed

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

## v0.23.2 - 2021-02-11

### Changed
Expand Down
55 changes: 30 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,69 +65,70 @@
"devDependencies": {
"@rollup/plugin-commonjs": "^17.1.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^11.1.1",
"@rollup/plugin-replace": "^2.3.4",
"@rollup/plugin-typescript": "^8.1.1",
"@rollup/plugin-node-resolve": "^11.2.0",
"@rollup/plugin-replace": "^2.4.1",
"@rollup/plugin-typescript": "^8.2.0",
"@rollup/plugin-url": "^6.0.0",
"@types/cheerio": "^0.22.23",
"@types/cheerio": "^0.22.27",
"@types/express": "^4.17.11",
"@types/jest": "^26.0.20",
"@types/node": "~14.14.25",
"@types/node": "~14.14.34",
"@types/pug": "^2.0.4",
"@types/supertest": "^2.0.10",
"@types/ws": "^7.4.0",
"@types/yargs": "^16.0.0",
"@typescript-eslint/eslint-plugin": "^4.15.0",
"@typescript-eslint/parser": "^4.15.0",
"autoprefixer": "^9.8.6",
"@typescript-eslint/eslint-plugin": "^4.17.0",
"@typescript-eslint/parser": "^4.17.0",
"autoprefixer": "^10.2.5",
"bespoke": "bespokejs/bespoke",
"builtin-modules": "^3.2.0",
"chalk": "^4.1.0",
"cheerio": "^1.0.0-rc.5",
"codecov": "^3.8.1",
"cssnano": "^4.1.10",
"eslint": "^7.19.0",
"eslint-config-prettier": "^7.2.0",
"eslint": "^7.22.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "^24.1.3",
"eslint-plugin-jest": "^24.3.0",
"file-url": "^3.0.0",
"get-stdin": "^8.0.0",
"image-size": "^0.9.3",
"image-size": "^0.9.5",
"is-wsl": "^2.2.0",
"jest": "^26.6.3",
"jest-junit": "^12.0.0",
"mkdirp": "^1.0.4",
"nanoid": "^3.1.20",
"nanoid": "^3.1.21",
"npm-run-all": "^4.1.5",
"os-locale": "^5.0.0",
"pkg": "^4.4.9",
"pkg-up": "^3.1.0",
"portfinder": "^1.0.28",
"postcss-url": "^8.0.0",
"postcss": "^8.2.8",
"postcss-url": "^10.1.1",
"prettier": "^2.2.1",
"pug": "^3.0.0",
"pug": "^3.0.2",
"rimraf": "^3.0.2",
"rollup": "^2.38.5",
"rollup-plugin-postcss": "^3.1.8",
"rollup": "^2.41.2",
"rollup-plugin-postcss": "^4.0.0",
"rollup-plugin-pug": "^1.1.1",
"rollup-plugin-terser": "^7.0.2",
"sass": "^1.32.7",
"sass": "^1.32.8",
"screenfull": "^5.1.0",
"strip-ansi": "^6.0.0",
"stylelint": "^13.9.0",
"stylelint": "^13.12.0",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-standard": "^20.0.0",
"stylelint-config-standard": "^21.0.0",
"stylelint-scss": "^3.19.0",
"supertest": "^6.1.3",
"tar-stream": "^2.2.0",
"ts-jest": "^26.5.1",
"ts-jest": "^26.5.3",
"ts-keycode-enum": "^1.0.6",
"tslib": "^2.1.0",
"typescript": "^4.1.5",
"typescript": "^4.2.3",
"vhtml": "^2.2.0",
"wrap-ansi": "^7.0.0",
"yauzl": "^2.10.0",
"zip-stream": "^4.0.4"
"zip-stream": "^4.1.0"
},
"dependencies": {
"@marp-team/marp-core": "^1.4.3",
Expand All @@ -142,10 +143,14 @@
"puppeteer-core": "8.0.0",
"serve-index": "^1.9.1",
"tmp": "^0.2.1",
"v8-compile-cache": "^2.2.0",
"ws": "^7.4.3",
"v8-compile-cache": "^2.3.0",
"ws": "^7.4.4",
"yargs": "^16.2.0"
},
"resolutions": {
"pug": "^3.0.2",
"pug-runtime": "^3.0.1"
},
"publishConfig": {
"access": "public"
}
Expand Down
5 changes: 4 additions & 1 deletion rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ const plugins = (opts = {}) => [
browser: !!opts.browser,
mainFields: ['module', 'jsnext:main', 'main'],
}),
replace({ 'process.env.NODE_ENV': JSON.stringify('production') }),
replace({
preventAssignment: true,
'process.env.NODE_ENV': JSON.stringify('production'),
}),
commonjs(),
typescript({ noEmitOnError: false }),
postcss({
Expand Down
Loading

0 comments on commit ecb3fdd

Please sign in to comment.