Merge main into nvp/deprecate-mixin-followups

babel.test.config.mjs

@@ -9,12 +9,29 @@
 
 import { createRequire } from 'node:module';
 import baseConfig from './babel.config.mjs';
+import { buildMacros } from '@embroider/macros/babel';
 
 // eslint-disable-next-line no-redeclare
 const require = createRequire(import.meta.url);
 const buildDebugMacroPlugin = require('./broccoli/build-debug-macro-plugin.cjs');
+const appEmberSatisfiesPlugin = require('./broccoli/app-ember-satisfies-plugin.cjs');
 const isProduction = process.env.EMBER_ENV === 'production';
 
+// @ember/test-helpers, @ember/test-waiters and ember-qunit use @embroider/macros.
+//
+// buildMacros() reads NODE_ENV, but our builds select the mode with EMBER_ENV.
+const macros = buildMacros({
+  setConfig: {
+    // index.html loads the QUnit styles, and tests render into #qunit-fixture.
+    'ember-qunit': { theme: 'none', disableContainerStyles: true },
+  },
+  configure(config) {
+    if (!isProduction) {
+      config.enablePackageDevelopment(process.cwd());
+    }
+  },
+});
+
 export default {
   ...baseConfig,
 
@@ -27,5 +44,10 @@ export default {
     ],
   ],
 
-  plugins: [...baseConfig.plugins, ...buildDebugMacroPlugin(!isProduction)],
+  plugins: [
+    ...baseConfig.plugins,
+    appEmberSatisfiesPlugin,
+    ...macros.babelMacros,
+    ...buildDebugMacroPlugin(!isProduction),
+  ],
 };

bin/benchmark/run.mjs

@@ -177,6 +177,10 @@ async function bootAndRun({ headless = true } = {}) {
       // as the contradictory flags cause use-after-free crashes on macOS
       '--disable-gpu',
       '--disable-gpu-compositing',
+      // Exposes gc(), which the benchmark app calls between phases (see
+      // waitForIdle in smoke-tests/benchmark-app/app/run-benchmark.js), so
+      // the garbage of one phase is not collected inside a later one.
+      '--js-flags=--expose-gc',
     ].join(','),
   ];
 

broccoli/app-ember-satisfies-plugin.cjs

@@ -0,0 +1,32 @@
+const semver = require('semver');
+const { version } = require('../package.json');
+
+/*
+  `appEmberSatisfies` from @embroider/macros reads the ember-source version
+  from the dependencies of the app.
+
+  In this repo the app is ember-source, and a package cannot depend on itself.
+  So this plugin answers the macro with the version of this repo, before
+  @embroider/macros sees it.
+*/
+module.exports = function appEmberSatisfiesPlugin({ types: t }) {
+  return {
+    name: 'app-ember-satisfies',
+    visitor: {
+      Program(program) {
+        program.traverse({
+          CallExpression(call) {
+            if (!call.get('callee').referencesImport('@embroider/macros', 'appEmberSatisfies')) {
+              return;
+            }
+
+            let [range] = call.node.arguments;
+            let satisfied = semver.satisfies(version, range.value, { includePrerelease: true });
+
+            call.replaceWith(t.booleanLiteral(satisfied));
+          },
+        });
+      },
+    },
+  };
+};

index.html

@@ -7,9 +7,14 @@
   </head>
   <body>
     <script type="module">
-      import 'qunit/qunit/qunit.js';
+      // By package name, as in the tests. The dev server then gives this page
+      // and the tests the same copy of QUnit.
+      import 'qunit';
       import 'qunit/qunit/qunit.css';
 
+      // The last script of this page starts QUnit, after all tests are loaded.
+      QUnit.config.autostart = false;
+
       window.EmberENV = {};
 
       // Test under octane defaults
@@ -46,13 +51,11 @@
 
     <script type="module">
       import setupQUnit from './packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts';
+      import setupTestHelpers from './packages/internal-test-helpers/lib/ember-dev/setup-test-helpers.js';
       import { setTesting } from './packages/@ember/debug/index.ts';
       setupQUnit();
+      setupTestHelpers();
       setTesting(true);
-
-      let s = document.createElement('script');
-      s.src = '/testem.js';
-      document.body.append(s);
     </script>
 
     <script type="module">
@@ -79,6 +82,13 @@
           eager: true,
         }
       );
+
+      // ember-qunit calls the testem hook when a test imports it, and that call
+      // throws if testem is already hooked. So testem loads after the tests.
+      let testem = document.createElement('script');
+      testem.src = '/testem.js';
+      testem.onload = testem.onerror = () => QUnit.start();
+      document.body.append(testem);
     </script>
 
     <div id="qunit"></div>

package.json

@@ -106,6 +106,7 @@
     "@babel/plugin-transform-typescript": "^7.26.8",
     "@babel/preset-env": "^7.16.11",
     "@babel/types": "^7.22.5",
+    "@ember/test-helpers": "^5.7.0",
     "@embroider/macros": "^1.20.2",
     "@embroider/shared-internals": "^3.0.2",
     "@embroider/vite": "^1.7.2",
@@ -131,6 +132,7 @@
     "ember-cli-browserstack": "^4.0.0",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-yuidoc": "^0.9.1",
+    "ember-qunit": "^9.1.0",
     "eslint": "^9.21.0",
     "eslint-import-resolver-node": "^0.3.10",
     "eslint-plugin-disable-features": "^0.1.3",
@@ -150,6 +152,7 @@
     "npm-run-all2": "^8.0.0",
     "prettier": "^3.5.3",
     "qunit": "^2.19.4",
+    "qunit-dom": "^3.6.0",
     "recast": "^0.22.0",
     "release-plan": "^0.19.0",
     "resolve.exports": "^2.0.3",