From f4fa2f3fa592e0f960bde12f1a4149918181e6dd Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Fri, 22 Dec 2023 20:34:41 -0500
Subject: [PATCH 1/2] Add es-compat to make asset loaders work as expected

The output produced by webpack's `asset/resource` and `asset/source` loaders is just a plain CJS module with no es compatibility built in. Since ember-auto-import turns the user's `import` into a `require()` in the entryfile, webpack doesn't have any reason to know to add cjs compatibility. This results in not getting a `default` export on the resulting module.

This change adds general es-compatibility checking to our `require()` calls. This is exactly the same as embroider already does.
---
 package-lock.json                        |  2 +-
 packages/ember-auto-import/ts/webpack.ts |  8 +++++--
 test-scenarios/static-import-test.ts     | 27 ++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bf129760..fbcf0177 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38016,7 +38016,7 @@
       }
     },
     "packages/ember-auto-import": {
-      "version": "2.7.0",
+      "version": "2.7.1",
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.16.7",
diff --git a/packages/ember-auto-import/ts/webpack.ts b/packages/ember-auto-import/ts/webpack.ts
index 5fa9e696..49e896ab 100644
--- a/packages/ember-auto-import/ts/webpack.ts
+++ b/packages/ember-auto-import/ts/webpack.ts
@@ -74,8 +74,12 @@ module.exports = (function(){
     {{! this is only used for synchronous importSync() using a template string }}
     return r('_eai_sync_' + specifier)(Array.prototype.slice.call(arguments, 1))
   };
+  {{!- es compatibility. Where we're using "require", webpack doesn't necessarily know to apply its own ES compatibility stuff -}}
+  function esc(m) {
+    return m && m.__esModule ? m : Object.assign({ default: m }, m);
+  }
   {{#each staticImports as |module|}}
-    d('{{js-string-escape module.specifier}}', EAI_DISCOVERED_EXTERNALS('{{module-to-id module.specifier}}'), function() { return require('{{js-string-escape module.specifier}}'); });
+    d('{{js-string-escape module.specifier}}', EAI_DISCOVERED_EXTERNALS('{{module-to-id module.specifier}}'), function() { return esc(require('{{js-string-escape module.specifier}}')); });
   {{/each}}
   {{#each dynamicImports as |module|}}
     d('_eai_dyn_{{js-string-escape module.specifier}}', [], function() { return import('{{js-string-escape module.specifier}}'); });
@@ -83,7 +87,7 @@ module.exports = (function(){
   {{#each staticTemplateImports as |module|}}
     d('_eai_sync_{{js-string-escape module.key}}', [], function() {
       return function({{module.args}}) {
-        return require({{{module.template}}});
+        return esc(require({{{module.template}}}));
       }
     });
   {{/each}}
diff --git a/test-scenarios/static-import-test.ts b/test-scenarios/static-import-test.ts
index 3f1b81b3..4a067ed1 100644
--- a/test-scenarios/static-import-test.ts
+++ b/test-scenarios/static-import-test.ts
@@ -43,6 +43,7 @@ function staticImportTest(project: Project) {
               ],
               allowAppImports: [
                'lib/**',
+               '**/*.txt',
                'assets/*.specialfile',
               ],
               webpack: {
@@ -52,6 +53,10 @@ function staticImportTest(project: Project) {
                       test: /\.specialfile/,
                       use: 'specialfile-loader',
                     },
+                    {
+                      test: /\.txt/,
+                      type: 'asset/resource',
+                    },
                   ],
                 },
               },
@@ -64,6 +69,17 @@ function staticImportTest(project: Project) {
       'reexport.js': `
           export { default as innerLib } from 'inner-lib';
         `,
+      'uses-an-asset.js': `
+        import txtURL from './images/example.txt';
+        export default async function fetchTxt() {
+          let response = await fetch(txtURL);
+          let body = await response.text();
+          return body;
+        }
+      `,
+      images: {
+        'example.txt': 'here is some text',
+      },
       components: {
         'hello-world.js': `
             import Component from '@ember/component';
@@ -191,6 +207,17 @@ function staticImportTest(project: Project) {
               });
             });
           `,
+        'asset-test.js': `
+          import { module, test } from 'qunit';
+          import loadTxt from '@ef4/app-template/uses-an-asset';
+
+          module('Unit | reexports are found', function () {
+            test('can load an asset URL', async function (assert) {
+              let txt = await loadTxt();
+              assert.equal(txt, 'here is some text');
+            });
+          });        
+        `,
         'import-into-tests-test.js': `
             import { module, test } from 'qunit';
             import { capitalize } from 'lodash-es';

From d1be0e59dbbbc8b172689584fee8ab1ec5567482 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Fri, 22 Dec 2023 21:09:28 -0500
Subject: [PATCH 2/2] this has been wrong

---
 test-scenarios/leader-test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-scenarios/leader-test.ts b/test-scenarios/leader-test.ts
index b9685ca8..7c229b42 100644
--- a/test-scenarios/leader-test.ts
+++ b/test-scenarios/leader-test.ts
@@ -41,7 +41,7 @@ Scenarios.fromProject(baseApp)
         unit: {
           'asset-test.js': `
             import { module, test } from 'qunit';
-            import * as example from 'images/thing.png';
+            import example from 'images/thing.png';
 
             module('Unit | webpack5', function () {
               test('can use webpack5 asset loading', function (assert) {