test: update dev-server-rollup test values

modernweb-dev · Apr 19, 2023 · ad9f0f1 · ad9f0f1
1 parent 1a5fe52
commit ad9f0f1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 25 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
@@ -24,6 +24,7 @@ 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');
   });
@@ -33,7 +34,7 @@ describe('commonjs', () => {
   });
 
   it('can handle require default', () => {
-    expect(requiredDefault).to.equal('foo');
+    expect(requiredDefault.default).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
@@ -52,10 +52,8 @@ describe('@rollup/plugin-commonjs', () => {
 
     try {
       const text = await fetchText(`${host}/foo.js`);
-      expectIncludes(text, 'var foo_1 = "bar"; var lorem = "ipsum";');
-      expectIncludes(text, 'export default foo;');
-      expectIncludes(text, 'export { foo_1 as foo };');
-      expectIncludes(text, 'export { lorem };');
+      expectIncludes(text, 'var foo_1 = foo.foo = "bar"; var lorem = foo.lorem = "ipsum";');
+      expectIncludes(text, 'export { foo as __moduleExports, foo_1 as foo, lorem, foo as default };');
     } finally {
       server.stop();
     }
@@ -86,10 +84,12 @@ module.exports.lorem = lorem;`;
     try {
       const text = await fetchText(`${host}/foo.js`);
 
-      expectIncludes(text, 'export default foo_1;');
-      expectIncludes(text, 'export { foo_1 as __moduleExports };');
-      expectIncludes(text, 'export { foo_2 as foo }');
-      expectIncludes(text, 'export { lorem_1 as lorem }');
+      expectIncludes(text, 'foo_1.__esModule = true;');
+      expectIncludes(text, "const foo = 'bar';");
+      expectIncludes(text, 'var foo_2 = foo_1.foo = foo;');
+      expectIncludes(text, "const lorem = 'ipsum';");
+      expectIncludes(text, 'var lorem_1 = foo_1.lorem = lorem;');
+      expectIncludes(text, 'export { foo_1 as __moduleExports, foo_2 as foo, lorem_1 as lorem, foo_1 as default };');
     } finally {
       server.stop();
     }
@@ -118,19 +118,15 @@ exports.default = _default;`;
       const text = await fetchText(`${host}/foo.js`);
       expectIncludes(
         text,
-        "import * as commonjsHelpers from '/__web-dev-server__/rollup/commonjsHelpers.js?web-dev-server-rollup-null-byte=%00commonjsHelpers.js';",
-      );
-      expectIncludes(
-        text,
-        'var foo = commonjsHelpers.createCommonjsModule(function (module, exports) {',
+        'import * as commonjsHelpers from "/__web-dev-server__/rollup/commonjsHelpers.js?web-dev-server-rollup-null-byte=%00commonjsHelpers.js";',
       );
-      expectIncludes(text, 'exports.__esModule = true;');
-      expectIncludes(text, 'exports.default = void 0;');
+      expectIncludes(text, 'foo.__esModule = true;');
+      expectIncludes(text, 'var default_1 = foo.default = void 0;');
       expectIncludes(text, "var _default = 'foo';");
-      expectIncludes(text, 'exports.default = _default;');
+      expectIncludes(text, 'default_1 = foo.default = _default;');
       expectIncludes(
         text,
-        'export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(foo);',
+        'export { foo as __moduleExports, default_1 as default };',
       );
     } finally {
       server.stop();
@@ -189,13 +185,9 @@ exports.default = _default;`;
 
     try {
       const text = await fetchText(`${host}/foo.js`);
-      expectIncludes(text, "import './bar.js';");
-      expectIncludes(
-        text,
-        "import bar from '/__web-dev-server__/rollup/bar.js?web-dev-server-rollup-null-byte=%00",
-      );
-      expectIncludes(text, 'export default foo;');
-      expectIncludes(text, 'export { bar_1 as bar };');
+      expectIncludes(text, "import require$$0 from \"");
+      expectIncludes(text, 'const bar = require$$0; var bar_1 = foo.bar = bar;');
+      expectIncludes(text, 'export { foo as __moduleExports, bar_1 as bar, foo as default };');
     } finally {
       server.stop();
     }