From 7b1b5a09974b6a3093193f422bf6e34b64127b91 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 21 Dec 2020 18:37:04 -0500
Subject: [PATCH] wip: asset resolution and tests

---
 packages/plugin-vue/src/script.ts   |  4 +--
 packages/plugin-vue/src/template.ts | 52 ++++++++++++++++++-----------
 scripts/jestGlobalSetup.js          |  1 +
 scripts/jestPerTestSetup.ts         |  1 +
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/packages/plugin-vue/src/script.ts b/packages/plugin-vue/src/script.ts
index 2a838f25..7a1cdcda 100644
--- a/packages/plugin-vue/src/script.ts
+++ b/packages/plugin-vue/src/script.ts
@@ -1,6 +1,6 @@
 import { compileScript, SFCDescriptor, SFCScriptBlock } from '@vue/compiler-sfc'
 import { ResolvedOptions } from '.'
-import { getTemplateCompilerOptions } from './template'
+import { resolveTemplateCompilerOptions } from './template'
 
 // ssr and non ssr builds would output different script content
 const clientCache = new WeakMap<SFCDescriptor, SFCScriptBlock | null>()
@@ -41,7 +41,7 @@ export function resolveScript(
     id: descriptor.id,
     isProd: options.isProduction,
     inlineTemplate: !options.devServer,
-    templateOptions: getTemplateCompilerOptions(descriptor, options)
+    templateOptions: resolveTemplateCompilerOptions(descriptor, options)
   })
 
   cacheToUse.set(descriptor, resolved)
diff --git a/packages/plugin-vue/src/template.ts b/packages/plugin-vue/src/template.ts
index 6c9ca4e7..7f72aab6 100644
--- a/packages/plugin-vue/src/template.ts
+++ b/packages/plugin-vue/src/template.ts
@@ -58,7 +58,7 @@ export function compile(
 ) {
   const filename = descriptor.filename
   const result = compileTemplate({
-    ...getTemplateCompilerOptions(descriptor, options)!,
+    ...resolveTemplateCompilerOptions(descriptor, options)!,
     source: code
   })
 
@@ -84,7 +84,7 @@ export function compile(
   return result
 }
 
-export function getTemplateCompilerOptions(
+export function resolveTemplateCompilerOptions(
   descriptor: SFCDescriptor,
   options: ResolvedOptions
 ): Omit<SFCTemplateCompileOptions, 'source'> | undefined {
@@ -97,26 +97,40 @@ export function getTemplateCompilerOptions(
   const { id, filename, cssVars } = descriptor
 
   let transformAssetUrls = options.template?.transformAssetUrls
-  // inject vite base so that @vue/compiler-sfc can transform relative paths
-  // directly to absolute paths without incurring an extra import request
-  if (filename.startsWith(options.root)) {
-    // TODO account for vite base config
-    const base =
-      '/' + slash(path.relative(options.root, path.dirname(filename)))
-    if (transformAssetUrls && typeof transformAssetUrls === 'object') {
-      // presence of array fields means this is raw tags config
-      if (
-        Object.keys(transformAssetUrls).some((key) =>
-          Array.isArray((transformAssetUrls as any)[key])
-        )
-      ) {
-        transformAssetUrls = { base, tags: transformAssetUrls } as any
-      } else {
-        transformAssetUrls = { ...transformAssetUrls, base }
+  let assetUrlOptions
+  if (options.devServer) {
+    // during dev, inject vite base so that @vue/compiler-sfc can transform
+    // relative paths directly to absolute paths without incurring an extra import
+    // request
+    if (filename.startsWith(options.root)) {
+      assetUrlOptions = {
+        base: '/' + slash(path.relative(options.root, path.dirname(filename)))
+      }
+    }
+  } else {
+    // build: force all asset urls into import requests so that they go through
+    // the assets plugin for asset registration
+    assetUrlOptions = {
+      includeAbsolute: true
+    }
+  }
+
+  if (transformAssetUrls && typeof transformAssetUrls === 'object') {
+    // presence of array fields means this is raw tags config
+    if (
+      Object.keys(transformAssetUrls).some((key) =>
+        Array.isArray((transformAssetUrls as any)[key])
+      )
+    ) {
+      transformAssetUrls = {
+        ...assetUrlOptions,
+        tags: transformAssetUrls as any
       }
     } else {
-      transformAssetUrls = { base }
+      transformAssetUrls = { ...transformAssetUrls, ...assetUrlOptions }
     }
+  } else {
+    transformAssetUrls = assetUrlOptions
   }
 
   return {
diff --git a/scripts/jestGlobalSetup.js b/scripts/jestGlobalSetup.js
index eb9da543..be126d7d 100644
--- a/scripts/jestGlobalSetup.js
+++ b/scripts/jestGlobalSetup.js
@@ -7,6 +7,7 @@ const DIR = path.join(os.tmpdir(), 'jest_playwright_global_setup')
 
 module.exports = async () => {
   const browserServer = await chromium.launchServer({
+    headless: !process.env.VITE_DEBUG_SERVE,
     args: process.env.CI
       ? ['--no-sandbox', '--disable-setuid-sandbox']
       : undefined
diff --git a/scripts/jestPerTestSetup.ts b/scripts/jestPerTestSetup.ts
index 2ec6de96..38b7f0f5 100644
--- a/scripts/jestPerTestSetup.ts
+++ b/scripts/jestPerTestSetup.ts
@@ -28,6 +28,7 @@ beforeAll(async () => {
       const srcDir = resolve(playgroundRoot, testName)
       tempDir = resolve(__dirname, '../temp', testName)
       await fs.copy(srcDir, tempDir, {
+        dereference: true,
         filter(file) {
           return !file.includes('__tests__')
         }