get ember 5 working

package.json

@@ -56,6 +56,7 @@
     "@babel/plugin-transform-typescript": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
     "@ember-data/json-api": "5.1.1",
+    "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^2.9.3",
     "@glimmer/compiler": "0.84.2",
     "@glimmer/component": "^1.1.2",
@@ -83,15 +84,16 @@
     "bootstrap": "5",
     "dag-map": "^2.0.2",
     "ember-bootstrap": "^5.1.1",
+    "ember-cookies": "^1.0.0",
     "ember-data": "5.1.1",
     "ember-intl": "^5.7.2",
     "ember-modifier": "^4.0.0",
     "ember-page-title": "^7.0.0",
     "ember-power-select": "^6.0.1",
     "ember-qunit": "^6.1.1",
-    "ember-resolver": "^9.0.1",
-    "ember-simple-auth": "^4.2.2",
-    "ember-source": "^4.9.3",
+    "ember-resolver": "10.1.1",
+    "ember-simple-auth": "6.0.0-rc.1",
+    "ember-source": "5.1.2",
     "ember-template-imports": "^3.4.0",
     "ember-truth-helpers": "^3.1.1",
     "jest": "^29.5.0",

patches/ember-source+4.9.3.patch → patches/ember-source+5.1.2.patch

@@ -1,59 +1,70 @@
 diff --git a/node_modules/ember-source/dist/dependencies/@glimmer/manager.js b/node_modules/ember-source/dist/dependencies/@glimmer/manager.js
-index f1ed636..ee96189 100644
+index 3c53152..21da6fa 100644
 --- a/node_modules/ember-source/dist/dependencies/@glimmer/manager.js
 +++ b/node_modules/ember-source/dist/dependencies/@glimmer/manager.js
-@@ -888,4 +888,7 @@ function getComponentTemplate(obj) {
+@@ -879,5 +879,5 @@ function getComponentTemplate(obj) {
+
    return undefined;
  }
- 
--export { setInternalHelperManager, setInternalModifierManager, setInternalComponentManager, getInternalHelperManager, getInternalModifierManager, getInternalComponentManager, hasInternalHelperManager, hasInternalModifierManager, hasInternalComponentManager, setHelperManager, setModifierManager, setComponentManager, componentCapabilities, CustomComponentManager, modifierCapabilities, CustomModifierManager, helperCapabilities, hasDestroyable, hasValue, CustomHelperManager, getComponentTemplate, setComponentTemplate, capabilityFlagsFrom, hasCapability, managerHasCapability, getCustomTagFor, setCustomTagFor };
+-
+-export { CustomComponentManager, CustomHelperManager, CustomModifierManager, capabilityFlagsFrom, componentCapabilities, getComponentTemplate, getCustomTagFor, getInternalComponentManager, getInternalHelperManager, getInternalModifierManager, hasCapability, hasDestroyable, hasInternalComponentManager, hasInternalHelperManager, hasInternalModifierManager, hasValue, helperCapabilities, managerHasCapability, modifierCapabilities, setComponentManager, setComponentTemplate, setCustomTagFor, setHelperManager, setInternalComponentManager, setInternalHelperManager, setInternalModifierManager, setModifierManager };
 +var capabilities = () => CAPABILITIES;
++export { capabilities, CustomComponentManager, CustomHelperManager, CustomModifierManager, capabilityFlagsFrom, componentCapabilities, getComponentTemplate, getCustomTagFor, getInternalComponentManager, getInternalHelperManager, getInternalModifierManager, hasCapability, hasDestroyable, hasInternalComponentManager, hasInternalHelperManager, hasInternalModifierManager, hasValue, helperCapabilities, managerHasCapability, modifierCapabilities, setComponentManager, setComponentTemplate, setCustomTagFor, setHelperManager, setInternalComponentManager, setInternalHelperManager, setInternalModifierManager, setModifierManager };
+diff --git a/node_modules/ember-source/dist/ember.debug.js b/node_modules/ember-source/dist/ember.debug.js
+index 6344c33..a66f0d6 100644
+--- a/node_modules/ember-source/dist/ember.debug.js
++++ b/node_modules/ember-source/dist/ember.debug.js
+@@ -27035,6 +27035,8 @@ define("@glimmer/global-context", ["exports"], function (_exports) {
+   _exports.deprecate = deprecate;
+   var globalContextWasSet = false;
+   function setGlobalContext(context) {
++    console.log('setGlobalContext10');
 +
-+
-+export { capabilities, setInternalHelperManager, setInternalModifierManager, setInternalComponentManager, getInternalHelperManager, getInternalModifierManager, getInternalComponentManager, hasInternalHelperManager, hasInternalModifierManager, hasInternalComponentManager, setHelperManager, setModifierManager, setComponentManager, componentCapabilities, CustomComponentManager, modifierCapabilities, CustomModifierManager, helperCapabilities, hasDestroyable, hasValue, CustomHelperManager, getComponentTemplate, setComponentTemplate, capabilityFlagsFrom, hasCapability, managerHasCapability, getCustomTagFor, setCustomTagFor };
+     var _a;
+     if (true /* DEBUG */) {
+       if (globalContextWasSet) {
 diff --git a/node_modules/ember-source/dist/packages/@ember/debug/index.js b/node_modules/ember-source/dist/packages/@ember/debug/index.js
-index 681b1a6..ce8bcdd 100644
+index 27eb287..ce45e34 100644
 --- a/node_modules/ember-source/dist/packages/@ember/debug/index.js
 +++ b/node_modules/ember-source/dist/packages/@ember/debug/index.js
-@@ -275,4 +275,10 @@ if (DEBUG && !isTesting()) {
+@@ -209,4 +209,9 @@ if (DEBUG && !isTesting()) {
+     }, false);
    }
  }
-
 +if (typeof deprecate !== 'function') {
 +  deprecate = function (message, test, options) {
-+   console.log('deprecate', message, test, options);
++    console.log('deprecate', message, test, options);
 +  };
 +}
-+
  export { assert, info, warn, debug, deprecate, debugSeal, debugFreeze, runInDebug, deprecateFunc, setDebugFunction, getDebugFunction, _warnIfUsingStrippedFeatureFlags };
 \ No newline at end of file
 diff --git a/node_modules/ember-source/dist/packages/@ember/routing/route.js b/node_modules/ember-source/dist/packages/@ember/routing/route.js
-index cead465..927f282 100644
+index 9f15d9a..bcf9675 100644
 --- a/node_modules/ember-source/dist/packages/@ember/routing/route.js
 +++ b/node_modules/ember-source/dist/packages/@ember/routing/route.js
-@@ -6,6 +6,7 @@ var __decorate = this && this.__decorate || function (decorators, target, key, d
+@@ -5,6 +5,7 @@ var __decorate = this && this.__decorate || function (decorators, target, key, d
+   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
    return c > 3 && r && Object.defineProperty(target, key, r), r;
  };
-
 +import { getComponentTemplate } from '@glimmer/manager';
  import { privatize as P } from '@ember/-internals/container';
  import { addObserver, defineProperty, descriptorForProperty, flushAsyncObservers } from '@ember/-internals/metal';
  import { getOwner } from '@ember/-internals/owner';
-@@ -1351,6 +1352,9 @@ function buildRenderOptions(route, nameOrOptions, options) {
+@@ -1021,6 +1022,9 @@ function buildRenderOptions(route, nameOrOptions, options) {
+     controller.set('model', model);
    }
-
    let template = owner.lookup(`template:${templateName}`);
 +  if (typeof template !== 'finction' && typeof template === 'object') {
 +    template = getComponentTemplate(template);
 +  }
    assert(`Could not find "${templateName}" template, view, or component.`, isDefaultRender || template !== undefined);
    let parent;
-
+   if (into && (parent = parentRoute(route)) && into === parent.routeName) {
 diff --git a/node_modules/ember-source/dist/packages/@ember/test/index.js b/node_modules/ember-source/dist/packages/@ember/test/index.js
-index 8d78b05..9d15054 100644
+index 336fa24..4393023 100644
 --- a/node_modules/ember-source/dist/packages/@ember/test/index.js
 +++ b/node_modules/ember-source/dist/packages/@ember/test/index.js
-@@ -1,14 +1,15 @@
+@@ -1,15 +1,16 @@
 -import require, { has } from 'require';
 +import * as testing from 'ember-testing';
 +import { DEBUG } from '@glimmer/env';
@@ -62,49 +73,41 @@ index 8d78b05..9d15054 100644
  export let registerWaiter;
  export let unregisterHelper;
  export let unregisterWaiter;
-
 -if (has('ember-testing')) {
 +if (DEBUG) {
-   let {
-     Test
--  } = require('ember-testing');
-+  } = testing;
-
+   // SAFETY: since `require` is opaque to TS, we need to inform it that this is
+   // the actual type of what we import. This `require` needs to stay in sync
+   // with the `import type` statement above. (This cast *increases* safety,
+   // because the result of `require` is `any`.)
+-  let Test = require('ember-testing').Test;
++  let Test = testing.Test;
    registerAsyncHelper = Test.registerAsyncHelper;
    registerHelper = Test.registerHelper;
+   registerWaiter = Test.registerWaiter;
 diff --git a/node_modules/ember-source/dist/packages/ember/index.js b/node_modules/ember-source/dist/packages/ember/index.js
-index 9382f12..a0dfc65 100644
+index bc7a5d9..4c42340 100644
 --- a/node_modules/ember-source/dist/packages/ember/index.js
 +++ b/node_modules/ember-source/dist/packages/ember/index.js
-@@ -1,4 +1,3 @@
+@@ -1,7 +1,9 @@
+ /**
+ @module ember
+ */
 -import require, { has } from 'require';
++import { DEBUG } from '@glimmer/env'
++import * as testing from 'ember-testing';
++import * as waiters from 'ember-testing/lib/test/waiters'
  import { getENV, getLookup, setLookup } from '@ember/-internals/environment';
  import * as utils from '@ember/-internals/utils';
- import { Registry, Container } from '@ember/-internals/container';
-@@ -7,10 +6,11 @@ import { meta } from '@ember/-internals/meta';
- import * as metal from '@ember/-internals/metal';
- import { FEATURES, isEnabled } from '@ember/canary-features';
- import * as EmberDebug from '@ember/debug';
-+import { DEBUG } from '@glimmer/env';
- import { assert, captureRenderTree, deprecate } from '@ember/debug';
- import Backburner from 'backburner';
- import Controller, { inject as injectController, ControllerMixin } from '@ember/controller';
--import { _getStrings, _setStrings, dasherize, camelize, capitalize, classify, decamelize, loc, underscore, w } from '@ember/string';
-+import { _getStrings, _setStrings, dasherize, camelize, capitalize, classify, decamelize, underscore, w } from '@ember/string';
- import Service, { service } from '@ember/service';
- import EmberObject, { action, computed, observer } from '@ember/object';
- import { dependentKeyCompat } from '@ember/object/compat';
-@@ -53,6 +53,39 @@ import { isNone, isBlank, isEmpty, isPresent, isEqual, typeOf, compare } from '@
- import { templateOnlyComponent, invokeHelper, hash, array, concat, get, on, fn } from '@glimmer/runtime';
+ import { Registry as InternalRegistry, Container as InternalContainer } from '@ember/-internals/container';
+@@ -56,6 +58,38 @@ import { isNone as emberIsNone, isBlank as emberIsBlank, isEmpty as emberIsEmpty
+ import * as glimmerRuntime from '@glimmer/runtime';
  import { helperCapabilities, setModifierManager, setComponentTemplate, getComponentTemplate, setHelperManager } from '@glimmer/manager';
- import { assertDestroyablesDestroyed, associateDestroyableChild, destroy, enableDestroyableTracking, isDestroying, isDestroyed, registerDestructor, unregisterDestructor } from '@ember/destroyable'; // ****@ember/-internals/environment****
-+import * as testing from 'ember-testing';
-+import * as waiters from 'ember-testing/lib/test/waiters'
+ import { assertDestroyablesDestroyed, associateDestroyableChild, destroy as emberDestroy, enableDestroyableTracking, isDestroying, isDestroyed, registerDestructor, unregisterDestructor } from '@ember/destroyable';
 +
 +const registry = {
 +  'ember-testing/lib/test/waiters': DEBUG ? waiters : undefined,
 +};
-+
++  
 +function define(a, b) {
 +  console.log(`define: ${a}`, b);
 +  registry[a] = b;
@@ -123,65 +126,43 @@ index 9382f12..a0dfc65 100644
 +    console.error(e);
 +  }
 +}
-+
++  
 +function has(a) {
 +  if (a === 'ember-testing') {
 +    return DEBUG ? true : false;
 +  }
 +  console.log(`has: ${a}`);
 +  return false;
 +}
-
- const Ember = {};
- Ember.isNamespace = true;
-@@ -219,7 +252,6 @@ Ember._Backburner = Backburner; // ****@ember/-internals/runtime****
-
- Ember.A = A;
- Ember.String = {
--  loc,
-   w,
-   dasherize,
-   decamelize,
-@@ -442,9 +474,9 @@ function defineEmberTemplateCompilerLazyLoad(key) {
++
+ // eslint-disable-next-line @typescript-eslint/no-namespace
+ var Ember;
+ (function (Ember) {
+@@ -316,7 +350,7 @@ var Ember;
+     require,
+     define,
+     // @ts-expect-error These properties don't appear as being defined
+-    registry: typeof requirejs !== 'undefined' ? requirejs.entries : require.entries
++    registry: registry
+   };
+ })(Ember || (Ember = {}));
+ Object.defineProperty(Ember, 'ENV', {
+@@ -377,7 +411,7 @@ function defineEmberTemplateCompilerLazyLoad(key) {
+     configurable: true,
      enumerable: true,
-
      get() {
 -      if (has('ember-template-compiler')) {
 +      if (false) {
          let templateCompiler = require('ember-template-compiler');
--
-+        console.log(templateCompiler);
          EmberHTMLBars.precompile = EmberHandlebars.precompile = templateCompiler.precompile;
          EmberHTMLBars.compile = EmberHandlebars.compile = templateCompiler.compile;
-         Object.defineProperty(Ember, 'HTMLBars', {
-@@ -477,9 +509,7 @@ function defineEmberTestingLazyLoad(key) {
+@@ -407,8 +441,7 @@ function defineEmberTestingLazyLoad(key) {
+     configurable: true,
      enumerable: true,
-
      get() {
 -      if (has('ember-testing')) {
 -        let testing = require('ember-testing');
--
 +      if (DEBUG) {
          let {
            Test,
            Adapter,
-@@ -509,14 +539,17 @@ function defineEmberTestingLazyLoad(key) {
-   });
- }
-
-+
-+
- defineEmberTestingLazyLoad('Test');
- defineEmberTestingLazyLoad('setupForTesting');
- runLoadHooks('Ember');
-+
- Ember.__loader = {
-   require,
-   // eslint-disable-next-line no-undef
-   define,
-   // eslint-disable-next-line no-undef
--  registry: typeof requirejs !== 'undefined' ? requirejs.entries : require.entries
-+  registry: registry
- };
- export default Ember;
-\ No newline at end of file

src/addons/ember-simple-auth.ts

@@ -3,7 +3,7 @@ import SessionStoresApplication from 'ember-simple-auth/app/session-stores/appli
 import Adaptive from 'ember-simple-auth/session-stores/adaptive';
 import LocalStorage from 'ember-simple-auth/session-stores/local-storage';
 import Cookie from 'ember-simple-auth/session-stores/cookie';
-import CookiesService from 'ember-cookies/addon/services/cookies.js';
+import CookiesService from 'ember-cookies/services/cookies';
 import InternalSession from 'ember-simple-auth/internal-session';
 
 import ENV from '@/config/env';

vite.config.ts

@@ -86,6 +86,7 @@ export default defineConfig(({ mode }) => {
         addonExport('ember-concurrency-decorators'),
         addonExport('ember-bootstrap'),
         addonExport('ember-inflector'),
+        addonExport('@ember/string'),
         {
           find: 'ember-simple-auth/use-session-setup-method',
           replacement: './compat/ember-simple-auth/use-session-setup-method.ts',
@@ -209,6 +210,12 @@ export default defineConfig(({ mode }) => {
           find: `@ember/${pkg}`,
           replacement: nodePath(`ember-source/dist/packages/@ember/${pkg}`),
         })),
+        ...emberGlimmerDepsPackages().map((pkg) => ({
+          find: `@glimmer/${pkg}`,
+          replacement: nodePath(
+            `ember-source/dist/dependencies/@glimmer/${pkg}`
+          ),
+        })),
         ...eDataPackages().map((pkg) => ({
           find: `@ember-data/${pkg}`,
           replacement: nodePath(`@ember-data/${pkg}/addon`),
@@ -286,6 +293,13 @@ export default defineConfig(({ mode }) => {
   };
 });
 
+function emberGlimmerDepsPackages() {
+  return fs
+    .readdirSync('node_modules/ember-source/dist/dependencies/@glimmer')
+    .filter((el) => !el.includes('env.') && !el.includes('manager.'))
+    .map((el) => el.replace('.js', ''));
+}
+
 function emberPackages() {
   return fs.readdirSync('node_modules/ember-source/dist/packages/@ember');
 }