allow require as a global in proxy check

yyx990803 · yyx990803 · commit 5eca12fcb893 · 2016-06-08T17:33:42.000-04:00
diff --git a/src/core/instance/proxy.js b/src/core/instance/proxy.js
@@ -8,7 +8,8 @@ if (process.env.NODE_ENV !== 'production') {
   const allowedGlobals = makeMap(
     'Infinity,undefined,NaN,isFinite,isNaN,' +
     'parseFloat,parseInt,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,' +
-    'Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl'
+    'Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl,' +
+    'require' // for Webpack/Browserify
   )
 
   hasProxy =

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ if (process.env.NODE_ENV !== 'production') {`
`8`	`8`	`const allowedGlobals = makeMap(`
`9`	`9`	`'Infinity,undefined,NaN,isFinite,isNaN,' +`
`10`	`10`	`'parseFloat,parseInt,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,' +`
`11`		`- 'Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl'`
	`11`	`+ 'Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl,' +`
	`12`	`+ 'require' // for Webpack/Browserify`
`12`	`13`	`)`
`13`	`14`
`14`	`15`	`hasProxy =`