test(optimizer): add test for cjs dep static import (vitejs#20011)

Author: sapphi-red

playground/optimize-deps/__tests__/optimize-deps.spec.ts

@@ -30,6 +30,18 @@ test('default import from webpacked cjs (clipboard)', async () => {
   await expectWithRetry(() => page.textContent('.cjs-clipboard')).toBe('ok')
 })
 
+test('default import from cjs (cjs-dep-cjs-compiled-from-esm)', async () => {
+  await expectWithRetry(() =>
+    page.textContent('.cjs-dep-cjs-compiled-from-esm'),
+  ).toBe('ok')
+})
+
+test('default import from cjs (cjs-dep-cjs-compiled-from-cjs)', async () => {
+  await expectWithRetry(() =>
+    page.textContent('.cjs-dep-cjs-compiled-from-cjs'),
+  ).toBe('ok')
+})
+
 test('dynamic imports from cjs dep (react)', async () => {
   await expectWithRetry(() => page.textContent('.cjs-dynamic button')).toBe(
     'count is 0',

playground/optimize-deps/cjs-dynamic.js

@@ -17,13 +17,11 @@
   }
 
   const cjsFromESM = await import('@vitejs/test-dep-cjs-compiled-from-esm')
-  console.log('cjsFromESM', cjsFromESM)
   if (typeof cjsFromESM.default === 'function') {
     text('.cjs-dynamic-dep-cjs-compiled-from-esm', 'ok')
   }
 
   const cjsFromCJS = await import('@vitejs/test-dep-cjs-compiled-from-cjs')
-  console.log('cjsFromCJS', cjsFromCJS)
   if (typeof cjsFromCJS.default === 'function') {
     text('.cjs-dynamic-dep-cjs-compiled-from-cjs', 'ok')
   }

playground/optimize-deps/cjs.js

@@ -5,6 +5,8 @@ import React, { useState } from 'react'
 import ReactDOM from 'react-dom/client'
 import { Socket } from 'phoenix'
 import clip from 'clipboard'
+import cjsFromESM from '@vitejs/test-dep-cjs-compiled-from-esm'
+import cjsFromCJS from '@vitejs/test-dep-cjs-compiled-from-cjs'
 
 // Test exporting a name that was already imported
 export { useState } from 'react'
@@ -19,6 +21,14 @@ if (typeof Socket === 'function') {
   text('.cjs-phoenix', 'ok')
 }
 
+if (typeof cjsFromESM === 'function') {
+  text('.cjs-dep-cjs-compiled-from-esm', 'ok')
+}
+
+if (typeof cjsFromCJS === 'function') {
+  text('.cjs-dep-cjs-compiled-from-cjs', 'ok')
+}
+
 function App() {
   const [count, setCount] = useState(0)
 

playground/optimize-deps/index.html

@@ -6,6 +6,10 @@ <h2>CommonJS w/ named imports (phoenix)</h2>
 <div class="cjs-phoenix">fail</div>
 <h2>CommonJS w/ default export (clipboard)</h2>
 <div class="cjs-clipboard">fail</div>
+<h2>CommonJS import default (dep-cjs-compiled-from-esm)</h2>
+<div class="cjs-dep-cjs-compiled-from-esm"></div>
+<h2>CommonJS import default (dep-cjs-compiled-from-cjs)</h2>
+<div class="cjs-dep-cjs-compiled-from-cjs"></div>
 
 <script type="module" src="./cjs.js"></script>