Support only 4.12 (LTS) or higher, delete a bunch of code, remove mac…

…ros, etc
ember-cli · Jun 7, 2024 · 7497979 · 7497979
1 parent 9d1a025
commit 7497979
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 61 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -66,8 +66,6 @@ jobs:
       fail-fast: false
       matrix:
         ember-try-scenario:
-          - ember-lts-4.4
-          - ember-lts-4.8
           - ember-lts-4.12
           - ember-lts-5.4
           - ember-lts-5.8

diff --git a/addon/addon/index.js b/addon/addon/index.js
@@ -5,21 +5,8 @@ import EmberObject from '@ember/object';
 import { dasherize, classify, underscore } from './string';
 import { DEBUG } from '@glimmer/env';
 import classFactory from './utils/class-factory';
-import {
-  macroCondition,
-  dependencySatisfies,
-  importSync,
-} from '@embroider/macros';
-
-let getOwner;
-
-if (macroCondition(dependencySatisfies('ember-source', '>= 4.11'))) {
-  getOwner = importSync('@ember/owner').getOwner;
-} else {
-  getOwner = importSync('@ember/application').getOwner;
-}
 
-import { TEMPLATES } from './template-cache';
+import { getOwner } from '@ember/owner';
 
 if (typeof requirejs.entries === 'undefined') {
   requirejs.entries = requirejs._eak_seen;
@@ -307,11 +294,7 @@ class Resolver extends EmberObject {
   }
 
   resolveTemplate(parsedName) {
-    let resolved = this.resolveOther(parsedName);
-    if (resolved == null) {
-      resolved = TEMPLATES[parsedName.fullNameWithoutType];
-    }
-    return resolved;
+    return this.resolveOther(parsedName);
   }
 
   mainModuleName(parsedName) {

diff --git a/addon/addon/template-cache.js b/addon/addon/template-cache.js
diff --git a/addon/package.json b/addon/package.json
@@ -23,7 +23,6 @@
   },
   "scripts": {},
   "dependencies": {
-    "@embroider/macros": "^1.16.2",
     "ember-cli-babel": "^7.26.11"
   },
   "peerDependencies": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/test-app/config/ember-try.js b/test-app/config/ember-try.js
@@ -42,22 +42,6 @@ module.exports = async function () {
     },
 
     scenarios: [
-      {
-        name: 'ember-lts-4.4',
-        npm: {
-          devDependencies: {
-            'ember-source': '~4.4.0',
-          },
-        },
-      },
-      {
-        name: 'ember-lts-4.8',
-        npm: {
-          devDependencies: {
-            'ember-source': '~4.8.0',
-          },
-        },
-      },
       {
         name: 'ember-lts-4.12',
         npm: {

diff --git a/test-app/tests/unit/resolvers/classic/-setup-resolver.js b/test-app/tests/unit/resolvers/classic/-setup-resolver.js
@@ -1,17 +1,6 @@
 import Resolver, { ModuleRegistry } from 'ember-resolver';
-import {
-  macroCondition,
-  dependencySatisfies,
-  importSync,
-} from '@embroider/macros';
 
-let setOwner;
-
-if (macroCondition(dependencySatisfies('ember-source', '>= 4.11'))) {
-  setOwner = importSync('@ember/owner').setOwner;
-} else {
-  setOwner = importSync('@ember/application').setOwner;
-}
+import { setOwner } from '@ember/owner';
 
 export let resolver;
 export let loader;