From 4c1a193617bee8ace6fad289b78e9d2557cb081e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 23 Mar 2020 15:10:35 -0400
Subject: [PATCH] fix: do not drop SFC runtime behavior code in global builds

fix #873
---
 packages/runtime-core/src/componentProxy.ts  |  1 -
 packages/runtime-core/src/helpers/scopeId.ts | 28 +++++++-------------
 packages/runtime-core/src/renderer.ts        | 18 ++++++-------
 3 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/packages/runtime-core/src/componentProxy.ts b/packages/runtime-core/src/componentProxy.ts
index 442f3f32af0..78ba4339cd2 100644
--- 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
index b63f0e7b96c..36aaf68ee82 100644
--- 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
index abf0065581c..0385a6dcc38 100644
--- 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