Skip to content

Commit 6fae7be

Browse files
authored
Merge pull request #362 from CloudBoost/sdk-build
Fixed cloudboost sdk bug
2 parents 7c0044a + a571e09 commit 6fae7be

File tree

3 files changed

+63
-38
lines changed

3 files changed

+63
-38
lines changed

.travis.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,8 @@ deploy:
126126
skip_cleanup: true
127127
on:
128128
tags: false
129-
branch: release
129+
branch: master
130130

131131
#Notify Team on Slack
132132
notifications:
133-
slack: hackerbaycompany:gm7nWJDLDtBRyF75VKLKOoMW
134-
135-
after_script:
136-
- docker logs cloudboost
133+
slack: hackerbaycompany:gm7nWJDLDtBRyF75VKLKOoMW

sdk/dist/cloudboost.js

+48-20
Original file line numberDiff line numberDiff line change
@@ -1086,6 +1086,7 @@ return /******/ (function(modules) { // webpackBootstrap
10861086
} else {
10871087
async.settlePromises(this);
10881088
}
1089+
this._dereferenceTrace();
10891090
}
10901091
};
10911092

@@ -1180,7 +1181,7 @@ return /******/ (function(modules) { // webpackBootstrap
11801181
__webpack_require__(25)(
11811182
Promise, PromiseArray, tryConvertToPromise, INTERNAL, async, getDomain);
11821183
Promise.Promise = Promise;
1183-
Promise.version = "3.5.1";
1184+
Promise.version = "3.5.3";
11841185
__webpack_require__(26)(Promise, PromiseArray, apiRejection, tryConvertToPromise, INTERNAL, debug);
11851186
__webpack_require__(27)(Promise);
11861187
__webpack_require__(28)(Promise, apiRejection, tryConvertToPromise, createContext, INTERNAL, debug);
@@ -1424,8 +1425,12 @@ return /******/ (function(modules) { // webpackBootstrap
14241425
/*jshint -W027,-W055,-W031*/
14251426
function FakeConstructor() {}
14261427
FakeConstructor.prototype = obj;
1427-
var l = 8;
1428-
while (l--) new FakeConstructor();
1428+
var receiver = new FakeConstructor();
1429+
function ic() {
1430+
return typeof receiver.foo;
1431+
}
1432+
ic();
1433+
ic();
14291434
return obj;
14301435
eval(obj);
14311436
}
@@ -1828,24 +1833,28 @@ return /******/ (function(modules) { // webpackBootstrap
18281833
};
18291834
}
18301835

1831-
Async.prototype._drainQueue = function(queue) {
1836+
function _drainQueue(queue) {
18321837
while (queue.length() > 0) {
1833-
var fn = queue.shift();
1834-
if (typeof fn !== "function") {
1835-
fn._settlePromises();
1836-
continue;
1837-
}
1838+
_drainQueueStep(queue);
1839+
}
1840+
}
1841+
1842+
function _drainQueueStep(queue) {
1843+
var fn = queue.shift();
1844+
if (typeof fn !== "function") {
1845+
fn._settlePromises();
1846+
} else {
18381847
var receiver = queue.shift();
18391848
var arg = queue.shift();
18401849
fn.call(receiver, arg);
18411850
}
1842-
};
1851+
}
18431852

18441853
Async.prototype._drainQueues = function () {
1845-
this._drainQueue(this._normalQueue);
1854+
_drainQueue(this._normalQueue);
18461855
this._reset();
18471856
this._haveDrainedQueues = true;
1848-
this._drainQueue(this._lateQueue);
1857+
_drainQueue(this._lateQueue);
18491858
};
18501859

18511860
Async.prototype._queueTick = function () {
@@ -2773,6 +2782,7 @@ return /******/ (function(modules) { // webpackBootstrap
27732782
var async = Promise._async;
27742783
var Warning = __webpack_require__(12).Warning;
27752784
var util = __webpack_require__(5);
2785+
var es5 = __webpack_require__(6);
27762786
var canAttachTrace = util.canAttachTrace;
27772787
var unhandledRejectionHandled;
27782788
var possiblyUnhandledRejection;
@@ -2891,19 +2901,22 @@ return /******/ (function(modules) { // webpackBootstrap
28912901
if (!config.longStackTraces && longStackTracesIsSupported()) {
28922902
var Promise_captureStackTrace = Promise.prototype._captureStackTrace;
28932903
var Promise_attachExtraTrace = Promise.prototype._attachExtraTrace;
2904+
var Promise_dereferenceTrace = Promise.prototype._dereferenceTrace;
28942905
config.longStackTraces = true;
28952906
disableLongStackTraces = function() {
28962907
if (async.haveItemsQueued() && !config.longStackTraces) {
28972908
throw new Error("cannot enable long stack traces after promises have been created\u000a\u000a See http://goo.gl/MqrFmX\u000a");
28982909
}
28992910
Promise.prototype._captureStackTrace = Promise_captureStackTrace;
29002911
Promise.prototype._attachExtraTrace = Promise_attachExtraTrace;
2912+
Promise.prototype._dereferenceTrace = Promise_dereferenceTrace;
29012913
Context.deactivateLongStackTraces();
29022914
async.enableTrampoline();
29032915
config.longStackTraces = false;
29042916
};
29052917
Promise.prototype._captureStackTrace = longStackTracesCaptureStackTrace;
29062918
Promise.prototype._attachExtraTrace = longStackTracesAttachExtraTrace;
2919+
Promise.prototype._dereferenceTrace = longStackTracesDereferenceTrace;
29072920
Context.activateLongStackTraces();
29082921
async.disableTrampolineIfNecessary();
29092922
}
@@ -2919,10 +2932,14 @@ return /******/ (function(modules) { // webpackBootstrap
29192932
var event = new CustomEvent("CustomEvent");
29202933
util.global.dispatchEvent(event);
29212934
return function(name, event) {
2922-
var domEvent = new CustomEvent(name.toLowerCase(), {
2935+
var eventData = {
29232936
detail: event,
29242937
cancelable: true
2925-
});
2938+
};
2939+
es5.defineProperty(
2940+
eventData, "promise", {value: event.promise});
2941+
es5.defineProperty(eventData, "reason", {value: event.reason});
2942+
var domEvent = new CustomEvent(name.toLowerCase(), eventData);
29262943
return !util.global.dispatchEvent(domEvent);
29272944
};
29282945
} else if (typeof Event === "function") {
@@ -2933,6 +2950,8 @@ return /******/ (function(modules) { // webpackBootstrap
29332950
cancelable: true
29342951
});
29352952
domEvent.detail = event;
2953+
es5.defineProperty(domEvent, "promise", {value: event.promise});
2954+
es5.defineProperty(domEvent, "reason", {value: event.reason});
29362955
return !util.global.dispatchEvent(domEvent);
29372956
};
29382957
} else {
@@ -3081,6 +3100,7 @@ return /******/ (function(modules) { // webpackBootstrap
30813100
};
30823101
Promise.prototype._captureStackTrace = function () {};
30833102
Promise.prototype._attachExtraTrace = function () {};
3103+
Promise.prototype._dereferenceTrace = function () {};
30843104
Promise.prototype._clearCancellationData = function() {};
30853105
Promise.prototype._propagateFrom = function (parent, flags) {
30863106
;
@@ -3186,6 +3206,10 @@ return /******/ (function(modules) { // webpackBootstrap
31863206
}
31873207
}
31883208

3209+
function longStackTracesDereferenceTrace() {
3210+
this._trace = undefined;
3211+
}
3212+
31893213
function checkForgottenReturns(returnValue, promiseCreated, name, promise,
31903214
parent) {
31913215
if (returnValue === undefined && promiseCreated !== null &&
@@ -7964,9 +7988,9 @@ return /******/ (function(modules) { // webpackBootstrap
79647988
* @return {boolean}
79657989
*/
79667990
function isNetworkError(error) {
7967-
return !error.response && Boolean(error.code) // Prevents retrying cancelled requests
7968-
&& error.code !== 'ECONNABORTED' // Prevents retrying timed out requests
7969-
&& (0, _isRetryAllowed2.default)(error); // Prevents retrying unsafe errors
7991+
return !error.response && Boolean(error.code) && // Prevents retrying cancelled requests
7992+
error.code !== 'ECONNABORTED' && // Prevents retrying timed out requests
7993+
(0, _isRetryAllowed2.default)(error); // Prevents retrying unsafe errors
79707994
}
79717995

79727996
var SAFE_HTTP_METHODS = ['get', 'head', 'options'];
@@ -8153,7 +8177,7 @@ return /******/ (function(modules) { // webpackBootstrap
81538177
var shouldRetry = retryCondition(error) && currentState.retryCount < retries;
81548178

81558179
if (shouldRetry) {
8156-
currentState.retryCount++;
8180+
currentState.retryCount += 1;
81578181
var delay = retryDelay(currentState.retryCount, error);
81588182

81598183
// Axios fails merging this configuration to the default configuration because it has an issue
@@ -8166,6 +8190,10 @@ return /******/ (function(modules) { // webpackBootstrap
81668190
config.timeout = Math.max(config.timeout - lastRequestDuration - delay, 1);
81678191
}
81688192

8193+
config.transformRequest = [function (data) {
8194+
return data;
8195+
}];
8196+
81698197
return new Promise(function (resolve) {
81708198
return setTimeout(function () {
81718199
return resolve(axios(config));
@@ -9799,7 +9827,7 @@ return /******/ (function(modules) { // webpackBootstrap
97999827

98009828
/*!
98019829
localForage -- Offline Storage, Improved
9802-
Version 1.7.1
9830+
Version 1.7.3
98039831
https://localforage.github.io/localForage
98049832
(c) 2013-2017 Mozilla, Apache License 2.0
98059833
*/
@@ -11508,7 +11536,7 @@ return /******/ (function(modules) { // webpackBootstrap
1150811536
function tryExecuteSql(t, dbInfo, sqlStatement, args, callback, errorCallback) {
1150911537
t.executeSql(sqlStatement, args, callback, function (t, error) {
1151011538
if (error.code === error.SYNTAX_ERR) {
11511-
t.executeSql('SELECT name FROM sqlite_master ' + "WHERE type='table' AND name = ?", [name], function (t, results) {
11539+
t.executeSql('SELECT name FROM sqlite_master ' + "WHERE type='table' AND name = ?", [dbInfo.storeName], function (t, results) {
1151211540
if (!results.rows.length) {
1151311541
// if the table is missing (was deleted)
1151411542
// re-create it table and retry

0 commit comments

Comments
 (0)