From 9ab7bd33a9e32c6d1f2dc5d481408d461c8ec839 Mon Sep 17 00:00:00 2001
From: Westbrook Johnson <westbrook.johnson@gmail.com>
Date: Fri, 17 Mar 2023 17:22:09 -0400
Subject: [PATCH] Configure for expected CJS importing

---
 .../node/fixtures/commonjs/commonjs-browser-test.js  | 12 ++++--------
 .../test/node/plugins/commonjs.test.ts               |  1 +
 .../test/rollup-plugin-html.test.ts                  |  1 -
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/dev-server-rollup/test/node/fixtures/commonjs/commonjs-browser-test.js b/packages/dev-server-rollup/test/node/fixtures/commonjs/commonjs-browser-test.js
index 2e0560991..f451fb201 100644
--- a/packages/dev-server-rollup/test/node/fixtures/commonjs/commonjs-browser-test.js
+++ b/packages/dev-server-rollup/test/node/fixtures/commonjs/commonjs-browser-test.js
@@ -2,10 +2,7 @@ import '../../../../../../node_modules/chai/chai.js';
 import defaultFoo from './modules/default-export.js';
 import { namedFoo, namedBar } from './modules/named-exports.js';
 
-// TODO: Ideally, we would be able to import named exports. But @rollup/plugin-commonjs does not support this yet
-// see: https://github.com/rollup/plugins/issues/481
-// import { compiledEsmFoo, compiledEsmBar } from '../src/compiled-esm-named-exports.js';
-import compiledEsm from './modules/compiled-esm-named-exports.js';
+import { compiledEsmFoo, compiledEsmBar } from './modules/compiled-esm-named-exports.js';
 import compiledEsmDefault from './modules/compiled-esm-default-exports.js';
 
 import requiredDefault from './modules/require-default.js';
@@ -24,9 +21,8 @@ describe('commonjs', () => {
   });
 
   it('can handle compiled es modules with named exports', () => {
-    console.log(compiledEsm);
-    expect(compiledEsm.compiledEsmFoo).to.equal('foo');
-    expect(compiledEsm.compiledEsmBar).to.equal('bar');
+    expect(compiledEsmFoo).to.equal('foo');
+    expect(compiledEsmBar).to.equal('bar');
   });
 
   it('can handle compiled es modules with a default export', () => {
@@ -34,7 +30,7 @@ describe('commonjs', () => {
   });
 
   it('can handle require default', () => {
-    expect(requiredDefault.default).to.equal('foo');
+    expect(requiredDefault).to.equal('foo');
   });
 
   it('can handle require named', () => {
diff --git a/packages/dev-server-rollup/test/node/plugins/commonjs.test.ts b/packages/dev-server-rollup/test/node/plugins/commonjs.test.ts
index daa0f69fe..3c5bd958d 100644
--- a/packages/dev-server-rollup/test/node/plugins/commonjs.test.ts
+++ b/packages/dev-server-rollup/test/node/plugins/commonjs.test.ts
@@ -204,6 +204,7 @@ exports.default = _default;`;
       browsers: [chromeLauncher({ launchOptions: { devtools: false } })],
       plugins: [
         fromRollup(rollupCommonjs)({
+          requireReturnsDefault: 'preferred',
           include: '**/commonjs/modules/**/*',
         }),
       ],
diff --git a/packages/rollup-plugin-html/test/rollup-plugin-html.test.ts b/packages/rollup-plugin-html/test/rollup-plugin-html.test.ts
index fefc6a7b8..3d08f16ef 100644
--- a/packages/rollup-plugin-html/test/rollup-plugin-html.test.ts
+++ b/packages/rollup-plugin-html/test/rollup-plugin-html.test.ts
@@ -695,7 +695,6 @@ describe('rollup-plugin-html', () => {
     }
 
     const outputHtml = getAsset(output, 'index.html').source;
-    console.log(outputHtml);
     expect(outputHtml).to.include(
       '<link rel="apple-touch-icon" sizes="180x180" href="assets/image-a.png">',
     );