refactor: restore previous helpers' names

vuejs · Jun 26, 2020 · 1f0d432 · 1f0d432
1 parent 77633e4
commit 1f0d432
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 41 deletions.
diff --git a/packages/server-renderer/__tests__/renderToStream.spec.ts b/packages/server-renderer/__tests__/renderToStream.spec.ts
@@ -13,8 +13,8 @@ import {
 import { escapeHtml, mockWarn } from '@vue/shared'
 import { renderToStream as _renderToStream } from '../src/renderToStream'
 import { Readable } from 'stream'
-import { renderSlot } from '../src/helpers/ssrRenderSlot'
-import { renderComponent } from '../src/helpers/ssrComponent'
+import { ssrRenderSlot } from '../src/helpers/ssrRenderSlot'
+import { ssrRenderComponent } from '../src/helpers/ssrRenderComponent'
 
 mockWarn()
 
@@ -165,7 +165,7 @@ describe('ssr: renderToStream', () => {
           createApp({
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
-              push(renderComponent(Child, { msg: 'hello' }, null, parent))
+              push(ssrRenderComponent(Child, { msg: 'hello' }, null, parent))
               push(`</div>`)
             }
           })
@@ -214,11 +214,13 @@ describe('ssr: renderToStream', () => {
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
               push(
-                renderComponent(OptimizedChild, { msg: 'opt' }, null, parent)
+                ssrRenderComponent(OptimizedChild, { msg: 'opt' }, null, parent)
               )
-              push(renderComponent(VNodeChild, { msg: 'vnode' }, null, parent))
               push(
-                renderComponent(
+                ssrRenderComponent(VNodeChild, { msg: 'vnode' }, null, parent)
+              )
+              push(
+                ssrRenderComponent(
                   TemplateChild,
                   { msg: 'template' },
                   null,
@@ -239,7 +241,7 @@ describe('ssr: renderToStream', () => {
         props: ['msg'],
         ssrRender(ctx: any, push: any, parent: any) {
           push(`<div class="child">`)
-          renderSlot(
+          ssrRenderSlot(
             ctx.$slots,
             'default',
             { msg: 'from slot' },
@@ -259,7 +261,7 @@ describe('ssr: renderToStream', () => {
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
               push(
-                renderComponent(
+                ssrRenderComponent(
                   Child,
                   { msg: 'hello' },
                   {
@@ -289,7 +291,7 @@ describe('ssr: renderToStream', () => {
           createApp({
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
-              push(renderComponent(Child, { msg: 'hello' }, null, parent))
+              push(ssrRenderComponent(Child, { msg: 'hello' }, null, parent))
               push(`</div>`)
             }
           })
@@ -304,7 +306,7 @@ describe('ssr: renderToStream', () => {
         props: ['msg'],
         ssrRender(ctx: any, push: any, parent: any) {
           push(`<div class="child">`)
-          renderSlot(
+          ssrRenderSlot(
             ctx.$slots,
             'default',
             { msg: 'from slot' },
@@ -322,7 +324,7 @@ describe('ssr: renderToStream', () => {
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
               push(
-                renderComponent(
+                ssrRenderComponent(
                   Child,
                   { msg: 'hello' },
                   {
@@ -408,7 +410,7 @@ describe('ssr: renderToStream', () => {
           createApp({
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
-              push(renderComponent(Child, null, null, parent))
+              push(ssrRenderComponent(Child, null, null, parent))
               push(`</div>`)
             }
           })
@@ -447,9 +449,11 @@ describe('ssr: renderToStream', () => {
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
               push(
-                renderComponent(OptimizedChild, { msg: 'opt' }, null, parent)
+                ssrRenderComponent(OptimizedChild, { msg: 'opt' }, null, parent)
+              )
+              push(
+                ssrRenderComponent(VNodeChild, { msg: 'vnode' }, null, parent)
               )
-              push(renderComponent(VNodeChild, { msg: 'vnode' }, null, parent))
               push(`</div>`)
             }
           })

diff --git a/packages/server-renderer/__tests__/renderToString.spec.ts b/packages/server-renderer/__tests__/renderToString.spec.ts
@@ -12,8 +12,8 @@ import {
 } from 'vue'
 import { escapeHtml, mockWarn } from '@vue/shared'
 import { renderToString } from '../src/renderToString'
-import { renderSlot } from '../src/helpers/ssrRenderSlot'
-import { renderComponent } from '../src/helpers/ssrComponent'
+import { ssrRenderSlot } from '../src/helpers/ssrRenderSlot'
+import { ssrRenderComponent } from '../src/helpers/ssrRenderComponent'
 
 mockWarn()
 
@@ -146,7 +146,7 @@ describe('ssr: renderToString', () => {
           createApp({
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
-              push(renderComponent(Child, { msg: 'hello' }, null, parent))
+              push(ssrRenderComponent(Child, { msg: 'hello' }, null, parent))
               push(`</div>`)
             }
           })
@@ -195,11 +195,13 @@ describe('ssr: renderToString', () => {
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
               push(
-                renderComponent(OptimizedChild, { msg: 'opt' }, null, parent)
+                ssrRenderComponent(OptimizedChild, { msg: 'opt' }, null, parent)
               )
-              push(renderComponent(VNodeChild, { msg: 'vnode' }, null, parent))
               push(
-                renderComponent(
+                ssrRenderComponent(VNodeChild, { msg: 'vnode' }, null, parent)
+              )
+              push(
+                ssrRenderComponent(
                   TemplateChild,
                   { msg: 'template' },
                   null,
@@ -220,7 +222,7 @@ describe('ssr: renderToString', () => {
         props: ['msg'],
         ssrRender(ctx: any, push: any, parent: any) {
           push(`<div class="child">`)
-          renderSlot(
+          ssrRenderSlot(
             ctx.$slots,
             'default',
             { msg: 'from slot' },
@@ -240,7 +242,7 @@ describe('ssr: renderToString', () => {
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
               push(
-                renderComponent(
+                ssrRenderComponent(
                   Child,
                   { msg: 'hello' },
                   {
@@ -270,7 +272,7 @@ describe('ssr: renderToString', () => {
           createApp({
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
-              push(renderComponent(Child, { msg: 'hello' }, null, parent))
+              push(ssrRenderComponent(Child, { msg: 'hello' }, null, parent))
               push(`</div>`)
             }
           })
@@ -285,7 +287,7 @@ describe('ssr: renderToString', () => {
         props: ['msg'],
         ssrRender(ctx: any, push: any, parent: any) {
           push(`<div class="child">`)
-          renderSlot(
+          ssrRenderSlot(
             ctx.$slots,
             'default',
             { msg: 'from slot' },
@@ -303,7 +305,7 @@ describe('ssr: renderToString', () => {
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
               push(
-                renderComponent(
+                ssrRenderComponent(
                   Child,
                   { msg: 'hello' },
                   {
@@ -389,7 +391,7 @@ describe('ssr: renderToString', () => {
           createApp({
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
-              push(renderComponent(Child, null, null, parent))
+              push(ssrRenderComponent(Child, null, null, parent))
               push(`</div>`)
             }
           })
@@ -428,9 +430,11 @@ describe('ssr: renderToString', () => {
             ssrRender(_ctx, push, parent) {
               push(`<div>parent`)
               push(
-                renderComponent(OptimizedChild, { msg: 'opt' }, null, parent)
+                ssrRenderComponent(OptimizedChild, { msg: 'opt' }, null, parent)
+              )
+              push(
+                ssrRenderComponent(VNodeChild, { msg: 'vnode' }, null, parent)
               )
-              push(renderComponent(VNodeChild, { msg: 'vnode' }, null, parent))
               push(`</div>`)
             }
           })

diff --git a/packages/server-renderer/__tests__/ssrTeleport.spec.ts b/packages/server-renderer/__tests__/ssrTeleport.spec.ts
@@ -1,7 +1,7 @@
 import { createApp, h, Teleport } from 'vue'
 import { renderToString } from '../src/renderToString'
 import { SSRContext } from '../src/render'
-import { renderTeleport } from '../src/helpers/ssrRenderTeleport'
+import { ssrRenderTeleport } from '../src/helpers/ssrRenderTeleport'
 
 describe('ssrRenderTeleport', () => {
   test('teleport rendering (compiled)', async () => {
@@ -12,7 +12,7 @@ describe('ssrRenderTeleport', () => {
           return { msg: 'hello' }
         },
         ssrRender(_ctx, _push, _parent) {
-          renderTeleport(
+          ssrRenderTeleport(
             _push,
             _push => {
               _push(`<div>content</div>`)
@@ -37,7 +37,7 @@ describe('ssrRenderTeleport', () => {
           return { msg: 'hello' }
         },
         ssrRender(_ctx, _push, _parent) {
-          renderTeleport(
+          ssrRenderTeleport(
             _push,
             _push => {
               _push(`<div>content</div>`)

diff --git a/...rver-renderer/src/helpers/ssrComponent.ts → ...enderer/src/helpers/ssrRenderComponent.ts b/...rver-renderer/src/helpers/ssrComponent.ts → ...enderer/src/helpers/ssrRenderComponent.ts
@@ -7,7 +7,7 @@ import {
 import { Props, renderComponentVNode, SSRBuffer } from '../render'
 import { SSRSlots } from './ssrRenderSlot'
 
-export function renderComponent(
+export function ssrRenderComponent(
   comp: Component,
   props: Props | null = null,
   children: Slots | SSRSlots | null = null,

diff --git a/packages/server-renderer/src/helpers/ssrRenderSlot.ts b/packages/server-renderer/src/helpers/ssrRenderSlot.ts
@@ -9,7 +9,7 @@ export type SSRSlot = (
   scopeId: string | null
 ) => void
 
-export function renderSlot(
+export function ssrRenderSlot(
   slots: Slots | SSRSlots,
   slotName: string,
   slotProps: Props,

diff --git a/packages/server-renderer/src/helpers/ssrRenderTeleport.ts b/packages/server-renderer/src/helpers/ssrRenderTeleport.ts
@@ -1,7 +1,7 @@
 import { ComponentInternalInstance, ssrContextKey } from '@vue/runtime-core'
 import { createBuffer, PushFn, SSRBufferItem, SSRContext } from '../render'
 
-export function renderTeleport(
+export function ssrRenderTeleport(
   parentPush: PushFn,
   contentRenderFn: (push: PushFn) => void,
   target: string,

diff --git a/packages/server-renderer/src/index.ts b/packages/server-renderer/src/index.ts
@@ -4,10 +4,9 @@ export { renderToString } from './renderToString'
 export { renderToStream } from './renderToStream'
 
 // internal runtime helpers
-export {
-  renderTeleport as ssrRenderTeleport
-} from './helpers/ssrRenderTeleport'
-export { renderSlot as ssrRenderSlot } from './helpers/ssrRenderSlot'
+export { ssrRenderComponent } from './helpers/ssrRenderComponent'
+export { ssrRenderSlot } from './helpers/ssrRenderSlot'
+export { ssrRenderTeleport } from './helpers/ssrRenderTeleport'
 export {
   ssrRenderClass,
   ssrRenderStyle,
@@ -26,4 +25,3 @@ export {
   ssrRenderDynamicModel,
   ssrGetDynamicModelProps
 } from './helpers/ssrVModelHelpers'
-export { renderComponent as ssrRenderComponent } from './helpers/ssrComponent'
diff --git a/packages/server-renderer/src/render.ts b/packages/server-renderer/src/render.ts
@@ -24,7 +24,7 @@ import {
 } from '@vue/shared'
 import { ssrRenderAttrs } from './helpers/ssrRenderAttrs'
 import { ssrCompile } from './helpers/ssrCompile'
-import { renderTeleport } from './helpers/ssrRenderTeleport'
+import { ssrRenderTeleport } from './helpers/ssrRenderTeleport'
 
 const {
   createComponentInstance,
@@ -270,7 +270,7 @@ function renderTeleportVNode(
     )
     return []
   }
-  renderTeleport(
+  ssrRenderTeleport(
     push,
     push => {
       renderVNodeChildren(