From 12a4460cc4836bd8ad7e8cb30c4d1374a0cb751c Mon Sep 17 00:00:00 2001
From: Carlos Rodrigues <carlos.rodrigues@just-eat.com>
Date: Tue, 15 Oct 2019 08:54:04 +0100
Subject: [PATCH 1/2] feat(shared): add makeMap method and replace
 globalWhilelist set

---
 .../src/transforms/transformExpression.ts         |  4 ++--
 packages/runtime-core/src/componentProxy.ts       |  2 +-
 packages/shared/src/globalsWhitelist.ts           |  4 +++-
 packages/shared/src/makeMap.ts                    | 15 +++++++++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 packages/shared/src/makeMap.ts

diff --git a/packages/compiler-core/src/transforms/transformExpression.ts b/packages/compiler-core/src/transforms/transformExpression.ts
index e3c2c028b80..15b53e1ca1d 100644
--- a/packages/compiler-core/src/transforms/transformExpression.ts
+++ b/packages/compiler-core/src/transforms/transformExpression.ts
@@ -86,7 +86,7 @@ export function processExpression(
     if (
       !asParams &&
       !context.identifiers[rawExp] &&
-      !globalsWhitelist.has(rawExp) &&
+      !globalsWhitelist(rawExp) &&
       !literalsWhitelist.has(rawExp)
     ) {
       node.content = `_ctx.${rawExp}`
@@ -246,7 +246,7 @@ function shouldPrefix(identifier: Identifier, parent: Node) {
     // not in an Array destructure pattern
     !(parent.type === 'ArrayPattern') &&
     // skip whitelisted globals
-    !globalsWhitelist.has(identifier.name) &&
+    !globalsWhitelist(identifier.name) &&
     // special case for webpack compilation
     identifier.name !== `require` &&
     // is a special keyword but parsed as identifier
diff --git a/packages/runtime-core/src/componentProxy.ts b/packages/runtime-core/src/componentProxy.ts
index 02a2ca2d841..d276ef3a8f4 100644
--- a/packages/runtime-core/src/componentProxy.ts
+++ b/packages/runtime-core/src/componentProxy.ts
@@ -106,6 +106,6 @@ if (__RUNTIME_COMPILE__) {
   // this trap is only called in browser-compiled render functions that use
   // `with (this) {}`
   PublicInstanceProxyHandlers.has = (_: any, key: string): boolean => {
-    return key[0] !== '_' && !globalsWhitelist.has(key)
+    return key[0] !== '_' && !globalsWhitelist(key)
   }
 }
diff --git a/packages/shared/src/globalsWhitelist.ts b/packages/shared/src/globalsWhitelist.ts
index 198d66a97e5..1d4e14591da 100644
--- a/packages/shared/src/globalsWhitelist.ts
+++ b/packages/shared/src/globalsWhitelist.ts
@@ -1,4 +1,6 @@
-export const globalsWhitelist = new Set([
+import { makeMap } from "./makeMap";
+
+export const globalsWhitelist = makeMap([
   'Infinity',
   'undefined',
   'NaN',
diff --git a/packages/shared/src/makeMap.ts b/packages/shared/src/makeMap.ts
new file mode 100644
index 00000000000..fbb78d934ef
--- /dev/null
+++ b/packages/shared/src/makeMap.ts
@@ -0,0 +1,15 @@
+/**
+ * Make a map and return a function for checking if a key
+ * is in that map.
+ */
+export const makeMap = (
+  str: string | string[],
+  expectsLowerCase?: boolean
+): ((key: string) => true | void) => {
+  const map: Record<string, true> = {}
+  const list = typeof str === 'string' ? str.split(',') : str
+  for (let i = 0; i < list.length; i++) {
+    map[list[i]] = true
+  }
+  return expectsLowerCase ? val => map[val.toLowerCase()] : val => map[val]
+}

From 5efd5e0ccff55d444f7b425f9bb815618d05dfde Mon Sep 17 00:00:00 2001
From: Carlos Rodrigues <carlos.rodrigues@just-eat.com>
Date: Tue, 15 Oct 2019 09:09:27 +0100
Subject: [PATCH 2/2] feat: export makeMap on sharedProject

---
 packages/shared/src/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
index 2b8a1023f4f..9b3db6f0141 100644
--- a/packages/shared/src/index.ts
+++ b/packages/shared/src/index.ts
@@ -1,6 +1,7 @@
 export * from './patchFlags'
 export * from './element'
 export { globalsWhitelist } from './globalsWhitelist'
+export { makeMap } from './makeMap'
 
 export const EMPTY_OBJ: { readonly [key: string]: any } = __DEV__
   ? Object.freeze({})