fix: use the Promise from babel-runtime and transform superagent

leeyeh · leeyeh · commit 3863cfa820ca · 2020-03-24T18:43:08.000+08:00
remove es6-promise
diff --git a/.babelrc b/.babelrc
@@ -2,6 +2,7 @@
   "presets": [
     "es2015"
   ],
+  "plugins": ["transform-runtime"],
   "env": {
     "test": {
       "plugins": ["istanbul"]
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,8 +26,8 @@
     "@leancloud/runtime-adapters-browser": "^1.0.1",
     "@leancloud/runtime-adapters-node": "^1.0.1",
     "@leancloud/runtime-adapters-weapp": "^1.0.2",
+    "babel-runtime": "^6.26.0",
     "debug": "^3.1.0",
-    "es6-promise": "4.2.3",
     "eventemitter3": "^2.0.3",
     "leancloud-realtime": "^5.0.0-rc.1",
     "leancloud-realtime-plugin-live-query": "^1.2.0",
@@ -40,10 +40,11 @@
     "@pollyjs/adapter-node-http": "^2.6.2",
     "@pollyjs/core": "^2.6.2",
     "@pollyjs/persister-fs": "^2.6.2",
-    "babel-core": "^6.4.0",
+    "babel-core": "^6.26.3",
     "babel-loader": "^7.0.0",
     "babel-plugin-istanbul": "^2.0.0",
-    "babel-preset-es2015": "^6.3.13",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-es2015": "^6.24.1",
     "babel-register": "^6.14.0",
     "cross-env": "^5.1.3",
     "docdash": "git+https://github.com/leeyeh/docdash.git#leancloud",
diff --git a/src/av.js b/src/av.js
@@ -3,7 +3,6 @@ const uuid = require('uuid/v4');
 const debug = require('debug');
 const getUA = require('./ua');
 const { inherits, parseDate } = require('./utils');
-const Promise = require('./promise');
 const { setAdapters } = require('./adapter');
 
 const AV = global.AV || {};
diff --git a/src/cloudfunction.js b/src/cloudfunction.js
@@ -1,6 +1,5 @@
 const _ = require('underscore');
 const { _request, request } = require('./request');
-const Promise = require('./promise');
 
 module.exports = function(AV) {
   /**
diff --git a/src/file.js b/src/file.js
@@ -4,7 +4,6 @@ const qiniu = require('./uploader/qiniu');
 const s3 = require('./uploader/s3');
 const AVError = require('./error');
 const AVRequest = require('./request')._request;
-const Promise = require('./promise');
 const { tap, transformFetchOptions } = require('./utils');
 const debug = require('debug')('leancloud:file');
 const parseBase64 = require('./utils/parse-base64');
diff --git a/src/geopoint.js b/src/geopoint.js
@@ -1,5 +1,4 @@
 var _ = require('underscore');
-const Promise = require('./promise');
 
 /*global navigator: false */
 module.exports = function(AV) {
diff --git a/src/index.js b/src/index.js
@@ -11,7 +11,7 @@ const AV = require('./av');
 
 AV._ = _;
 AV.version = require('./version');
-AV.Promise = require('./promise');
+AV.Promise = Promise;
 AV.localStorage = require('./localstorage');
 AV.Cache = require('./cache');
 AV.Error = require('./error');
diff --git a/src/insight.js b/src/insight.js
@@ -1,7 +1,6 @@
 const _ = require('underscore');
 const AVError = require('./error');
 const { request } = require('./request');
-const Promise = require('./promise');
 
 module.exports = function(AV) {
   /**
diff --git a/src/leaderboard.js b/src/leaderboard.js
@@ -1,5 +1,4 @@
 const _ = require('underscore');
-const Promise = require('./promise');
 const { request } = require('./request');
 const { ensureArray, parseDate } = require('./utils');
 const AV = require('./av');
@@ -428,9 +427,7 @@ _.extend(
     reset(authOptions) {
       return request({
         method: 'PUT',
-        path: `/leaderboard/leaderboards/${
-          this.statisticName
-        }/incrementVersion`,
+        path: `/leaderboard/leaderboards/${this.statisticName}/incrementVersion`,
         authOptions,
       }).then(data => this._finishFetch(data));
     },
diff --git a/src/live-query.js b/src/live-query.js
@@ -1,6 +1,5 @@
 const _ = require('underscore');
 const EventEmitter = require('eventemitter3');
-const Promise = require('./promise');
 const { inherits } = require('./utils');
 const { request } = require('./request');
 
diff --git a/src/localstorage.js b/src/localstorage.js
@@ -1,4 +1,3 @@
-var Promise = require('./promise');
 var { getAdapter } = require('./adapter');
 
 var syncApiNames = ['getItem', 'setItem', 'removeItem', 'clear'];
diff --git a/src/object.js b/src/object.js
@@ -1,6 +1,5 @@
 const _ = require('underscore');
 const AVError = require('./error');
-const Promise = require('./promise');
 const { _request } = require('./request');
 const {
   isNullOrUndefined,
@@ -9,6 +8,7 @@ const {
   setValue,
   findValue,
   isPlainObject,
+  continueWhile,
 } = require('./utils');
 
 const recursiveToPointer = value => {
@@ -1662,7 +1662,7 @@ module.exports = function(AV) {
 
     return promise
       .then(function() {
-        return Promise._continueWhile(
+        return continueWhile(
           function() {
             return remaining.length > 0;
           },
diff --git a/src/promise.js b/src/promise.js
diff --git a/src/query.js b/src/query.js
@@ -1,9 +1,12 @@
 const _ = require('underscore');
 const debug = require('debug')('leancloud:query');
-const Promise = require('./promise');
 const AVError = require('./error');
 const { _request, request } = require('./request');
-const { ensureArray, transformFetchOptions } = require('./utils');
+const {
+  ensureArray,
+  transformFetchOptions,
+  continueWhile,
+} = require('./utils');
 
 const requires = (value, message) => {
   if (value === undefined) {
@@ -1079,7 +1082,7 @@ module.exports = function(AV) {
         query.ascending('objectId');
 
         var finished = false;
-        return Promise._continueWhile(
+        return continueWhile(
           function() {
             return !finished;
           },
diff --git a/src/request.js b/src/request.js
@@ -1,7 +1,6 @@
 const _ = require('underscore');
 const md5 = require('md5');
 const { extend } = require('underscore');
-const Promise = require('./promise');
 const AV = require('./av');
 const { getSessionToken, ajax } = require('./utils');
 
diff --git a/src/status.js b/src/status.js
@@ -1,5 +1,4 @@
 const _ = require('underscore');
-const Promise = require('./promise');
 const AVRequest = require('./request')._request;
 const { getSessionToken } = require('./utils');
 
diff --git a/src/user.js b/src/user.js
@@ -2,7 +2,6 @@ const _ = require('underscore');
 const uuid = require('uuid/v4');
 const AVError = require('./error');
 const { _request: AVRequest, request } = require('./request');
-const Promise = require('./promise');
 
 const PLATFORM_ANONYMOUS = 'anonymous';
 const PLATFORM_WEAPP = 'lc_weapp';
diff --git a/src/utils/index.js b/src/utils/index.js
@@ -210,6 +210,15 @@ const findValue = (target, key) => {
 const isPlainObject = obj =>
   _.isObject(obj) && Object.getPrototypeOf(obj) === Object.prototype;
 
+const continueWhile = function(predicate, asyncFunction) {
+  if (predicate()) {
+    return asyncFunction().then(function() {
+      return continueWhile(predicate, asyncFunction);
+    });
+  }
+  return Promise.resolve();
+};
+
 module.exports = {
   ajax,
   isNullOrUndefined,
@@ -222,4 +231,5 @@ module.exports = {
   setValue,
   findValue,
   isPlainObject,
+  continueWhile,
 };
diff --git a/webpack/common.js b/webpack/common.js
@@ -30,11 +30,14 @@ exports.create = () => ({
         test: /\.js$/,
         include: [
           path.resolve(__dirname, '../src'),
+          /node_modules\/leancloud-realtime/,
           /node_modules\/event-target-shim/,
+          /node_modules\/superagent/,
         ],
         loader: 'babel-loader',
         query: {
           presets: ['es2015'],
+          plugins: ['transform-runtime'],
         },
       },
       {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`var _ = require('underscore');`
`2`		`-const Promise = require('./promise');`
`3`	`2`
`4`	`3`	`/global navigator: false /`
`5`	`4`	`module.exports = function(AV) {`