`
- return decoder.children[0].getAttribute('foo') as string
+ return decoder.children[0].getAttribute('foo')!
} else {
decoder.innerHTML = raw
- return decoder.textContent as string
+ return decoder.textContent!
}
}
diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index 18b5d90eaf6..b7925ada895 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -745,6 +745,21 @@ return { get vMyDir() { return vMyDir } }
})"
`;
+exports[`SFC compile
+
+
+
+
+ `)
+ expect(content).toMatch(
+ `return { get FooBar() { return FooBar }, get foo() { return foo }, ` +
+ `get bar() { return bar } }`
+ )
+ assertCode(content)
+ })
+
// https://github.com/vuejs/core/issues/4599
test('attribute expressions', () => {
const { content } = compile(`
@@ -513,6 +532,23 @@ describe('SFC compile
+
+
+
+
+ `)
+ expect(content).toMatch(
+ 'return { get foo() { return foo }, get bar() { return bar }, get Baz() { return Baz } }'
+ )
+ assertCode(content)
+ })
})
describe('inlineTemplate mode', () => {
diff --git a/packages/compiler-sfc/src/script/importUsageCheck.ts b/packages/compiler-sfc/src/script/importUsageCheck.ts
index b42397d573b..7019dcf2312 100644
--- a/packages/compiler-sfc/src/script/importUsageCheck.ts
+++ b/packages/compiler-sfc/src/script/importUsageCheck.ts
@@ -50,6 +50,12 @@ function resolveTemplateUsageCheckString(sfc: SFCDescriptor) {
if (!isBuiltInDirective(prop.name)) {
code += `,v${capitalize(camelize(prop.name))}`
}
+ if (prop.arg && !(prop.arg as SimpleExpressionNode).isStatic) {
+ code += `,${processExp(
+ (prop.arg as SimpleExpressionNode).content,
+ prop.name
+ )}`
+ }
if (prop.exp) {
code += `,${processExp(
(prop.exp as SimpleExpressionNode).content,
@@ -57,6 +63,9 @@ function resolveTemplateUsageCheckString(sfc: SFCDescriptor) {
)}`
}
}
+ if (prop.type === NodeTypes.ATTRIBUTE && prop.name === 'ref' && prop.value?.content) {
+ code += `,${prop.value.content}`
+ }
}
} else if (node.type === NodeTypes.INTERPOLATION) {
code += `,${processExp(
diff --git a/packages/compiler-sfc/src/style/cssVars.ts b/packages/compiler-sfc/src/style/cssVars.ts
index c86dbf2a5b9..2380959b819 100644
--- a/packages/compiler-sfc/src/style/cssVars.ts
+++ b/packages/compiler-sfc/src/style/cssVars.ts
@@ -53,8 +53,9 @@ export function parseCssVars(sfc: SFCDescriptor): string[] {
const vars: string[] = []
sfc.styles.forEach(style => {
let match
- // ignore v-bind() in comments /* ... */
- const content = style.content.replace(/\/\*([\s\S]*?)\*\//g, '')
+ // ignore v-bind() in comments, eg /* ... */
+ // and // (Less, Sass and Stylus all support the use of // to comment)
+ const content = style.content.replace(/\/\*([\s\S]*?)\*\/|\/\/.*/g, '')
while ((match = vBindRE.exec(content))) {
const start = match.index + match[0].length
const end = lexBinding(content, start)
diff --git a/packages/compiler-sfc/src/style/pluginScoped.ts b/packages/compiler-sfc/src/style/pluginScoped.ts
index 1dcc248ad71..f6e9be2fde7 100644
--- a/packages/compiler-sfc/src/style/pluginScoped.ts
+++ b/packages/compiler-sfc/src/style/pluginScoped.ts
@@ -130,9 +130,10 @@ function rewriteSelector(
// DEPRECATED usage
// .foo ::v-deep .bar -> .foo[xxxxxxx] .bar
warn(
- `::v-deep usage as a combinator has ` +
- `been deprecated. Use :deep(
) instead.`
+ `${value} usage as a combinator has been deprecated. ` +
+ `Use :deep() instead of ${value} .`
)
+
const prev = selector.at(selector.index(n) - 1)
if (prev && isSpaceCombinator(prev)) {
selector.removeChild(prev)
diff --git a/packages/compiler-sfc/src/style/preprocessors.ts b/packages/compiler-sfc/src/style/preprocessors.ts
index 96c1153f05d..9b3610501c7 100644
--- a/packages/compiler-sfc/src/style/preprocessors.ts
+++ b/packages/compiler-sfc/src/style/preprocessors.ts
@@ -98,8 +98,7 @@ const less: StylePreprocessor = (source, map, options, load = require) => {
const styl: StylePreprocessor = (source, map, options, load = require) => {
const nodeStylus = load('stylus')
try {
- const ref = nodeStylus(source)
- Object.keys(options).forEach(key => ref.set(key, options[key]))
+ const ref = nodeStylus(source, options)
if (map) ref.set('sourcemap', { inline: false, comment: false })
const result = ref.render()
diff --git a/packages/compiler-ssr/__tests__/ssrVModel.spec.ts b/packages/compiler-ssr/__tests__/ssrVModel.spec.ts
index 3411aa291c9..5bccbcb788c 100644
--- a/packages/compiler-ssr/__tests__/ssrVModel.spec.ts
+++ b/packages/compiler-ssr/__tests__/ssrVModel.spec.ts
@@ -33,6 +33,44 @@ describe('ssr: v-model', () => {
`)
})
+ test('', () => {
+ expect(
+ compileWithWrapper(
+ ` 
+