Skip to content

Commit

Permalink
update promise to something that works with react-native
Browse files Browse the repository at this point in the history
  • Loading branch information
jquense committed Apr 19, 2016
1 parent 82ad1de commit 7350bbb
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = function (config) {

logLevel: config.LOG_INFO,

browsers: ['jsdom'], //['PhantomJS'],
browsers: ['jsdom'],

preprocessors: {
'tests-webpack.js': ['webpack', 'sourcemap']
Expand Down
2 changes: 1 addition & 1 deletion lib/array.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };

var MixedSchema = require('./mixed');
var Promise = require('promise/lib/es6-extensions');
var Promise = require('universal-promise');
var isAbsent = require('./util/isAbsent');

var _require = require('./locale.js');
Expand Down
2 changes: 1 addition & 1 deletion lib/mixed.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };

var Promise = require('promise/lib/es6-extensions'),
var Promise = require('universal-promise'),
Condition = require('./util/condition'),
locale = require('./locale.js').mixed,
_ = require('./util/_'),
Expand Down
2 changes: 1 addition & 1 deletion lib/object.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };

var MixedSchema = require('./mixed');
var Promise = require('promise/lib/es6-extensions');
var Promise = require('universal-promise');
var toposort = require('toposort');
var locale = require('./locale.js').object;
var split = require('property-expr').split;
Expand Down
2 changes: 1 addition & 1 deletion lib/util/_.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

var Promise = require('promise/lib/es6-extensions'),
var Promise = require('universal-promise'),
ValidationError = require('./validation-error');

var toString = Object.prototype.toString;
Expand Down
2 changes: 1 addition & 1 deletion lib/util/createValidation.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument

function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }

var Promise = require('promise/lib/es6-extensions');
var Promise = require('universal-promise');
var ValidationError = require('./validation-error');
var Ref = require('./reference');

Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"mocha": "^1.21.4",
"mt-changelog": "^0.6.2",
"node-libs-browser": "^0.5.2",
"phantomjs": "^1.9.17",
"release-script": "^0.5.2",
"sinon": "^1.17.3",
"sinon-chai": "^2.8.0",
Expand All @@ -57,9 +56,9 @@
"dependencies": {
"case": "^1.2.1",
"fn-name": "~1.0.1",
"promise": "~7.0.0",
"property-expr": "^1.2.0",
"toposort": "^0.2.10"
"toposort": "^0.2.10",
"universal-promise": "^1.0.1"
},
"release-script": {
"defaultDryRun": "false"
Expand Down
2 changes: 1 addition & 1 deletion src/array.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';
var MixedSchema = require('./mixed')
, Promise = require('promise/lib/es6-extensions')
, Promise = require('universal-promise')
, isAbsent = require('./util/isAbsent')
, { mixed, array: locale } = require('./locale.js')
, { inherits, collectErrors } = require('./util/_');
Expand Down
2 changes: 1 addition & 1 deletion src/mixed.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

var Promise = require('promise/lib/es6-extensions')
var Promise = require('universal-promise')
, Condition = require('./util/condition')
, locale = require('./locale.js').mixed
, _ = require('./util/_')
Expand Down
2 changes: 1 addition & 1 deletion src/object.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';
var MixedSchema = require('./mixed')
, Promise = require('promise/lib/es6-extensions')
, Promise = require('universal-promise')
, toposort = require('toposort')
, locale = require('./locale.js').object
, split = require('property-expr').split
Expand Down
2 changes: 1 addition & 1 deletion src/util/_.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Promise = require('promise/lib/es6-extensions')
var Promise = require('universal-promise')
, ValidationError = require('./validation-error');

let toString = Object.prototype.toString
Expand Down
2 changes: 1 addition & 1 deletion src/util/createValidation.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
var Promise = require('promise/lib/es6-extensions')
var Promise = require('universal-promise')
, ValidationError = require('./validation-error')
, Ref = require('./reference')
, { transform } = require('./_');
Expand Down

0 comments on commit 7350bbb

Please sign in to comment.