vite 2.5.5 → 2.5.9

package/src/node/ssr/__tests__/ssrTransform.spec.ts

@@ -149,43 +149,43 @@ test('import.meta', async () => {
 })
 
 test('dynamic import', async () => {
-  expect(
-    (await ssrTransform(`export const i = () => import('./foo')`, null, null))
-      .code
-  ).toMatchInlineSnapshot(`
+  const result = await ssrTransform(
+    `export const i = () => import('./foo')`,
+    null,
+    null
+  )
+  expect(result.code).toMatchInlineSnapshot(`
     "const i = () => __vite_ssr_dynamic_import__('./foo')
     Object.defineProperty(__vite_ssr_exports__, \\"i\\", { enumerable: true, configurable: true, get(){ return i }});"
   `)
+  expect(result.deps).toEqual([])
+  expect(result.dynamicDeps).toEqual(['./foo'])
 })
 
 test('do not rewrite method definition', async () => {
-  expect(
-    (
-      await ssrTransform(
-        `import { fn } from 'vue';class A { fn() { fn() } }`,
-        null,
-        null
-      )
-    ).code
-  ).toMatchInlineSnapshot(`
+  const result = await ssrTransform(
+    `import { fn } from 'vue';class A { fn() { fn() } }`,
+    null,
+    null
+  )
+  expect(result.code).toMatchInlineSnapshot(`
     "const __vite_ssr_import_0__ = await __vite_ssr_import__(\\"vue\\");
     class A { fn() { __vite_ssr_import_0__.fn() } }"
   `)
+  expect(result.deps).toEqual(['vue'])
 })
 
 test('do not rewrite catch clause', async () => {
-  expect(
-    (
-      await ssrTransform(
-        `import {error} from './dependency';try {} catch(error) {}`,
-        null,
-        null
-      )
-    ).code
-  ).toMatchInlineSnapshot(`
+  const result = await ssrTransform(
+    `import {error} from './dependency';try {} catch(error) {}`,
+    null,
+    null
+  )
+  expect(result.code).toMatchInlineSnapshot(`
     "const __vite_ssr_import_0__ = await __vite_ssr_import__(\\"./dependency\\");
     try {} catch(error) {}"
   `)
+  expect(result.deps).toEqual(['./dependency'])
 })
 
 // #2221

package/src/node/ssr/ssrExternal.ts

@@ -1,10 +1,18 @@
 import fs from 'fs'
 import path from 'path'
 import { tryNodeResolve, InternalResolveOptions } from '../plugins/resolve'
-import { isDefined, lookupFile, resolveFrom, unique } from '../utils'
+import {
+  createDebugger,
+  isDefined,
+  lookupFile,
+  resolveFrom,
+  unique
+} from '../utils'
 import { ResolvedConfig } from '..'
 import { createFilter } from '@rollup/pluginutils'
 
+const debug = createDebugger('vite:ssr-external')
+
 /**
  * Heuristics for determining whether a dependency should be externalized for
  * server-side rendering.
@@ -63,9 +71,7 @@ export function resolveSSRExternal(
       requireEntry = require.resolve(id, { paths: [root] })
     } catch (e) {
       // resolve failed, assume include
-      config.logger.warn(
-        `Bundling package for SSR due to resolve failure. ${e.message}`
-      )
+      debug(`Failed to resolve entries for package "${id}"\n`, e)
       continue
     }
     if (!entry) {

package/src/node/ssr/ssrTransform.ts

@@ -39,6 +39,7 @@ export async function ssrTransform(
 
   let uid = 0
   const deps = new Set<string>()
+  const dynamicDeps = new Set<string>()
   const idToImportMap = new Map<string, string>()
   const declaredConst = new Set<string>()
 
@@ -200,6 +201,9 @@ export async function ssrTransform(
     },
     onDynamicImport(node) {
       s.overwrite(node.start, node.start + 6, ssrDynamicImportKey)
+      if (node.type === 'ImportExpression' && node.source.type === 'Literal') {
+        dynamicDeps.add(node.source.value as string)
+      }
     }
   })
 
@@ -221,7 +225,8 @@ export async function ssrTransform(
   return {
     code: s.toString(),
     map,
-    deps: [...deps]
+    deps: [...deps],
+    dynamicDeps: [...dynamicDeps]
   }
 }