fix(frontend): update ember-power-calendar

adfinis · Aug 12, 2024 · 67837ff · 67837ff
1 parent 71a98aa
commit 67837ff
Show file tree

Hide file tree

Showing 6 changed files with 156 additions and 122 deletions.
diff --git a/frontend/app/app.js b/frontend/app/app.js
@@ -1,11 +1,12 @@
 import Application from "@ember/application";
 import * as Sentry from "@sentry/ember";
 import loadInitializers from "ember-load-initializers";
+import { registerDateLibrary } from "ember-power-calendar";
+import DateUtils from "ember-power-calendar-moment";
 import Resolver from "ember-resolver";
 import fastRedact from "fast-redact";
 import config from "timed/config/environment";
-// simplebar setup
-// see components/scroll-container for further usage
+
 import "simplebar";
 import "simplebar/dist/simplebar.css";
 
@@ -58,6 +59,8 @@ if (config["@sentry/ember"]) {
 
 // simplebar setup end
 
+registerDateLibrary(DateUtils);
+
 export default class App extends Application {
   modulePrefix = config.modulePrefix;
   podModulePrefix = config.podModulePrefix;

diff --git a/frontend/app/components/sy-calendar/component.js b/frontend/app/components/sy-calendar/component.js
@@ -1,12 +1,12 @@
 import { action } from "@ember/object";
-import PowerCalendarComponent from "ember-power-calendar/components/power-calendar";
+import Component from "@glimmer/component";
 import moment from "moment";
 
 const CURRENT_YEAR = moment().year();
 
 const YEARS_IN_FUTURE = 5;
 
-export default class SyCalendar extends PowerCalendarComponent {
+export default class SyCalendar extends Component {
   months = moment.months();
 
   years = [...new Array(40).keys()].map(

diff --git a/frontend/app/components/sy-calendar/styles.scss b/frontend/app/components/sy-calendar/styles.scss
diff --git a/frontend/ember-cli-build.js b/frontend/ember-cli-build.js
@@ -6,6 +6,11 @@ const EmberApp = require("ember-cli/lib/broccoli/ember-app");
 
 module.exports = function (defaults) {
   const app = new EmberApp(defaults, {
+    babel: {
+      plugins: [
+        require.resolve("ember-concurrency/async-arrow-task-transform"),
+      ],
+    },
     sassOptions: {
       onlyIncluded: true,
     },

diff --git a/frontend/package.json b/frontend/package.json
@@ -74,7 +74,7 @@
     "ember-cli-update": "1.0.1",
     "ember-component-css": "0.8.1",
     "ember-composable-helpers": "5.0.0",
-    "ember-concurrency": "^2.3.7",
+    "ember-concurrency": "^4.0.2",
     "ember-data": "~4.11.3",
     "ember-decorators": "6.1.1",
     "ember-event-helpers": "^0.1.1",
@@ -86,8 +86,8 @@
     "ember-moment": "9.0.1",
     "ember-notify": "6.0.4",
     "ember-page-title": "7.0.0",
-    "ember-power-calendar": "0.18.0",
-    "ember-power-calendar-moment": "0.2.0",
+    "ember-power-calendar": "^1.0.2",
+    "ember-power-calendar-moment": "^1.0.2",
     "ember-power-select": "6.0.1",
     "ember-qunit": "6.2.0",
     "ember-resolver": "10.0.0",
@@ -139,9 +139,6 @@
     "edition": "octane"
   },
   "pnpm": {
-    "overrides": {
-      "ember-concurrency": "^2.1.1"
-    },
     "peerDependencyRules": {
       "ignoreMissing": [
         "@babel/core",