diff --git a/app/assets/javascripts/admin/jsconfig.json b/app/assets/javascripts/admin/jsconfig.json deleted file mode 100644 index 990839f3fe9..00000000000 --- a/app/assets/javascripts/admin/jsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../../../jsconfig.base.json", - "compilerOptions": { - "baseUrl": ".", - "paths": { - "admin/*": ["./addon/*"], - "discourse/*": ["../discourse/app/*"], - "discourse/tests/*": ["../discourse/tests/*"], - "discourse-common/*": ["../discourse-common/addon/*"], - "pretty-text/*": ["../pretty-text/addon/*"], - } - }, -} diff --git a/app/assets/javascripts/admin/package.json b/app/assets/javascripts/admin/package.json index 2959935d6ef..c2aff968516 100644 --- a/app/assets/javascripts/admin/package.json +++ b/app/assets/javascripts/admin/package.json @@ -26,6 +26,27 @@ "@ember/string": "^3.1.1", "@embroider/test-setup": "^3.0.2", "@glimmer/component": "^1.1.2", + "@types/ember": "^4.0.6", + "@types/ember__application": "^4.0.8", + "@types/ember__array": "^4.0.6", + "@types/ember__component": "^4.0.18", + "@types/ember__controller": "^4.0.8", + "@types/ember__debug": "^4.0.5", + "@types/ember__destroyable": "^4.0.2", + "@types/ember__engine": "^4.0.7", + "@types/ember__error": "^4.0.3", + "@types/ember__object": "^4.0.8", + "@types/ember__polyfills": "^4.0.3", + "@types/ember__routing": "^4.0.16", + "@types/ember__runloop": "^4.0.6", + "@types/ember__service": "^4.0.5", + "@types/ember__string": "^3.0.11", + "@types/ember__template": "^4.0.3", + "@types/ember__test": "^4.0.3", + "@types/ember__utils": "^4.0.4", + "@types/jquery": "^3.5.22", + "@types/qunit": "^2.19.6", + "@types/rsvp": "^4.0.5", "broccoli-asset-rev": "^3.0.0", "ember-cli": "~5.0.0", "ember-cli-inject-live-reload": "^2.1.0", diff --git a/app/assets/javascripts/dialog-holder/package.json b/app/assets/javascripts/dialog-holder/package.json index 739cd5f9b95..ce7a3b7bd55 100644 --- a/app/assets/javascripts/dialog-holder/package.json +++ b/app/assets/javascripts/dialog-holder/package.json @@ -14,6 +14,27 @@ "ember-cli-htmlbars": "^6.3.0" }, "devDependencies": { + "@types/ember": "^4.0.6", + "@types/ember__application": "^4.0.8", + "@types/ember__array": "^4.0.6", + "@types/ember__component": "^4.0.18", + "@types/ember__controller": "^4.0.8", + "@types/ember__debug": "^4.0.5", + "@types/ember__destroyable": "^4.0.2", + "@types/ember__engine": "^4.0.7", + "@types/ember__error": "^4.0.3", + "@types/ember__object": "^4.0.8", + "@types/ember__polyfills": "^4.0.3", + "@types/ember__routing": "^4.0.16", + "@types/ember__runloop": "^4.0.6", + "@types/ember__service": "^4.0.5", + "@types/ember__string": "^3.0.11", + "@types/ember__template": "^4.0.3", + "@types/ember__test": "^4.0.3", + "@types/ember__utils": "^4.0.4", + "@types/jquery": "^3.5.22", + "@types/qunit": "^2.19.6", + "@types/rsvp": "^4.0.5", "webpack": "^5.89.0" }, "engines": { diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json index c9622e170b0..69a0d4eb7d4 100644 --- a/app/assets/javascripts/discourse-common/package.json +++ b/app/assets/javascripts/discourse-common/package.json @@ -33,6 +33,27 @@ "@ember/optional-features": "^2.0.0", "@embroider/test-setup": "^3.0.2", "@glimmer/component": "^1.1.2", + "@types/ember": "^4.0.6", + "@types/ember__application": "^4.0.8", + "@types/ember__array": "^4.0.6", + "@types/ember__component": "^4.0.18", + "@types/ember__controller": "^4.0.8", + "@types/ember__debug": "^4.0.5", + "@types/ember__destroyable": "^4.0.2", + "@types/ember__engine": "^4.0.7", + "@types/ember__error": "^4.0.3", + "@types/ember__object": "^4.0.8", + "@types/ember__polyfills": "^4.0.3", + "@types/ember__routing": "^4.0.16", + "@types/ember__runloop": "^4.0.6", + "@types/ember__service": "^4.0.5", + "@types/ember__string": "^3.0.11", + "@types/ember__template": "^4.0.3", + "@types/ember__test": "^4.0.3", + "@types/ember__utils": "^4.0.4", + "@types/jquery": "^3.5.22", + "@types/qunit": "^2.19.6", + "@types/rsvp": "^4.0.5", "broccoli-asset-rev": "^3.0.0", "ember-cli": "~5.0.0", "ember-cli-inject-live-reload": "^2.1.0", diff --git a/app/assets/javascripts/discourse-widget-hbs/jsconfig.json b/app/assets/javascripts/discourse-widget-hbs/jsconfig.json deleted file mode 100644 index 984b8c55f56..00000000000 --- a/app/assets/javascripts/discourse-widget-hbs/jsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../../../jsconfig.base.json", - "compilerOptions": { - "baseUrl": ".", - "paths": { - "discourse-widget-hbs/*": ["./addon/*"], - "discourse/*": ["../discourse/app/*"], - "discourse/tests/*": ["../discourse/tests/*"], - "discourse-common/*": ["../discourse-common/addon/*"] - } - }, -} diff --git a/app/assets/javascripts/discourse/jsconfig.json b/app/assets/javascripts/discourse/jsconfig.json deleted file mode 100644 index 5c4de90906e..00000000000 --- a/app/assets/javascripts/discourse/jsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../../../jsconfig.base.json", - "compilerOptions": { - "baseUrl": ".", - "paths": { - "discourse/*": ["./app/*"], - "discourse/tests/*": ["./tests/*"], - "discourse-common/*": ["../discourse-common/addon/*"], - "pretty-text/*": ["../pretty-text/addon/*"], - "select-kit/*": ["../select-kit/addon/*"], - "wizard/*": ["../wizard/addon/*"], - } - }, -} diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index fb90f0aa97d..79f6bae269e 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -45,6 +45,28 @@ "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "@popperjs/core": "^2.11.8", + "@types/ember": "^4.0.6", + "@types/ember-resolver": "^9.0.0", + "@types/ember__application": "^4.0.8", + "@types/ember__array": "^4.0.6", + "@types/ember__component": "^4.0.18", + "@types/ember__controller": "^4.0.8", + "@types/ember__debug": "^4.0.5", + "@types/ember__destroyable": "^4.0.2", + "@types/ember__engine": "^4.0.7", + "@types/ember__error": "^4.0.3", + "@types/ember__object": "^4.0.8", + "@types/ember__polyfills": "^4.0.3", + "@types/ember__routing": "^4.0.16", + "@types/ember__runloop": "^4.0.6", + "@types/ember__service": "^4.0.5", + "@types/ember__string": "^3.0.11", + "@types/ember__template": "^4.0.3", + "@types/ember__test": "^4.0.3", + "@types/ember__utils": "^4.0.4", + "@types/jquery": "^3.5.22", + "@types/qunit": "^2.19.6", + "@types/rsvp": "^4.0.5", "@uppy/aws-s3": "3.0.6", "@uppy/aws-s3-multipart": "3.1.3", "@uppy/core": "3.0.4", diff --git a/app/assets/javascripts/float-kit/jsconfig.json b/app/assets/javascripts/float-kit/jsconfig.json deleted file mode 100644 index 9f224112d4b..00000000000 --- a/app/assets/javascripts/float-kit/jsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../../../jsconfig.base.json", - "compilerOptions": { - "baseUrl": ".", - "paths": { - "float-kit/*": ["./addon/*"], - "discourse/*": ["../discourse/app/*"], - "discourse/tests/*": ["../discourse/tests/*"], - "discourse-common/*": ["../discourse-common/addon/*"], - } - }, -} diff --git a/app/assets/javascripts/float-kit/package.json b/app/assets/javascripts/float-kit/package.json index c723f3af676..3759d1e9ffd 100644 --- a/app/assets/javascripts/float-kit/package.json +++ b/app/assets/javascripts/float-kit/package.json @@ -25,6 +25,27 @@ "@ember/string": "^3.1.1", "@embroider/test-setup": "^3.0.2", "@glimmer/component": "^1.1.2", + "@types/ember": "^4.0.6", + "@types/ember__application": "^4.0.8", + "@types/ember__array": "^4.0.6", + "@types/ember__component": "^4.0.18", + "@types/ember__controller": "^4.0.8", + "@types/ember__debug": "^4.0.5", + "@types/ember__destroyable": "^4.0.2", + "@types/ember__engine": "^4.0.7", + "@types/ember__error": "^4.0.3", + "@types/ember__object": "^4.0.8", + "@types/ember__polyfills": "^4.0.3", + "@types/ember__routing": "^4.0.16", + "@types/ember__runloop": "^4.0.6", + "@types/ember__service": "^4.0.5", + "@types/ember__string": "^3.0.11", + "@types/ember__template": "^4.0.3", + "@types/ember__test": "^4.0.3", + "@types/ember__utils": "^4.0.4", + "@types/jquery": "^3.5.22", + "@types/qunit": "^2.19.6", + "@types/rsvp": "^4.0.5", "broccoli-asset-rev": "^3.0.0", "ember-cli": "~5.0.0", "ember-cli-inject-live-reload": "^2.1.0", diff --git a/app/assets/javascripts/pretty-text/jsconfig.json b/app/assets/javascripts/pretty-text/jsconfig.json deleted file mode 100644 index 63aedc69284..00000000000 --- a/app/assets/javascripts/pretty-text/jsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../../../jsconfig.base.json", - "compilerOptions": { - "baseUrl": ".", - "paths": { - "pretty-text/*": ["./addon/*"], - "discourse/*": ["../discourse/app/*"], - "discourse/tests/*": ["../discourse/tests/*"], - "discourse-common/*": ["../discourse-common/addon/*"] - } - }, -} diff --git a/app/assets/javascripts/pretty-text/package.json b/app/assets/javascripts/pretty-text/package.json index c7cc500f85c..5e4b3734509 100644 --- a/app/assets/javascripts/pretty-text/package.json +++ b/app/assets/javascripts/pretty-text/package.json @@ -25,6 +25,27 @@ "@ember/string": "^3.1.1", "@embroider/test-setup": "^3.0.2", "@glimmer/component": "^1.1.2", + "@types/ember": "^4.0.6", + "@types/ember__application": "^4.0.8", + "@types/ember__array": "^4.0.6", + "@types/ember__component": "^4.0.18", + "@types/ember__controller": "^4.0.8", + "@types/ember__debug": "^4.0.5", + "@types/ember__destroyable": "^4.0.2", + "@types/ember__engine": "^4.0.7", + "@types/ember__error": "^4.0.3", + "@types/ember__object": "^4.0.8", + "@types/ember__polyfills": "^4.0.3", + "@types/ember__routing": "^4.0.16", + "@types/ember__runloop": "^4.0.6", + "@types/ember__service": "^4.0.5", + "@types/ember__string": "^3.0.11", + "@types/ember__template": "^4.0.3", + "@types/ember__test": "^4.0.3", + "@types/ember__utils": "^4.0.4", + "@types/jquery": "^3.5.22", + "@types/qunit": "^2.19.6", + "@types/rsvp": "^4.0.5", "broccoli-asset-rev": "^3.0.0", "ember-cli": "~5.0.0", "ember-cli-inject-live-reload": "^2.1.0", diff --git a/app/assets/javascripts/select-kit/jsconfig.json b/app/assets/javascripts/select-kit/jsconfig.json deleted file mode 100644 index 93aa23e58d4..00000000000 --- a/app/assets/javascripts/select-kit/jsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../../../jsconfig.base.json", - "compilerOptions": { - "baseUrl": ".", - "paths": { - "select-kit/*": ["./addon/*"], - "discourse/*": ["../discourse/app/*"], - "discourse/tests/*": ["../discourse/tests/*"], - "discourse-common/*": ["../discourse-common/addon/*"], - } - }, -} diff --git a/app/assets/javascripts/select-kit/package.json b/app/assets/javascripts/select-kit/package.json index b5e2480a7aa..9b9a32e5151 100644 --- a/app/assets/javascripts/select-kit/package.json +++ b/app/assets/javascripts/select-kit/package.json @@ -24,6 +24,27 @@ "@ember/string": "^3.1.1", "@embroider/test-setup": "^3.0.2", "@glimmer/component": "^1.1.2", + "@types/ember": "^4.0.6", + "@types/ember__application": "^4.0.8", + "@types/ember__array": "^4.0.6", + "@types/ember__component": "^4.0.18", + "@types/ember__controller": "^4.0.8", + "@types/ember__debug": "^4.0.5", + "@types/ember__destroyable": "^4.0.2", + "@types/ember__engine": "^4.0.7", + "@types/ember__error": "^4.0.3", + "@types/ember__object": "^4.0.8", + "@types/ember__polyfills": "^4.0.3", + "@types/ember__routing": "^4.0.16", + "@types/ember__runloop": "^4.0.6", + "@types/ember__service": "^4.0.5", + "@types/ember__string": "^3.0.11", + "@types/ember__template": "^4.0.3", + "@types/ember__test": "^4.0.3", + "@types/ember__utils": "^4.0.4", + "@types/jquery": "^3.5.22", + "@types/qunit": "^2.19.6", + "@types/rsvp": "^4.0.5", "broccoli-asset-rev": "^3.0.0", "ember-cli": "~5.0.0", "ember-cli-inject-live-reload": "^2.1.0", diff --git a/app/assets/javascripts/truth-helpers/package.json b/app/assets/javascripts/truth-helpers/package.json index 87a9134299f..9e8677a05f3 100644 --- a/app/assets/javascripts/truth-helpers/package.json +++ b/app/assets/javascripts/truth-helpers/package.json @@ -24,6 +24,7 @@ "@ember/string": "^3.1.1", "@embroider/test-setup": "^3.0.2", "@glimmer/component": "^1.1.2", + "@types/ember": "^4.0.6", "broccoli-asset-rev": "^3.0.0", "ember-cli": "~5.0.0", "ember-cli-inject-live-reload": "^2.1.0", diff --git a/app/assets/javascripts/wizard/jsconfig.json b/app/assets/javascripts/wizard/jsconfig.json deleted file mode 100644 index bc4cb2b2f78..00000000000 --- a/app/assets/javascripts/wizard/jsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../../../jsconfig.base.json", - "compilerOptions": { - "baseUrl": ".", - "paths": { - "wizard/*": ["./addon/*"], - "discourse/*": ["../discourse/app/*"], - "discourse/tests/*": ["../discourse/tests/*"], - "discourse-common/*": ["../discourse-common/addon/*"], - } - }, -} diff --git a/app/assets/javascripts/wizard/package.json b/app/assets/javascripts/wizard/package.json index d2dcb385b59..be389702801 100644 --- a/app/assets/javascripts/wizard/package.json +++ b/app/assets/javascripts/wizard/package.json @@ -24,6 +24,27 @@ "@ember/string": "^3.1.1", "@embroider/test-setup": "^3.0.2", "@glimmer/component": "^1.1.2", + "@types/ember": "^4.0.6", + "@types/ember__application": "^4.0.8", + "@types/ember__array": "^4.0.6", + "@types/ember__component": "^4.0.18", + "@types/ember__controller": "^4.0.8", + "@types/ember__debug": "^4.0.5", + "@types/ember__destroyable": "^4.0.2", + "@types/ember__engine": "^4.0.7", + "@types/ember__error": "^4.0.3", + "@types/ember__object": "^4.0.8", + "@types/ember__polyfills": "^4.0.3", + "@types/ember__routing": "^4.0.16", + "@types/ember__runloop": "^4.0.6", + "@types/ember__service": "^4.0.5", + "@types/ember__string": "^3.0.11", + "@types/ember__template": "^4.0.3", + "@types/ember__test": "^4.0.3", + "@types/ember__utils": "^4.0.4", + "@types/jquery": "^3.5.22", + "@types/qunit": "^2.19.6", + "@types/rsvp": "^4.0.5", "broccoli-asset-rev": "^3.0.0", "ember-cli": "~5.0.0", "ember-cli-inject-live-reload": "^2.1.0", diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock index 38c31565d4b..e34dbfbee6d 100644 --- a/app/assets/javascripts/yarn.lock +++ b/app/assets/javascripts/yarn.lock @@ -1432,7 +1432,7 @@ resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.4.tgz#19654d1026cc410975d46445180e70a5089b3e7d" integrity sha512-qprfWkn82Iw821mcKofJ5Pk9wgioHicxcQMxx+5zt5GSKoqdWvgG5AxVmpmUUjzTLPVSH5auBrhI93Deayn/DA== -"@glimmer/component@^1.1.2": +"@glimmer/component@^1.1.0", "@glimmer/component@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.1.2.tgz#892ec0c9f0b6b3e41c112be502fde073cf24d17c" integrity sha512-XyAsEEa4kWOPy+gIdMjJ8XlzA3qrGH55ZDv6nA16ibalCR17k74BI0CztxuRds+Rm6CtbUVgheCVlcCULuqD7A== @@ -1712,6 +1712,170 @@ dependencies: "@types/node" "*" +"@types/ember-resolver@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@types/ember-resolver/-/ember-resolver-9.0.0.tgz#dd54791af74a692b7ee33d808a572d5c96582b7e" + integrity sha512-lEuC2QD8K6rRAbELMejrALFBgelRPt6OQtapny4Oke07ZtK/Lbf9zn5KIDl7PNkirxMD0AStsQTdUqFu6eVbVw== + dependencies: + ember-resolver "*" + +"@types/ember@*", "@types/ember@^4.0.6": + version "4.0.7" + resolved "https://registry.yarnpkg.com/@types/ember/-/ember-4.0.7.tgz#46e1b575d087eed223f36f11360209b0e8d0948e" + integrity sha512-TVarF9iFM2qBBaLPEEfbhhoIeI6ews/02tZx/DzL08qvjG5P/buGuFzoSc7fXB1ibb3RIY9NHpB7SHwL5uwA2A== + dependencies: + "@types/ember__application" "*" + "@types/ember__array" "*" + "@types/ember__component" "*" + "@types/ember__controller" "*" + "@types/ember__debug" "*" + "@types/ember__engine" "*" + "@types/ember__error" "*" + "@types/ember__object" "*" + "@types/ember__polyfills" "*" + "@types/ember__routing" "*" + "@types/ember__runloop" "*" + "@types/ember__service" "*" + "@types/ember__string" "*" + "@types/ember__template" "*" + "@types/ember__test" "*" + "@types/ember__utils" "*" + "@types/rsvp" "*" + +"@types/ember__application@*", "@types/ember__application@^4.0.8": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@types/ember__application/-/ember__application-4.0.8.tgz#e51a4a5a57cb9ffb46d660f73d6975a52f91e672" + integrity sha512-ruOQCPO4NrGsraja52wbu0lX/oXQxPvUc6pNr7v/5Lix6UdV3jkP9RW3HwWljMEj48gcCvIwuTt0HfIha4T0GQ== + dependencies: + "@glimmer/component" "^1.1.0" + "@types/ember" "*" + "@types/ember__application" "*" + "@types/ember__engine" "*" + "@types/ember__object" "*" + "@types/ember__owner" "*" + "@types/ember__routing" "*" + +"@types/ember__array@*", "@types/ember__array@^4.0.6": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@types/ember__array/-/ember__array-4.0.6.tgz#a16020e6754be79f2be4e7c36fac0c718ffbe22b" + integrity sha512-17tuhICdjh3UoGBKO7We3J58iXuhFuDIRPVNY9GpvayOMGiVkBOMLpaLpu3FpRppJ3qu0UkpwA06uHmcGoBT5g== + dependencies: + "@types/ember" "*" + "@types/ember__array" "*" + "@types/ember__object" "*" + +"@types/ember__component@*", "@types/ember__component@^4.0.18": + version "4.0.18" + resolved "https://registry.yarnpkg.com/@types/ember__component/-/ember__component-4.0.18.tgz#6ab61dcc2d67f72ea1d80cf0aaef3ea8953e6653" + integrity sha512-TUTSNL4HLYazBFxc2g/C9GUn4/0akKFfB8IRqjGHyyByKiaNbnf992Dxu6Zfl62QtuhLEHzpfppLGuQLwY448w== + dependencies: + "@types/ember" "*" + "@types/ember__component" "*" + "@types/ember__object" "*" + +"@types/ember__controller@*", "@types/ember__controller@^4.0.8": + version "4.0.9" + resolved "https://registry.yarnpkg.com/@types/ember__controller/-/ember__controller-4.0.9.tgz#6a2c02b5b6ca564788ced54d15bc50ce310e919f" + integrity sha512-qR52qCWjhdM9Le0UqQbJp0e8ItKLFZlaMq4WR3CE2D5ezwipmwz13vyVYBbQPGvC3BO+/vh6tqtYjZtXgQdyUg== + dependencies: + "@types/ember__object" "*" + +"@types/ember__debug@*", "@types/ember__debug@^4.0.5": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@types/ember__debug/-/ember__debug-4.0.6.tgz#073a6f2fd8c6c8026078ffbd93dd53c382777146" + integrity sha512-sRYDMcr3/rDHCXYSyfwur7ud8z1LOtCeWHZZq9AAiQIo7+teXfom+JoVocA72KVQs/kQlmt2VVAGpIzOZ+1URg== + dependencies: + "@types/ember__object" "*" + "@types/ember__owner" "*" + +"@types/ember__destroyable@^4.0.2": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@types/ember__destroyable/-/ember__destroyable-4.0.3.tgz#7e7ae0e2a8fe9ba6ad6cdaa20bf3895129a20e1b" + integrity sha512-82GteeJCDYNFXwyS4KkcbzpRr9Yz9GrhjuGKhme4n0cpuVheZ1TN5eE3eRsTnvsa8Pu1im6wiTbtbj7eIkQhEg== + +"@types/ember__engine@*", "@types/ember__engine@^4.0.7": + version "4.0.7" + resolved "https://registry.yarnpkg.com/@types/ember__engine/-/ember__engine-4.0.7.tgz#33bbc8fe3b6808a4e91523140e15768ac5828797" + integrity sha512-AxIrs9bsmgup7da6GHNFI6iU/YiUWhme3RRFID7eEU21tGtT2JjlHz1i2TxSk9SKYkUvpoTYR+nnxlpOD3VheA== + dependencies: + "@types/ember__engine" "*" + "@types/ember__object" "*" + "@types/ember__owner" "*" + +"@types/ember__error@*", "@types/ember__error@^4.0.3": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@types/ember__error/-/ember__error-4.0.4.tgz#7e0c29c573cfab76b0bbf523708f7a3e02e2e0a7" + integrity sha512-fCDdF5oSzSMIdBjYnJsU1qG/3LdBVZrnQ1oPgRC23/NeOr+bAQHZxTjtSO3/ruyEPtRc02q3a9K/ITz1uphz7g== + +"@types/ember__object@*", "@types/ember__object@^4.0.8": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@types/ember__object/-/ember__object-4.0.8.tgz#b17401ae317f077f71ce56ab5405fedeac061f7d" + integrity sha512-ZpMUVWnOr/FespCyriI2I3PvvJLUVkVZx8tlCFql9Cd3dqMF1O4RN4IdaFTWHcT/4rNdjAFKF5CxzoVSzKU/9A== + dependencies: + "@types/ember" "*" + "@types/ember__object" "*" + "@types/rsvp" "*" + +"@types/ember__owner@*": + version "4.0.7" + resolved "https://registry.yarnpkg.com/@types/ember__owner/-/ember__owner-4.0.7.tgz#51600cc44176e395a26b93bf7d7f0ab8b35681cf" + integrity sha512-mYG0OL1let/StvnfXCyPdfaigsSOVyOIzrXsk7iRzlRjEjsBawEGrkckLiej50cI25k9yp/kLl3ZIT1FqMLBpg== + +"@types/ember__polyfills@*", "@types/ember__polyfills@^4.0.3": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@types/ember__polyfills/-/ember__polyfills-4.0.4.tgz#c684803433e11581d7383301c86c1c09610dfc86" + integrity sha512-icOWTR6f++nHTBLrrWp/X3sjGFs3PpenEwoWoQM6LL3wUFLSeAwsvXNp1zdDV3Sq0H61sAWymBmUeBLNO18Ogg== + +"@types/ember__routing@*", "@types/ember__routing@^4.0.16": + version "4.0.16" + resolved "https://registry.yarnpkg.com/@types/ember__routing/-/ember__routing-4.0.16.tgz#4cd4aa82c3fcac5e581045d19d066337775a001d" + integrity sha512-ydxQ7LVkkNEsnibnRX8hofF/6uHFRwdbTfS3o3pHC5rchfhEg2/G2hPOdF60UIikTcn6JfekjViz+HDwNwqUQw== + dependencies: + "@types/ember" "*" + "@types/ember__controller" "*" + "@types/ember__object" "*" + "@types/ember__routing" "*" + "@types/ember__service" "*" + +"@types/ember__runloop@*", "@types/ember__runloop@^4.0.6": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@types/ember__runloop/-/ember__runloop-4.0.6.tgz#aaf562f73ff5da377278d0c8d21bedebbb0feeca" + integrity sha512-Lh/4ViAiD4xcAEyhcTjz3p79j7cQSHc2Y+eZZyXhASugHjdKI5e0SzpZTWiJipE4n6aqB68BTdhiu5K8p5Zbrg== + dependencies: + "@types/ember" "*" + "@types/ember__runloop" "*" + +"@types/ember__service@*", "@types/ember__service@^4.0.5": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@types/ember__service/-/ember__service-4.0.6.tgz#1774577f54d7f554d15bb66b1b2c8b1b9333aa03" + integrity sha512-0kGA2eofiufsFby7vO61hIzDD2YDdhK7wyT6VQjUJQl6gT1N90xosZd+cGI6GILM2KmCsWgjlOMlPT033sBz/w== + dependencies: + "@types/ember__object" "*" + +"@types/ember__string@*", "@types/ember__string@^3.0.11": + version "3.0.12" + resolved "https://registry.yarnpkg.com/@types/ember__string/-/ember__string-3.0.12.tgz#bb6f4258a60dce04b9df8044b3f6dd8e257f9a4b" + integrity sha512-TpFGoM2yJuzvRl98k8a4tcwE7k0x2fAMLktkkyaDnveldv0jVOmgJttHwnX+LmEAjpK1rqa1Xes7jzxIgAtNjA== + +"@types/ember__template@*", "@types/ember__template@^4.0.3": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@types/ember__template/-/ember__template-4.0.4.tgz#ce480a49e184d071c9b22bc2e6c8ecc3444a5d0c" + integrity sha512-RJHlTKWjIMZVwqyvhdgkwbGvTq6OlmzVMO+E9ONRLb+qTlX9KE9zqzZPRJgw8znttV+xWjUmEb7Giz21O1uVOg== + +"@types/ember__test@*", "@types/ember__test@^4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@types/ember__test/-/ember__test-4.0.3.tgz#43389352162993f78874ddb1baa0d72045886cdb" + integrity sha512-aPfPBdWaOSj9Tc5ol/KU1vA2M35iB8knsmSxopIZHb4Mx/oTuAp3JzC4zm4DZYfuF5+l/rng6Zru+4PkG2KQRw== + dependencies: + "@types/ember__application" "*" + +"@types/ember__utils@*", "@types/ember__utils@^4.0.4": + version "4.0.5" + resolved "https://registry.yarnpkg.com/@types/ember__utils/-/ember__utils-4.0.5.tgz#e618eff3e597c00099cde4d31390ac738e7035de" + integrity sha512-JKaXOofBACIuOjmIS/zPzV6oMvcb9YgKQOVSkChvzAm28xxuV/jn7Q5CeoV3xBJB4z8buNIxl2n7Ko1H91z+5Q== + dependencies: + "@types/ember" "*" + "@types/eslint-scope@^3.7.3": version "3.7.4" resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" @@ -1788,6 +1952,13 @@ resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.1.tgz#20172f9578b225f6c7da63446f56d4ce108d5a65" integrity sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ== +"@types/jquery@^3.5.22": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.23.tgz#f99f08533ad5a5c4cb1d0dc131ecf5e2a73eb182" + integrity sha512-LwtD05mlY8iPF/1aB8dOZaYhRDothbHA7csnAxhyqMnQxj90Fo3J4nPhmHiA0OMTwHhjwZdE1Lpd6UK+b+C6Bw== + dependencies: + "@types/sizzle" "*" + "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb" @@ -1823,6 +1994,11 @@ resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== +"@types/qunit@^2.19.6": + version "2.19.6" + resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.19.6.tgz#2c0af41f8afdc6db554a7f575a2b6df535b86bd0" + integrity sha512-bz9STa6EHurtpSfn5cNiScBladlw43bM+7luQA985Kd9YlF4dZaLmKt3c5/oSyN1AWAl50YBpqTq0BxCP64nGg== + "@types/range-parser@*": version "1.2.4" resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" @@ -1836,6 +2012,11 @@ "@types/glob" "*" "@types/node" "*" +"@types/rsvp@*", "@types/rsvp@^4.0.5": + version "4.0.5" + resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.5.tgz#badc7df3b653a1184e456cde845c5a770120a15a" + integrity sha512-Vhmt0IASo026ZU20O3KP1nBZOCXduQ/Ei+vpgs0hfDZHysSIfhnMc61ZMIUuaazfYS0J9EhLz+jJsft6iYX4Kw== + "@types/send@*": version "0.17.1" resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301" @@ -1853,6 +2034,11 @@ "@types/mime" "*" "@types/node" "*" +"@types/sizzle@*": + version "2.3.4" + resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.4.tgz#cd6531924f60834fa4a1b8081f9eecf9bb1117f0" + integrity sha512-jA2llq2zNkg8HrALI7DtWzhALcVH0l7i89yhY3iBdOz6cBPeACoFq+fkQrjHA39t1hnSFOboZ7A/AY5MMZSlag== + "@types/supports-color@^8.1.0": version "8.1.1" resolved "https://registry.yarnpkg.com/@types/supports-color/-/supports-color-8.1.1.tgz#1b44b1b096479273adf7f93c75fc4ecc40a61ee4" @@ -5119,6 +5305,13 @@ ember-resize-observer-service@^1.1.0: ember-cli-babel "^7.26.6" ember-cli-htmlbars "^5.7.1" +ember-resolver@*: + version "11.0.1" + resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-11.0.1.tgz#5914e67aec7053f7148e4b0ae2d6918e830f7909" + integrity sha512-ucBk3oM+PR+AfYoSUXeQh8cDQS1sSiEKp4Pcgbew5cFMSqPxJfqd1zyZsfQKNTuyubeGmWxBOyMVSTvX2LeCyg== + dependencies: + ember-cli-babel "^7.26.11" + ember-resolver@^10.1.1: version "10.1.1" resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-10.1.1.tgz#1106a2386337b13a9ee509a9ad2a18b53a728ab3" diff --git a/jsconfig.base.json b/jsconfig.base.json deleted file mode 100644 index 7b50cf30ba6..00000000000 --- a/jsconfig.base.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "compilerOptions": { - "target": "es2020", - "module": "amd", - "experimentalDecorators": true, - }, - "exclude": [ - ".git", - "**/node_modules", - "**/dist", - ], - "glint": { - "environment": [ - "ember-loose", - "ember-template-imports" - ] - } -} diff --git a/jsconfig.json b/jsconfig.json new file mode 100644 index 00000000000..39c7aaddc9a --- /dev/null +++ b/jsconfig.json @@ -0,0 +1,107 @@ +// This file was generated by scripts/build_jsconfig.rb +{ + "compilerOptions": { + "target": "es2021", + "module": "esnext", + "moduleResolution": "bundler", + "experimentalDecorators": true, + "paths": { + "discourse/*": [ + "./app/assets/javascripts/discourse/app/*" + ], + "discourse/tests/*": [ + "./app/assets/javascripts/discourse/tests/*" + ], + "discourse-common/*": [ + "./app/assets/javascripts/discourse-common/addon/*" + ], + "admin/*": [ + "./app/assets/javascripts/admin/addon/*" + ], + "wizard/*": [ + "./app/assets/javascripts/wizard/addon/*" + ], + "pretty-text/*": [ + "./app/assets/javascripts/pretty-text/addon/*" + ], + "select-kit/*": [ + "./app/assets/javascripts/select-kit/addon/*" + ], + "float-kit/*": [ + "./app/assets/javascripts/float-kit/addon/*" + ], + "truth-helpers/*": [ + "./app/assets/javascripts/truth-helpers/addon/*" + ], + "dialog-holder/*": [ + "./app/assets/javascripts/dialog-holder/addon/*" + ], + "discourse/plugins/chat/*": [ + "./plugins/chat/assets/javascripts/*", + "./plugins/chat/test/javascripts/*" + ], + "discourse/plugins/checklist/*": [ + "./plugins/checklist/assets/javascripts/*", + "./plugins/checklist/test/javascripts/*" + ], + "discourse/plugins/discourse-details/*": [ + "./plugins/discourse-details/assets/javascripts/*", + "./plugins/discourse-details/test/javascripts/*" + ], + "discourse/plugins/discourse-lazy-videos/*": [ + "./plugins/discourse-lazy-videos/assets/javascripts/*", + "./plugins/discourse-lazy-videos/test/javascripts/*" + ], + "discourse/plugins/discourse-local-dates/*": [ + "./plugins/discourse-local-dates/assets/javascripts/*", + "./plugins/discourse-local-dates/test/javascripts/*" + ], + "discourse/plugins/discourse-narrative-bot/*": [ + "./plugins/discourse-narrative-bot/assets/javascripts/*", + "./plugins/discourse-narrative-bot/test/javascripts/*" + ], + "discourse/plugins/discourse-presence/*": [ + "./plugins/discourse-presence/assets/javascripts/*", + "./plugins/discourse-presence/test/javascripts/*" + ], + "discourse/plugins/poll/*": [ + "./plugins/poll/assets/javascripts/*", + "./plugins/poll/test/javascripts/*" + ], + "discourse/plugins/styleguide/*": [ + "./plugins/styleguide/assets/javascripts/*", + "./plugins/styleguide/test/javascripts/*" + ] + } + }, + "include": [ + "./app/assets/javascripts/discourse/app", + "./app/assets/javascripts/discourse/tests", + "./app/assets/javascripts/discourse-common/addon", + "./app/assets/javascripts/admin/addon", + "./app/assets/javascripts/wizard/addon", + "./app/assets/javascripts/pretty-text/addon", + "./app/assets/javascripts/select-kit/addon", + "./app/assets/javascripts/float-kit/addon", + "./app/assets/javascripts/truth-helpers/addon", + "./app/assets/javascripts/dialog-holder/addon", + "./plugins/chat/assets/javascripts", + "./plugins/chat/test/javascripts", + "./plugins/checklist/assets/javascripts", + "./plugins/checklist/test/javascripts", + "./plugins/discourse-details/assets/javascripts", + "./plugins/discourse-details/test/javascripts", + "./plugins/discourse-lazy-videos/assets/javascripts", + "./plugins/discourse-lazy-videos/test/javascripts", + "./plugins/discourse-local-dates/assets/javascripts", + "./plugins/discourse-local-dates/test/javascripts", + "./plugins/discourse-narrative-bot/assets/javascripts", + "./plugins/discourse-narrative-bot/test/javascripts", + "./plugins/discourse-presence/assets/javascripts", + "./plugins/discourse-presence/test/javascripts", + "./plugins/poll/assets/javascripts", + "./plugins/poll/test/javascripts", + "./plugins/styleguide/assets/javascripts", + "./plugins/styleguide/test/javascripts" + ] +} diff --git a/script/build_jsconfig.rb b/script/build_jsconfig.rb new file mode 100644 index 00000000000..b52fe23a7f2 --- /dev/null +++ b/script/build_jsconfig.rb @@ -0,0 +1,64 @@ +# frozen_string_literal: true + +require "pathname" +require "json" + +Dir.chdir("#{__dir__}/..") # rubocop:disable Discourse/NoChdir because this is not part of the app + +CORE_NAMESPACES = { + "discourse/*" => ["app/assets/javascripts/discourse/app"], + "discourse/tests/*" => ["app/assets/javascripts/discourse/tests"], + "discourse-common/*" => ["app/assets/javascripts/discourse-common/addon"], + "admin/*" => ["app/assets/javascripts/admin/addon"], + "wizard/*" => ["app/assets/javascripts/wizard/addon"], + "pretty-text/*" => ["app/assets/javascripts/pretty-text/addon"], + "select-kit/*" => ["app/assets/javascripts/select-kit/addon"], + "float-kit/*" => ["app/assets/javascripts/float-kit/addon"], + "truth-helpers/*" => ["app/assets/javascripts/truth-helpers/addon"], + "dialog-holder/*" => ["app/assets/javascripts/dialog-holder/addon"], +} + +def relative(from, to) + relative_path = Pathname.new(to).relative_path_from(from).to_s + relative_path = "./#{relative_path}" if !relative_path.start_with?(".") + relative_path +end + +def write_config(package_dir, extras: {}) + package_dir = Pathname.new(package_dir) + namespaces = { **CORE_NAMESPACES, **extras } + config = { + "compilerOptions" => { + "target" => "es2021", + "module" => "esnext", + "moduleResolution" => "bundler", + "experimentalDecorators" => true, + "paths" => { + **namespaces + .map { |ns, paths| [ns, paths.map { |p| "#{relative(package_dir, p)}/*" }] } + .to_h, + }, + }, + "include" => namespaces.flat_map { |ns, paths| paths.map { |p| relative(package_dir, p) } }, + } + + output = <<~JSON + // This file was generated by scripts/build_jsconfig.rb + #{JSON.pretty_generate(config)} + JSON + + File.write("#{package_dir}/jsconfig.json", output) +end + +core_plugins = `git ls-files plugins/*/plugin.rb`.lines.map { |path| path.split("/")[1] } +plugin_configs = + core_plugins + .map do |name| + [ + "discourse/plugins/#{name}/*", + ["plugins/#{name}/assets/javascripts", "plugins/#{name}/test/javascripts"], + ] + end + .to_h + +write_config ".", extras: { **plugin_configs } diff --git a/yarn.lock b/yarn.lock index 8fe880d614d..b922ed734d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -58,7 +58,7 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.1" -"@babel/generator@^7.22.15", "@babel/generator@^7.23.0": +"@babel/generator@^7.23.0": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420" integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g== @@ -135,7 +135,7 @@ dependencies: "@babel/types" "^7.22.15" -"@babel/helper-module-transforms@^7.22.15", "@babel/helper-module-transforms@^7.23.0": +"@babel/helper-module-transforms@^7.23.0": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e" integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw== @@ -203,7 +203,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040" integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA== -"@babel/helpers@^7.22.15", "@babel/helpers@^7.23.0": +"@babel/helpers@^7.23.0": version "7.23.1" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.1.tgz#44e981e8ce2b9e99f8f0b703f3326a4636c16d15" integrity sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA== @@ -260,7 +260,7 @@ "@babel/parser" "^7.22.15" "@babel/types" "^7.22.15" -"@babel/traverse@^7.22.15", "@babel/traverse@^7.23.0": +"@babel/traverse@^7.23.0": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8" integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw== @@ -417,12 +417,12 @@ dependencies: eslint-visitor-keys "^3.3.0" -"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.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/eslintrc@^2.0.3", "@eslint/eslintrc@^2.1.2": +"@eslint/eslintrc@^2.1.2": version "2.1.2" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.2.tgz#c6936b4b328c64496692f76944e755738be62396" integrity sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g== @@ -437,11 +437,6 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.43.0": - version "8.43.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.43.0.tgz#559ca3d9ddbd6bf907ad524320a0d14b85586af0" - integrity sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg== - "@eslint/js@8.51.0": version "8.51.0" resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.51.0.tgz#6d419c240cfb2b66da37df230f7e7eef801c32fa" @@ -549,7 +544,7 @@ resolved "https://registry.yarnpkg.com/@highlightjs/cdn-assets/-/cdn-assets-11.8.0.tgz#e3aa9f20bf742b50bd7b1d60a24c8e7d124a602f" integrity sha512-gkfCH4xGBGY9xPaW+t26WpgnfpDhNhB5RtVUDLx3MHkC7ZrmKeIxXsfjzOiuOnEgRk+vydlY6XeOeglh+eVhyg== -"@humanwhocodes/config-array@^0.11.10", "@humanwhocodes/config-array@^0.11.11": +"@humanwhocodes/config-array@^0.11.11": version "0.11.11" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.11.tgz#88a04c570dbbc7dd943e4712429c3df09bc32844" integrity sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA== @@ -771,7 +766,7 @@ agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0: dependencies: debug "^4.3.4" -ajv@^6.10.0, ajv@^6.12.4: +ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -1392,11 +1387,6 @@ concurrently@^8.2.1: tree-kill "^1.2.2" yargs "^17.7.2" -convert-source-map@^1.7.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" - integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== - convert-source-map@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" @@ -1700,7 +1690,7 @@ errlop@^2.0.0: resolved "https://registry.yarnpkg.com/errlop/-/errlop-2.2.0.tgz#1ff383f8f917ae328bebb802d6ca69666a42d21b" integrity sha512-e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw== -es-abstract@^1.20.4, es-abstract@^1.22.1: +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== @@ -1935,7 +1925,7 @@ eslint-scope@5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-scope@^7.2.0, eslint-scope@^7.2.2: +eslint-scope@^7.2.2: version "7.2.2" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== @@ -2020,7 +2010,7 @@ esm@^3.2.25: resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== -espree@^9.5.2, espree@^9.6.0, espree@^9.6.1: +espree@^9.6.0, espree@^9.6.1: version "9.6.1" resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== @@ -2554,7 +2544,7 @@ import-cwd@^3.0.0: dependencies: import-from "^3.0.0" -import-fresh@^3.0.0, import-fresh@^3.2.1: +import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== @@ -2592,7 +2582,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== -internal-slot@^1.0.3, internal-slot@^1.0.5: +internal-slot@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== @@ -3378,7 +3368,7 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" -optionator@^0.9.1, optionator@^0.9.3: +optionator@^0.9.3: version "0.9.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== @@ -3704,7 +3694,7 @@ regenerator-runtime@^0.14.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== -regexp.prototype.flags@^1.4.3, regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1: +regexp.prototype.flags@^1.5.0, 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" integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==