Configure for expected CJS importing

modernweb-dev · Mar 21, 2023 · 9ab7bd3 · 9ab7bd3
1 parent b150e0d
commit 9ab7bd3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 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
@@ -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,17 +21,16 @@ 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', () => {
     expect(compiledEsmDefault).to.equal('bar');
   });
 
   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
@@ -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
@@ -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">',
     );