type StringifiableNode = PlainElementNode | TextCallNode
+/**
+ * Regex for replacing placeholders for embedded constant variables
+ * (e.g. import URL string constants generated by compiler-sfc)
+ */
+const expReplaceRE = /__VUE_EXP_START__(.*?)__VUE_EXP_END__/g
+
/**
* Turn eligible hoisted static trees into stringified static nodes, e.g.
*
const staticCall = createCallExpression(context.helper(CREATE_STATIC), [
JSON.stringify(
currentChunk.map(node => stringifyNode(node, context)).join('')
- ),
+ ).replace(expReplaceRE, `" + $1 + "`),
// the 2nd argument indicates the number of DOM nodes this static vnode
// will insert / hydrate
String(currentChunk.length)
res += `="${escapeHtml(p.value.content)}"`
}
} else if (p.type === NodeTypes.DIRECTIVE && p.name === 'bind') {
+ const exp = p.exp as SimpleExpressionNode
+ if (exp.content[0] === '_') {
+ // internally generated string constant references
+ // e.g. imported URL strings via compiler-sfc transformAssetUrl plugin
+ res += ` ${(p.arg as SimpleExpressionNode).content}="__VUE_EXP_START__${
+ exp.content
+ }__VUE_EXP_END__"`
+ continue
+ }
// constant v-bind, e.g. :foo="1"
- let evaluated = evaluateConstant(p.exp as SimpleExpressionNode)
+ let evaluated = evaluateConstant(exp)
if (evaluated != null) {
const arg = p.arg && (p.arg as SimpleExpressionNode).content
if (arg === 'class') {
}"
`;
+exports[`compiler sfc: transform asset url transform with stringify 1`] = `
+"import { createElementVNode as _createElementVNode, createStaticVNode as _createStaticVNode, openBlock as _openBlock, createElementBlock as _createElementBlock } from \\"vue\\"
+import _imports_0 from './bar.png'
+import _imports_1 from '/bar.png'
+
+
+const _hoisted_1 = /*#__PURE__*/_createStaticVNode(\\"<img src=\\\\\\"\\" + _imports_0 + \\"\\\\\\"><img src=\\\\\\"\\" + _imports_1 + \\"\\\\\\"><img src=\\\\\\"https://foo.bar/baz.png\\\\\\"><img src=\\\\\\"//foo.bar/baz.png\\\\\\"><img src=\\\\\\"\\" + _imports_0 + \\"\\\\\\">\\", 5)
+const _hoisted_6 = [
+ _hoisted_1
+]
+
+export function render(_ctx, _cache) {
+ return (_openBlock(), _createElementBlock(\\"div\\", null, _hoisted_6))
+}"
+`;
+
exports[`compiler sfc: transform asset url with explicit base 1`] = `
"import { createElementVNode as _createElementVNode, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock } from \\"vue\\"
import _imports_0 from 'bar.png'
], 64 /* STABLE_FRAGMENT */))
}"
`;
+
+exports[`compiler sfc: transform srcset transform srcset w/ stringify 1`] = `
+"import { createElementVNode as _createElementVNode, createStaticVNode as _createStaticVNode, openBlock as _openBlock, createElementBlock as _createElementBlock } from \\"vue\\"
+import _imports_0 from './logo.png'
+import _imports_1 from '/logo.png'
+
+
+const _hoisted_1 = _imports_0
+const _hoisted_2 = _imports_0 + ' 2x'
+const _hoisted_3 = _imports_0 + ' 2x'
+const _hoisted_4 = _imports_0 + ', ' + _imports_0 + ' 2x'
+const _hoisted_5 = _imports_0 + ' 2x, ' + _imports_0
+const _hoisted_6 = _imports_0 + ' 2x, ' + _imports_0 + ' 3x'
+const _hoisted_7 = _imports_0 + ', ' + _imports_0 + ' 2x, ' + _imports_0 + ' 3x'
+const _hoisted_8 = _imports_1 + ', ' + _imports_1 + ' 2x'
+const _hoisted_9 = _imports_1 + ', ' + _imports_0 + ' 2x'
+const _hoisted_10 = /*#__PURE__*/_createStaticVNode(\\"<img src=\\\\\\"./logo.png\\\\\\" srcset=\\\\\\"\\\\\\"><img src=\\\\\\"./logo.png\\\\\\" srcset=\\\\\\"\\" + _hoisted_1 + \\"\\\\\\"><img src=\\\\\\"./logo.png\\\\\\" srcset=\\\\\\"\\" + _hoisted_2 + \\"\\\\\\"><img src=\\\\\\"./logo.png\\\\\\" srcset=\\\\\\"\\" + _hoisted_3 + \\"\\\\\\"><img src=\\\\\\"./logo.png\\\\\\" srcset=\\\\\\"\\" + _hoisted_4 + \\"\\\\\\"><img src=\\\\\\"./logo.png\\\\\\" srcset=\\\\\\"\\" + _hoisted_5 + \\"\\\\\\"><img src=\\\\\\"./logo.png\\\\\\" srcset=\\\\\\"\\" + _hoisted_6 + \\"\\\\\\"><img src=\\\\\\"./logo.png\\\\\\" srcset=\\\\\\"\\" + _hoisted_7 + \\"\\\\\\"><img src=\\\\\\"/logo.png\\\\\\" srcset=\\\\\\"\\" + _hoisted_8 + \\"\\\\\\"><img src=\\\\\\"https://example.com/logo.png\\\\\\" srcset=\\\\\\"https://example.com/logo.png, https://example.com/logo.png 2x\\\\\\"><img src=\\\\\\"/logo.png\\\\\\" srcset=\\\\\\"\\" + _hoisted_9 + \\"\\\\\\"><img src=\\\\\\"data:image/png;base64,i\\\\\\" srcset=\\\\\\"data:image/png;base64,i 1x, data:image/png;base64,i 2x\\\\\\">\\", 12)
+const _hoisted_22 = [
+ _hoisted_10
+]
+
+export function render(_ctx, _cache) {
+ return (_openBlock(), _createElementBlock(\\"div\\", null, _hoisted_22))
+}"
+`;
-import { generate, baseParse, transform } from '@vue/compiler-core'
+import {
+ generate,
+ baseParse,
+ transform,
+ TransformOptions
+} from '@vue/compiler-core'
import {
transformAssetUrl,
createAssetUrlTransformWithOptions,
} from '../src/templateTransformAssetUrl'
import { transformElement } from '../../compiler-core/src/transforms/transformElement'
import { transformBind } from '../../compiler-core/src/transforms/vBind'
+import { stringifyStatic } from '../../compiler-dom/src/transforms/stringifyStatic'
-function compileWithAssetUrls(template: string, options?: AssetURLOptions) {
+function compileWithAssetUrls(
+ template: string,
+ options?: AssetURLOptions,
+ transformOptions?: TransformOptions
+) {
const ast = baseParse(template)
const t = options
? createAssetUrlTransformWithOptions(normalizeOptions(options))
nodeTransforms: [t, transformElement],
directiveTransforms: {
bind: transformBind
- }
+ },
+ ...transformOptions
})
return generate(ast, { mode: 'module' })
}
expect(code).toMatchSnapshot()
})
+
+ test('transform with stringify', () => {
+ const { code } = compileWithAssetUrls(
+ `<div>` +
+ `<img src="./bar.png"/>` +
+ `<img src="/bar.png"/>` +
+ `<img src="https://foo.bar/baz.png"/>` +
+ `<img src="//foo.bar/baz.png"/>` +
+ `<img src="./bar.png"/>` +
+ `</div>`,
+ {
+ includeAbsolute: true
+ },
+ {
+ hoistStatic: true,
+ transformHoist: stringifyStatic
+ }
+ )
+ console.log(code)
+ expect(code).toMatch(`_createStaticVNode`)
+ expect(code).toMatchSnapshot()
+ })
})
-import { generate, baseParse, transform } from '@vue/compiler-core'
+import {
+ generate,
+ baseParse,
+ transform,
+ TransformOptions
+} from '@vue/compiler-core'
import {
transformSrcset,
createSrcsetTransformWithOptions
AssetURLOptions,
normalizeOptions
} from '../src/templateTransformAssetUrl'
+import { stringifyStatic } from '../../compiler-dom/src/transforms/stringifyStatic'
-function compileWithSrcset(template: string, options?: AssetURLOptions) {
+function compileWithSrcset(
+ template: string,
+ options?: AssetURLOptions,
+ transformOptions?: TransformOptions
+) {
const ast = baseParse(template)
const srcsetTransform = options
? createSrcsetTransformWithOptions(normalizeOptions(options))
nodeTransforms: [srcsetTransform, transformElement],
directiveTransforms: {
bind: transformBind
- }
+ },
+ ...transformOptions
})
return generate(ast, { mode: 'module' })
}
}).code
).toMatchSnapshot()
})
+
+ test('transform srcset w/ stringify', () => {
+ const code = compileWithSrcset(
+ `<div>${src}</div>`,
+ {
+ includeAbsolute: true
+ },
+ {
+ hoistStatic: true,
+ transformHoist: stringifyStatic
+ }
+ ).code
+ expect(code).toMatch(`_createStaticVNode`)
+ expect(code).toMatchSnapshot()
+ })
})
exp = context.imports[existingIndex].exp as SimpleExpressionNode
} else {
name = `_imports_${context.imports.length}`
- exp = createSimpleExpression(name, false, loc, ConstantTypes.CAN_HOIST)
+ exp = createSimpleExpression(
+ name,
+ false,
+ loc,
+ ConstantTypes.CAN_STRINGIFY
+ )
context.imports.push({ exp, path })
}
`_hoisted_${existingHoistIndex + 1}`,
false,
loc,
- ConstantTypes.CAN_HOIST
+ ConstantTypes.CAN_STRINGIFY
)
}
return context.hoist(
- createSimpleExpression(hashExp, false, loc, ConstantTypes.CAN_HOIST)
+ createSimpleExpression(hashExp, false, loc, ConstantTypes.CAN_STRINGIFY)
)
} else {
- return createSimpleExpression(`''`, false, loc, ConstantTypes.CAN_HOIST)
+ return createSimpleExpression(`''`, false, loc, ConstantTypes.CAN_STRINGIFY)
}
}
`_imports_${existingImportsIndex}`,
false,
attr.loc,
- ConstantTypes.CAN_HOIST
+ ConstantTypes.CAN_STRINGIFY
)
} else {
exp = createSimpleExpression(
`_imports_${context.imports.length}`,
false,
attr.loc,
- ConstantTypes.CAN_HOIST
+ ConstantTypes.CAN_STRINGIFY
)
context.imports.push({ exp, path })
}
`"${url}"`,
false,
attr.loc,
- ConstantTypes.CAN_HOIST
+ ConstantTypes.CAN_STRINGIFY
)
compoundExpression.children.push(exp)
}
})
const hoisted = context.hoist(compoundExpression)
- hoisted.constType = ConstantTypes.CAN_HOIST
+ hoisted.constType = ConstantTypes.CAN_STRINGIFY
node.props[index] = {
type: NodeTypes.DIRECTIVE,
projects / thirdparty / vuejs / core.git / commitdiff
