fix: add language fallback for template code (#407)

Nerixyz · web-flow · commit e334e8c1818c · 2020-10-24T23:15:35.000+05:30
* fix: add language fallback for template code

* tests: expect lang.js in template

* fix: always force language fallback
diff --git a/src/index.spec.ts b/src/index.spec.ts
@@ -53,7 +53,7 @@ describe('Rollup Plugin Vue', () => {
 
       expect(code).toEqual(
         expect.stringContaining(
-          `import { render } from "example.vue?vue&type=template&id=063a7d4c"`
+          `import { render } from "example.vue?vue&type=template&id=063a7d4c&lang.js"`
         )
       )
       expect(code).toEqual(expect.stringContaining(`script.render = render`))
@@ -66,7 +66,7 @@ describe('Rollup Plugin Vue', () => {
       )
       expect(code).toEqual(
         expect.stringContaining(
-          `import { render } from "example.vue?vue&type=template&id=063a7d4c"`
+          `import { render } from "example.vue?vue&type=template&id=063a7d4c&lang.js"`
         )
       )
       expect(code).toEqual(expect.stringContaining(`script.render = render`))
diff --git a/src/index.ts b/src/index.ts
@@ -144,9 +144,9 @@ export default function PluginVue(userOptions: Partial<Options> = {}): Plugin {
         const descriptor = getDescriptor(query.filename)
         const hasScoped = descriptor.styles.some((s) => s.scoped)
         if (query.src) {
-            this.addWatchFile(query.filename);
+          this.addWatchFile(query.filename)
         }
-        
+
         if (query.type === 'template') {
           debug(`transform(${id})`)
           const block = descriptor.template!
@@ -478,7 +478,7 @@ function getTemplateCode(
     const idQuery = `&id=${id}`
     const scopedQuery = hasScoped ? `&scoped=true` : ``
     const srcQuery = descriptor.template.src ? `&src` : ``
-    const attrsQuery = attrsToQuery(descriptor.template.attrs)
+    const attrsQuery = attrsToQuery(descriptor.template.attrs, 'js', true)
     const query = `?vue&type=template${idQuery}${srcQuery}${scopedQuery}${attrsQuery}`
     templateRequest = _(src + query)
     templateImport = `import { ${renderFnName} } from ${templateRequest}`
@@ -638,12 +638,15 @@ function _(any: any) {
   return JSON.stringify(any)
 }
 
-function normalizeSourceMap(map: SFCTemplateCompileResults['map'], id: string): any {
+function normalizeSourceMap(
+  map: SFCTemplateCompileResults['map'],
+  id: string
+): any {
   if (!map) return null as any
 
   if (!id.includes('type=script')) {
-    map.file = id;
-    map.sources[0] = id;
+    map.file = id
+    map.sources[0] = id
   }
 
   return {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ describe('Rollup Plugin Vue', () => {`
`53`	`53`
`54`	`54`	`expect(code).toEqual(`
`55`	`55`	`expect.stringContaining(`
`56`		- `import { render } from "example.vue?vue&type=template&id=063a7d4c"`
	`56`	+ `import { render } from "example.vue?vue&type=template&id=063a7d4c&lang.js"`
`57`	`57`	`)`
`58`	`58`	`)`
`59`	`59`	expect(code).toEqual(expect.stringContaining(`script.render = render`))
`@@ -66,7 +66,7 @@ describe('Rollup Plugin Vue', () => {`
`66`	`66`	`)`
`67`	`67`	`expect(code).toEqual(`
`68`	`68`	`expect.stringContaining(`
`69`		- `import { render } from "example.vue?vue&type=template&id=063a7d4c"`
	`69`	+ `import { render } from "example.vue?vue&type=template&id=063a7d4c&lang.js"`
`70`	`70`	`)`
`71`	`71`	`)`
`72`	`72`	expect(code).toEqual(expect.stringContaining(`script.render = render`))