Hanks10100 closed pull request #1609: [jsfm] Decide whether to use promise
polyfill by environment variable
URL: https://github.com/apache/incubator-weex/pull/1609
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/runtime/shared/index.js b/runtime/shared/index.js
index 19ca3cd2a9..48b432a6fd 100644
--- a/runtime/shared/index.js
+++ b/runtime/shared/index.js
@@ -22,12 +22,15 @@ if (!process.env.SUPPORT_ES2015) {
require('./polyfill/objectAssign')
require('./polyfill/objectSetPrototypeOf')
- // import promise hack and polyfills
- require('./polyfill/promise')
- require('core-js/modules/es6.object.to-string')
- require('core-js/modules/es6.string.iterator')
- require('core-js/modules/web.dom.iterable')
- require('core-js/modules/es6.promise')
+ // eslint-disable-next-line
+ if (typeof WXEnvironment === 'undefined' ||
!WXEnvironment.__enable_native_promise__) {
+ // import promise hack and polyfill
+ require('./polyfill/promise')
+ require('core-js/modules/es6.object.to-string')
+ require('core-js/modules/es6.string.iterator')
+ require('core-js/modules/web.dom.iterable')
+ require('core-js/modules/es6.promise')
+ }
}
export * from './env/console'
diff --git a/runtime/shared/polyfill/promise.js
b/runtime/shared/polyfill/promise.js
index 39fe8169b0..1bb0ee3654 100644
--- a/runtime/shared/polyfill/promise.js
+++ b/runtime/shared/polyfill/promise.js
@@ -23,6 +23,8 @@
const { WXEnvironment } = global
/* istanbul ignore next */
-if (WXEnvironment && WXEnvironment.platform === 'iOS') {
+if (typeof WXEnvironment !== 'undefined'
+ && WXEnvironment.platform === 'iOS'
+ && !WXEnvironment.__enable_native_promise__) {
global.Promise = undefined
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
