Remove old code that existed for now unsupported ember-sources (2.4, etc)

.github/workflows/ci-build.yml

@@ -105,7 +105,7 @@ jobs:
  - ember-canary
  - ember-default
  - embroider-safe
- # - embroider-optimized # see comments in ember-try.js
+ - embroider-optimized 
 
  steps:
  - uses: actions/checkout@v4

addon/package.json

@@ -103,5 +103,8 @@
  "@ember/-internals",
  "@ember/renderer"
  ]
+ },
+ "volta": {
+ "extends": "../package.json"
  }
 }

addon/src/settled.ts

@@ -190,19 +190,24 @@ if (loader.registry['ember-testing/test/waiters']) {
 function checkWaiters() {
  // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
  type Waiter = [any, Function];
- const EmberTest = Ember.Test as any as { waiters: Array<Waiter> };
+ const EmberTest = Ember.Test as any as {
+ waiters: Array<Waiter>;
+ checkWaiters: () => boolean;
+ };
 
  if (_internalCheckWaiters) {
  return _internalCheckWaiters();
- } else if (EmberTest.waiters) {
+ }
+
+ if (EmberTest.waiters) {
  if (
  EmberTest.waiters.some(([context, callback]) => !callback.call(context))
  ) {
  return true;
  }
  }
 
- return false;
+ return EmberTest.checkWaiters();
 }
 
 export interface SettledState {

test-app/config/ember-try.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const getChannelURL = require('ember-source-channel-url');
-const { embroiderSafe } = require('@embroider/test-setup');
+const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
 const latestVersion = require('latest-version');
 
 module.exports = async function () {
@@ -122,19 +122,7 @@ module.exports = async function () {
  },
  },
  embroiderSafe(),
- // disable embroider optimized test scenarios, as the dynamism these
- // tests use is not compatible with embroider we are still exploring
- // appropriate paths forward.
- //
- // Steps to re-enable:
- //
- // 1. have a strategy to make this work, import from '@embroider/test-setup'
- // 2. uncomment the next line
- // embroiderOptimized();
- //
- // 3. add "embroider-optimized" to .github/workflows/ci-build.yml's
- // ember-try-scenario list.
- //
+ embroiderOptimized(),
  ],
  };
 };

test-app/ember-cli-build.js

@@ -7,5 +7,39 @@ module.exports = function (defaults) {
  // Add options here
  });
 
- return app.toTree();
+ const { maybeEmbroider } = require('@embroider/test-setup');
+ return maybeEmbroider(app, {
+ packageRules: [
+ {
+ package: 'test-app',
+ components: {
+ /**
+ * All of these were found by searching for 'component:
+ * and all of those happen to be in-app registrations
+ *
+ * It very well could be that we don't actually need to interact
+ * with the resolver or registry anymore, but that investigation
+ * has been left for a future date.
+ */
+ '{{x-test-1}}': { safeToIgnore: true },
+ '{{x-test-2}}': { safeToIgnore: true },
+ '{{x-test-3}}': { safeToIgnore: true },
+ '{{x-test-4}}': { safeToIgnore: true },
+ '{{x-test-5}}': { safeToIgnore: true },
+ '{{x-foo}}': { safeToIgnore: true },
+ '{{x-input}}': { safeToIgnore: true },
+ '{{foo}}': { safeToIgnore: true },
+ '{{foo-bar}}': { safeToIgnore: true },
+ '{{my-input}}': { safeToIgnore: true },
+ '{{my-component}}': { safeToIgnore: true },
+ '{{click-me-button}}': { safeToIgnore: true },
+ '{{promise-wrapper}}': { safeToIgnore: true },
+ '{{js-only}}': { safeToIgnore: true },
+ '{{outer-comp}}': { safeToIgnore: true },
+ '{{inner-comp}}': { safeToIgnore: true },
+ '{{template-only}}': { safeToIgnore: true },
+ },
+ },
+ ],
+ });
 };

test-app/tests/unit/setup-rendering-context-test.js

@@ -87,7 +87,6 @@ module('setupRenderingContext', function (hooks) {
  'component:js-only': Component.extend({
  classNames: ['js-only'],
  }),
- 'helper:jax': helper(([name]) => `${name}-jax`),
  'component:outer-comp': setComponentTemplate(
  hbs`outer{{inner-comp}}outer`,
  class extends Component {}
@@ -287,15 +286,21 @@ module('setupRenderingContext', function (hooks) {
  });
 
  test('can invoke helper', async function (assert) {
- await render(hbs`{{jax "max"}}`);
+ this.setProperties({
+ jax: helper(([name]) => `${name}-jax`),
+ });
+ await render(hbs`{{this.jax "max"}}`);
 
  assert.equal(this.element.textContent, 'max-jax');
  });
 
  test('can pass arguments to helper from context', async function (assert) {
+ this.setProperties({
+ jax: helper(([name]) => `${name}-jax`),
+ });
  this.set('name', 'james');
 
- await render(hbs`{{jax this.name}}`);
+ await render(hbs`{{this.jax this.name}}`);
 
  assert.equal(this.element.textContent, 'james-jax');
  });