fix: Resolve src attr value with require.resolve (vuejs#205)

znck · web-flow · commit ecb2d874df27 · 2018-05-26T01:18:16.000+05:30
* fix: Add *.vue to include patterns

* fix: Resolve src attr values on custom block
diff --git a/src/index.ts b/src/index.ts
@@ -15,7 +15,7 @@ import {
 } from '@vue/component-compiler'
 import {Plugin} from 'rollup'
 import * as path from 'path'
-import {parse, SFCDescriptor} from '@vue/component-compiler-utils'
+import {parse, SFCDescriptor, SFCBlock} from '@vue/component-compiler-utils'
 
 const hash = require('hash-sum')
 
@@ -133,8 +133,13 @@ export default function VuePlugin(opts: VuePluginOptions = {}): Plugin {
       const ref = parseVuePartRequest(id)
       if (ref) {
         const element = resolveVuePart(descriptors, ref)
-        if ('src' in element && ref.meta.type !== 'styles') {
-          return path.resolve(path.dirname(ref.filename), (element as any).src as string)
+        const src = (element as SFCBlock).src
+        if (ref.meta.type !== 'styles' && typeof src === 'string') {
+          if (src.startsWith('.')) {
+            return path.resolve(path.dirname(ref.filename), src as string)
+          } else {
+            return require.resolve(src, { paths: [path.dirname(ref.filename)] })
+          }
         }
 
         return id
diff --git a/src/utils.ts b/src/utils.ts
@@ -30,10 +30,10 @@ export interface VuePartRequestCreator {
 }
 
 export function createVueFilter(
-  include: string | undefined,
-  exclude: string | undefined
+  include: string | string[] = ['*.vue', '**/*.vue'],
+  exclude: string | string[] = []
 ): (file: string) => boolean {
-  const filter = createFilter(include || '**/*.vue', exclude)
+  const filter = createFilter(include, exclude)
 
   return id => filter(id)
 }

Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ export interface VuePartRequestCreator {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`export function createVueFilter(`
`33`		`- include: string \| undefined,`
`34`		`- exclude: string \| undefined`
	`33`	`+ include: string \| string[] = ['.vue', '/.vue'],`
	`34`	`+ exclude: string \| string[] = []`
`35`	`35`	`): (file: string) => boolean {`
`36`		`- const filter = createFilter(include \|\| '*/.vue', exclude)`
	`36`	`+ const filter = createFilter(include, exclude)`
`37`	`37`
`38`	`38`	`return id => filter(id)`
`39`	`39`	`}`