chore: rebase

Author: lmiller1990

.gitignore

@@ -25,3 +25,5 @@ pids
 *.pid.lock
 
 package-lock.json
+/e2e/**/yarn.lock
+

README.md

@@ -271,6 +271,28 @@ If a string is provided, it will be an assumed path to a TypeScript configuratio
 }
 ```
 
+#### templateCompiler
+
+You can provide [TemplateCompileOptions](https://github.com/vuejs/component-compiler-utils#compiletemplatetemplatecompileoptions-templatecompileresults) in `templateCompiler` section like this:
+
+```json
+{
+  "jest": {
+    "globals": {
+      "vue-jest": {
+        "templateCompiler": {
+          "transpileOptions": {
+            "transforms": {
+              "dangerousTaggedTemplateString": true
+            }
+          }
+        }
+      }
+    }
+  }
+}
+```
+
 ### Supported template languages
 
 - **pug** (`lang="pug"`)

e2e/__projects__/basic/components/TemplateString.vue

@@ -0,0 +1,21 @@
+<template>
+  <div
+    :data-sth="
+      gql`
+        query {
+          id
+        }
+      `
+    "
+  />
+</template>
+
+<script lang="ts">
+export default {
+  methods: {
+    gql([str]) {
+      return str
+    }
+  }
+}
+</script>

e2e/__projects__/basic/package.json

@@ -38,6 +38,13 @@
       "vue-jest": {
         "pug": {
           "basedir": "./"
+        },
+        "templateCompiler": {
+          "transpileOptions": {
+            "transforms": {
+              "dangerousTaggedTemplateString": true
+            }
+          }
         }
       }
     }

e2e/__projects__/basic/test.js

@@ -1,5 +1,6 @@
 import { mount } from '@vue/test-utils'
 import TypeScript from './components/TypeScript.vue'
+import TemplateString from './components/TemplateString.vue'
 import { resolve } from 'path'
 import { readFileSync } from 'fs'
 import jestVue from 'vue-jest'
@@ -81,6 +82,15 @@ test('processes .vue files with lang set to typescript', () => {
   expect(wrapper.element.tagName).toBe('DIV')
 })
 
+test('processes .vue files with template strings in the template', () => {
+  const wrapper = mount(TemplateString)
+  expect(wrapper.attributes('data-sth')).toBe(`
+      query {
+        id
+      }
+    `)
+})
+
 test('processes functional components', () => {
   const clickSpy = jest.fn()
   const wrapper = mount(FunctionalSFC, {

e2e/__projects__/style/components/External.vue

@@ -6,6 +6,10 @@
 
 <style module src="./styles/external.css" />
 
+<style module="$style2" src="~__styles/external.css" />
+
+<style module="$style3" src="./styles/external.css"></style>
+
 <style module="css">
 .a {
   background: color(red a(90%));

e2e/__projects__/style/test.js

@@ -45,5 +45,7 @@ test('process External', () => {
   const wrapper = mount(External)
   expect(wrapper.vm).toBeTruthy()
   expect(wrapper.vm.$style.testClass).toEqual('testClass')
+  expect(wrapper.vm.$style2.testClass).toEqual('testClass')
+  expect(wrapper.vm.$style3.testClass).toEqual('testClass')
   expect(wrapper.vm.css.a).toEqual('a')
 })

lib/process-style.js

@@ -52,8 +52,15 @@ function getPreprocessOptions(lang, filePath, jestConfig) {
 module.exports = function processStyle(stylePart, filePath, config = {}) {
   const vueJestConfig = getVueJestConfig(config)
 
-  if (stylePart.src && !stylePart.content) {
-    stylePart.content = loadSrc(stylePart.src, filePath)
+  if (stylePart.src && !stylePart.content.trim()) {
+    const cssFilePath = applyModuleNameMapper(
+      stylePart.src,
+      filePath,
+      config,
+      stylePart.lang
+    )
+    stylePart.content = loadSrc(cssFilePath, filePath)
+    filePath = cssFilePath
   }
 
   if (vueJestConfig.experimentalCSSCompile === false || !stylePart.content) {

lib/process.js

@@ -56,16 +56,19 @@ function processTemplate(template, filename, config) {
     template.content = loadSrc(template.src, filename)
   }
 
+  const userTemplateCompilerOptions = vueJestConfig.templateCompiler || {}
   const result = compilerUtils.compileTemplate({
     source: template.content,
     compiler: VueTemplateCompiler,
     filename: filename,
-    compilerOptions: {
-      optimize: false
-    },
     isFunctional: template.attrs.functional,
     preprocessLang: template.lang,
-    preprocessOptions: vueJestConfig[template.lang]
+    preprocessOptions: vueJestConfig[template.lang],
+    ...userTemplateCompilerOptions,
+    compilerOptions: {
+      optimize: false,
+      ...userTemplateCompilerOptions.compilerOptions
+    }
   })
 
   logResultErrors(result)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-jest",
-  "version": "4.0.0-rc.0",
+  "version": "4.0.0",
   "description": "Jest Vue transform",
   "main": "lib/index.js",
   "files": [