fix: do not drop SFC runtime behavior code in global builds

fix #873
vuejs · Mar 23, 2020 · 4c1a193 · 4c1a193
1 parent 4126a9d
commit 4c1a193
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 29 deletions.
diff --git a/packages/runtime-core/src/componentProxy.ts b/packages/runtime-core/src/componentProxy.ts
@@ -124,7 +124,6 @@ export const PublicInstanceProxyHandlers: ProxyHandler<any> = {
  }
  return publicGetter(target)
  } else if (
- __BUNDLER__ &&
  (cssModule = type.__cssModules) &&
  (cssModule = cssModule[key])
  ) {

diff --git a/packages/runtime-core/src/helpers/scopeId.ts b/packages/runtime-core/src/helpers/scopeId.ts
@@ -8,28 +8,20 @@ export let currentScopeId: string | null = null
 const scopeIdStack: string[] = []
 
 export function pushScopeId(id: string) {
- if (__BUNDLER__) {
- scopeIdStack.push((currentScopeId = id))
- }
+ scopeIdStack.push((currentScopeId = id))
 }
 
 export function popScopeId() {
- if (__BUNDLER__) {
- scopeIdStack.pop()
- currentScopeId = scopeIdStack[scopeIdStack.length - 1] || null
- }
+ scopeIdStack.pop()
+ currentScopeId = scopeIdStack[scopeIdStack.length - 1] || null
 }
 
 export function withScopeId(id: string): <T extends Function>(fn: T) => T {
- if (__BUNDLER__) {
- return ((fn: Function) =>
- withCtx(function(this: any) {
- pushScopeId(id)
- const res = fn.apply(this, arguments)
- popScopeId()
- return res
- })) as any
- } else {
- return undefined as any
- }
+ return ((fn: Function) =>
+ withCtx(function(this: any) {
+ pushScopeId(id)
+ const res = fn.apply(this, arguments)
+ popScopeId()
+ return res
+ })) as any
 }
diff --git a/packages/runtime-core/src/renderer.ts b/packages/runtime-core/src/renderer.ts
@@ -563,16 +563,14 @@ function baseCreateRenderer(
  }
 
  // scopeId
- if (__BUNDLER__) {
- if (scopeId) {
- hostSetScopeId(el, scopeId)
- }
- const treeOwnerId = parentComponent && parentComponent.type.__scopeId
- // vnode's own scopeId and the current patched component's scopeId is
- // different - this is a slot content node.
- if (treeOwnerId && treeOwnerId !== scopeId) {
- hostSetScopeId(el, treeOwnerId + '-s')
- }
+ if (scopeId) {
+ hostSetScopeId(el, scopeId)
+ }
+ const treeOwnerId = parentComponent && parentComponent.type.__scopeId
+ // vnode's own scopeId and the current patched component's scopeId is
+ // different - this is a slot content node.
+ if (treeOwnerId && treeOwnerId !== scopeId) {
+ hostSetScopeId(el, treeOwnerId + '-s')
  }
 
  // children