Merge pull request #1902 from NullVoxPopuli/upgrade-primitives

Update ember-primitives

Author: NullVoxPopuli

apps/repl/app/routes/application.ts

@@ -1,13 +1,17 @@
 import Route from '@ember/routing/route';
-import { service } from '@ember/service';
 
-import type { SetupService } from 'ember-primitives';
+import { setupTabster } from 'ember-primitives/tabster';
+
+const map = new WeakSet();
 
 export default class ApplicationRoute extends Route {
-  @service('ember-primitives/setup') declare primitives: SetupService;
+  // The router is littered with bugs.. so here we only let the model hook run once per instance
+  model() {
+    if (!map.has(this)) {
+      setupTabster(this);
+      map.add(this);
+    }
 
-  async beforeModel() {
-    this.primitives.setup();
     document.querySelector('#initial-loader')?.remove();
   }
 }

apps/repl/package.json

@@ -152,7 +152,7 @@
     "ember-element-helper": "^0.8.5",
     "ember-focus-trap": "^1.1.1",
     "ember-modifier": "^4.2.0",
-    "ember-primitives": "^0.23.1",
+    "ember-primitives": "^0.27.2",
     "ember-repl": "workspace:*",
     "ember-resize-observer-service": "^1.1.0",
     "ember-resources": "^7.0.3",
@@ -162,6 +162,7 @@
     "html-to-image": "^1.11.13",
     "kolay": "^3.0.0",
     "limber-ui": "workspace:*",
+    "tabster": "8.2.0",
     "lz-string": "^1.5.0",
     "path-browserify": "^1.0.1",
     "penpal": "^6.2.2",

apps/tutorial/package.json

@@ -41,7 +41,7 @@
     "@universal-ember/kolay-ui": "^0.0.13",
     "ember-async-data": "1.0.3",
     "ember-modifier": "^4.2.0",
-    "ember-primitives": "^0.23.1",
+    "ember-primitives": "^0.27.2",
     "ember-resources": "^7.0.3",
     "ember-route-template": "^1.0.3",
     "kolay": "^3.0.0",

package.json

@@ -55,6 +55,7 @@
       "ember-get-config": "github:mansona/ember-get-config#config-meta-loader",
       "ember-auto-import": "^2.9.0",
       "ember-repl": "workspace:*",
+      "ember-primitives": "^0.27.2",
       "ember-source": ">= 6.4.0-alpha.3",
       "array-includes": "npm:@nolyfill/array-includes@^1",
       "array.prototype.findlastindex": "npm:@nolyfill/array.prototype.findlastindex@^1",

packages/app-support/limber-ui/addon/package.json

@@ -77,7 +77,7 @@
     "ember-async-data": "1.0.3",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-modifier": "^4.2.0",
-    "ember-primitives": "^0.23.1",
+    "ember-primitives": "^0.27.2",
     "ember-resources": "^7.0.3",
     "ember-source": ">= 6.4.0-alpha.3",
     "ember-template-imports": "^4.3.0",