Skip to content

Commit

Permalink
Move to ember-cli@5.12 (#194)
Browse files Browse the repository at this point in the history
  • Loading branch information
onechiporenko authored Oct 15, 2024
1 parent 607592c commit 46a9f49
Show file tree
Hide file tree
Showing 17 changed files with 1,081 additions and 631 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
/pnpm.lock.ember-try
/pnpm-lock.ember-try.yaml

/.idea

Expand Down
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
/pnpm.lock.ember-try
/pnpm-lock.ember-try.yaml

/.idea
16 changes: 9 additions & 7 deletions addon/components/ebmm-modals-container/progress.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { tracked, TrackedArray } from 'tracked-built-ins';
import { action } from '@ember/object';
import { later } from '@ember/runloop';
import { A } from '@ember/array';
import { run } from '@ember/runloop';
import RSVP from 'rsvp';
import Base, { ModalArgs } from './base';
import {
EbmmConfirmPayload,
EbmmDeclinePayload,
EbmmPromiseFactory,
} from '../../services/modals-manager';
import { runTask } from 'ember-lifeline';

const noResult = Symbol('no-result');

/**
* @category Default Modals
Expand Down Expand Up @@ -87,17 +88,17 @@ export default class ProgressModal<T> extends Base {
.catch((error) => {
if (this.settled) {
this.errors.push(error);
this._next();
this._next(noResult);
} else {
this.decline([this.results, error]);
}
return error;
});
}

_next(result?: EbmmConfirmPayload): void {
run(() => {
if (arguments.length === 1) {
_next(result: unknown): void {
runTask(this, () => {
if (result !== noResult) {
this.results.push(result);
}
this.done++;
Expand All @@ -112,7 +113,8 @@ export default class ProgressModal<T> extends Base {
}

_complete(): void {
later(
runTask(
this,
() =>
this.confirm(this.settled ? [this.results, this.errors] : this.results),
500,
Expand Down
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-bootstrap-modals-manager",
"version": "7.6.0",
"version": "7.7.0",
"description": "Modals-manager for modals from ember-bootstrap",
"keywords": [
"bootstrap",
Expand Down Expand Up @@ -35,13 +35,14 @@
"postpack": "ember ts:clean"
},
"dependencies": {
"@babel/core": "^7.25.2",
"@embroider/macros": "^1.5.0",
"@embroider/util": "^1.5.0",
"@babel/core": "^7.25.2",
"ember-auto-import": "^2.7.4",
"ember-auto-import": "^2.8.1",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-typescript": "^5.2.1",
"ember-lifeline": "^7.0.0",
"tracked-built-ins": "^3.1.0"
},
"devDependencies": {
Expand Down Expand Up @@ -78,7 +79,7 @@
"@types/htmlbars-inline-precompile": "^3.0.0",
"@types/qunit": "^2.19.4",
"@types/rsvp": "^4.0.4",
"@typescript-eslint/eslint-plugin": "^5.31.0",
"@typescript-eslint/eslint-plugin": "^7.0.0",
"@typescript-eslint/parser": "^7.0.0",
"babel-eslint": "^10.1.0",
"bootstrap": "^5.0.0",
Expand All @@ -89,7 +90,7 @@
"ember-bootstrap-power-select": "^5.0.0",
"ember-changeset": "^4.0.0-beta.5",
"ember-changeset-validations": "^4.0.0-beta.3",
"ember-cli": "~5.11.0",
"ember-cli": "~5.12.0",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-inject-live-reload": "^2.1.0",
Expand All @@ -105,30 +106,30 @@
"ember-power-select": "^7.1.0",
"ember-prism": "^0.13.0",
"ember-qunit": "^8.1.0",
"ember-resolver": "^11.0.1",
"ember-source": "~5.11.0",
"ember-resolver": "^12.0.1",
"ember-source": "~5.12.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^6.0.0",
"ember-try": "^3.0.0",
"eslint": "^8.57.0",
"eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-ember": "^12.2.1",
"eslint-plugin-n": "^17.0.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-qunit": "^8.1.1",
"eslint-plugin-qunit": "^8.1.2",
"loader.js": "^4.7.0",
"prettier": "^3.3.3",
"qunit": "^2.22.0",
"qunit-dom": "^3.0.0",
"qunit-dom": "^3.2.1",
"sass": "^1.63.6",
"stylelint": "^16.0.0",
"stylelint-config-standard": "^36.0.0",
"stylelint-prettier": "^5.0.0",
"stylelint-scss": "^6.0.0",
"typedoc": "0.25.13",
"typedoc": "0.26.9",
"typedoc-plugin-rename-defaults": "^0.7.0",
"typescript": "^5.0.4",
"webpack": "^5.93.0"
"webpack": "^5.95.0"
},
"peerDependencies": {
"ember-source": ">= 4.0.0"
Expand Down
Loading

0 comments on commit 46a9f49

Please sign in to comment.