Skip to content

feat: support directives #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ On-demand components auto importing for Vue.
###### Features

- 💚 Supports both Vue 2 and Vue 3 out-of-the-box.
- ✨ Supports both components and directives.
- ⚡️ Supports Vite, Webpack, Vue CLI, Rollup and more, powered by <a href="https://github.com/unjs/unplugin">unplugin</a>.
- 🏝 Tree-shakable, only registers the components you use.
- 🪐 Folder names as namespaces.
Expand Down Expand Up @@ -284,6 +285,11 @@ Components({
// works when `directoryAsNamespace: true`
globalNamespaces: [],

// auto import for directives
// default: `true` for Vue 3, `false` for Vue 2
// Babel is needed to do the transformation for Vue 2, it's disabled by default for performance concerns.
directives: true,

// filters for transforming targets
include: [/\.vue$/, /\.vue\?vue/],
exclude: [/[\\/]node_modules[\\/]/, /[\\/]\.git[\\/]/, /[\\/]\.nuxt[\\/]/],
Expand Down
27 changes: 15 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@
"description": "Components auto importing for Vue",
"homepage": "https://github.com/antfu/unplugin-vue-components",
"bugs": "https://github.com/antfu/unplugin-vue-components/issues",
"license": "MIT",
"repository": {
"type": "git",
"url": "https://github.com/antfu/unplugin-vue-components"
},
"funding": "https://github.com/sponsors/antfu",
"license": "MIT",
"author": "antfu <[email protected]>",
"files": [
"dist",
"*.d.ts"
],
"exports": {
".": {
"require": "./dist/index.js",
Expand Down Expand Up @@ -45,20 +49,19 @@
"main": "dist/index.js",
"module": "dist/index.mjs",
"types": "index.d.ts",
"files": [
"dist",
"*.d.ts"
],
"scripts": {
"build": "rimraf dist && tsup src/*.ts --format cjs,esm --dts --splitting && esno scripts/postbuild.ts",
"dev": "tsup src/*.ts --format cjs,esm --watch src",
"example:build": "npm -C examples/vue3 run build",
"example:dev": "npm -C examples/vue3 run dev",
"build": "tsup src/*.ts && esno scripts/postbuild.ts",
"dev": "tsup src/*.ts --watch src",
"example:build": "npm -C examples/vite-vue3 run build",
"example:dev": "npm -C examples/vite-vue3 run dev",
"prepublishOnly": "npm run build",
"release": "npx bumpp --commit --tag --push",
"test": "jest",
"test:update": "jest --u"
},
"peerDependencies": {
"vue": "2 || 3"
},
"dependencies": {
"@antfu/utils": "^0.3.0",
"@rollup/pluginutils": "^4.1.1",
Expand All @@ -73,6 +76,9 @@
},
"devDependencies": {
"@antfu/eslint-config": "^0.9.0",
"@babel/parser": "^7.15.8",
"@babel/traverse": "^7.15.4",
"@babel/types": "^7.15.6",
"@types/debug": "^4.1.7",
"@types/jest": "^27.0.2",
"@types/minimatch": "^3.0.5",
Expand All @@ -90,9 +96,6 @@
"typescript": "^4.4.3",
"vite": "^2.5.10"
},
"peerDependencies": {
"vue": "2 || 3"
},
"engines": {
"node": ">=14"
}
Expand Down
85 changes: 85 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions src/core/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ import { pascalCase, getNameFromFilePath, resolveAlias, matchGlobs, parseId } fr
import { resolveOptions } from './options'
import { searchComponents } from './fs/glob'
import { generateDeclaration } from './declaration'
import { Vue2Transformer } from './transforms/vue2'
import { Vue3Transformer } from './transforms/vue3'
import transformer from './transformer'

const debug = {
components: Debug('unplugin-vue-components:context:components'),
Expand Down Expand Up @@ -51,9 +50,7 @@ export class Context {

setTransformer(name: Options['transformer']) {
debug.env('transformer', name)
this.transformer = name === 'vue2'
? Vue2Transformer(this)
: Vue3Transformer(this)
this.transformer = transformer(this, name || 'vue3')
}

transform(code: string, id: string) {
Expand Down Expand Up @@ -181,15 +178,15 @@ export class Context {
})
}

async findComponent(name: string, excludePaths: string[] = [], rawName?: string): Promise<ComponentInfo | undefined> {
async findComponent(name: string, type: 'component' | 'directive', excludePaths: string[] = []): Promise<ComponentInfo | undefined> {
// resolve from fs
let info = this._componentNameMap[name]
if (info && !excludePaths.includes(info.path) && !excludePaths.includes(info.path.slice(1)))
return info

// custom resolvers
for (const resolver of this.options.resolvers) {
const result = await resolver(name)
const result = await resolver(name, type)
if (result) {
if (typeof result === 'string') {
info = {
Expand Down
5 changes: 4 additions & 1 deletion src/core/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { isPackageExists } from 'local-pkg'
import { ResolvedOptions, Options } from '../types'
import { LibraryResolver } from './helpers/libraryResolver'

export const defaultOptions: Omit<Required<Options>, 'include' | 'exclude' | 'transformer' | 'globs'> = {
export const defaultOptions: Omit<Required<Options>, 'include' | 'exclude' | 'transformer' | 'globs' |'directives'> = {
dirs: 'src/components',
extensions: 'vue',
deep: true,
Expand Down Expand Up @@ -58,6 +58,9 @@ export function resolveOptions(options: Options, root: string): ResolvedOptions
)
resolved.root = root
resolved.transformer = options.transformer || getVueVersion() || 'vue3'
resolved.directives = (typeof options.directives === 'boolean')
? options.directives
: getVueVersion() === 'vue3'

return resolved
}
Expand Down
38 changes: 38 additions & 0 deletions src/core/transformer.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import Debug from 'debug'
import MagicString from 'magic-string'
import { TransformResult } from 'unplugin'
import { SupportedTransformer } from '..'
import type { Transformer } from '../types'
import { DISABLE_COMMENT } from './constants'
import { Context } from './context'
import transformComponent from './transforms/component'
import transformDirectives from './transforms/directive'

const debug = Debug('unplugin-vue-components:transformer')

export interface ResolveResult {
rawName: string
replace: (resolved: string) => void
}

export default (ctx: Context, transformer: SupportedTransformer): Transformer => {
return async(code, id, path) => {
ctx.searchGlob()

const sfcPath = ctx.normalizePath(path)
debug(sfcPath)

const s = new MagicString(code)

await transformComponent(code, transformer, s, ctx, sfcPath)
if (ctx.options.directives)
await transformDirectives(code, transformer, s, ctx, sfcPath)

s.prepend(DISABLE_COMMENT)

const result: TransformResult = { code: s.toString() }
if (ctx.sourcemap)
result.map = s.generateMap({ source: id, includeContent: true })
return result
}
}
Loading