Allow ember-concurrency v5 (#575)

* Allow `ember-concurrency` v5

* Fix lock file

Author: mkszepp

.github/workflows/ci.yml

@@ -99,6 +99,7 @@ jobs:
           - ember-lts-5.12
           - ember-lts-6.4
           - glimmer-component-v1
+          - ember-concurrency-v4
           - ember-release
           - ember-beta
           - ember-canary

docs/app/components/snippets/action-handling-2.js

@@ -1,15 +1,14 @@
 import Component from '@glimmer/component';
-import { task, timeout } from 'ember-concurrency';
+import { dropTask, timeout } from 'ember-concurrency';
 import { tracked } from '@glimmer/tracking';
 
 export default class extends Component {
   @tracked center;
   @tracked selected;
 
-  @(task(function* ({ date }) {
-    yield timeout(600); // Pretend this is an ajax call to the server...
+  updateMonth = dropTask(async ({ date }) => {
+    await timeout(600); // Pretend this is an ajax call to the server...
     // ...and that here we update the events somehow
     this.center = date;
-  }).drop())
-  updateMonth;
+  });
 }

docs/app/controllers/public-pages.js

@@ -2,7 +2,7 @@ import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { add } from 'ember-power-calendar/utils';
-import { task, timeout, waitForQueue } from 'ember-concurrency';
+import { dropTask, timeout, waitForQueue } from 'ember-concurrency';
 
 export default class extends Controller {
   @service router;
@@ -12,7 +12,7 @@ export default class extends Controller {
   now = new Date();
   today = this.now;
 
-  @(task(function* (e) {
+  flipPage = dropTask(async (e) => {
     if (this.router.currentRouteName === 'public-pages.docs.index') {
       return;
     }
@@ -25,15 +25,14 @@ export default class extends Controller {
     parent.insertBefore(clone, pageElement);
     this.day = add(this.day, 1, 'day');
 
-    yield waitForQueue('afterRender');
+    await waitForQueue('afterRender');
 
     pageElement.offsetLeft; // force layout
     pageElement.classList.add('run-animation');
 
-    yield timeout(400);
+    await timeout(400);
 
     pageElement.classList.remove('run-animation');
     parent.removeChild(clone);
-  }).drop())
-  flipPage;
+  });
 }

docs/package.json

@@ -68,7 +68,7 @@
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-code-snippet": "git+https://git@github.com/ef4/ember-code-snippet.git#d054b697098ad52481c94a952ccf8d89ba1f25fe",
-    "ember-concurrency": "^4.0.2",
+    "ember-concurrency": "^5.1.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",

ember-power-calendar/package.json

@@ -89,7 +89,7 @@
     "@rollup/plugin-babel": "^6.0.4",
     "babel-plugin-ember-template-compilation": "^2.3.0",
     "concurrently": "^9.1.2",
-    "ember-concurrency": "^4.0.4",
+    "ember-concurrency": "^5.1.0",
     "ember-source": "~6.4.0",
     "ember-template-lint": "^7.6.0",
     "eslint": "^9.26.0",
@@ -112,7 +112,7 @@
   "peerDependencies": {
     "@ember/test-helpers": "^2.9.4 || ^3.2.1 || ^4.0.4 || ^5.0.0",
     "@glimmer/component": "^1.1.2 || ^2.0.0",
-    "ember-concurrency": "^4.0.4"
+    "ember-concurrency": "^4.0.4 || ^5.1.0"
   },
   "ember": {
     "edition": "octane"

pnpm-lock.yaml

@@ -92,6 +92,14 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'ember-concurrency-v4',
+        npm: {
+          devDependencies: {
+            'ember-concurrency': '^4.0.4',
+          },
+        },
+      },
       {
         name: 'ember-release',
         npm: {

test-app/config/ember-try.js

@@ -68,7 +68,7 @@
     "ember-cli-sass": "^11.0.1",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-concurrency": "^4.0.2",
+    "ember-concurrency": "^5.1.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",