From 274d7de5684d3f3e3be7ed903aba74f9805ed15b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2020 21:29:10 +0000 Subject: [PATCH 01/10] chore(deps-dev): bump @types/node from 14.0.21 to 14.0.23 (#60) --- package.json | 2 +- yarn.lock | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 0f06f632..8e9f0824 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@rollup/plugin-node-resolve": "^8.1.0", "@types/fs-extra": "^9.0.1", "@types/jest": "^26.0.4", - "@types/node": "^14.0.21", + "@types/node": "^14.0.23", "@types/resolve": "^1.17.1", "execa": "^4.0.2", "fs-extra": "^9.0.1", diff --git a/yarn.lock b/yarn.lock index 89ea538f..398ecbd3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -608,15 +608,10 @@ jest-diff "^25.2.1" pretty-format "^25.2.1" -"@types/node@*": - version "14.0.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.18.tgz#5111b2285659442f9f95697386a2b42b875bd7e9" - integrity sha512-0Z3nS5acM0cIV4JPzrj9g/GH0Et5vmADWtip3YOXOp1NpOLU8V3KoZDc8ny9c1pe/YSYYzQkAWob6dyV/EWg4g== - -"@types/node@^14.0.21": - version "14.0.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.21.tgz#c84005e3f43b7e19a7374d47d5c411039da59231" - integrity sha512-kmfWRnh81BrOfQ2Bn3xXCkoB6PLNsJlHhliYvkPa5UL6nmMHkANm358zVpO7TW6CDe9i267pkS/Id65OKL8+Ug== +"@types/node@*", "@types/node@^14.0.23": + version "14.0.23" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.23.tgz#676fa0883450ed9da0bb24156213636290892806" + integrity sha512-Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw== "@types/normalize-package-data@^2.4.0": version "2.4.0" From 1cfd6d2192c4ad85d74508316b0d0cb7a2f9306c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2020 21:30:05 +0000 Subject: [PATCH 02/10] chore(deps-dev): bump ts-jest from 26.1.1 to 26.1.2 (#62) --- package.json | 2 +- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 8e9f0824..30780e12 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "pretty-bytes": "^5.3.0", "resolve": "^1.17.0", "rollup-plugin-hashbang": "^2.2.2", - "ts-jest": "^26.1.1", + "ts-jest": "^26.1.2", "tsup": "^2.0.1", "typescript": "^3.9.6" } diff --git a/yarn.lock b/yarn.lock index 398ecbd3..9cc9aea9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2306,7 +2306,7 @@ jest-snapshot@^26.1.0: pretty-format "^26.1.0" semver "^7.3.2" -jest-util@^26.1.0: +jest-util@26.x, jest-util@^26.1.0: version "26.1.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.1.0.tgz#80e85d4ba820decacf41a691c2042d5276e5d8d8" integrity sha512-rNMOwFQevljfNGvbzNQAxdmXQ+NawW/J72dmddsK0E8vgxXCMtwQ/EH0BiWEIxh0hhMcTsxwAxINt7Lh46Uzbg== @@ -2595,14 +2595,6 @@ 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== -micromatch@4.x, micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== - dependencies: - braces "^3.0.1" - picomatch "^2.0.5" - micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" @@ -2622,6 +2614,14 @@ micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" +micromatch@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" + integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + dependencies: + braces "^3.0.1" + picomatch "^2.0.5" + mime-db@1.44.0: version "1.44.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" @@ -3585,18 +3585,18 @@ tr46@^2.0.2: dependencies: punycode "^2.1.1" -ts-jest@^26.1.1: - version "26.1.1" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.1.1.tgz#b98569b8a4d4025d966b3d40c81986dd1c510f8d" - integrity sha512-Lk/357quLg5jJFyBQLnSbhycnB3FPe+e9i7ahxokyXxAYoB0q1pPmqxxRPYr4smJic1Rjcf7MXDBhZWgxlli0A== +ts-jest@^26.1.2: + version "26.1.2" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.1.2.tgz#dd2e832ffae9cb803361483b6a3010a6413dc475" + integrity sha512-V4SyBDO9gOdEh+AF4KtXJeP+EeI4PkOrxcA8ptl4o8nCXUVM5Gg/8ngGKneS5BsZaR9DXVQNqj9k+iqGAnpGow== dependencies: bs-logger "0.x" buffer-from "1.x" fast-json-stable-stringify "2.x" + jest-util "26.x" json5 "2.x" lodash.memoize "4.x" make-error "1.x" - micromatch "4.x" mkdirp "1.x" semver "7.x" yargs-parser "18.x" From 3abe15a21d3ad961fe2978aae16edaeac183e1b4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2020 21:30:24 +0000 Subject: [PATCH 03/10] chore(deps): bump rollup-plugin-dts from 1.4.7 to 1.4.8 (#63) --- package.json | 2 +- yarn.lock | 31 ++++++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 30780e12..8f0bf5cb 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "cac": "^6.5.12", "joycon": "^2.2.5", "rollup": "^2.20.0", - "rollup-plugin-dts": "^1.4.7", + "rollup-plugin-dts": "^1.4.8", "rollup-plugin-typescript2": "^0.27.1", "tslib": "^2.0.0" }, diff --git a/yarn.lock b/yarn.lock index 9cc9aea9..cb4a1fa7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,6 +9,13 @@ dependencies: "@babel/highlight" "^7.8.3" +"@babel/code-frame@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" + integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== + dependencies: + "@babel/highlight" "^7.10.4" + "@babel/core@^7.1.0", "@babel/core@^7.7.5": version "7.9.6" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376" @@ -121,6 +128,11 @@ dependencies: "@babel/types" "^7.8.3" +"@babel/helper-validator-identifier@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" + integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== + "@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5": version "7.9.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80" @@ -135,6 +147,15 @@ "@babel/traverse" "^7.9.6" "@babel/types" "^7.9.6" +"@babel/highlight@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" + integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== + dependencies: + "@babel/helper-validator-identifier" "^7.10.4" + chalk "^2.0.0" + js-tokens "^4.0.0" + "@babel/highlight@^7.8.3": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079" @@ -3129,12 +3150,12 @@ rimraf@^3.0.0: dependencies: glob "^7.1.3" -rollup-plugin-dts@^1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-1.4.7.tgz#6255147ac777314c0725a1efcb42df10fe282243" - integrity sha512-QkunbJ96yUNkW95k/Vd6SdTjCbWSG0rMVUtpHSCwfg078Z7vbDaBnfz/gkSqR5h8WFMxoccBT4aodHm6387Jvg== +rollup-plugin-dts@^1.4.7, rollup-plugin-dts@^1.4.8: + version "1.4.8" + resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-1.4.8.tgz#3b0eadc285aede11c3f5ced72b56b5f7735df95c" + integrity sha512-2qHB4B3oaTyi1mDmqDzsRGKlev32v3EhMUAmc45Cn9eB22R7FsYDiigvT9XdM/oQzfd0qv5MkeZju8DP0nauiA== optionalDependencies: - "@babel/code-frame" "^7.8.3" + "@babel/code-frame" "^7.10.4" rollup-plugin-hashbang@^2.2.2: version "2.2.2" From ba7ee62eb4075056473e336df63fd470e73cc1ad Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2020 21:30:36 +0000 Subject: [PATCH 04/10] chore(deps-dev): bump @rollup/plugin-commonjs from 13.0.0 to 13.0.1 (#64) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8f0bf5cb..f1883867 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "tslib": "^2.0.0" }, "devDependencies": { - "@rollup/plugin-commonjs": "^13.0.0", + "@rollup/plugin-commonjs": "^13.0.1", "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^8.1.0", "@types/fs-extra": "^9.0.1", diff --git a/yarn.lock b/yarn.lock index cb4a1fa7..82f938c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -477,10 +477,10 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@rollup/plugin-commonjs@^13.0.0": - version "13.0.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-13.0.0.tgz#8a1d684ba6848afe8b9e3d85649d4b2f6f7217ec" - integrity sha512-Anxc3qgkAi7peAyesTqGYidG5GRim9jtg8xhmykNaZkImtvjA7Wsqep08D2mYsqw1IF7rA3lYfciLgzUSgRoqw== +"@rollup/plugin-commonjs@^13.0.1": + version "13.0.1" + resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-13.0.1.tgz#4fe12144271af724db35bac07b9bf718f22332e0" + integrity sha512-4G08+lhTIPxp6g5eDGiwD4BKr3Pf467h+Sfhvd7kztSpZyplQv0dAtcWbGqJ9kV0ovgGo/Z6Hhl1d/q6egkl6Q== dependencies: "@rollup/pluginutils" "^3.0.8" commondir "^1.0.1" From e7c911e2be9d53ba5f41bc2c66d012423c6927dc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2020 21:34:36 +0000 Subject: [PATCH 05/10] chore(deps-dev): bump @rollup/plugin-node-resolve from 8.1.0 to 8.4.0 (#66) --- package.json | 2 +- yarn.lock | 33 +++++++++++++-------------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index f1883867..b891feb0 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "devDependencies": { "@rollup/plugin-commonjs": "^13.0.1", "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^8.1.0", + "@rollup/plugin-node-resolve": "^8.4.0", "@types/fs-extra": "^9.0.1", "@types/jest": "^26.0.4", "@types/node": "^14.0.23", diff --git a/yarn.lock b/yarn.lock index 82f938c2..f6295953 100644 --- a/yarn.lock +++ b/yarn.lock @@ -497,23 +497,23 @@ dependencies: "@rollup/pluginutils" "^3.0.8" -"@rollup/plugin-node-resolve@^8.1.0": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.1.0.tgz#1da5f3d0ccabc8f66f5e3c74462aad76cfd96c47" - integrity sha512-ovq7ZM3JJYUUmEjjO+H8tnUdmQmdQudJB7xruX8LFZ1W2q8jXdPUS6SsIYip8ByOApu4RR7729Am9WhCeCMiHA== +"@rollup/plugin-node-resolve@^8.4.0": + version "8.4.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.4.0.tgz#261d79a680e9dc3d86761c14462f24126ba83575" + integrity sha512-LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ== dependencies: - "@rollup/pluginutils" "^3.0.8" - "@types/resolve" "0.0.8" + "@rollup/pluginutils" "^3.1.0" + "@types/resolve" "1.17.1" builtin-modules "^3.1.0" deep-freeze "^0.0.1" deepmerge "^4.2.2" is-module "^1.0.0" - resolve "^1.14.2" + resolve "^1.17.0" -"@rollup/pluginutils@^3.0.8": - version "3.0.10" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.0.10.tgz#a659b9025920378494cd8f8c59fbf9b3a50d5f12" - integrity sha512-d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw== +"@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" + integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== dependencies: "@types/estree" "0.0.39" estree-walker "^1.0.1" @@ -644,14 +644,7 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.0.tgz#dc85454b953178cc6043df5208b9e949b54a3bc4" integrity sha512-/rM+sWiuOZ5dvuVzV37sUuklsbg+JPOP8d+nNFlo2ZtfpzPiPvh1/gc8liWOLBqe+sR+ZM7guPaIcTt6UZTo7Q== -"@types/resolve@0.0.8": - version "0.0.8" - resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194" - integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ== - dependencies: - "@types/node" "*" - -"@types/resolve@^1.17.1": +"@types/resolve@1.17.1", "@types/resolve@^1.17.1": version "1.17.1" resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw== @@ -3131,7 +3124,7 @@ resolve@1.15.1: dependencies: path-parse "^1.0.6" -resolve@^1.10.0, resolve@^1.11.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.3.2: +resolve@^1.10.0, resolve@^1.11.0, resolve@^1.17.0, resolve@^1.3.2: version "1.17.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== From b97565c03d8ad2aac2dd42b5e1831a87a50b18b8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2020 21:35:31 +0000 Subject: [PATCH 06/10] chore(deps-dev): bump execa from 4.0.2 to 4.0.3 (#65) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b891feb0..e8746b31 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@types/jest": "^26.0.4", "@types/node": "^14.0.23", "@types/resolve": "^1.17.1", - "execa": "^4.0.2", + "execa": "^4.0.3", "fs-extra": "^9.0.1", "jest": "^26.1.0", "kleur": "^4.0.2", diff --git a/yarn.lock b/yarn.lock index f6295953..ecbae9b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1372,10 +1372,10 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^4.0.0, execa@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.2.tgz#ad87fb7b2d9d564f70d2b62d511bee41d5cbb240" - integrity sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q== +execa@^4.0.0, execa@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2" + integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A== dependencies: cross-spawn "^7.0.0" get-stream "^5.0.0" From 5de5e50ca4931fb3766565667d087d80826bac61 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2020 21:35:37 +0000 Subject: [PATCH 07/10] chore(deps): bump cac from 6.5.12 to 6.5.13 (#67) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e8746b31..c41ad36b 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "test": "npm run build && jest" }, "dependencies": { - "cac": "^6.5.12", + "cac": "^6.5.13", "joycon": "^2.2.5", "rollup": "^2.20.0", "rollup-plugin-dts": "^1.4.8", diff --git a/yarn.lock b/yarn.lock index ecbae9b0..9673526c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -957,10 +957,10 @@ builtin-modules@^3.1.0: resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484" integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw== -cac@^6.5.12: - version "6.5.12" - resolved "https://registry.yarnpkg.com/cac/-/cac-6.5.12.tgz#e166a9e68fea2689f5fee08bb03d9d9d4fadaaa7" - integrity sha512-XUhnXoAEdDCufbxn0U1vhbPKMoTx3D/D5Dcn8s0bOl6RZmYdxFE7TsWFbMqMMAqVFGhdbnZpXN+HosiuJiGfAQ== +cac@^6.5.13: + version "6.5.13" + resolved "https://registry.yarnpkg.com/cac/-/cac-6.5.13.tgz#8d9be6dce0afb707c76c5962bf9cc6571f4c933a" + integrity sha512-pt643//kQb3S6syXMJ/EIfNZpivKeFpCdnnPbJ3Iq9ZVZyXQcQjXvzVMWTEQuUspp+rHUlhZYZZfnviP88VuYA== cache-base@^1.0.1: version "1.0.1" From 309fb35f037faf7cee5413faa5ff1d51e7e3f592 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2020 21:40:26 +0000 Subject: [PATCH 08/10] chore(deps): bump rollup from 2.20.0 to 2.21.0 (#61) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c41ad36b..d576fc79 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "dependencies": { "cac": "^6.5.13", "joycon": "^2.2.5", - "rollup": "^2.20.0", + "rollup": "^2.21.0", "rollup-plugin-dts": "^1.4.8", "rollup-plugin-typescript2": "^0.27.1", "tslib": "^2.0.0" diff --git a/yarn.lock b/yarn.lock index 9673526c..bfed48e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3168,10 +3168,10 @@ rollup-plugin-typescript2@^0.27.1: resolve "1.15.1" tslib "1.11.2" -rollup@^2.20.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.20.0.tgz#7456fed8424a5247954958751642e9fdd0ad7485" - integrity sha512-hkbp//ne1om8+PQRpd81zk0KDvbJxkLZdZJh1ZNxjd1EkI0H1TmYuHqqXx88yciS+5YnMom3geubQjTeeUnNNw== +rollup@^2.20.0, rollup@^2.21.0: + version "2.21.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.21.0.tgz#d2e114533812043d5c9b7b0a83f1b2a242e4e1d6" + integrity sha512-BEGgy+wSzux7Ycq58pRiWEOBZaXRXTuvzl1gsm7gqmsAHxkWf9nyA5V2LN9fGSHhhDQd0/C13iRzSh4bbIpWZQ== optionalDependencies: fsevents "~2.1.2" From a1fd47886eca0a72e5310fd64965ff32d96f7a58 Mon Sep 17 00:00:00 2001 From: EGOIST <0x142857@gmail.com> Date: Sat, 18 Jul 2020 22:57:31 +0800 Subject: [PATCH 09/10] feat: improve logs under watch mode --- src/cli.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/cli.ts b/src/cli.ts index bc143db5..930a6615 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -48,8 +48,19 @@ async function main() { output: config.outputConfig, })) ) + let builtOnce = false watcher.on('event', (event) => { - console.log(event) + if (event.code === 'START') { + if (builtOnce) { + console.log(`Rebuilding..`) + } else { + console.log(`Building..`) + } + } + if (event.code === 'END') { + builtOnce = true + printSizes() + } }) } else { const startTime = Date.now() From bba34171b294e6d89b85a6c85df1c2b4c9d4783a Mon Sep 17 00:00:00 2001 From: EGOIST <0x142857@gmail.com> Date: Sun, 19 Jul 2020 00:12:45 +0800 Subject: [PATCH 10/10] feat: use esbuild again --- README.md | 2 +- package.json | 4 ++-- src/cli.ts | 8 +++++++- src/index.ts | 21 +++++++++++++-------- test/__snapshots__/index.test.ts.snap | 4 ++-- yarn.lock | 19 +++++++++++++++++++ 6 files changed, 44 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d2f58dec..dcfba36e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # tsup -Rollup your TypeScript library with no config. +Rollup your TypeScript library with no config, powered by [esbuild](https://github.com/evanw/esbuild). ## What can it bundle? diff --git a/package.json b/package.json index d576fc79..c401bdbe 100644 --- a/package.json +++ b/package.json @@ -19,11 +19,11 @@ }, "dependencies": { "cac": "^6.5.13", + "esbuild": "^0.6.3", "joycon": "^2.2.5", "rollup": "^2.21.0", "rollup-plugin-dts": "^1.4.8", - "rollup-plugin-typescript2": "^0.27.1", - "tslib": "^2.0.0" + "rollup-plugin-esbuild": "^2.4.1" }, "devDependencies": { "@rollup/plugin-commonjs": "^13.0.1", diff --git a/src/cli.ts b/src/cli.ts index 930a6615..1903a4a1 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -8,11 +8,17 @@ async function main() { const cli = cac('tsup') cli - .command('[...files]', 'Bundle files') + .command('[...files]', 'Bundle files', { + ignoreOptionDefaultValue: true, + }) .option('-d, --out-dir ', 'Output directory', { default: 'dist' }) .option('--format ', 'Bundle format, "cjs", "iife", "umd", "esm"', { default: 'cjs', }) + .option('--minify', 'Minify bundle') + .option('--target ', 'Bundle target, "es20XX" or "esnext"', { + default: 'es2017', + }) .option('--bundle', 'Bundle node_modules') .option('--dts', 'Generate declaration file') .option('--dts-bundle', 'Bundle types from node_modules') diff --git a/src/index.ts b/src/index.ts index f698aabd..bc14c77e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,7 @@ import { ModuleFormat, InputOptions, OutputOptions } from 'rollup' import prettyBytes from 'pretty-bytes' import colors from 'kleur' import hashbangPlugin from 'rollup-plugin-hashbang' -import tsPlugin from 'rollup-plugin-typescript2' +import tsPlugin from 'rollup-plugin-esbuild' import commonjsPlugin from '@rollup/plugin-commonjs' import jsonPlugin from '@rollup/plugin-json' import { sizePlugin, caches } from './size-plugin' @@ -16,10 +16,12 @@ type Options = { dts?: boolean // Bundle .d.ts files in node_modules dtsBundle?: boolean + target?: string + minify?: boolean watch?: boolean jsxFactory?: string jsxFragment?: string - outDir: string + outDir?: string format: ModuleFormat moduleName?: string define?: { @@ -80,10 +82,13 @@ export async function createRollupConfigs(files: string[], options: Options) { jsonPlugin(), !dts && tsPlugin({ - tsconfigOverride: { - compilerOptions, - }, - tsconfig, + target: options.target, + watch: options.watch, + minify: options.minify, + jsxFactory: options.jsxFactory, + jsxFragment: options.jsxFragment, + define: options.define, + tsconfig }), (!dts || dtsBundle) && resolvePlugin({ @@ -107,8 +112,8 @@ export async function createRollupConfigs(files: string[], options: Options) { ].filter(Boolean), }, outputConfig: { - dir: options.outDir, - format: options.format, + dir: options.outDir || 'dist', + format: options.format || 'cjs', exports: 'named', name: options.moduleName, }, diff --git a/test/__snapshots__/index.test.ts.snap b/test/__snapshots__/index.test.ts.snap index baba9d95..26b9be13 100644 --- a/test/__snapshots__/index.test.ts.snap +++ b/test/__snapshots__/index.test.ts.snap @@ -5,8 +5,8 @@ exports[`simple 1`] = ` Object.defineProperty(exports, '__esModule', { value: true }); -var foo = 'foo'; +var foo2 = \\"foo\\"; -exports.default = foo; +exports.default = foo2; " `; diff --git a/yarn.lock b/yarn.lock index bfed48e1..ca5b72e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1312,6 +1312,11 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +esbuild@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.6.3.tgz#a957e22f2503c745793514388110f9b55b3a6f83" + integrity sha512-4lHgz/EvGLRQnDYzzrvW+eilaPHim5pCLz4mP0k0QIalD/n8Ji2NwQwoIa1uX+yKkbn9R/FAZvaEbodjx55rDg== + escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -3150,6 +3155,15 @@ rollup-plugin-dts@^1.4.7, rollup-plugin-dts@^1.4.8: optionalDependencies: "@babel/code-frame" "^7.10.4" +rollup-plugin-esbuild@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-esbuild/-/rollup-plugin-esbuild-2.4.1.tgz#6e05850e3051a56811b2f491e2243272701b060d" + integrity sha512-UyL3LKbh4DxV8VZCzEw3kZB/z+vhkIXSMT8Y5JzOMc/PI3FGA6w94vSRl68IZUsS1hLxG1NB+W+0ck/9fDLk3A== + dependencies: + "@rollup/pluginutils" "^3.1.0" + joycon "^2.2.5" + strip-json-comments "^3.1.1" + rollup-plugin-hashbang@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/rollup-plugin-hashbang/-/rollup-plugin-hashbang-2.2.2.tgz#971fc49b452e63f9dfdc75f79ae7256b3485e750" @@ -3484,6 +3498,11 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== +strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"