@vue/compiler-ssr 3.6.0-rc.5 → 3.6.0-rc.6

package/dist/compiler-ssr.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-ssr v3.6.0-rc.5
+  * @vue/compiler-ssr v3.6.0-rc.6
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -225,7 +225,8 @@ const ssrTransformElement = (node, context) => {
 				} else if (node.tag === "input") {
 					const vModel = findVModel(node);
 					if (vModel) {
-						const tempExp = (0, _vue_compiler_dom.createSimpleExpression)(`_temp${context.temps++}`, false);
+						const tempId = `_temp${context.temps++}`;
+						const tempExp = (0, _vue_compiler_dom.createSimpleExpression)(tempId, false);
 						propsExp.arguments = [(0, _vue_compiler_dom.createSequenceExpression)([(0, _vue_compiler_dom.createAssignmentExpression)(tempExp, mergedProps), (0, _vue_compiler_dom.createCallExpression)(context.helper(_vue_compiler_dom.MERGE_PROPS), [tempExp, (0, _vue_compiler_dom.createCallExpression)(context.helper(SSR_GET_DYNAMIC_MODEL_PROPS), [tempExp, vModel.exp])])])];
 					}
 				} else if (directives.length && !node.children.length) {
@@ -266,9 +267,10 @@ const ssrTransformElement = (node, context) => {
 								let attrName = key.content;
 								if (attrName === "key" || attrName === "ref") continue;
 								if (attrName === "class") openTag.push(` class="`, dynamicClassBinding = (0, _vue_compiler_dom.createCallExpression)(context.helper(SSR_RENDER_CLASS), [value]), `"`);
-								else if (attrName === "style") if (dynamicStyleBinding) mergeCall(dynamicStyleBinding, value);
-								else openTag.push(` style="`, dynamicStyleBinding = (0, _vue_compiler_dom.createCallExpression)(context.helper(SSR_RENDER_STYLE), [value]), `"`);
-								else {
+								else if (attrName === "style") {
+									if (dynamicStyleBinding) mergeCall(dynamicStyleBinding, value);
+									else openTag.push(` style="`, dynamicStyleBinding = (0, _vue_compiler_dom.createCallExpression)(context.helper(SSR_RENDER_STYLE), [value]), `"`);
+								} else {
 									attrName = node.tag.indexOf("-") > 0 ? attrName : _vue_shared.propsToAttrMap[attrName] || attrName.toLowerCase();
 									if ((0, _vue_shared.isBooleanAttr)(attrName)) openTag.push((0, _vue_compiler_dom.createConditionalExpression)((0, _vue_compiler_dom.createCallExpression)(context.helper(SSR_INCLUDE_BOOLEAN_ATTR), [value]), (0, _vue_compiler_dom.createSimpleExpression)(" " + attrName, true), (0, _vue_compiler_dom.createSimpleExpression)("", true), false));
 									else if (attrName === "hidden") openTag.push((0, _vue_compiler_dom.createCallExpression)(context.helper(SSR_RENDER_DYNAMIC_ATTR), [key, value]));
@@ -303,8 +305,10 @@ const ssrTransformElement = (node, context) => {
 };
 function buildSSRProps(props, directives, context) {
 	let mergePropsArgs = [];
-	if (props) if (props.type === 14) mergePropsArgs = props.arguments;
-	else mergePropsArgs.push(props);
+	if (props) {
+		if (props.type === 14) mergePropsArgs = props.arguments;
+		else mergePropsArgs.push(props);
+	}
 	if (directives.length) for (const dir of directives) mergePropsArgs.push((0, _vue_compiler_dom.createCallExpression)(context.helper(SSR_GET_DIRECTIVE_PROPS), [`_ctx`, ...(0, _vue_compiler_dom.buildDirectiveArgs)(dir, context).elements]));
 	return mergePropsArgs.length > 1 ? (0, _vue_compiler_dom.createCallExpression)(context.helper(_vue_compiler_dom.MERGE_PROPS), mergePropsArgs) : mergePropsArgs[0];
 }
@@ -349,7 +353,8 @@ function ssrTransformTransitionGroup(node, context) {
 	return () => {
 		const tag = (0, _vue_compiler_dom.findProp)(node, "tag");
 		if (tag) {
-			const { props, directives } = (0, _vue_compiler_dom.buildProps)(node, context, node.props.filter((p) => p !== tag), true, false, true);
+			const otherProps = node.props.filter((p) => p !== tag);
+			const { props, directives } = (0, _vue_compiler_dom.buildProps)(node, context, otherProps, true, false, true);
 			let propsExp = null;
 			if (props || directives.length) propsExp = (0, _vue_compiler_dom.createCallExpression)(context.helper(SSR_RENDER_ATTRS), [buildSSRProps(props, directives, context)]);
 			wipMap$2.set(node, {
@@ -450,8 +455,9 @@ const ssrTransformComponent = (node, context) => {
 		const wipEntries = [];
 		wipMap.set(node, wipEntries);
 		const buildSSRSlotFn = (props, _vForExp, children, loc) => {
+			const param0 = props && (0, _vue_compiler_dom.stringifyExpression)(props) || `_`;
 			const fn = (0, _vue_compiler_dom.createFunctionExpression)([
-				props && (0, _vue_compiler_dom.stringifyExpression)(props) || `_`,
+				param0,
 				`_push`,
 				`_parent`,
 				`_scopeId`
@@ -484,15 +490,16 @@ const ssrTransformComponent = (node, context) => {
 };
 function ssrProcessComponent(node, context, parent) {
 	const component = componentTypeMap.get(node);
-	if (!node.ssrCodegenNode) if (component === _vue_compiler_dom.TELEPORT) return ssrProcessTeleport(node, context);
-	else if (component === _vue_compiler_dom.SUSPENSE) return ssrProcessSuspense(node, context);
-	else if (component === _vue_compiler_dom.TRANSITION_GROUP) return ssrProcessTransitionGroup(node, context);
-	else {
-		if (parent.type === WIP_SLOT) context.pushStringPart(``);
-		if (component === _vue_compiler_dom.TRANSITION) return ssrProcessTransition(node, context);
-		processChildren(node, context);
-	}
-	else {
+	if (!node.ssrCodegenNode) {
+		if (component === _vue_compiler_dom.TELEPORT) return ssrProcessTeleport(node, context);
+		else if (component === _vue_compiler_dom.SUSPENSE) return ssrProcessSuspense(node, context);
+		else if (component === _vue_compiler_dom.TRANSITION_GROUP) return ssrProcessTransitionGroup(node, context);
+		else {
+			if (parent.type === WIP_SLOT) context.pushStringPart(``);
+			if (component === _vue_compiler_dom.TRANSITION) return ssrProcessTransition(node, context);
+			processChildren(node, context);
+		}
+	} else {
 		const wipEntries = wipMap.get(node) || [];
 		for (let i = 0; i < wipEntries.length; i++) {
 			const { fn, vnodeBranch } = wipEntries[i];
@@ -592,7 +599,7 @@ function ssrCodegenTransform(ast, options) {
 	}
 	processChildren(ast, context, ast.children.length > 1 && ast.children.some((c) => !(0, _vue_compiler_dom.isText)(c)));
 	ast.codegenNode = (0, _vue_compiler_dom.createBlockStatement)(context.body);
-	ast.ssrHelpers = Array.from(new Set([...Array.from(ast.helpers).filter((h) => h in ssrHelpers), ...context.helpers]));
+	ast.ssrHelpers = Array.from(/* @__PURE__ */ new Set([...Array.from(ast.helpers).filter((h) => h in ssrHelpers), ...context.helpers]));
 	ast.helpers = new Set(Array.from(ast.helpers).filter((h) => !(h in ssrHelpers)));
 }
 function createSSRTransformContext(root, options, helpers = /* @__PURE__ */ new Set(), withSlotScopeId = false) {
@@ -737,7 +744,6 @@ const ssrTransformModel = (dir, node, context) => {
 					default:
 						checkDuplicatedValue();
 						res.props = defaultProps;
-						break;
 				}
 			} else if ((0, _vue_compiler_dom.hasDynamicKeyVBind)(node)) {} else {
 				checkDuplicatedValue();
@@ -799,16 +805,18 @@ const ssrInjectCssVars = (node, context) => {
 	else injectCssVars(node);
 };
 function injectCssVars(node) {
-	if (node.type === 1 && (node.tagType === 0 || node.tagType === 1) && !(0, _vue_compiler_dom.findDir)(node, "for")) if (node.tag === "suspense" || node.tag === "Suspense") for (const child of node.children) if (child.type === 1 && child.tagType === 3) child.children.forEach(injectCssVars);
-	else injectCssVars(child);
-	else node.props.push({
-		type: 7,
-		name: "bind",
-		arg: void 0,
-		exp: (0, _vue_compiler_dom.createSimpleExpression)(`_cssVars`, false),
-		modifiers: [],
-		loc: _vue_compiler_dom.locStub
-	});
+	if (node.type === 1 && (node.tagType === 0 || node.tagType === 1) && !(0, _vue_compiler_dom.findDir)(node, "for")) {
+		if (node.tag === "suspense" || node.tag === "Suspense") for (const child of node.children) if (child.type === 1 && child.tagType === 3) child.children.forEach(injectCssVars);
+		else injectCssVars(child);
+		else node.props.push({
+			type: 7,
+			name: "bind",
+			arg: void 0,
+			exp: (0, _vue_compiler_dom.createSimpleExpression)(`_cssVars`, false),
+			modifiers: [],
+			loc: _vue_compiler_dom.locStub
+		});
+	}
 }
 //#endregion
 //#region packages/compiler-ssr/src/index.ts

package/dist/compiler-ssr.d.ts

@@ -1,5 +1,4 @@
 import { CodegenResult, CompilerOptions, RootNode } from "@vue/compiler-dom";
-
 //#region temp/packages/compiler-ssr/src/index.d.ts
 export declare function compile(source: string | RootNode, options?: CompilerOptions): CodegenResult;
-//#endregion
+//#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-ssr",
-  "version": "3.6.0-rc.5",
+  "version": "3.6.0-rc.6",
   "description": "@vue/compiler-ssr",
   "main": "dist/compiler-ssr.cjs.js",
   "types": "dist/compiler-ssr.d.ts",
@@ -28,7 +28,7 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-ssr#readme",
   "dependencies": {
-    "@vue/shared": "3.6.0-rc.5",
-    "@vue/compiler-dom": "3.6.0-rc.5"
+    "@vue/shared": "3.6.0-rc.6",
+    "@vue/compiler-dom": "3.6.0-rc.6"
   }
 }