fix: A static and dynamically imported module is loaded twice

packages/playground/dynamic-import/__tests__/dynamic-import.spec.ts

@@ -29,3 +29,8 @@ test('should load dynamic import with vars', async () => {
   await page.click('.bar')
   await untilUpdated(() => page.textContent('.view'), 'Bar view', true)
 })
+
+test('should have same reference on static on dynamic import', async () => {
+  await page.click('.mxd')
+  await untilUpdated(() => page.textContent('.view'), '2', true)
+})

packages/playground/dynamic-import/index.html

@@ -2,6 +2,7 @@
 <button class="bar">Bar</button>
 <button class="baz">Baz</button>
 <button class="qux">Qux</button>
+<button class="mxd">Mxd</button>
 <button class="issue-2658-1">Issue 2658 - 1</button>
 <button class="issue-2658-2">Issue 2658 - 2</button>
 

packages/playground/dynamic-import/mxd.js

@@ -0,0 +1,4 @@
+let n = 0
+export default function () {
+  return ++n
+}

packages/playground/dynamic-import/nested/index.js

@@ -1,3 +1,5 @@
+import mxd from '../mxd'
+
 async function setView(view) {
   const { msg } = await import(`../views/${view}.js`)
   text('.view', msg)
@@ -21,6 +23,14 @@ document.querySelector('.qux').addEventListener('click', async () => {
   text('.view', msg)
 })
 
+// mixed static and dynamic
+document.querySelector('.mxd').addEventListener('click', async () => {
+  const view = 'mxd'
+  const { default: mxd2 } = await import(`../${view}.js`)
+  mxd()
+  text('.view', mxd2())
+})
+
 // data URLs (`blob:`)
 const code1 = 'export const msg = "blob"'
 const blob = new Blob([code1], { type: 'text/javascript;charset=UTF-8' })

packages/vite/src/node/plugins/importAnalysis.ts

@@ -408,7 +408,22 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
             )
           }
           needQueryInjectHelper = true
-          str().overwrite(start, end, `__vite__injectQuery(${url}, 'import')`)
+          if (
+            !/^('.*'|".*"|`.*`)$/.test(url) ||
+            (!isJSRequest(cleanUrl(url.slice(1, -1))) &&
+              !isCSSRequest(url.slice(1, -1)))
+          ) {
+            str().overwrite(start, end, `__vite__injectQuery(${url}, 'import')`)
+          } else {
+            const depModule = await moduleGraph.ensureEntryFromUrl(url)
+            if (depModule.lastHMRTimestamp > 0) {
+              str().overwrite(
+                start,
+                end,
+                `__vite__injectQuery(${url}, 't=${depModule.lastHMRTimestamp}')`
+              )
+            }
+          }
         }
       }