From 0b0e14f7ffc389588b294d426679a24284000b19 Mon Sep 17 00:00:00 2001 From: Cahllagerfeld <43843195+Cahllagerfeld@users.noreply.github.com> Date: Sun, 2 Oct 2022 21:02:55 +0000 Subject: [PATCH] feat: move to esm --- bin/gluegun | 25 ----- bin/gluegun.js | 17 +++ package.json | 6 +- scripts/esbuild.js | 38 +++++++ sniff.js | 2 +- src/cli/cli.ts | 5 + src/index.ts | 12 ++- src/toolbox/print-tools.ts | 4 +- src/toolbox/print-types.ts | 2 +- src/toolbox/template-tools.ts | 2 +- tsconfig.json | 4 +- yarn.lock | 190 +++++++++++++++++++++++++++++++--- 12 files changed, 258 insertions(+), 49 deletions(-) delete mode 100755 bin/gluegun create mode 100755 bin/gluegun.js create mode 100644 scripts/esbuild.js diff --git a/bin/gluegun b/bin/gluegun deleted file mode 100755 index 21751ed6..00000000 --- a/bin/gluegun +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env node - -// speed up `gluegun --version` et al -if (['v', 'version', '-v', '--v', '-version', '--version'].includes(process.argv[2])) { - var contents = require('fs').readFileSync(__dirname + '/../package.json') - var package = JSON.parse(contents) - console.log(package.version) - process.exit(0) -} - -// check if we're running in dev mode -var devMode = require('fs').existsSync(`${__dirname}/../src`) -var wantsCompiled = process.argv.indexOf('--compiled-gluegun') >= 0 - -if (devMode && !wantsCompiled) { - // hook into ts-node so we can run typescript on the fly - require('ts-node').register({ - project: `${__dirname}/../tsconfig.json`, - compiler: require.resolve('typescript', { paths: [__dirname] }), - }) - // kick off gluegun - require(`${__dirname}/../src/cli/cli`).run(process.argv) -} else { - require(`${__dirname}/../build/cli/cli`).run(process.argv) -} diff --git a/bin/gluegun.js b/bin/gluegun.js new file mode 100755 index 00000000..5a2148b4 --- /dev/null +++ b/bin/gluegun.js @@ -0,0 +1,17 @@ +#!/usr/bin/env node +import { dirname } from 'path' +import { fileURLToPath } from 'url' +import { run } from '../build/cli/cli.js' + +const __dirname = dirname(fileURLToPath(import.meta.url)) + +// speed up `gluegun --version` et al +if (['v', 'version', '-v', '--v', '-version', '--version'].includes(process.argv[2])) { + const fs = await import('fs') + const contents = fs.readFileSync(__dirname + '/../package.json') + const pkg = JSON.parse(contents) + console.log(pkg.version) + process.exit(0) +} + +run(process.argv) diff --git a/package.json b/package.json index b2e4ccc5..56ccb1f7 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,9 @@ "version": "0.0.4", "description": "A delightful toolkit for building Node-powered CLIs.", "repository": "webstoneHQ/gluegun", + "type": "module", "bin": { - "gluegun": "bin/gluegun" + "gluegun": "bin/gluegun.js" }, "main": "build/index.js", "types": "build/types/index.d.ts", @@ -99,6 +100,8 @@ "@typescript-eslint/eslint-plugin": "5.38.0", "@typescript-eslint/parser": "5.38.0", "cpy-cli": "4.2.0", + "esbuild": "^0.15.10", + "esbuild-node-externals": "^1.5.0", "eslint": "8.24.0", "eslint-config-prettier": "8.5.0", "eslint-config-standard": "17.0.0", @@ -119,6 +122,7 @@ "sinon": "14.0.0", "strip-ansi": "7.0.1", "temp-write": "5.0.0", + "tiny-glob": "^0.2.9", "ts-jest": "^29.0.2", "ts-node": "10.9.1", "typescript": "4.8.3", diff --git a/scripts/esbuild.js b/scripts/esbuild.js new file mode 100644 index 00000000..bc653f95 --- /dev/null +++ b/scripts/esbuild.js @@ -0,0 +1,38 @@ +import esbuild from 'esbuild' +import { nodeExternalsPlugin } from 'esbuild-node-externals' +import glob from 'tiny-glob' + +/** + * @type {Object.} + */ + +const config = { + shared: { + format: 'esm', + target: 'esnext', + plugins: [nodeExternalsPlugin()], + entryPoints: await glob('src/**/*.ts'), + logLevel: 'info', + bundle: true, + minify: true, + outdir: 'build', + platform: 'node', + }, + build: {}, + dev: { + watch: true, + }, +} + +const mode = process.argv[2] +if (!mode) { + console.error('Usage: node ./scripts/esbuild.js build|dev') + process.exit(1) +} + +esbuild + .build({ + ...config.shared, + ...(config[mode] || {}), + }) + .catch(() => process.exit(1)) diff --git a/sniff.js b/sniff.js index 0cc19a60..ed4e6e01 100644 --- a/sniff.js +++ b/sniff.js @@ -19,7 +19,7 @@ if (ver[0] >= 8) { ok = hasAsyncAwait && isNewEnough -module.exports = { +export default { nodeMinimum, nodeVersion, isNewEnough, diff --git a/src/cli/cli.ts b/src/cli/cli.ts index f1079d12..8e66c823 100644 --- a/src/cli/cli.ts +++ b/src/cli/cli.ts @@ -1,5 +1,10 @@ import { build, GluegunToolbox } from '../index' +import { dirname } from 'path' +import { fileURLToPath } from 'url' + +const __dirname = dirname(fileURLToPath(import.meta.url)) + /** * Create the cli and kick it off */ diff --git a/src/index.ts b/src/index.ts index cf8ad5b3..7f590ea4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,13 @@ import * as path from 'path' // first, do a sniff test to ensure our dependencies are met -const sniff = require('../sniff') +import sniff from '../sniff.js' +import AppModulePath from 'app-module-path' + +import { dirname } from 'path' +import { fileURLToPath } from 'url' + +const __dirname = dirname(fileURLToPath(import.meta.url)) // check the node version if (!sniff.isNewEnough) { @@ -40,5 +46,5 @@ export { GluegunMeta } from './core-extensions/meta-extension' // this adds the node_modules path to the "search path" // it's hacky, but it works well! -require('app-module-path').addPath(path.join(__dirname, '..', 'node_modules')) -require('app-module-path').addPath(process.cwd()) +AppModulePath.addPath(path.join(__dirname, '..', 'node_modules')) +AppModulePath.addPath(process.cwd()) diff --git a/src/toolbox/print-tools.ts b/src/toolbox/print-tools.ts index 30dbb96f..f380ba1b 100644 --- a/src/toolbox/print-tools.ts +++ b/src/toolbox/print-tools.ts @@ -1,5 +1,5 @@ -import * as CLITable from 'cli-table3' -import * as importedColors from 'colors/safe' +import CLITable from 'cli-table3' +import importedColors from 'colors' import { commandInfo } from './meta-tools' import { Toolbox } from '../domain/toolbox' import { times } from './utils' diff --git a/src/toolbox/print-types.ts b/src/toolbox/print-types.ts index f488092f..bdf57a52 100644 --- a/src/toolbox/print-types.ts +++ b/src/toolbox/print-types.ts @@ -2,7 +2,7 @@ import { GluegunToolbox } from '../index' import * as CLITable from 'cli-table3' import * as importedColors from 'colors' import { Toolbox } from '../domain/toolbox' -import ora = require('ora') +import ora from 'ora' export type GluegunPrintColors = typeof importedColors & { highlight: (t: string) => string diff --git a/src/toolbox/template-tools.ts b/src/toolbox/template-tools.ts index b823d4b9..b197ed54 100644 --- a/src/toolbox/template-tools.ts +++ b/src/toolbox/template-tools.ts @@ -14,7 +14,7 @@ function buildGenerate(toolbox: GluegunToolbox): (opts: Options) => Promise { - const ejs = require('ejs') + const ejs = await import('ejs') // required const template = opts.template diff --git a/tsconfig.json b/tsconfig.json index 4ba2549a..8ca3d385 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,7 @@ "allowSyntheticDefaultImports": true, "experimentalDecorators": true, "lib": ["es2016", "es2016.array.include", "scripthost"], - "module": "commonjs", + "module": "ESNext", "moduleResolution": "node", "noImplicitAny": false, "noImplicitThis": true, @@ -14,7 +14,7 @@ "declaration": true, "declarationDir": "build/types", "strict": false, - "target": "ES6", + "target": "ESNext", "pretty": true, "skipLibCheck": true }, diff --git a/yarn.lock b/yarn.lock index 47b8adda..26f01872 100644 --- a/yarn.lock +++ b/yarn.lock @@ -497,6 +497,16 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" +"@esbuild/android-arm@0.15.10": + version "0.15.10" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.10.tgz#a5f9432eb221afc243c321058ef25fe899886892" + integrity sha512-FNONeQPy/ox+5NBkcSbYJxoXj9GWu8gVGJTVmUyoOCKQFDTrHVKgNSzChdNt0I8Aj/iKcsDf2r9BFwv+FSNUXg== + +"@esbuild/linux-loong64@0.15.10": + version "0.15.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.10.tgz#78a42897c2cf8db9fd5f1811f7590393b77774c7" + integrity sha512-w0Ou3Z83LOYEkwaui2M8VwIp+nLi/NA60lBLMvaJ+vXVMcsARYdEzLNE7RSm4+lSg4zq4d7fAVuzk7PNQ5JFgg== + "@eslint/eslintrc@^1.3.2": version "1.3.2" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.2.tgz#58b69582f3b7271d8fa67fe5251767a5b38ea356" @@ -2639,6 +2649,142 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" +esbuild-android-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.10.tgz#8a59a84acbf2eca96996cadc35642cf055c494f0" + integrity sha512-UI7krF8OYO1N7JYTgLT9ML5j4+45ra3amLZKx7LO3lmLt1Ibn8t3aZbX5Pu4BjWiqDuJ3m/hsvhPhK/5Y/YpnA== + +esbuild-android-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.10.tgz#f453851dc1d8c5409a38cf7613a33852faf4915d" + integrity sha512-EOt55D6xBk5O05AK8brXUbZmoFj4chM8u3riGflLa6ziEoVvNjRdD7Cnp82NHQGfSHgYR06XsPI8/sMuA/cUwg== + +esbuild-darwin-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.10.tgz#778bd29c8186ff47b176c8af58c08cf0fb8e6b86" + integrity sha512-hbDJugTicqIm+WKZgp208d7FcXcaK8j2c0l+fqSJ3d2AzQAfjEYDRM3Z2oMeqSJ9uFxyj/muSACLdix7oTstRA== + +esbuild-darwin-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.10.tgz#b30bbefb46dc3c5d4708b0435e52f6456578d6df" + integrity sha512-M1t5+Kj4IgSbYmunf2BB6EKLkWUq+XlqaFRiGOk8bmBapu9bCDrxjf4kUnWn59Dka3I27EiuHBKd1rSO4osLFQ== + +esbuild-freebsd-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.10.tgz#ab301c5f6ded5110dbdd611140bef1a7c2e99236" + integrity sha512-KMBFMa7C8oc97nqDdoZwtDBX7gfpolkk6Bcmj6YFMrtCMVgoU/x2DI1p74DmYl7CSS6Ppa3xgemrLrr5IjIn0w== + +esbuild-freebsd-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.10.tgz#a5b09b867a6ff49110f52343b6f12265db63d43f" + integrity sha512-m2KNbuCX13yQqLlbSojFMHpewbn8wW5uDS6DxRpmaZKzyq8Dbsku6hHvh2U+BcLwWY4mpgXzFUoENEf7IcioGg== + +esbuild-linux-32@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.10.tgz#5282fe9915641caf9c8070e4ba2c3e16d358f837" + integrity sha512-guXrwSYFAvNkuQ39FNeV4sNkNms1bLlA5vF1H0cazZBOLdLFIny6BhT+TUbK/hdByMQhtWQ5jI9VAmPKbVPu1w== + +esbuild-linux-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.10.tgz#f3726e85a00149580cb19f8abfabcbb96f5d52bb" + integrity sha512-jd8XfaSJeucMpD63YNMO1JCrdJhckHWcMv6O233bL4l6ogQKQOxBYSRP/XLWP+6kVTu0obXovuckJDcA0DKtQA== + +esbuild-linux-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.10.tgz#2f0056e9d5286edb0185b56655caa8c574d8dbe7" + integrity sha512-GByBi4fgkvZFTHFDYNftu1DQ1GzR23jws0oWyCfhnI7eMOe+wgwWrc78dbNk709Ivdr/evefm2PJiUBMiusS1A== + +esbuild-linux-arm@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.10.tgz#40a9270da3c8ffa32cf72e24a79883e323dff08d" + integrity sha512-6N8vThLL/Lysy9y4Ex8XoLQAlbZKUyExCWyayGi2KgTBelKpPgj6RZnUaKri0dHNPGgReJriKVU6+KDGQwn10A== + +esbuild-linux-mips64le@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.10.tgz#90ce1c4ee0202edb4ac69807dea77f7e5804abc4" + integrity sha512-BxP+LbaGVGIdQNJUNF7qpYjEGWb0YyHVSKqYKrn+pTwH/SiHUxFyJYSP3pqkku61olQiSBnSmWZ+YUpj78Tw7Q== + +esbuild-linux-ppc64le@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.10.tgz#782837ae7bd5b279178106c9dd801755a21fabdf" + integrity sha512-LoSQCd6498PmninNgqd/BR7z3Bsk/mabImBWuQ4wQgmQEeanzWd5BQU2aNi9mBURCLgyheuZS6Xhrw5luw3OkQ== + +esbuild-linux-riscv64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.10.tgz#d7420d806ece5174f24f4634303146f915ab4207" + integrity sha512-Lrl9Cr2YROvPV4wmZ1/g48httE8z/5SCiXIyebiB5N8VT7pX3t6meI7TQVHw/wQpqP/AF4SksDuFImPTM7Z32Q== + +esbuild-linux-s390x@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.10.tgz#21fdf0cb3494a7fb520a71934e4dffce67fe47be" + integrity sha512-ReP+6q3eLVVP2lpRrvl5EodKX7EZ1bS1/z5j6hsluAlZP5aHhk6ghT6Cq3IANvvDdscMMCB4QEbI+AjtvoOFpA== + +esbuild-netbsd-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.10.tgz#6c06b3107e3df53de381e6299184d4597db0440f" + integrity sha512-iGDYtJCMCqldMskQ4eIV+QSS/CuT7xyy9i2/FjpKvxAuCzrESZXiA1L64YNj6/afuzfBe9i8m/uDkFHy257hTw== + +esbuild-node-externals@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/esbuild-node-externals/-/esbuild-node-externals-1.5.0.tgz#56674e3d102efeb704e931574b1866cf1f79c7b8" + integrity sha512-9394Ne2t2Z243BWeNBRkXEYVMOVbQuzp7XSkASZTOQs0GSXDuno5aH5OmzEXc6GMuln5zJjpkZpgwUPW0uRKgw== + dependencies: + find-up "5.0.0" + tslib "2.3.1" + +esbuild-openbsd-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.10.tgz#4daef5f5d8e74bbda53b65160029445d582570cf" + integrity sha512-ftMMIwHWrnrYnvuJQRJs/Smlcb28F9ICGde/P3FUTCgDDM0N7WA0o9uOR38f5Xe2/OhNCgkjNeb7QeaE3cyWkQ== + +esbuild-sunos-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.10.tgz#5fe7bef267a02f322fd249a8214d0274937388a7" + integrity sha512-mf7hBL9Uo2gcy2r3rUFMjVpTaGpFJJE5QTDDqUFf1632FxteYANffDZmKbqX0PfeQ2XjUDE604IcE7OJeoHiyg== + +esbuild-windows-32@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.10.tgz#48e3dde25ab0135579a288b30ab6ddef6d1f0b28" + integrity sha512-ttFVo+Cg8b5+qHmZHbEc8Vl17kCleHhLzgT8X04y8zudEApo0PxPg9Mz8Z2cKH1bCYlve1XL8LkyXGFjtUYeGg== + +esbuild-windows-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.10.tgz#387a9515bef3fee502d277a5d0a2db49a4ecda05" + integrity sha512-2H0gdsyHi5x+8lbng3hLbxDWR7mKHWh5BXZGKVG830KUmXOOWFE2YKJ4tHRkejRduOGDrBvHBriYsGtmTv3ntA== + +esbuild-windows-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.10.tgz#5a6fcf2fa49e895949bf5495cf088ab1b43ae879" + integrity sha512-S+th4F+F8VLsHLR0zrUcG+Et4hx0RKgK1eyHc08kztmLOES8BWwMiaGdoW9hiXuzznXQ0I/Fg904MNbr11Nktw== + +esbuild@^0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.10.tgz#85c2f8446e9b1fe04fae68daceacba033eedbd42" + integrity sha512-N7wBhfJ/E5fzn/SpNgX+oW2RLRjwaL8Y0ezqNqhjD6w0H2p0rDuEz2FKZqpqLnO8DCaWumKe8dsC/ljvVSSxng== + optionalDependencies: + "@esbuild/android-arm" "0.15.10" + "@esbuild/linux-loong64" "0.15.10" + esbuild-android-64 "0.15.10" + esbuild-android-arm64 "0.15.10" + esbuild-darwin-64 "0.15.10" + esbuild-darwin-arm64 "0.15.10" + esbuild-freebsd-64 "0.15.10" + esbuild-freebsd-arm64 "0.15.10" + esbuild-linux-32 "0.15.10" + esbuild-linux-64 "0.15.10" + esbuild-linux-arm "0.15.10" + esbuild-linux-arm64 "0.15.10" + esbuild-linux-mips64le "0.15.10" + esbuild-linux-ppc64le "0.15.10" + esbuild-linux-riscv64 "0.15.10" + esbuild-linux-s390x "0.15.10" + esbuild-netbsd-64 "0.15.10" + esbuild-openbsd-64 "0.15.10" + esbuild-sunos-64 "0.15.10" + esbuild-windows-32 "0.15.10" + esbuild-windows-64 "0.15.10" + esbuild-windows-arm64 "0.15.10" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" @@ -3017,6 +3163,14 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" +find-up@5.0.0, find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + find-up@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -3032,14 +3186,6 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - find-versions@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965" @@ -3228,6 +3374,11 @@ globals@^13.15.0: dependencies: type-fest "^0.20.2" +globalyzer@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465" + integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q== + globby@^11.0.0, globby@^11.0.1, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" @@ -3251,6 +3402,11 @@ globby@^13.1.1: merge2 "^1.4.1" slash "^4.0.0" +globrex@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098" + integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg== + graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: version "4.2.9" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" @@ -6535,6 +6691,14 @@ through@2, "through@>=2.2.7 <3", through@^2.3.8: resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= +tiny-glob@^0.2.9: + version "0.2.9" + resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2" + integrity sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg== + dependencies: + globalyzer "0.1.0" + globrex "^0.1.2" + tiny-relative-date@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07" @@ -6625,16 +6789,16 @@ tsconfig-paths@^3.14.1: minimist "^1.2.6" strip-bom "^3.0.0" +tslib@2.3.1, tslib@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== + tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.1.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== - tsutils@^3.21.0: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"