Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat(plugin-vue): add customElement option to compiler #238

Merged
merged 16 commits into from
Dec 7, 2023
Merged

feat(plugin-vue): add customElement option to compiler #238

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
31ed426
chore: added customElement option to vue compiler
baiwusanyu-c Aug 22, 2023
b3d50c6
Update packages/plugin-vue/src/script.ts
baiwusanyu-c Aug 22, 2023
55e84b7
Update packages/plugin-vue/src/script.ts
baiwusanyu-c Aug 22, 2023
e9acb45
chore: updated code
baiwusanyu-c Aug 22, 2023
1db7b3c
chore: updated code
baiwusanyu-c Aug 22, 2023
07ed380
Merge branch 'main' into bwsy/feat/customElOption
baiwusanyu-c Sep 13, 2023
4811f9e
Merge branch 'main' into bwsy/feat/customElOption
baiwusanyu-c Sep 22, 2023
4b0a99f
Merge remote-tracking branch 'origin/main' into bwsy/feat/customElOption
baiwusanyu-c Oct 9, 2023
65d2e98
Merge branch 'main' into bwsy/feat/customElOption
baiwusanyu-c Oct 12, 2023
f7c100e
Merge branch 'main' into bwsy/feat/customElOption
baiwusanyu-c Oct 26, 2023
ceaa948
Merge branch 'main' into bwsy/feat/customElOption
baiwusanyu-c Oct 31, 2023
0cfc54a
Merge branch 'main' into bwsy/feat/customElOption
baiwusanyu-c Nov 29, 2023
9dc497f
Merge branch 'main' into bwsy/feat/customElOption
baiwusanyu-c Dec 6, 2023
6c9696e
chore: rollback code
baiwusanyu-c Dec 6, 2023
38058be
chore: updated code
baiwusanyu-c Dec 7, 2023
74be1dd
Merge branch 'main' into bwsy/feat/customElOption
sxzz Dec 7, 2023
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
9 changes: 8 additions & 1 deletion packages/plugin-vue/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,14 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin {
: getDescriptor(filename, options)!

if (query.type === 'template') {
return transformTemplateAsModule(code, descriptor, options, this, ssr)
return transformTemplateAsModule(
code,
descriptor,
options,
this,
ssr,
customElementFilter(filename),
)
} else if (query.type === 'style') {
return transformStyle(
code,
Expand Down
7 changes: 6 additions & 1 deletion packages/plugin-vue/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export async function transformMain(
options,
pluginContext,
ssr,
asCustomElement,
sxzz marked this conversation as resolved.
Show resolved Hide resolved
)

// template
Expand All @@ -75,6 +76,7 @@ export async function transformMain(
options,
pluginContext,
ssr,
asCustomElement,
))
}

Expand Down Expand Up @@ -262,6 +264,7 @@ async function genTemplateCode(
options: ResolvedOptions,
pluginContext: PluginContext,
ssr: boolean,
asCustomElement: boolean,
) {
const template = descriptor.template!
const hasScoped = descriptor.styles.some((style) => style.scoped)
Expand All @@ -276,6 +279,7 @@ async function genTemplateCode(
options,
pluginContext,
ssr,
asCustomElement,
)
} else {
if (template.src) {
Expand Down Expand Up @@ -309,14 +313,15 @@ async function genScriptCode(
options: ResolvedOptions,
pluginContext: PluginContext,
ssr: boolean,
asCustomElement: boolean,
): Promise<{
code: string
map: RawSourceMap | undefined
}> {
let scriptCode = `const ${scriptIdentifier} = {}`
let map: RawSourceMap | undefined

const script = resolveScript(descriptor, options, ssr)
const script = resolveScript(descriptor, options, ssr, asCustomElement)
if (script) {
// If the script is js/ts and has no external src, it can be directly placed
// in the main module.
Expand Down
2 changes: 2 additions & 0 deletions packages/plugin-vue/src/script.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export function resolveScript(
descriptor: SFCDescriptor,
options: ResolvedOptions,
ssr: boolean,
asCustomElement: boolean,
baiwusanyu-c marked this conversation as resolved.
Show resolved Hide resolved
): SFCScriptBlock | null {
if (!descriptor.script && !descriptor.scriptSetup) {
return null
Expand All @@ -72,6 +73,7 @@ export function resolveScript(
genDefaultAs: canInlineMain(descriptor, options)
? scriptIdentifier
: undefined,
customElement: asCustomElement,
baiwusanyu-c marked this conversation as resolved.
Show resolved Hide resolved
})

if (!options.isProduction && resolved?.deps) {
Expand Down
23 changes: 20 additions & 3 deletions packages/plugin-vue/src/template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,19 @@ export async function transformTemplateAsModule(
options: ResolvedOptions,
pluginContext: TransformPluginContext,
ssr: boolean,
asCustomElement: boolean,
): Promise<{
code: string
map: any
}> {
const result = compile(code, descriptor, options, pluginContext, ssr)
const result = compile(
code,
descriptor,
options,
pluginContext,
ssr,
asCustomElement,
)

let returnCode = result.code
if (
Expand Down Expand Up @@ -50,8 +58,16 @@ export function transformTemplateInMain(
options: ResolvedOptions,
pluginContext: PluginContext,
ssr: boolean,
asCustomElement: boolean,
): SFCTemplateCompileResults {
const result = compile(code, descriptor, options, pluginContext, ssr)
const result = compile(
code,
descriptor,
options,
pluginContext,
ssr,
asCustomElement,
)
return {
...result,
code: result.code.replace(
Expand All @@ -68,9 +84,10 @@ export function compile(
options: ResolvedOptions,
pluginContext: PluginContext,
ssr: boolean,
asCustomElement: boolean,
) {
const filename = descriptor.filename
resolveScript(descriptor, options, ssr)
resolveScript(descriptor, options, ssr, asCustomElement)
const result = options.compiler.compileTemplate({
...resolveTemplateCompilerOptions(descriptor, options, ssr)!,
source: code,
Expand Down