Update fixtuse and formatting fixes

Author: NullVoxPopuli

files/.try.mjs

@@ -36,10 +36,6 @@ module.exports = async function (defaults) {
 }
 
 function compatEmberScenario(name, emberVersion) {
-  // older LTSs would also need the compat configuration
-  let needsCompat = ['5.4.0', '4.12.0'];
-  let needsBabelComat = needsCompat.some((v) => emberVersion.includes(v));
-
   return {
     name,
     npm: {
@@ -56,7 +52,6 @@ function compatEmberScenario(name, emberVersion) {
     },
     files: {
       'ember-cli-build.js': emberCliBuildJS(),
-      ...(needsBabelComat ? { 'babel.config.cjs': compatBabel() } : {}),
       'config/optional-features.json': JSON.stringify({
         'application-template-wrapper': false,
         'default-async-observers': true,

files/babel.config.cjs

@@ -1,6 +1,9 @@
 const { buildMacros } = require('@embroider/macros/babel');
 
-const { babelCompatSupport, templateCompatSupport } = require('@embroider/compat/babel');
+const {
+  babelCompatSupport,
+  templateCompatSupport,
+} = require('@embroider/compat/babel');
 
 const macros = buildMacros();
 
@@ -17,7 +20,9 @@ module.exports = {
     [
       'babel-plugin-ember-template-compilation',
       {
-        transforms: [...(isCompat ? templateCompatSupport() : macros.templateMacros)],
+        transforms: [
+          ...(isCompat ? templateCompatSupport() : macros.templateMacros),
+        ],
       },
     ],
     [

tests/fixtures/default/.github/workflows/ci.yml

@@ -82,11 +82,15 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: pnpm
+          cache: npm
       - name: Apply Scenario
-        run: pnpm dlx @embroider/try apply ${{ matrix.name }}
+        run: |
+          
+           npx @embroider/try apply ${{ matrix.name }}
       - name: Install Dependencies
-        run: pnpm install --no-lockfile
+        run: npm install --no-package-lock
       - name: Run Tests
-        run: pnpm test
+        run: |
+          
+          npm test
         env: ${{ matrix.env }}

tests/fixtures/pnpm/.github/workflows/ci.yml

@@ -87,9 +87,13 @@ jobs:
           node-version: 18
           cache: pnpm
       - name: Apply Scenario
-        run: pnpm dlx @embroider/try apply ${{ matrix.name }}
+        run: |
+           pnpm dlx @embroider/try apply ${{ matrix.name }}
+          
       - name: Install Dependencies
         run: pnpm install --no-lockfile
       - name: Run Tests
-        run: pnpm test
+        run: |
+          pnpm test
+          
         env: ${{ matrix.env }}