Skip to content

Commit 4d35eca

Browse files
authored
fix(server-renderer): remove package dependency cycle (#15063)
1 parent bd962bb commit 4d35eca

13 files changed

Lines changed: 40 additions & 18 deletions

‎packages/runtime-core/__tests__/hydration.spec.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,37 @@ import {
2525
openBlock,
2626
reactive,
2727
ref,
28+
registerRuntimeCompiler,
2829
renderSlot,
2930
useCssVars,
3031
vModelCheckbox,
3132
vShow,
3233
withCtx,
3334
withDirectives,
3435
} from '@vue/runtime-dom'
36+
import * as runtimeDom from '@vue/runtime-dom'
3537
import type { HMRRuntime } from '../src/hmr'
38+
import type { InternalRenderFunction } from '../src/component'
3639
import { type SSRContext, renderToString } from '@vue/server-renderer'
40+
import { type CompilerOptions, compile } from '@vue/compiler-dom'
3741
import { PatchFlags, normalizeStyle } from '@vue/shared'
3842
import { vShowOriginalDisplay } from '../../runtime-dom/src/directives/vShow'
3943

4044
declare var __VUE_HMR_RUNTIME__: HMRRuntime
4145
const { createRecord, reload } = __VUE_HMR_RUNTIME__
4246

47+
registerRuntimeCompiler(compileToFunction)
48+
49+
function compileToFunction(template: string, options?: CompilerOptions) {
50+
const { code } = compile(
51+
template,
52+
Object.assign({ hoistStatic: true }, options),
53+
)
54+
const render = new Function('Vue', code)(runtimeDom) as InternalRenderFunction
55+
render._rc = true
56+
return render
57+
}
58+
4359
function mountWithHydration(html: string, render: () => any) {
4460
const container = document.createElement('div')
4561
container.innerHTML = html

‎packages/server-renderer/package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@
4545
"url": "https://github.com/vuejs/core/issues"
4646
},
4747
"homepage": "https://github.com/vuejs/core/tree/main/packages/server-renderer#readme",
48-
"peerDependencies": {
49-
"vue": "workspace:*"
50-
},
5148
"dependencies": {
5249
"@vue/shared": "workspace:*",
53-
"@vue/compiler-ssr": "workspace:*"
50+
"@vue/compiler-ssr": "workspace:*",
51+
"@vue/runtime-dom": "workspace:*"
5452
}
5553
}

‎packages/server-renderer/src/helpers/ssrCompile.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import {
22
type ComponentInternalInstance,
33
type ComponentOptions,
44
warn,
5-
} from 'vue'
5+
} from '@vue/runtime-dom'
66
import { compile } from '@vue/compiler-ssr'
77
import { NO, extend, generateCodeFrame, isFunction } from '@vue/shared'
88
import type { CompilerError, CompilerOptions } from '@vue/compiler-core'
99
import type { PushFn } from '../render'
1010

11-
import * as Vue from 'vue'
11+
import * as Vue from '@vue/runtime-dom'
1212
import * as helpers from '../internal'
1313

1414
type SSRRenderFunction = (

‎packages/server-renderer/src/helpers/ssrGetDirectiveProps.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import { type ComponentPublicInstance, type Directive, ssrUtils } from 'vue'
1+
import {
2+
type ComponentPublicInstance,
3+
type Directive,
4+
ssrUtils,
5+
} from '@vue/runtime-dom'
26

37
export function ssrGetDirectiveProps(
48
instance: ComponentPublicInstance,

‎packages/server-renderer/src/helpers/ssrRenderComponent.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
type ComponentInternalInstance,
44
type Slots,
55
createVNode,
6-
} from 'vue'
6+
} from '@vue/runtime-dom'
77
import { type Props, type SSRBuffer, renderComponentVNode } from '../render'
88
import type { SSRSlots } from './ssrRenderSlot'
99

‎packages/server-renderer/src/helpers/ssrRenderList.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { isArray, isObject, isString } from '@vue/shared'
2-
import { warn } from '@vue/runtime-core'
2+
import { warn } from '@vue/runtime-dom'
33

44
export function ssrRenderList(
55
source: unknown,

‎packages/server-renderer/src/helpers/ssrRenderSlot.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import { type ComponentInternalInstance, type Slots, ssrUtils } from 'vue'
1+
import {
2+
type ComponentInternalInstance,
3+
type Slots,
4+
ssrUtils,
5+
} from '@vue/runtime-dom'
26
import {
37
type Props,
48
type PushFn,

‎packages/server-renderer/src/helpers/ssrRenderTeleport.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type ComponentInternalInstance, ssrContextKey } from 'vue'
1+
import { type ComponentInternalInstance, ssrContextKey } from '@vue/runtime-dom'
22
import { isArray, isPromise } from '@vue/shared'
33
import {
44
type PushFn,

‎packages/server-renderer/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { initDirectivesForSSR } from 'vue'
1+
import { initDirectivesForSSR } from '@vue/runtime-dom'
22
initDirectivesForSSR()
33

44
// public

‎packages/server-renderer/src/render.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
mergeProps,
1414
ssrUtils,
1515
warn,
16-
} from 'vue'
16+
} from '@vue/runtime-dom'
1717
import {
1818
NOOP,
1919
ShapeFlags,

0 commit comments

Comments
 (0)