Skip to content

Commit

Permalink
Merge pull request #936 from ember-learn/updates
Browse files Browse the repository at this point in the history
update ember-power-select and ember-concurrency
  • Loading branch information
mansona authored Feb 27, 2025
2 parents d06dce1 + 85a8d85 commit 707b57d
Show file tree
Hide file tree
Showing 5 changed files with 281 additions and 152 deletions.
1 change: 1 addition & 0 deletions app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import loadInitializers from 'ember-load-initializers';
import config from 'ember-api-docs/config/environment';

import './deprecation-workflow';
import 'ember-power-select/styles';

export default class App extends Application {
modulePrefix = config.modulePrefix;
Expand Down
3 changes: 0 additions & 3 deletions app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ body {
}
}


@import "ember-power-select";

// fix header
@media (min-width: 992px) {
nav.es-navbar div.container {
Expand Down
2 changes: 2 additions & 0 deletions app/templates/application.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@

{{!-- required by ember-cli-meta-tags --}}
<HeadLayout />

<BasicDropdownWormhole />
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,12 @@
"broccoli-funnel": "^2.0.1",
"ember-a11y-testing": "^5.2.1",
"ember-anchor": "^1.0.3",
"ember-auto-import": "^2.7.2",
"ember-auto-import": "^2.10.0",
"ember-basic-dropdown": "^8.6.0",
"ember-cli": "~3.28.6",
"ember-cli-app-version": "^5.0.0",
"ember-cli-autoprefixer": "^1.0.0",
"ember-cli-babel": "^7.26.10",
"ember-cli-babel": "^8.2.0",
"ember-cli-bourbon": "^2.0.1",
"ember-cli-browserstack": "^1.0.1",
"ember-cli-clipboard": "^1.1.0",
Expand All @@ -85,7 +86,7 @@
"ember-cli-showdown": "^9.0.1",
"ember-cli-terser": "^4.0.2",
"ember-composable-helpers": "^3.1.1",
"ember-concurrency": "^2.3.7",
"ember-concurrency": "^4.0.3",
"ember-data": "~3.28.6",
"ember-data-fastboot": "https://github.com/cardstack/ember-data-fastboot#6e6fb8bbf0b405ae174160cc1e4833c5582f68cd",
"ember-export-application-global": "^2.0.1",
Expand All @@ -95,7 +96,7 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-metrics": "^1.5.2",
"ember-page-title": "^6.2.2",
"ember-power-select": "^7.2.0",
"ember-power-select": "^8.7.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-rfc176-data": "^0.3.17",
Expand Down
Loading

0 comments on commit 707b57d

Please sign in to comment.