Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(server-renderer): support for non-Node.js Environments #3460

Closed
wants to merge 3 commits into from
Closed

feat(server-renderer): support for non-Node.js Environments #3460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca5718d
feat: basic server-renderer
ferdinando-ferreira Mar 22, 2021
dad4db7
Merge remote-tracking branch 'upstream/master' into basic-renderer
ferdinando-ferreira Mar 24, 2021
2e0f873
Merge branch 'master' into basic-renderer
yyx990803 Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/server-renderer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
"buildOptions": {
"name": "VueServerRenderer",
"formats": [
"esm-bundler",
"cjs"
"cjs",
"basic-cjs",
"esm-bundler"
]
},
"repository": {
Expand Down
27 changes: 27 additions & 0 deletions packages/server-renderer/src/basic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// public
export { SSRContext } from './render'
export { renderToString } from './renderToString'

// internal runtime helpers
export { renderVNode as ssrRenderVNode } from './render'
export { ssrRenderComponent } from './helpers/ssrRenderComponent'
export { ssrRenderSlot } from './helpers/ssrRenderSlot'
export { ssrRenderTeleport } from './helpers/ssrRenderTeleport'
export {
ssrRenderClass,
ssrRenderStyle,
ssrRenderAttrs,
ssrRenderAttr,
ssrRenderDynamicAttr
} from './helpers/ssrRenderAttrs'
export { ssrInterpolate } from './helpers/ssrInterpolate'
export { ssrRenderList } from './helpers/ssrRenderList'
export { ssrRenderSuspense } from './helpers/ssrRenderSuspense'

// v-model helpers
export {
ssrLooseEqual,
ssrLooseContain,
ssrRenderDynamicModel,
ssrGetDynamicModelProps
} from './helpers/ssrVModelHelpers'
27 changes: 1 addition & 26 deletions packages/server-renderer/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,3 @@
// public
export { SSRContext } from './render'
export { renderToString } from './renderToString'
export * from './basic'
export { renderToStream } from './renderToStream'

// internal runtime helpers
export { renderVNode as ssrRenderVNode } from './render'
export { ssrRenderComponent } from './helpers/ssrRenderComponent'
export { ssrRenderSlot } from './helpers/ssrRenderSlot'
export { ssrRenderTeleport } from './helpers/ssrRenderTeleport'
export {
ssrRenderClass,
ssrRenderStyle,
ssrRenderAttrs,
ssrRenderAttr,
ssrRenderDynamicAttr
} from './helpers/ssrRenderAttrs'
export { ssrInterpolate } from './helpers/ssrInterpolate'
export { ssrRenderList } from './helpers/ssrRenderList'
export { ssrRenderSuspense } from './helpers/ssrRenderSuspense'

// v-model helpers
export {
ssrLooseEqual,
ssrLooseContain,
ssrRenderDynamicModel,
ssrGetDynamicModelProps
} from './helpers/ssrVModelHelpers'
20 changes: 15 additions & 5 deletions rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ const outputConfigs = {
format: `iife`
},

// basic builds, for 'server-renderer' package only
'basic-cjs': {
file: resolve(`dist/${name}.basic-cjs.js`),
format: `cjs`
},

// runtime-only builds, for main "vue" package only
'esm-bundler-runtime': {
file: resolve(`dist/${name}.runtime.esm-bundler.js`),
Expand All @@ -51,7 +57,7 @@ const outputConfigs = {
format: 'iife'
}
}

const isCjs = format => /^(basic-)?cjs$/.test(format)
const defaultFormats = ['esm-bundler', 'cjs']
const inlineFormats = process.env.FORMATS && process.env.FORMATS.split(',')
const packageFormats = inlineFormats || packageOptions.formats || defaultFormats
Expand All @@ -64,7 +70,7 @@ if (process.env.NODE_ENV === 'production') {
if (packageOptions.prod === false) {
return
}
if (format === 'cjs') {
if (isCjs(format)) {
packageConfigs.push(createProductionConfig(format))
}
if (/^(global|esm-browser)(-runtime)?/.test(format)) {
Expand All @@ -89,7 +95,7 @@ function createConfig(format, output, plugins = []) {
process.env.__DEV__ === 'false' || /\.prod\.js$/.test(output.file)
const isBundlerESMBuild = /esm-bundler/.test(format)
const isBrowserESMBuild = /esm-browser/.test(format)
const isNodeBuild = format === 'cjs'
const isNodeBuild = isCjs(format)
const isGlobalBuild = /global/.test(format)
const isCompatBuild = !!packageOptions.compat
const isCompatPackage = pkg.name === '@vue/compat'
Expand Down Expand Up @@ -119,7 +125,11 @@ function createConfig(format, output, plugins = []) {
// during a single build.
hasTSChecked = true

let entryFile = /runtime$/.test(format) ? `src/runtime.ts` : `src/index.ts`
let entryFile = /^basic-/.test(format)
? `src/basic.ts`
: /runtime$/.test(format)
? `src/runtime.ts`
: `src/index.ts`

// the compat build needs both default AND named exports. This will cause
// Rollup to complain for non-ESM targets, so we use separate entries for
Expand Down Expand Up @@ -155,7 +165,7 @@ function createConfig(format, output, plugins = []) {
}

const nodePlugins =
packageOptions.enableNonBrowserBranches && format !== 'cjs'
packageOptions.enableNonBrowserBranches && !isCjs(format)
? [
// @ts-ignore
require('@rollup/plugin-commonjs')({
Expand Down