@vue/compiler-ssr 3.0.7 → 3.0.11

package/dist/compiler-ssr.cjs.js

@@ -104,14 +104,20 @@ function ssrProcessFor(node, context, disableNestedFragments = false) {
 const ssrTransformSlotOutlet = (node, context) => {
     if (compilerDom.isSlotOutlet(node)) {
         const { slotName, slotProps } = compilerDom.processSlotOutlet(node, context);
-        node.ssrCodegenNode = compilerDom.createCallExpression(context.helper(SSR_RENDER_SLOT), [
+        const args = [
             `_ctx.$slots`,
             slotName,
             slotProps || `{}`,
+            // fallback content placeholder. will be replaced in the process phase
             `null`,
             `_push`,
             `_parent`
-        ]);
+        ];
+        // inject slot scope id if current template uses :slotted
+        if (context.scopeId && context.slotted !== false) {
+            args.push(`"${context.scopeId}-s"`);
+        }
+        node.ssrCodegenNode = compilerDom.createCallExpression(context.helper(SSR_RENDER_SLOT), args);
     }
 };
 function ssrProcessSlotOutlet(node, context) {
@@ -123,6 +129,13 @@ function ssrProcessSlotOutlet(node, context) {
         // _renderSlot(slots, name, props, fallback, ...)
         renderCall.arguments[3] = fallbackRenderFn;
     }
+    // Forwarded <slot/>. Merge slot scope ids
+    if (context.withSlotScopeId) {
+        const slotScopeId = renderCall.arguments[6];
+        renderCall.arguments[6] = slotScopeId
+            ? `${slotScopeId} + _scopeId`
+            : `_scopeId`;
+    }
     context.pushStatement(node.ssrCodegenNode);
 }
 
@@ -365,6 +378,10 @@ function ssrProcessComponent(node, context) {
             // is called by `_ssrRenderSlot`.
             fn.body = compilerDom.createIfStatement(compilerDom.createSimpleExpression(`_push`, false), processChildrenAsStatement(children, context, false, true /* withSlotScopeId */), vnodeBranch);
         }
+        // component is inside a slot, inherit slot scope Id
+        if (context.withSlotScopeId) {
+            node.ssrCodegenNode.arguments.push(`_scopeId`);
+        }
         if (typeof component === 'string') {
             // static component
             context.pushStatement(compilerDom.createCallExpression(`_push`, [node.ssrCodegenNode]));
@@ -433,11 +450,23 @@ function subTransform(node, options, parentContext) {
     // inherit parent scope analysis state
     childContext.scopes = { ...parentContext.scopes };
     childContext.identifiers = { ...parentContext.identifiers };
+    childContext.imports = parentContext.imports;
     // traverse
     compilerDom.traverseNode(childRoot, childContext);
     ['helpers', 'components', 'directives'].forEach(key => {
-        childContext[key].forEach((value) => {
-            parentContext[key].add(value);
+        childContext[key].forEach((value, helperKey) => {
+            if (key === 'helpers') {
+                const parentCount = parentContext.helpers.get(helperKey);
+                if (parentCount === undefined) {
+                    parentContext.helpers.set(helperKey, value);
+                }
+                else {
+                    parentContext.helpers.set(helperKey, value + parentCount);
+                }
+            }
+            else {
+                parentContext[key].add(value);
+            }
         });
     });
     // imports/hoists are not merged because:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-ssr",
-  "version": "3.0.7",
+  "version": "3.0.11",
   "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/vue-next/tree/master/packages/compiler-ssr#readme",
   "dependencies": {
-    "@vue/shared": "3.0.7",
-    "@vue/compiler-dom": "3.0.7"
+    "@vue/shared": "3.0.11",
+    "@vue/compiler-dom": "3.0.11"
   }
 }