Skip to content

Commit

Permalink
Re-bump dependent packages
Browse files Browse the repository at this point in the history
  • Loading branch information
yhatt committed Jul 22, 2021
1 parent 9c242f0 commit dce0bd6
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 35 deletions.
2 changes: 1 addition & 1 deletion jest.config.js
@@ -1,6 +1,6 @@
const { jsWithBabel } = require('ts-jest/presets')

const esModules = ['ansi-regex', 'strip-ansi']
const esModules = ['ansi-regex', 'globby', 'strip-ansi']

module.exports = {
collectCoverageFrom: ['src/**/*.ts', 'src/**/*.tsx'],
Expand Down
14 changes: 7 additions & 7 deletions package.json
Expand Up @@ -26,7 +26,7 @@
"url": "https://github.com/marp-team/marp-cli"
},
"engines": {
"node": ">=12"
"node": ">=12.20"
},
"main": "lib/index.js",
"types": "types/src/index.d.ts",
Expand Down Expand Up @@ -90,19 +90,20 @@
"eslint": "^7.31.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jest": "^24.3.7",
"eslint-plugin-jest": "^24.4.0",
"get-stdin": "^9.0.0",
"globby": "^12.0.0",
"image-size": "^1.0.0",
"is-wsl": "^2.2.0",
"jest": "^27.0.6",
"jest-junit": "^12.2.0",
"nanoid": "^3.1.23",
"npm-run-all": "^4.1.5",
"os-locale": "^5.0.0",
"pkg": "^5.3.0",
"pkg": "^5.3.1",
"pkg-up": "^3.1.0",
"portfinder": "^1.0.28",
"postcss": "^8.3.5",
"postcss": "^8.3.6",
"postcss-url": "^10.1.3",
"prettier": "^2.3.2",
"pug": "^3.0.2",
Expand All @@ -121,7 +122,7 @@
"stylelint-scss": "^3.20.1",
"supertest": "^6.1.4",
"tar-stream": "^2.2.0",
"ts-jest": "^27.0.3",
"ts-jest": "^27.0.4",
"ts-key-enum": "^2.0.7",
"tslib": "^2.3.0",
"typescript": "^4.3.5",
Expand All @@ -137,9 +138,8 @@
"chrome-launcher": "^0.14.0",
"cosmiconfig": "^7.0.0",
"express": "^4.17.1",
"globby": "^11.0.4",
"import-from": "^4.0.0",
"pptxgenjs": "^3.7.0",
"pptxgenjs": "^3.7.1",
"puppeteer-core": "10.1.0",
"serve-index": "^1.9.1",
"tmp": "^0.2.1",
Expand Down
2 changes: 1 addition & 1 deletion src/file.ts
Expand Up @@ -5,7 +5,7 @@ import path from 'path'
import * as url from 'url'
import { promisify } from 'util'
import getStdin from 'get-stdin'
import globby, { GlobbyOptions } from 'globby'
import { globby, Options as GlobbyOptions } from 'globby'
import { tmpName } from 'tmp'

const tmpNamePromise = promisify(tmpName)
Expand Down
4 changes: 2 additions & 2 deletions src/theme.ts
Expand Up @@ -2,7 +2,7 @@
import fs from 'fs'
import path from 'path'
import { Marpit } from '@marp-team/marpit'
import { hasMagic } from 'globby'
import { isDynamicPattern } from 'globby'
import { warn } from './cli'
import { File } from './file'

Expand Down Expand Up @@ -122,7 +122,7 @@ export class ThemeSet {

for (const f of fn) {
// globby's hasMagic (backed by fast-glob) always recognizes "\\" (Windows path separator) as the escape character.
if (!hasMagic(f.split(path.sep).join('/'))) {
if (!isDynamicPattern(f.split(path.sep).join('/'))) {
try {
const stat: fs.Stats = await fs.promises.lstat(f)

Expand Down
79 changes: 55 additions & 24 deletions yarn.lock
Expand Up @@ -1851,6 +1851,11 @@ array-union@^2.1.0:
resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==

array-union@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975"
integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==

array.prototype.flat@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
Expand Down Expand Up @@ -3109,10 +3114,10 @@ eslint-plugin-import@^2.23.4:
resolve "^1.20.0"
tsconfig-paths "^3.9.0"

eslint-plugin-jest@^24.3.7:
version "24.3.7"
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.7.tgz#a4deaa9e88182b92533a9c25cc4f3c369d7f33eb"
integrity sha512-pXED2NA4q2M/5mxlN6GyuUXAFJndT0uosOkQCHaUED9pqgBPd89ZzpcZEU6c5HtZNahC00M36FkwLdDHMDqaHw==
eslint-plugin-jest@^24.4.0:
version "24.4.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz#fa4b614dbd46a98b652d830377971f097bda9262"
integrity sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"

Expand Down Expand Up @@ -3388,7 +3393,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==

fast-glob@^3.1.1, fast-glob@^3.2.5:
fast-glob@^3.1.1, fast-glob@^3.2.5, fast-glob@^3.2.7:
version "3.2.7"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
Expand Down Expand Up @@ -3716,7 +3721,7 @@ globals@^13.6.0, globals@^13.9.0:
dependencies:
type-fest "^0.20.2"

globby@^11.0.3, globby@^11.0.4:
globby@^11.0.3:
version "11.0.4"
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
Expand All @@ -3728,6 +3733,18 @@ globby@^11.0.3, globby@^11.0.4:
merge2 "^1.3.0"
slash "^3.0.0"

globby@^12.0.0:
version "12.0.0"
resolved "https://registry.yarnpkg.com/globby/-/globby-12.0.0.tgz#b8bbb8e9d48f8a3c9abf5624030f1f9e1cfbe3ed"
integrity sha512-3mOIUduqSMHm6gNjIw9E641TZ93NB8lFVt+6MKIw6vUaIS5aSsw/6cl0gT86z1IoKlaL90BiOQlA593GUMlzEA==
dependencies:
array-union "^3.0.1"
dir-glob "^3.0.1"
fast-glob "^3.2.7"
ignore "^5.1.8"
merge2 "^1.4.1"
slash "^4.0.0"

globjoin@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
Expand Down Expand Up @@ -5342,7 +5359,7 @@ merge-stream@^2.0.0:
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==

merge2@^1.3.0:
merge2@^1.3.0, merge2@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
Expand Down Expand Up @@ -5967,10 +5984,10 @@ pkg-dir@^2.0.0:
dependencies:
find-up "^2.1.0"

pkg-fetch@3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.1.1.tgz#8f94115d926e71359ed96c211fe022b7a2452f8d"
integrity sha512-3GfpNwbwoTxge2TrVp6Oyz/FZJOoxF1r0+1YikOhnBXa2Di/VOJKtUObFHap76BFnyFo1fwh5vARWFR9TzLKUg==
pkg-fetch@3.2.2:
version "3.2.2"
resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.2.2.tgz#33f391eb176c1844e93189a32f2279b36a1ec949"
integrity sha512-bLhFNT4cNnONxzbHo1H2mCCKuQkCR4dgQtv0gUZnWtp8TDP0v0UAXKHG7DXhAoTC5IYP3slLsFJtIda9ksny8g==
dependencies:
chalk "^4.1.0"
fs-extra "^9.1.0"
Expand All @@ -5994,10 +6011,10 @@ pkg-up@^3.1.0:
dependencies:
find-up "^3.0.0"

pkg@^5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/pkg/-/pkg-5.3.0.tgz#27b5a0afd7cd2b85199cc1ab95e6d19ac5ae3fcd"
integrity sha512-/DGG+QcSPraMAIxaoGCNqb2A6Xkm2jBQMsj2mjb4ag236ByTY9Xhpikvj5ixwlSQV0euuJw4fphKCd5YHRPS8w==
pkg@^5.3.1:
version "5.3.1"
resolved "https://registry.yarnpkg.com/pkg/-/pkg-5.3.1.tgz#8f81671613b9e5bb1d83c39b2eed4799e1e679fe"
integrity sha512-jT/sptM1ZG++FNk+jnJYNoWLDQXYd7hqpnBhd5j18SNW1jJzNYo55RahuCiD0KN0PX9mb53GWCqKM0ia/mJytA==
dependencies:
"@babel/parser" "7.13.13"
"@babel/types" "7.13.12"
Expand All @@ -6008,7 +6025,7 @@ pkg@^5.3.0:
into-stream "^6.0.0"
minimist "^1.2.5"
multistream "^4.1.0"
pkg-fetch "3.1.1"
pkg-fetch "3.2.2"
prebuild-install "6.0.1"
progress "^2.0.3"
resolve "^1.20.0"
Expand Down Expand Up @@ -6375,10 +6392,19 @@ postcss@^8.3.5:
nanoid "^3.1.23"
source-map-js "^0.6.2"

pptxgenjs@^3.7.0:
version "3.7.0"
resolved "https://registry.yarnpkg.com/pptxgenjs/-/pptxgenjs-3.7.0.tgz#445e3dbb4191218b30d480b24eb01e26af5b3772"
integrity sha512-ZtKT11DA3arRhyQ0AJoaa4iizHEghfreobQhbDq9EVtJhZ0JN3it/lREnvervuHinHi6sGBcSlHC6scfubEm7Q==
postcss@^8.3.6:
version "8.3.6"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea"
integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==
dependencies:
colorette "^1.2.2"
nanoid "^3.1.23"
source-map-js "^0.6.2"

pptxgenjs@^3.7.1:
version "3.7.1"
resolved "https://registry.yarnpkg.com/pptxgenjs/-/pptxgenjs-3.7.1.tgz#2369cf9f4d2cf62de2a63d9ebddac3921e08c449"
integrity sha512-j1WX7CJHiof6ETHtQe1zQCE+T6V+F3aUWaAqNtK+T495aICEjcy35zbxlsCeNULUcmItxXMGDIM4pz+5FEr+gQ==
dependencies:
"@types/node" "^16.0.0"
https "^1.0.0"
Expand Down Expand Up @@ -7194,6 +7220,11 @@ slash@^3.0.0:
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==

slash@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==

slice-ansi@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
Expand Down Expand Up @@ -7852,10 +7883,10 @@ trough@^1.0.0:
resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==

ts-jest@^27.0.3:
version "27.0.3"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.0.3.tgz#808492f022296cde19390bb6ad627c8126bf93f8"
integrity sha512-U5rdMjnYam9Ucw+h0QvtNDbc5+88nxt7tbIvqaZUhFrfG4+SkWhMXjejCLVGcpILTPuV+H3W/GZDZrnZFpPeXw==
ts-jest@^27.0.4:
version "27.0.4"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.0.4.tgz#df49683535831560ccb58f94c023d831b1b80df0"
integrity sha512-c4E1ECy9Xz2WGfTMyHbSaArlIva7Wi2p43QOMmCqjSSjHP06KXv+aT+eSY+yZMuqsMi3k7pyGsGj2q5oSl5WfQ==
dependencies:
bs-logger "0.x"
buffer-from "1.x"
Expand Down

0 comments on commit dce0bd6

Please sign in to comment.