From d74f21a42cf067abebb4b170d0818cc5d1c06f8d Mon Sep 17 00:00:00 2001 From: Evan You Date: Wed, 22 Sep 2021 23:28:13 -0400 Subject: [PATCH] fix(compiler-ssr): import ssr helpers from updated path --- packages/compiler-core/src/codegen.ts | 2 +- .../__tests__/ssrComponent.spec.ts | 30 +++++++++---------- .../compiler-ssr/__tests__/ssrElement.spec.ts | 6 ++-- .../__tests__/ssrInjectCssVars.spec.ts | 10 +++---- .../compiler-ssr/__tests__/ssrPortal.spec.ts | 6 ++-- .../__tests__/ssrSlotOutlet.spec.ts | 16 +++++----- .../__tests__/ssrSuspense.spec.ts | 4 +-- .../compiler-ssr/__tests__/ssrText.spec.ts | 4 +-- .../compiler-ssr/__tests__/ssrVFor.spec.ts | 14 ++++----- .../compiler-ssr/__tests__/ssrVIf.spec.ts | 16 +++++----- .../compiler-ssr/__tests__/ssrVModel.spec.ts | 26 ++++++++-------- .../compiler-ssr/__tests__/ssrVShow.spec.ts | 12 ++++---- 12 files changed, 73 insertions(+), 73 deletions(-) diff --git a/packages/compiler-core/src/codegen.ts b/packages/compiler-core/src/codegen.ts index 9f245bf742e..d59be36e0be 100644 --- a/packages/compiler-core/src/codegen.ts +++ b/packages/compiler-core/src/codegen.ts @@ -363,7 +363,7 @@ function genFunctionPreamble(ast: RootNode, context: CodegenContext) { push( `const { ${ast.ssrHelpers .map(aliasHelper) - .join(', ')} } = require("@vue/server-renderer")\n` + .join(', ')} } = require("vue/server-renderer")\n` ) } genHoists(ast.hoists, context) diff --git a/packages/compiler-ssr/__tests__/ssrComponent.spec.ts b/packages/compiler-ssr/__tests__/ssrComponent.spec.ts index fe16096c102..d7ceb0bcb3c 100644 --- a/packages/compiler-ssr/__tests__/ssrComponent.spec.ts +++ b/packages/compiler-ssr/__tests__/ssrComponent.spec.ts @@ -4,7 +4,7 @@ describe('ssr: components', () => { test('basic', () => { expect(compile(``).code).toMatchInlineSnapshot(` "const { resolveComponent: _resolveComponent, mergeProps: _mergeProps } = require(\\"vue\\") - const { ssrRenderComponent: _ssrRenderComponent } = require(\\"@vue/server-renderer\\") + const { ssrRenderComponent: _ssrRenderComponent } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { const _component_foo = _resolveComponent(\\"foo\\") @@ -21,7 +21,7 @@ describe('ssr: components', () => { expect(compile(``).code) .toMatchInlineSnapshot(` "const { resolveDynamicComponent: _resolveDynamicComponent, mergeProps: _mergeProps, createVNode: _createVNode } = require(\\"vue\\") - const { ssrRenderVNode: _ssrRenderVNode } = require(\\"@vue/server-renderer\\") + const { ssrRenderVNode: _ssrRenderVNode } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { _ssrRenderVNode(_push, _createVNode(_resolveDynamicComponent(\\"foo\\"), _mergeProps({ prop: \\"b\\" }, _attrs), null), _parent) @@ -31,7 +31,7 @@ describe('ssr: components', () => { expect(compile(``).code) .toMatchInlineSnapshot(` "const { resolveDynamicComponent: _resolveDynamicComponent, mergeProps: _mergeProps, createVNode: _createVNode } = require(\\"vue\\") - const { ssrRenderVNode: _ssrRenderVNode } = require(\\"@vue/server-renderer\\") + const { ssrRenderVNode: _ssrRenderVNode } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { _ssrRenderVNode(_push, _createVNode(_resolveDynamicComponent(_ctx.foo), _mergeProps({ prop: \\"b\\" }, _attrs), null), _parent) @@ -43,7 +43,7 @@ describe('ssr: components', () => { test('implicit default slot', () => { expect(compile(`hello
`).code).toMatchInlineSnapshot(` "const { resolveComponent: _resolveComponent, withCtx: _withCtx, createVNode: _createVNode, createTextVNode: _createTextVNode } = require(\\"vue\\") - const { ssrRenderComponent: _ssrRenderComponent } = require(\\"@vue/server-renderer\\") + const { ssrRenderComponent: _ssrRenderComponent } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { const _component_foo = _resolveComponent(\\"foo\\") @@ -69,7 +69,7 @@ describe('ssr: components', () => { expect(compile(`{{ msg + outer }}`).code) .toMatchInlineSnapshot(` "const { resolveComponent: _resolveComponent, withCtx: _withCtx, toDisplayString: _toDisplayString, createTextVNode: _createTextVNode } = require(\\"vue\\") - const { ssrRenderComponent: _ssrRenderComponent, ssrInterpolate: _ssrInterpolate } = require(\\"@vue/server-renderer\\") + const { ssrRenderComponent: _ssrRenderComponent, ssrInterpolate: _ssrInterpolate } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { const _component_foo = _resolveComponent(\\"foo\\") @@ -98,7 +98,7 @@ describe('ssr: components', () => { `).code ).toMatchInlineSnapshot(` "const { resolveComponent: _resolveComponent, withCtx: _withCtx, createTextVNode: _createTextVNode } = require(\\"vue\\") - const { ssrRenderComponent: _ssrRenderComponent } = require(\\"@vue/server-renderer\\") + const { ssrRenderComponent: _ssrRenderComponent } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { const _component_foo = _resolveComponent(\\"foo\\") @@ -135,7 +135,7 @@ describe('ssr: components', () => { `).code ).toMatchInlineSnapshot(` "const { resolveComponent: _resolveComponent, withCtx: _withCtx, createTextVNode: _createTextVNode, createSlots: _createSlots } = require(\\"vue\\") - const { ssrRenderComponent: _ssrRenderComponent } = require(\\"@vue/server-renderer\\") + const { ssrRenderComponent: _ssrRenderComponent } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { const _component_foo = _resolveComponent(\\"foo\\") @@ -167,7 +167,7 @@ describe('ssr: components', () => { `).code ).toMatchInlineSnapshot(` "const { resolveComponent: _resolveComponent, withCtx: _withCtx, toDisplayString: _toDisplayString, createTextVNode: _createTextVNode, renderList: _renderList, createSlots: _createSlots } = require(\\"vue\\") - const { ssrRenderComponent: _ssrRenderComponent, ssrInterpolate: _ssrInterpolate } = require(\\"@vue/server-renderer\\") + const { ssrRenderComponent: _ssrRenderComponent, ssrInterpolate: _ssrInterpolate } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { const _component_foo = _resolveComponent(\\"foo\\") @@ -208,7 +208,7 @@ describe('ssr: components', () => { `).code ).toMatchInlineSnapshot(` "const { resolveComponent: _resolveComponent, withCtx: _withCtx, renderList: _renderList, Fragment: _Fragment, openBlock: _openBlock, createBlock: _createBlock, createCommentVNode: _createCommentVNode } = require(\\"vue\\") - const { ssrRenderComponent: _ssrRenderComponent, ssrRenderList: _ssrRenderList } = require(\\"@vue/server-renderer\\") + const { ssrRenderComponent: _ssrRenderComponent, ssrRenderList: _ssrRenderList } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { const _component_foo = _resolveComponent(\\"foo\\") @@ -269,7 +269,7 @@ describe('ssr: components', () => { test('built-in fallthroughs', () => { expect(compile(`
`).code) .toMatchInlineSnapshot(` - "const { ssrRenderAttrs: _ssrRenderAttrs } = require(\\"@vue/server-renderer\\") + "const { ssrRenderAttrs: _ssrRenderAttrs } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { _push(\`
\`) @@ -279,7 +279,7 @@ describe('ssr: components', () => { expect(compile(``).code) .toMatchInlineSnapshot(` "const { resolveComponent: _resolveComponent } = require(\\"vue\\") - const { ssrRenderComponent: _ssrRenderComponent } = require(\\"@vue/server-renderer\\") + const { ssrRenderComponent: _ssrRenderComponent } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { const _component_foo = _resolveComponent(\\"foo\\") @@ -298,7 +298,7 @@ describe('ssr: components', () => { `
` ).code ).toMatchInlineSnapshot(` - "const { ssrRenderList: _ssrRenderList } = require(\\"@vue/server-renderer\\") + "const { ssrRenderList: _ssrRenderList } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { _push(\`\`) @@ -316,7 +316,7 @@ describe('ssr: components', () => { `
` ).code ).toMatchInlineSnapshot(` - "const { ssrRenderList: _ssrRenderList } = require(\\"@vue/server-renderer\\") + "const { ssrRenderList: _ssrRenderList } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { _push(\`
    \`) @@ -334,7 +334,7 @@ describe('ssr: components', () => { `
    ` ).code ).toMatchInlineSnapshot(` - "const { ssrRenderList: _ssrRenderList } = require(\\"@vue/server-renderer\\") + "const { ssrRenderList: _ssrRenderList } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { _push(\`<\${_ctx.someTag}>\`) @@ -356,7 +356,7 @@ describe('ssr: components', () => { ` ).code ).toMatchInlineSnapshot(` - "const { ssrRenderList: _ssrRenderList } = require(\\"@vue/server-renderer\\") + "const { ssrRenderList: _ssrRenderList } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { _push(\`\`) diff --git a/packages/compiler-ssr/__tests__/ssrElement.spec.ts b/packages/compiler-ssr/__tests__/ssrElement.spec.ts index b7de9f69c31..fee43975512 100644 --- a/packages/compiler-ssr/__tests__/ssrElement.spec.ts +++ b/packages/compiler-ssr/__tests__/ssrElement.spec.ts @@ -57,7 +57,7 @@ describe('ssr: element', () => { expect(compile(``).code) .toMatchInlineSnapshot(` "const { mergeProps: _mergeProps } = require(\\"vue\\") - const { ssrRenderAttrs: _ssrRenderAttrs, ssrInterpolate: _ssrInterpolate } = require(\\"@vue/server-renderer\\") + const { ssrRenderAttrs: _ssrRenderAttrs, ssrInterpolate: _ssrInterpolate } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { let _temp0 @@ -75,7 +75,7 @@ describe('ssr: element', () => { expect( compile(`
    {{ hello }}
    `).code ).toMatchInlineSnapshot(` - "const { ssrRenderAttrs: _ssrRenderAttrs, ssrInterpolate: _ssrInterpolate } = require(\\"@vue/server-renderer\\") + "const { ssrRenderAttrs: _ssrRenderAttrs, ssrInterpolate: _ssrInterpolate } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { let _temp0 @@ -100,7 +100,7 @@ describe('ssr: element', () => { }).code ).toMatchInlineSnapshot(` "const { mergeProps: _mergeProps } = require(\\"vue\\") - const { ssrRenderAttrs: _ssrRenderAttrs } = require(\\"@vue/server-renderer\\") + const { ssrRenderAttrs: _ssrRenderAttrs } = require(\\"vue/server-renderer\\") return function ssrRender(_ctx, _push, _parent, _attrs) { _push(\`\`) diff --git a/packages/compiler-ssr/__tests__/ssrInjectCssVars.spec.ts b/packages/compiler-ssr/__tests__/ssrInjectCssVars.spec.ts index 89fbe162449..b2e5b44518d 100644 --- a/packages/compiler-ssr/__tests__/ssrInjectCssVars.spec.ts +++ b/packages/compiler-ssr/__tests__/ssrInjectCssVars.spec.ts @@ -8,7 +8,7 @@ describe('ssr: inject