diff --git a/addon/components/au-accordion.gjs b/addon/components/au-accordion.gjs index fb4da72c4..b740d03e9 100644 --- a/addon/components/au-accordion.gjs +++ b/addon/components/au-accordion.gjs @@ -9,7 +9,11 @@ import { on } from '@ember/modifier'; import { action } from '@ember/object'; import Component from '@glimmer/component'; import { tracked } from '@glimmer/tracking'; -import autoFocus from '@zestia/ember-auto-focus/modifiers/auto-focus'; +import { modifier } from 'ember-modifier'; + +const autofocus = modifier(function autofocus(element) { + element.focus(); +}); export default class AuAccordion extends Component { @tracked isOpen = false; @@ -96,7 +100,7 @@ export default class AuAccordion extends Component { {{#if this.isOpen}} - + {{#if this.loading}} {{else}} diff --git a/package-lock.json b/package-lock.json index 4eb435f03..cb7e249ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,6 @@ "@floating-ui/dom": "^1.1.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", - "@zestia/ember-auto-focus": "^5.1.0", "ember-auto-import": "^2.6.3", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0", @@ -12869,244 +12868,6 @@ "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" }, - "node_modules/@zestia/ember-auto-focus": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@zestia/ember-auto-focus/-/ember-auto-focus-5.1.0.tgz", - "integrity": "sha512-uyqhngaUMEJPLF6uwBmgS4U49NfTCa/APvla0faJAuceSiqjtDGFq1NUJAGDq6QT/KuWPOm/YaGqoWKN7Vo/LA==", - "deprecated": "Moved to GitHub Packages", - "dependencies": { - "ember-auto-import": "^2.6.3", - "ember-cli-babel": "^7.26.11", - "ember-cli-htmlbars": "^6.2.0", - "ember-modifier": "^4.1.0" - }, - "engines": { - "node": "16.* || >= 18" - }, - "peerDependencies": { - "ember-source": ">= 4.0.0" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/babel-plugin-ember-modules-api-polyfill": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.5.0.tgz", - "integrity": "sha512-pJajN/DkQUnStw0Az8c6khVcMQHgzqWr61lLNtVeu0g61LRW0k9jyK7vaedrHDWGe/Qe8sxG5wpiyW9NsMqFzA==", - "dependencies": { - "ember-rfc176-data": "^0.3.17" - }, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/babel-plugin-module-resolver": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz", - "integrity": "sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==", - "dependencies": { - "find-babel-config": "^1.1.0", - "glob": "^7.1.2", - "pkg-up": "^2.0.0", - "reselect": "^3.0.1", - "resolve": "^1.4.0" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/broccoli-babel-transpiler": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.1.tgz", - "integrity": "sha512-6IXBgfRt7HZ61g67ssBc6lBb3Smw3DPZ9dEYirgtvXWpRZ2A9M22nxy6opEwJDgDJzlu/bB7ToppW33OFkA1gA==", - "dependencies": { - "@babel/core": "^7.12.0", - "@babel/polyfill": "^7.11.5", - "broccoli-funnel": "^2.0.2", - "broccoli-merge-trees": "^3.0.2", - "broccoli-persistent-filter": "^2.2.1", - "clone": "^2.1.2", - "hash-for-dep": "^1.4.7", - "heimdalljs": "^0.2.1", - "heimdalljs-logger": "^0.1.9", - "json-stable-stringify": "^1.0.1", - "rsvp": "^4.8.4", - "workerpool": "^3.1.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/broccoli-source": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/broccoli-source/-/broccoli-source-2.1.2.tgz", - "integrity": "sha512-1lLayO4wfS0c0Sj50VfHJXNWf94FYY0WUhxj0R77thbs6uWI7USiOWFqQV5dRmhAJnoKaGN4WyLGQbgjgiYFwQ==", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/ember-cli-babel": { - "version": "7.26.11", - "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz", - "integrity": "sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==", - "dependencies": { - "@babel/core": "^7.12.0", - "@babel/helper-compilation-targets": "^7.12.0", - "@babel/plugin-proposal-class-properties": "^7.16.5", - "@babel/plugin-proposal-decorators": "^7.13.5", - "@babel/plugin-proposal-private-methods": "^7.16.5", - "@babel/plugin-proposal-private-property-in-object": "^7.16.5", - "@babel/plugin-transform-modules-amd": "^7.13.0", - "@babel/plugin-transform-runtime": "^7.13.9", - "@babel/plugin-transform-typescript": "^7.13.0", - "@babel/polyfill": "^7.11.5", - "@babel/preset-env": "^7.16.5", - "@babel/runtime": "7.12.18", - "amd-name-resolver": "^1.3.1", - "babel-plugin-debug-macros": "^0.3.4", - "babel-plugin-ember-data-packages-polyfill": "^0.1.2", - "babel-plugin-ember-modules-api-polyfill": "^3.5.0", - "babel-plugin-module-resolver": "^3.2.0", - "broccoli-babel-transpiler": "^7.8.0", - "broccoli-debug": "^0.6.4", - "broccoli-funnel": "^2.0.2", - "broccoli-source": "^2.1.2", - "calculate-cache-key-for-tree": "^2.0.0", - "clone": "^2.1.2", - "ember-cli-babel-plugin-helpers": "^1.1.1", - "ember-cli-version-checker": "^4.1.0", - "ensure-posix-path": "^1.0.2", - "fixturify-project": "^1.10.0", - "resolve-package-path": "^3.1.0", - "rimraf": "^3.0.1", - "semver": "^5.5.0" - }, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/ember-cli-version-checker": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-4.1.1.tgz", - "integrity": "sha512-bzEWsTMXUGEJfxcAGWPe6kI7oHEGD3jaxUWDYPTqzqGhNkgPwXTBgoWs9zG1RaSMaOPFnloWuxRcoHi4TrYS3Q==", - "dependencies": { - "resolve-package-path": "^2.0.0", - "semver": "^6.3.0", - "silent-error": "^1.1.1" - }, - "engines": { - "node": "8.* || 10.* || >= 12.*" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/ember-cli-version-checker/node_modules/resolve-package-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-2.0.0.tgz", - "integrity": "sha512-/CLuzodHO2wyyHTzls5Qr+EFeG6RcW4u6//gjYvUfcfyuplIX1SSccU+A5A9A78Gmezkl3NBkFAMxLbzTY9TJA==", - "dependencies": { - "path-root": "^0.1.1", - "resolve": "^1.13.1" - }, - "engines": { - "node": "8.* || 10.* || >= 12" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/ember-cli-version-checker/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/find-babel-config": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.0.tgz", - "integrity": "sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==", - "dependencies": { - "json5": "^0.5.1", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", - "dependencies": { - "locate-path": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==", - "bin": { - "json5": "lib/cli.js" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", - "integrity": "sha512-fjAPuiws93rm7mPUu21RdBnkeZNrbfCFCwfAhPWY+rR3zG0ubpe5cEReHOw5fIbfmsxEV/g2kSxGTATY3Bpnwg==", - "dependencies": { - "find-up": "^2.1.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/reselect": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz", - "integrity": "sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA==" - }, - "node_modules/@zestia/ember-auto-focus/node_modules/resolve-package-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-3.1.0.tgz", - "integrity": "sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==", - "dependencies": { - "path-root": "^0.1.1", - "resolve": "^1.17.0" - }, - "engines": { - "node": "10.* || >= 12" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/@zestia/ember-auto-focus/node_modules/workerpool": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-3.1.2.tgz", - "integrity": "sha512-WJFA0dGqIK7qj7xPTqciWBH5DlJQzoPjsANvc3Y4hNB0SScT+Emjvt0jPPkDBUjBNngX1q9hHgt1Gfwytu6pug==", - "dependencies": { - "@babel/core": "^7.3.4", - "object-assign": "4.1.1", - "rsvp": "^4.8.4" - } - }, "node_modules/abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", diff --git a/package.json b/package.json index 2c198113f..f4c06da49 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ }, "overridesComments": { "@glimmer/validator and util": "https://github.com/emberjs/ember.js/issues/20502", - "ember-source": "storybook/ember, zestia/auto-focus and focus-trap all depend on ember-source peerDeps that don't match all our test scenarios" + "ember-source": "storybook/ember and focus-trap all depend on ember-source peerDeps that don't match all our test scenarios" }, "dependencies": { "@babel/core": "^7.23.2", @@ -87,7 +87,6 @@ "@floating-ui/dom": "^1.1.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", - "@zestia/ember-auto-focus": "^5.1.0", "ember-auto-import": "^2.6.3", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0",