From 5eb48749870f8bcc5ff246a39d15daf19d11af39 Mon Sep 17 00:00:00 2001 From: JounQin Date: Sun, 22 Sep 2019 10:02:12 +0800 Subject: [PATCH] fix(deps): bump configurations, use resolutions to simplify tests --- .github/workflows/nodejs.yml | 2 +- package.json | 28 ++--- src/index.ts | 2 - tests/baseEslintConfig.js | 8 +- yarn.lock | 199 ++++++++++++++++++++++++----------- 5 files changed, 156 insertions(+), 83 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 185f6a9..de3a21f 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -22,8 +22,8 @@ jobs: - name: build, lint, test run: | yarn --frozen-lockfile - yarn lint yarn build + yarn lint yarn eslint -f friendly tests/**/*.{ts,tsx} env: CI: true diff --git a/package.json b/package.json index 5882f3d..574d9d1 100644 --- a/package.json +++ b/package.json @@ -8,18 +8,19 @@ "engines": { "node": ">=4" }, - "main": "lib/cjs.js", - "module": "lib/index.js", - "fesm5": "lib/esm.js", - "es2015": "lib/es2015.js", - "types": "lib/index.d.ts", + "main": "lib/cjs", + "module": "lib", + "fesm5": "lib/esm", + "es2015": "lib/es2015", + "types": "lib", "files": [ "lib" ], "scripts": { - "build": "rimraf lib && tsc -b src && r", + "build:ts": "tsc -b src", + "build:bundle": "r", + "build": "run-p build:*", "lint": "eslint --ext md,js,ts -f friendly --ignore-pattern tests .", - "pretest": "r", "test": "eslint -f friendly tests/**/*.{ts,tsx}", "type-coverage": "type-coverage --cache --ignore-catch --detail --strict" }, @@ -42,14 +43,14 @@ "tsconfig-paths": "^3.9.0" }, "devDependencies": { - "@1stg/babel-preset": "^0.6.2", + "@1stg/babel-preset": "^0.7.0", "@1stg/commitlint-config": "^0.1.0", - "@1stg/eslint-config": "^0.12.1", + "@1stg/eslint-config": "^0.12.10", "@1stg/husky-config": "^0.3.0", - "@1stg/lint-staged": "^0.6.1", + "@1stg/lint-staged": "^0.7.4", "@1stg/prettier-config": "^0.2.0", "@1stg/remark-config": "^0.2.1", - "@1stg/rollup-config": "^0.9.4", + "@1stg/rollup-config": "^0.9.5", "@1stg/tsconfig": "^0.5.1", "@babel/core": "^7.6.0", "@commitlint/cli": "^8.2.0", @@ -64,11 +65,14 @@ "lint-staged": "^9.2.5", "npm-run-all": "^4.1.5", "prettier": "^1.18.2", - "rimraf": "^3.0.0", + "react": "^16.9.0", "rollup": "^1.21.4", "type-coverage": "^2.3.0", "typescript": "^3.6.3" }, + "resolutions": { + "eslint-import-resolver-ts": "link:." + }, "typeCoverage": { "atLeast": 100 } diff --git a/src/index.ts b/src/index.ts index 1509fa4..810873e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -123,7 +123,6 @@ function getMappedPath(source: string, file: string) { .map(mapper => mapper(source, file)) .filter(path => !!path) - // eslint-disable-next-line @typescript-eslint/no-magic-numbers if (paths.length > 1) { log('found multiple matching ts paths:', paths) } @@ -191,7 +190,6 @@ function mangleScopedPackage(moduleName: string) { if (moduleName.startsWith('@')) { const replaceSlash = moduleName.replace(path.sep, '__') if (replaceSlash !== moduleName) { - // eslint-disable-next-line @typescript-eslint/no-magic-numbers return replaceSlash.slice(1) // Take off the "@" } } diff --git a/tests/baseEslintConfig.js b/tests/baseEslintConfig.js index 23151ac..4d97282 100644 --- a/tests/baseEslintConfig.js +++ b/tests/baseEslintConfig.js @@ -1,6 +1,4 @@ -const path = require('path') - -module.exports = dirname => ({ +module.exports = directory => ({ parser: '@typescript-eslint/parser', extends: [ 'eslint:recommended', @@ -11,8 +9,8 @@ module.exports = dirname => ({ ], settings: { 'import/resolver': { - [path.resolve(__dirname, '../lib/cjs.js')]: { - directory: dirname, + ts: { + directory, alwaysTryTypes: true, }, }, diff --git a/yarn.lock b/yarn.lock index ec76f63..ce9ef82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@1stg/babel-preset@^0.6.2": - version "0.6.2" - resolved "https://registry.yarnpkg.com/@1stg/babel-preset/-/babel-preset-0.6.2.tgz#3f21bf4ff143ddd38af0c3761af24e7c384dc6d2" - integrity sha512-OlyLihNhhtZ1FbWvohpalo4ITbN/WuaAm1tAGffKLXJETUbKguU5pEg0bOw5W8+FuLjWRGrYuVDG107qhnb8HA== +"@1stg/babel-preset@^0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@1stg/babel-preset/-/babel-preset-0.7.0.tgz#cc25629bf9b9c7785cf16b0a86fc1f564c7a64de" + integrity sha512-iO9P3GA309R+tQ60w8KvHJ2nFQMjiKWQnFlmEE48OfDYk4AvpAysi0frTQXcKJkUJgvJ7vM/Z5MOLq1CLuA4cg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/preset-env" "^7.6.0" @@ -15,6 +15,8 @@ "@vue/babel-preset-jsx" "^1.1.0" babel-plugin-transform-react-remove-prop-types "^0.4.24" babel-preset-proposal-typescript "^1.4.1" + core-js "^3.2.1" + fast-async "^7.0.6" "@1stg/commitlint-config@^0.1.0": version "0.1.0" @@ -24,10 +26,10 @@ "@commitlint/config-conventional" "^8.2.0" "@commitlint/config-lerna-scopes" "^8.2.0" -"@1stg/eslint-config@^0.12.1": - version "0.12.1" - resolved "https://registry.yarnpkg.com/@1stg/eslint-config/-/eslint-config-0.12.1.tgz#543c1cf4f8b93157c82bbddab5a1e0ea229ab04e" - integrity sha512-aLslTll4JQDYNCfIaFUC/4oA+Xv+Y9Icoba3MTYVhkHCVEoIp14ZuBfTI92FDPt8Wkhfv9b8ISYisSgBxZdOfQ== +"@1stg/eslint-config@^0.12.10": + version "0.12.10" + resolved "https://registry.yarnpkg.com/@1stg/eslint-config/-/eslint-config-0.12.10.tgz#40b0572c56c6bcf85b834d8412ee6545c194b6d9" + integrity sha512-g4SlekVmqaO8kor/9J7xYhLvauffJZdcz2yy4K2WEahwB8JZrJh1lTNRUEfmmAo4CFCL5O6dSyQBc/w9tx1qUA== dependencies: "@typescript-eslint/eslint-plugin" "^2.3.0" "@typescript-eslint/eslint-plugin-tslint" "^2.3.0" @@ -45,7 +47,7 @@ eslint-plugin-jest "^22.17.0" eslint-plugin-mdx "^1.5.0" eslint-plugin-node "^10.0.0" - eslint-plugin-prettier "^3.1.0" + eslint-plugin-prettier "^3.1.1" eslint-plugin-promise "^4.2.1" eslint-plugin-react "^7.14.3" eslint-plugin-react-hooks "^2.0.1" @@ -57,10 +59,12 @@ resolved "https://registry.yarnpkg.com/@1stg/husky-config/-/husky-config-0.3.0.tgz#dcf89d1f791dfd04d8d1a3fc1b59ba97c57ed6be" integrity sha512-YKVLG5lc/qKPyY9by/mVPdZLMe3s1FuO1d0mCmCogYl6VTWW/98LW80B4pMcDTmHPBTjZfKUAwgVBIvaYVthBA== -"@1stg/lint-staged@^0.6.1": - version "0.6.1" - resolved "https://registry.yarnpkg.com/@1stg/lint-staged/-/lint-staged-0.6.1.tgz#2785e6f749a56d8a9a6c550abb7356a3aaf848c5" - integrity sha512-kFiLmW4xID+jB4zTgSBxUZADZznfJs+GdyUDTlAs9jTzmG6bvCldbSSpzR1nr68emfrBSZg6rhQxx+SpZWdkLw== +"@1stg/lint-staged@^0.7.4": + version "0.7.4" + resolved "https://registry.yarnpkg.com/@1stg/lint-staged/-/lint-staged-0.7.4.tgz#42ed21c01c420ea495fe258af686f33c26b620fa" + integrity sha512-261n0nzQgB3lJz0C38CRfJamQjsmiy8oYLZHEfKW2KC241WI5Zx+NwBVjG0TVFiQq23MYtg8l7UbuvAuEc7tQA== + dependencies: + "@prettier/plugin-pug" "^1.0.3" "@1stg/prettier-config@^0.2.0": version "0.2.0" @@ -78,10 +82,10 @@ remark-preset-lint-recommended "^3.0.3" remark-preset-prettier "^0.2.0" -"@1stg/rollup-config@^0.9.4": - version "0.9.4" - resolved "https://registry.yarnpkg.com/@1stg/rollup-config/-/rollup-config-0.9.4.tgz#8a8768cf85782909c6695c4c3b939c63aeab8108" - integrity sha512-wGVBRx+mwgjJFVarjIWyKQ823hi10W5YcsyUbjvsBN9og6vs0qd9EsfS30QVYrQgWgc8+bhHi2nvJmvVxRCgNw== +"@1stg/rollup-config@^0.9.5": + version "0.9.5" + resolved "https://registry.yarnpkg.com/@1stg/rollup-config/-/rollup-config-0.9.5.tgz#c918cad1ca8687773168f5159deafc66dbd3e074" + integrity sha512-7w1nrfmAI0dPlv3dVG7p3RlOLrXvimEZ/hppwdCx43NM4vzFbrMGkBQVwClQkZJJp6FEBqSailozdduYNbWbVA== dependencies: "@babel/preset-env" "^7.6.0" builtin-modules "^3.1.0" @@ -135,7 +139,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.6.0": +"@babel/generator@^7.0.0-beta.44", "@babel/generator@^7.6.0": version "7.6.0" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.0.tgz#e2c21efbfd3293ad819a2359b448f002bfdfda56" integrity sha512-Ms8Mo7YBdMMn1BYuNtKuP/z0TgEIhbcyB8HVR6PPNYp4P61lMsABiS4A3VG1qznjXVCf3r+fVHhm4efTYVsySA== @@ -237,7 +241,7 @@ dependencies: "@babel/types" "^7.5.5" -"@babel/helper-module-imports@^7.0.0": +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.44": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d" integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A== @@ -1280,6 +1284,14 @@ "@nodelib/fs.scandir" "2.1.2" fastq "^1.6.0" +"@prettier/plugin-pug@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@prettier/plugin-pug/-/plugin-pug-1.0.3.tgz#9c4d08f39c2443d63d04cee1a6d000fc75cdf1a4" + integrity sha512-v1tV3mwQCpoImzQuqZsobLylTAHztaJB6iPgr5TZpEkmLeN121Pq9fxiff2bMSW6CPHZDta9ZcbYHzX/NqynCA== + dependencies: + prettier "~1.18.2" + pug-lexer "~4.1.0" + "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -1609,6 +1621,11 @@ acorn@^7.0.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz#26b8d1cd9a9b700350b71c0905546f64d1284e7a" integrity sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ== +acorn@~4.0.2: + version "4.0.13" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" + integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c= + aggregate-error@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.0.tgz#5b5a3c95e9095f311c9ab16c19fb4f3527cd3f79" @@ -1799,6 +1816,11 @@ babel-runtime@^6.23.0, babel-runtime@^6.26.0: core-js "^2.4.0" regenerator-runtime "^0.11.0" +babylon@^7.0.0-beta.44: + version "7.0.0-beta.47" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.47.tgz#6d1fa44f0abec41ab7c780481e62fd9aafbdea80" + integrity sha512-+rq2cr4GDhtToEzKFD6KZZMDBXhjFAr9JjPw9pAppZACeEWqNM294j+NdBzkSHYXwzzBmVjZ3nEVJlOhbR2gOQ== + bail@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz#7181b66d508aa3055d3f6c13f0a0c720641dde9b" @@ -1887,9 +1909,9 @@ camelcase@^5.0.0: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== caniuse-db@^1.0.30000977: - version "1.0.30000995" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000995.tgz#8e0557e822dab88fbbb21358d3ed395cb8efc21d" - integrity sha512-25ew/vPIVU0g/OjeZay2IfcljWAmNVy1TSmeoozFrJzEOqnka0ZSusJFS+4iGZKVIJ4RHOZB4NyilpwNcsh8tA== + version "1.0.30000996" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000996.tgz#bf37e65ebd994c503280892090427fbe991339d9" + integrity sha512-WvzxMtKe5CCBUaTVBM/EjsoFXJf6f/2s17BlWeZMhc5DSP7d9QjAZe5vdZp3T3fjxtGkJbg5W24bnRAdz9LVIw== caniuse-lite@^1.0.30000989: version "1.0.30000989" @@ -1936,6 +1958,13 @@ character-entities@^1.0.0: resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.3.tgz#bbed4a52fe7ef98cc713c6d80d9faa26916d54e6" integrity sha512-yB4oYSAa9yLcGyTbB4ItFwHw43QHdH129IJ5R+WvxOkWlyFnR5FAaBNnUq4mcxsTVZGh28bHoeTHMKXH1wZf3w== +character-parser@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0" + integrity sha1-x84o821LzZdE5f/CxfzeHHMmH8A= + dependencies: + is-regex "^1.0.3" + character-reference-invalid@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz#1647f4f726638d3ea4a750cf5d1975c1c7919a85" @@ -2072,6 +2101,11 @@ core-js@^2.4.0, core-js@^2.5.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A== +core-js@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz#cd41f38534da6cc59f7db050fe67307de9868b09" + integrity sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw== + core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -2221,9 +2255,9 @@ dot-prop@^3.0.0: uid "" electron-to-chromium@^1.3.247: - version "1.3.260" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.260.tgz#ffd686b4810bab0e1a428e7af5f08c21fe7c1fa2" - integrity sha512-wGt+OivF1C1MPwaSv3LJ96ebNbLAWlx3HndivDDWqwIVSQxmhL17Y/YmwUdEMtS/bPyommELt47Dct0/VZNQBQ== + version "1.3.264" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.264.tgz#ed837f44524d0601a7b2b7b6efd86e35753d0e27" + integrity sha512-z8E7WkrrquCuGYv+kKyybuZIbdms+4PeHp7Zm2uIgEhAigP0bOwqXILItwj0YO73o+QyHY/7XtEfP5DsHOWQgQ== elegant-spinner@^1.0.1: version "1.0.1" @@ -2323,20 +2357,17 @@ eslint-import-resolver-node@^0.3.2: resolve "^1.5.0" eslint-import-resolver-ts@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-ts/-/eslint-import-resolver-ts-0.3.0.tgz#0e872be42d7236c7d6b7583c588ee28f6488a6f6" - integrity sha512-Oh98sl9RQ6hdoyZQ/35C7mzdpes1RB1gTUP8/EqaRyuqG4F7EMRwR3Y8vJaBbBTNEHJCL+O4RkTygJx49lMQkw== - dependencies: - debug "^4.1.1" - glob "^7.1.4" - is-glob "^4.0.1" - resolve "^1.12.0" - tsconfig-paths "^3.8.0" + version "0.0.0" + uid "" -eslint-mdx@^1.4.5: - version "1.4.5" - resolved "https://registry.yarnpkg.com/eslint-mdx/-/eslint-mdx-1.4.5.tgz#5341ae8bf77b4afedcb4d2d4983dc0ed11bef4c0" - integrity sha512-+J2ODRnyNkxAzU7mLCLFPwF0JMALgSFFtbrpfB8i7t72vx7Lz3gFsPgugkd/ktWjB7Bi9qWeh1vNRs8JnNxTqQ== +"eslint-import-resolver-ts@link:.": + version "0.0.0" + uid "" + +eslint-mdx@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/eslint-mdx/-/eslint-mdx-1.5.2.tgz#49d546856c6333ea5de6a6c1555d8a9a25b734d9" + integrity sha512-0UUELtQ++APKR/4NZkHc02yLOX5Y32bP/mtY5hVHihuT2dR5KviSCjK2p8OpJYHJB/jZCmKcpbLu+2/uSNitNA== dependencies: espree "^6.1.1" remark-mdx "^1.4.4" @@ -2404,12 +2435,12 @@ eslint-plugin-jest@^22.17.0: "@typescript-eslint/experimental-utils" "^1.13.0" eslint-plugin-mdx@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-mdx/-/eslint-plugin-mdx-1.5.0.tgz#aee249a01e1f86c2e6d1f365fde04c0a21120154" - integrity sha512-BiNhdW6HUprzixfxmBYyjH0FSvi6EfI7ZYwqvR9i9aQM4yUFdu2C83ifPTWbH4xDFU1OQHF0xeW4eg/K+SjdVA== + version "1.5.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-mdx/-/eslint-plugin-mdx-1.5.2.tgz#cc0478ebeea8543c7f8ffa51c746fc7cd746040c" + integrity sha512-1M9GNIAi0dQwJK7KUDeCA2aAnVWZxVBPMYBBhck9ofXVBGSAV/Aqzou8JFMH3z+EnyPhZSLd40I9N6a8Cbi10A== dependencies: cosmiconfig "^5.2.1" - eslint-mdx "^1.4.5" + eslint-mdx "^1.5.2" rebass "^4.0.5" remark-mdx "^1.4.4" remark-parse "^7.0.1" @@ -2429,10 +2460,10 @@ eslint-plugin-node@^10.0.0: resolve "^1.10.1" semver "^6.1.0" -eslint-plugin-prettier@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.0.tgz#8695188f95daa93b0dc54b249347ca3b79c4686d" - integrity sha512-XWX2yVuwVNLOUhQijAkXz+rMPPoCr7WFiAl8ig6I7Xn+pPVhDhzg4DxHpmbeb0iqjO9UronEA3Tb09ChnFVHHA== +eslint-plugin-prettier@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.1.tgz#507b8562410d02a03f0ddc949c616f877852f2ba" + integrity sha512-A+TZuHZ0KU0cnn56/9mfR7/KjUJ9QNVXUhwvRFSR7PGPe0zQR6PTkmyqg1AtUUEOzTqeRsUwyKFh0oVZKVCrtA== dependencies: prettier-linter-helpers "^1.0.0" @@ -2651,6 +2682,17 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" +fast-async@^7.0.6: + version "7.0.6" + resolved "https://registry.yarnpkg.com/fast-async/-/fast-async-7.0.6.tgz#a9bcc0b4aa6c7a5b25f0cec1a9b7324d13cb169b" + integrity sha512-/iUa3eSQC+Xh5tN6QcVLsEsN7b1DaPIoTZo++VpLLIxtdNW2tEmMZex4TcrMeRnBwMOpZwue2CB171wjt5Kgqg== + dependencies: + "@babel/generator" "^7.0.0-beta.44" + "@babel/helper-module-imports" "^7.0.0-beta.44" + babylon "^7.0.0-beta.44" + nodent-runtime "^3.2.1" + nodent-transform "^3.2.4" + fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" @@ -2809,9 +2851,9 @@ git-raw-commits@^1.3.0: through2 "^2.0.0" glob-parent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954" - integrity sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg== + version "5.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" + integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== dependencies: is-glob "^4.0.1" @@ -3063,6 +3105,14 @@ is-directory@^0.3.1: resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= +is-expression@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f" + integrity sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8= + dependencies: + acorn "~4.0.2" + object-assign "^4.0.1" + is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -3146,7 +3196,7 @@ is-reference@^1.1.2: dependencies: "@types/estree" "0.0.39" -is-regex@^1.0.4: +is-regex@^1.0.3, is-regex@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= @@ -3663,6 +3713,16 @@ node-releases@^1.1.29: dependencies: semver "^5.3.0" +nodent-runtime@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/nodent-runtime/-/nodent-runtime-3.2.1.tgz#9e2755d85e39f764288f0d4752ebcfe3e541e00e" + integrity sha512-7Ws63oC+215smeKJQCxzrK21VFVlCFBkwl0MOObt0HOpVQXs3u483sAmtkF33nNqZ5rSOQjB76fgyPBmAUrtCA== + +nodent-transform@^3.2.4: + version "3.2.9" + resolved "https://registry.yarnpkg.com/nodent-transform/-/nodent-transform-3.2.9.tgz#ec11a6116b5476e60bc212371cf6b8e4c74f40b6" + integrity sha512-4a5FH4WLi+daH/CGD5o/JWRR8W5tlCkd3nrDSkxbOzscJTyTUITltvOJeQjg3HJ1YgEuNyiPhQbvbtRjkQBByQ== + normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -3712,7 +3772,7 @@ number-is-nan@^1.0.0: resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= -object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -4023,7 +4083,7 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^1.18.2: +prettier@^1.18.2, prettier@~1.18.2: version "1.18.2" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw== @@ -4052,6 +4112,20 @@ prop-types@^15.6.2, prop-types@^15.7.2: object-assign "^4.1.1" react-is "^16.8.1" +pug-error@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.3.tgz#f342fb008752d58034c185de03602dd9ffe15fa6" + integrity sha512-qE3YhESP2mRAWMFJgKdtT5D7ckThRScXRwkfo+Erqga7dyJdY3ZquspprMCj/9sJ2ijm5hXFWQE/A3l4poMWiQ== + +pug-lexer@~4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-4.1.0.tgz#531cde48c7c0b1fcbbc2b85485c8665e31489cfd" + integrity sha512-i55yzEBtjm0mlplW4LoANq7k3S8gDdfC6+LThGEvsK4FuobcKfDAwt6V4jKPH9RtiE3a2Akfg5UpafZ1OksaPA== + dependencies: + character-parser "^2.1.1" + is-expression "^3.0.0" + pug-error "^1.3.3" + pump@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" @@ -4080,7 +4154,7 @@ react-is@^16.8.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb" integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw== -react@^16.8.6: +react@^16.9.0: version "16.9.0" resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa" integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w== @@ -4147,11 +4221,11 @@ readable-stream@~2.3.6: util-deprecate "~1.0.1" rebass@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/rebass/-/rebass-4.0.5.tgz#87bf5b0cc53e530ce0939611637d01aeb989df57" - integrity sha512-8MZngk/AmbC8u8pGmI1WelbsKYjmN9Z91C11G4ESB9QZnoppWsI+OAqio1/4/l6dxHmwZ/hR8Q4UApF+IVEprA== + version "4.0.6" + resolved "https://registry.yarnpkg.com/rebass/-/rebass-4.0.6.tgz#eaded5d0d99f68e69cd6b1e9e645f391c15d90dd" + integrity sha512-O4eSG4vhboiI00R5YmrRTuKiehpLkB3gDBWp00qymEbPxJPjkXoQVkOEhbWaRNRqBv/bMlvLczqarvCno1JORw== dependencies: - reflexbox "^4.0.5" + reflexbox "^4.0.6" redent@^2.0.0: version "2.0.0" @@ -4161,16 +4235,15 @@ redent@^2.0.0: indent-string "^3.0.0" strip-indent "^2.0.0" -reflexbox@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/reflexbox/-/reflexbox-4.0.5.tgz#63a53702a111d16df6b1f0d6363b86be8ebc1fc6" - integrity sha512-SFWlrlKusgQVqjEimlLGNls3khjMlaTLrrF1H7YY7FfXv/mKK5mREDOW4l95D6Qa1kGoyM3hF+H5RLb3N6bCCA== +reflexbox@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/reflexbox/-/reflexbox-4.0.6.tgz#fc756d2cc1ca493baf9b96bb27dd640ad8154cf1" + integrity sha512-UNUL4YoJEXAPjRKHuty1tuOk+LV1nDJ2KYViDcH7lYm5yU3AQ+EKNXxPU3E14bQNK/pE09b1hYl+ZKdA94tWLQ== dependencies: "@emotion/core" "^10.0.0" "@emotion/styled" "^10.0.0" "@styled-system/css" "^5.0.0" "@styled-system/should-forward-prop" "^5.0.0" - react "^16.8.6" styled-system "^5.0.0" regenerate-unicode-properties@^8.1.0: @@ -5526,7 +5599,7 @@ ts-lib-utils@^2.2.0: glob "7" tslib "1" -tsconfig-paths@^3.8.0, tsconfig-paths@^3.9.0: +tsconfig-paths@^3.9.0: version "3.9.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==