diff --git a/.eslintrc.json b/.eslintrc.json index 6de967e..0b52ae1 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -11,12 +11,15 @@ "extends": ["plugin:@mufan/javascript"], "overrides": [ { - "files": "**/*.{js,jsx}" + "files": "**/*.{js,cjs}", + "parserOptions": { + "sourceType": "script" + } }, { - "files": "**/*.cjs", + "files": "**/*.mjs", "parserOptions": { - "sourceType": "script" + "sourceType": "module" } } ] diff --git a/.prettierignore b/.prettierignore index 29b6f33..5d862c3 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,4 @@ +# Magicspace boilerplate.schema.json # TypeScript Build Artifacts bld/ diff --git a/.vscode/settings.json b/.vscode/settings.json index 8c229e0..3419237 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,6 +10,8 @@ "files.eol": "\n", "files.insertFinalNewline": true, "files.trimTrailingWhitespace": true, + "typescript.preferences.importModuleSpecifier": "project-relative", + "typescript.preferences.importModuleSpecifierEnding": "js", "typescript.tsdk": "node_modules/typescript/lib", "eslint.workingDirectories": [ ".", diff --git a/general/src/composables/LICENSE.ts b/general/src/composables/LICENSE.ts index 9c0e6a0..ef17907 100644 --- a/general/src/composables/LICENSE.ts +++ b/general/src/composables/LICENSE.ts @@ -5,7 +5,7 @@ import {composable, handlebars} from '@magicspace/core'; import type {ResolvedOptions} from '../library/index.js'; -import {LICENSE_TEMPLATES_DIR} from './@constants'; +import {LICENSE_TEMPLATES_DIR} from './@constants.js'; export default composable(({license, author}) => { if (!license) { diff --git a/general/src/composables/README.md.ts b/general/src/composables/README.md.ts index e656235..a3438d3 100644 --- a/general/src/composables/README.md.ts +++ b/general/src/composables/README.md.ts @@ -8,7 +8,7 @@ import type { ResolvedOptions, } from '../library/index.js'; -import {TEMPLATES_DIR} from './@constants'; +import {TEMPLATES_DIR} from './@constants.js'; const TEMPLATE_PATH = Path.join(TEMPLATES_DIR, 'README.md.hbs'); diff --git a/general/src/composables/prettierignore.ts b/general/src/composables/prettierignore.ts index 04d6bec..6ffa245 100644 --- a/general/src/composables/prettierignore.ts +++ b/general/src/composables/prettierignore.ts @@ -14,13 +14,6 @@ const BOILERPLATE_SCHEMA_FILE_NAME = 'boilerplate.schema.json'; export default composable( async ({packageManager, magicspaceDir}) => { - const packageManagerIgnoreEntries = - PACKAGE_MANAGER_IGNORE_ENTRIES_DICT[packageManager]; - - if (!packageManagerIgnoreEntries) { - return undefined; - } - const boilerplateSchemaExists = await FS.stat( Path.join(magicspaceDir, BOILERPLATE_SCHEMA_FILE_NAME), ).then( @@ -28,6 +21,13 @@ export default composable( () => false, ); + const packageManagerIgnoreEntries = + PACKAGE_MANAGER_IGNORE_ENTRIES_DICT[packageManager]; + + if (!boilerplateSchemaExists && !packageManagerIgnoreEntries) { + return; + } + return text('.prettierignore', content => { if (boilerplateSchemaExists) { content += `\ @@ -36,10 +36,12 @@ ${BOILERPLATE_SCHEMA_FILE_NAME} `; } - content += `\ + if (packageManagerIgnoreEntries) { + content += `\ # Package Manager ${packageManagerIgnoreEntries.join('\n')} `; + } return content; }); diff --git a/general/src/library/index.ts b/general/src/library/index.ts index b4e4e0d..df071aa 100644 --- a/general/src/library/index.ts +++ b/general/src/library/index.ts @@ -1,3 +1,3 @@ -export {default} from './boilerplate'; +export {default} from './boilerplate.js'; export * from './boilerplate.js'; export * from './examples.js'; diff --git a/package.json b/package.json index eaf8f5a..0704450 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "typescript": "^5.2.2" }, "devDependencies": { - "@mufan/eslint-plugin": "^0.2.1", + "@mufan/eslint-plugin": "^0.2.5", "@types/lodash": "^4.14.159", "@types/node": "^14.0.27", "eslint": "^8.51.0", diff --git a/typescript/src/composables/entrances.ts.ts b/typescript/src/composables/entrances.ts.ts index a83c624..239ca99 100644 --- a/typescript/src/composables/entrances.ts.ts +++ b/typescript/src/composables/entrances.ts.ts @@ -4,7 +4,7 @@ import {composable, handlebars} from '@magicspace/core'; import type {ResolvedOptions} from '../library/index.js'; -import {TEMPLATES_DIR} from './@constants'; +import {TEMPLATES_DIR} from './@constants.js'; const TEMPLATE_PATH = Path.join(TEMPLATES_DIR, '@entrances.ts.hbs'); diff --git a/typescript/src/composables/index.ts.ts b/typescript/src/composables/index.ts.ts index c31beb0..038c3ca 100644 --- a/typescript/src/composables/index.ts.ts +++ b/typescript/src/composables/index.ts.ts @@ -5,7 +5,7 @@ import _ from 'lodash'; import type {ResolvedOptions} from '../library/index.js'; -import {TEMPLATES_DIR} from './@constants'; +import {TEMPLATES_DIR} from './@constants.js'; const TEMPLATE_PATH = Path.join(TEMPLATES_DIR, 'index.ts.hbs'); diff --git a/typescript/src/library/@boilerplate.ts b/typescript/src/library/@boilerplate.ts index 0c3385e..271f9d3 100644 --- a/typescript/src/library/@boilerplate.ts +++ b/typescript/src/library/@boilerplate.ts @@ -4,15 +4,15 @@ import {boilerplate, composables} from '@magicspace/core'; import general from '../../../general/bld/library/index.js'; -import type {Options} from './options'; -import {resolveOptions} from './options'; +import type {Options} from './options.js'; +import {resolveOptions} from './options.js'; -export default boilerplate(async options => { +export default boilerplate(async (options, context) => { return { - extends: await general(options), + extends: await general(options, context), composables: await composables( Path.join(__dirname, '../composables'), - resolveOptions(options), + resolveOptions(options, context), ), }; }); diff --git a/typescript/src/library/options.ts b/typescript/src/library/options.ts index 29d401a..371d950 100644 --- a/typescript/src/library/options.ts +++ b/typescript/src/library/options.ts @@ -1,5 +1,6 @@ import * as Path from 'path'; +import type {BoilerplateBuilderContext} from '@magicspace/core'; import {x} from '@magicspace/core'; import _ from 'lodash'; import type {OmitValueOfKey} from 'tslang'; @@ -176,8 +177,11 @@ export type ResolvedOptions = Options & bldDirNames: string[]; }; -export function resolveOptions(options: Options): ResolvedOptions { - const resolvedOptions = resolveGeneralOptions(options); +export function resolveOptions( + options: Options, + context: BoilerplateBuilderContext, +): ResolvedOptions { + const resolvedOptions = resolveGeneralOptions(options, context); const projectOptionsArray = resolvedOptions.packages.flatMap( (packageOptions: ResolvedPackageOptions) => diff --git a/yarn.lock b/yarn.lock index 54c2579..bb31b8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,30 +7,18 @@ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== -"@eslint-community/eslint-utils@^4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz#a831e6e468b4b2b5ae42bf658bea015bf10bc518" - integrity sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ== - dependencies: - eslint-visitor-keys "^3.3.0" - -"@eslint-community/eslint-utils@^4.4.0": +"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== dependencies: eslint-visitor-keys "^3.3.0" -"@eslint-community/regexpp@^4.5.1": +"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1": version "4.9.1" resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.1.tgz#449dfa81a57a1d755b09aa58d826c1262e4283b4" integrity sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA== -"@eslint-community/regexpp@^4.6.1": - version "4.6.2" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8" - integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw== - "@eslint/eslintrc@^2.1.2": version "2.1.2" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.2.tgz#c6936b4b328c64496692f76944e755738be62396" @@ -114,10 +102,10 @@ tslang "^0.1.27" tslib "^2.6.2" -"@mufan/eslint-plugin@^0.2.1": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@mufan/eslint-plugin/-/eslint-plugin-0.2.1.tgz#1428e7b35108603919efd5467a577857d85cdc4a" - integrity sha512-Ku0QdISC0vrMfnWyT2B4QMj1fPygPq3Qg8i3Z6lnCGgBMBCNu4gAeL44swLlMwFwkjG4sVHsBnS975Kozix+ng== +"@mufan/eslint-plugin@^0.2.5": + version "0.2.5" + resolved "https://registry.yarnpkg.com/@mufan/eslint-plugin/-/eslint-plugin-0.2.5.tgz#26b6f72e0f115908b6d30bba4635eb23a6e2f98d" + integrity sha512-M5ctGm4OKNPZJWy0ZjelXyyGHGK3ElicASQnDSw6ePMbIzfj3A3IVjBviIiQya06h84qrwiR+00qqRxgmWa3TQ== dependencies: "@types/eslint" "^8.44.4" "@typescript-eslint/eslint-plugin" "^6.7.5" @@ -126,6 +114,7 @@ eslint-import-resolver-typescript "^3.6.1" eslint-plugin-import "^2.28.1" eslint-plugin-only-warn "^1.1.0" + module-lens "^0.1.6" tslib "^2.6.2" x-value "^0.1.16" @@ -674,47 +663,7 @@ enhanced-resolve@^5.12.0: graceful-fs "^4.2.4" tapable "^2.2.0" -es-abstract@^1.19.0, es-abstract@^1.20.4: - version "1.21.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff" - integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg== - dependencies: - array-buffer-byte-length "^1.0.0" - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-set-tostringtag "^2.0.1" - es-to-primitive "^1.2.1" - function.prototype.name "^1.1.5" - get-intrinsic "^1.2.0" - get-symbol-description "^1.0.0" - globalthis "^1.0.3" - gopd "^1.0.1" - has "^1.0.3" - has-property-descriptors "^1.0.0" - has-proto "^1.0.1" - has-symbols "^1.0.3" - internal-slot "^1.0.5" - is-array-buffer "^3.0.2" - is-callable "^1.2.7" - is-negative-zero "^2.0.2" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" - is-string "^1.0.7" - is-typed-array "^1.1.10" - is-weakref "^1.0.2" - object-inspect "^1.12.3" - object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.4.3" - safe-regex-test "^1.0.0" - string.prototype.trim "^1.2.7" - string.prototype.trimend "^1.0.6" - string.prototype.trimstart "^1.0.6" - typed-array-length "^1.0.4" - unbox-primitive "^1.0.2" - which-typed-array "^1.1.9" - -es-abstract@^1.22.1: +es-abstract@^1.20.4, es-abstract@^1.22.1: version "1.22.2" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.2.tgz#90f7282d91d0ad577f505e423e52d4c1d93c1b8a" integrity sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA== @@ -950,18 +899,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.2.12, fast-glob@^3.2.9: - version "3.2.12" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" - integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - -fast-glob@^3.3.1: +fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4" integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg== @@ -1058,16 +996,6 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== -function.prototype.name@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" - integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.0" - functions-have-names "^1.2.2" - function.prototype.name@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" @@ -1078,7 +1006,7 @@ function.prototype.name@^1.1.6: es-abstract "^1.22.1" functions-have-names "^1.2.3" -functions-have-names@^1.2.2, functions-have-names@^1.2.3: +functions-have-names@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== @@ -1292,12 +1220,7 @@ hyphenate@^0.2.1: resolved "https://registry.yarnpkg.com/hyphenate/-/hyphenate-0.2.5.tgz#57ac6637b2ce6ac7aa046350873693b0c36ea0cf" integrity sha512-mSY0+dVLWFq7iIUgiID3EWo5S8rLnZa595mcuWiN8di91n6eL+WS8HKmcpiZZIX7iElri0a/2hOYpwzldsY4gQ== -ignore@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" - integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== - -ignore@^5.2.4: +ignore@^5.2.0, ignore@^5.2.4: version "5.2.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== @@ -1368,14 +1291,7 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== -is-core-module@^2.11.0: - version "2.12.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4" - integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ== - dependencies: - has "^1.0.3" - -is-core-module@^2.13.0: +is-core-module@^2.11.0, is-core-module@^2.13.0: version "2.13.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db" integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ== @@ -1453,18 +1369,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.1" -is-typed-array@^1.1.10, is-typed-array@^1.1.9: - version "1.1.10" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" - integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.0" - -is-typed-array@^1.1.12: +is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9: version "1.1.12" resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== @@ -1873,15 +1778,6 @@ reflect-metadata@^0.1.10: resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== -regexp.prototype.flags@^1.4.3: - version "1.5.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" - integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - functions-have-names "^1.2.3" - regexp.prototype.flags@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e" @@ -1992,24 +1888,12 @@ safe-regex-test@^1.0.0: get-intrinsic "^1.1.3" is-regex "^1.1.4" -semver@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^6.3.1: +semver@^6.2.0, semver@^6.3.1: version "6.3.1" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.5.0: - version "7.5.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec" - integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw== - dependencies: - lru-cache "^6.0.0" - -semver@^7.5.4: +semver@^7.5.0, semver@^7.5.4: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== @@ -2097,15 +1981,6 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -string.prototype.trim@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" - integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - string.prototype.trim@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd" @@ -2115,15 +1990,6 @@ string.prototype.trim@^1.2.8: define-properties "^1.2.0" es-abstract "^1.22.1" -string.prototype.trimend@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" - integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - string.prototype.trimend@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e" @@ -2133,15 +1999,6 @@ string.prototype.trimend@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" -string.prototype.trimstart@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" - integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - string.prototype.trimstart@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298" @@ -2394,18 +2251,6 @@ which-typed-array@^1.1.11: gopd "^1.0.1" has-tostringtag "^1.0.0" -which-typed-array@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" - integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.0" - is-typed-array "^1.1.10" - which@^1.2.10: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -2448,7 +2293,7 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -x-value@^0.1.16: +x-value@^0.1.16, x-value@^0.1.8: version "0.1.16" resolved "https://registry.yarnpkg.com/x-value/-/x-value-0.1.16.tgz#5b62a6a61110c6d1cdc5a359527d2c3caceb620a" integrity sha512-Nza2hOUBMyprjK+MbiIq0xMtneYEcIeivOg9XodWXOfpSow6C2EKlTdLNFiWetPsoqssPHksapVP7aBEjFJ5VA== @@ -2456,14 +2301,6 @@ x-value@^0.1.16: lodash.isequal "^4.5.0" tslib "^2.6.1" -x-value@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/x-value/-/x-value-0.1.8.tgz#aed6c128abd916f7ccde0d5b05f48a6942e7b78b" - integrity sha512-rHJUlrs+eexg34BOIezX22fLWdJkm9e7yUyZ1TCUOAF2EhetSmhScHaIVANBq9phe6q+1P9K+KB5lB+xQmqSAw== - dependencies: - lodash.isequal "^4.5.0" - tslib "^2.5.0" - yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"