Merge pull request #2333 from embroider-build/ember-5-4

Add Vite support for Ember 5.4

Author: ef4

packages/compat/src/compat-adapters/ember-source.ts

@@ -102,7 +102,9 @@ export default class extends V1Addon {
       // top-level `ember` package tries to import it until 4.10. A
       // spec-compliant ES modules implementation will treat this as a parse
       // error.
-      trees.push(new FixStringLoc([packages]));
+      trees.push(new ReplaceRequire([new FixStringLoc([packages])]));
+    } else if (satisfies(this.packageJSON.version, '<5.7.0')) {
+      trees.push(new ReplaceRequire([packages]));
     }
 
     if (satisfies(this.packageJSON.version, '<5.12.0')) {
@@ -165,6 +167,149 @@ class FixStringLoc extends Plugin {
   }
 }
 
+class ReplaceRequire extends Plugin {
+  build() {
+    updateFileWithTransform(this, 'ember/index.js', function (babel: typeof Babel) {
+      const { types: t } = babel;
+
+      return {
+        visitor: {
+          CallExpression(path: NodePath<Babel.types.CallExpression>) {
+            if (
+              path.node.callee.type === 'Identifier' &&
+              (path.node.callee.name === 'has' || path.node.callee.name === 'require') &&
+              path.node.arguments[0].type === 'StringLiteral' &&
+              path.node.arguments[0].value === 'ember-testing'
+            ) {
+              path.replaceWith(t.identifier('EmberTestingImpl'));
+            }
+          },
+          ImportDeclaration(path: NodePath<Babel.types.ImportDeclaration>) {
+            if (path.node.source.value === 'require') {
+              path.replaceWith(
+                t.importDeclaration(
+                  [t.importSpecifier(t.identifier('EmberTestingImpl'), t.identifier('_impl'))],
+                  t.stringLiteral('@ember/test')
+                )
+              );
+            }
+          },
+          AssignmentExpression(path: NodePath<Babel.types.AssignmentExpression>) {
+            if (
+              path.node.left.type === 'MemberExpression' &&
+              path.node.left.object.type === 'Identifier' &&
+              path.node.left.object.name === 'Ember' &&
+              path.node.left.property.type === 'Identifier' &&
+              path.node.left.property.name === '__loader'
+            ) {
+              path.node.right = t.objectExpression([
+                t.objectMethod(
+                  'get',
+                  t.identifier('require'),
+                  [],
+                  t.blockStatement([
+                    t.returnStatement(t.memberExpression(t.identifier('globalThis'), t.identifier('require'))),
+                  ])
+                ),
+                t.objectMethod(
+                  'get',
+                  t.identifier('define'),
+                  [],
+                  t.blockStatement([
+                    t.returnStatement(t.memberExpression(t.identifier('globalThis'), t.identifier('define'))),
+                  ])
+                ),
+                t.objectMethod(
+                  'get',
+                  t.identifier('registry'),
+                  [],
+
+                  t.blockStatement([
+                    t.returnStatement(
+                      t.logicalExpression(
+                        '??',
+                        t.optionalMemberExpression(
+                          t.memberExpression(t.identifier('globalThis'), t.identifier('requirejs')),
+                          t.identifier('entries'),
+                          false,
+                          true
+                        ),
+                        t.optionalMemberExpression(
+                          t.memberExpression(t.identifier('globalThis'), t.identifier('require')),
+                          t.identifier('entries'),
+                          false,
+                          true
+                        )
+                      )
+                    ),
+                  ])
+                ),
+              ]);
+            }
+          },
+        },
+      };
+    });
+
+    replaceFile(
+      this,
+      '@ember/test/index.js',
+      `export let registerAsyncHelper;
+export let registerHelper;
+export let registerWaiter;
+export let unregisterHelper;
+export let unregisterWaiter;
+export let _impl;
+
+let testingNotAvailableMessage = () => {
+  throw new Error('Attempted to use test utilities, but \`ember-testing\` was not included');
+};
+
+registerAsyncHelper = testingNotAvailableMessage;
+registerHelper = testingNotAvailableMessage;
+registerWaiter = testingNotAvailableMessage;
+unregisterHelper = testingNotAvailableMessage;
+unregisterWaiter = testingNotAvailableMessage;
+
+export function registerTestImplementaiton(impl) {
+  let { Test } = impl;
+  registerAsyncHelper = Test.registerAsyncHelper;
+  registerHelper = Test.registerHelper;
+  registerWaiter = Test.registerWaiter;
+  unregisterHelper = Test.unregisterHelper;
+  unregisterWaiter = Test.unregisterWaiter;
+  _impl = impl;
+}`
+    );
+
+    replaceFile(
+      this,
+      'ember-testing/index.js',
+      `export * from './lib/public-api';
+import * as EmberTesting from './lib/public-api';
+import { registerTestImplementaiton } from '@ember/test';
+
+
+registerTestImplementaiton(EmberTesting);`
+    );
+
+    replaceFile(
+      this,
+      'ember-testing/lib/public-api.js',
+      `
+export { default as Test } from './test';
+export { default as Adapter } from './adapters/adapter';
+export { default as setupForTesting } from './setup_for_testing';
+export { default as QUnitAdapter } from './adapters/qunit';
+
+import './ext/application';
+import './ext/rsvp'; // setup RSVP + run loop integration
+import './helpers'; // adds helpers to helpers object in Test
+import './initializers'; // to setup initializer`
+    );
+  }
+}
+
 class FixDeprecateFunction extends Plugin {
   build() {
     let inSource = readFileSync(resolve(this.inputPaths[0], '@ember', 'debug', 'index.js'), 'utf8');
@@ -252,6 +397,10 @@ function updateFileWithTransform(
   outputFileSync(resolve(context.outputPath, file), outSource, 'utf8');
 }
 
+function replaceFile(context: Plugin, file: string, content: string) {
+  outputFileSync(resolve(context.outputPath, file), content, 'utf8');
+}
+
 class FixCycleImports extends Plugin {
   build() {
     for (let file of ['@ember/object/observable.js', '@ember/utils/lib/is_empty.js']) {

tests/scenarios/scenarios.ts

@@ -114,7 +114,6 @@ export function fullSupportMatrix(scenarios: Scenarios) {
       .skip('lts_4_4')
       .skip('lts_4_8')
       .skip('lts_4_12')
-      .skip('lts_5_4')
   );
 }