diff --git a/package.json b/package.json index cc28b0a..d9bd7a9 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "async": "^0.9.0", "brfs": "^1.2.0", "eventemitter3": "^0.1.6", - "extend": "^2.0.0", + "object-assign": "^2.0.0", "resource-loader": "^1.3.0" }, "devDependencies": { diff --git a/package.json b/package.json index cc28b0a..d9bd7a9 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "async": "^0.9.0", "brfs": "^1.2.0", "eventemitter3": "^0.1.6", - "extend": "^2.0.0", + "object-assign": "^2.0.0", "resource-loader": "^1.3.0" }, "devDependencies": { diff --git a/src/core/index.js b/src/core/index.js index 2134d92..1da113b 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -5,8 +5,7 @@ * @license {@link https://github.com/GoodBoyDigital/pixi.js/blob/master/LICENSE|MIT License} */ -var extend = require('extend'), - utils = require('./utils'); +var utils = require('./utils'); /** * @namespace PIXI @@ -86,5 +85,5 @@ } }; -// export core and const. We extend into const so that the non-reference types in const remain in-tact -module.exports = extend(require('./const'), core); +// export core and const. We assign core to const so that the non-reference types in const remain in-tact +module.exports = Object.assign(require('./const'), core); diff --git a/package.json b/package.json index cc28b0a..d9bd7a9 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "async": "^0.9.0", "brfs": "^1.2.0", "eventemitter3": "^0.1.6", - "extend": "^2.0.0", + "object-assign": "^2.0.0", "resource-loader": "^1.3.0" }, "devDependencies": { diff --git a/src/core/index.js b/src/core/index.js index 2134d92..1da113b 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -5,8 +5,7 @@ * @license {@link https://github.com/GoodBoyDigital/pixi.js/blob/master/LICENSE|MIT License} */ -var extend = require('extend'), - utils = require('./utils'); +var utils = require('./utils'); /** * @namespace PIXI @@ -86,5 +85,5 @@ } }; -// export core and const. We extend into const so that the non-reference types in const remain in-tact -module.exports = extend(require('./const'), core); +// export core and const. We assign core to const so that the non-reference types in const remain in-tact +module.exports = Object.assign(require('./const'), core); diff --git a/src/index.js b/src/index.js index fab2ef9..d279952 100644 --- a/src/index.js +++ b/src/index.js @@ -1,17 +1,17 @@ // run the polyfills require('./polyfill'); -var extend = require('extend'), - core = require('./core'); +var core = require('./core'), + assign = Object.assign; -extend(core, require('./core/math')); -extend(core, require('./extras')); -extend(core, require('./mesh')); -extend(core, require('./filters')); -extend(core, require('./interaction')); -extend(core, require('./loaders')); -extend(core, require('./spine')); -extend(core, require('./text')); -extend(core, require('./deprecation')); +assign(core, require('./core/math')); +assign(core, require('./extras')); +assign(core, require('./mesh')); +assign(core, require('./filters')); +assign(core, require('./interaction')); +assign(core, require('./loaders')); +assign(core, require('./spine')); +assign(core, require('./text')); +assign(core, require('./deprecation')); module.exports = core; diff --git a/package.json b/package.json index cc28b0a..d9bd7a9 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "async": "^0.9.0", "brfs": "^1.2.0", "eventemitter3": "^0.1.6", - "extend": "^2.0.0", + "object-assign": "^2.0.0", "resource-loader": "^1.3.0" }, "devDependencies": { diff --git a/src/core/index.js b/src/core/index.js index 2134d92..1da113b 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -5,8 +5,7 @@ * @license {@link https://github.com/GoodBoyDigital/pixi.js/blob/master/LICENSE|MIT License} */ -var extend = require('extend'), - utils = require('./utils'); +var utils = require('./utils'); /** * @namespace PIXI @@ -86,5 +85,5 @@ } }; -// export core and const. We extend into const so that the non-reference types in const remain in-tact -module.exports = extend(require('./const'), core); +// export core and const. We assign core to const so that the non-reference types in const remain in-tact +module.exports = Object.assign(require('./const'), core); diff --git a/src/index.js b/src/index.js index fab2ef9..d279952 100644 --- a/src/index.js +++ b/src/index.js @@ -1,17 +1,17 @@ // run the polyfills require('./polyfill'); -var extend = require('extend'), - core = require('./core'); +var core = require('./core'), + assign = Object.assign; -extend(core, require('./core/math')); -extend(core, require('./extras')); -extend(core, require('./mesh')); -extend(core, require('./filters')); -extend(core, require('./interaction')); -extend(core, require('./loaders')); -extend(core, require('./spine')); -extend(core, require('./text')); -extend(core, require('./deprecation')); +assign(core, require('./core/math')); +assign(core, require('./extras')); +assign(core, require('./mesh')); +assign(core, require('./filters')); +assign(core, require('./interaction')); +assign(core, require('./loaders')); +assign(core, require('./spine')); +assign(core, require('./text')); +assign(core, require('./deprecation')); module.exports = core; diff --git a/src/polyfill/Object.assign.js b/src/polyfill/Object.assign.js new file mode 100644 index 0000000..9615210 --- /dev/null +++ b/src/polyfill/Object.assign.js @@ -0,0 +1,3 @@ +if (!Object.assign) { + Object.assign = require('object-assign'); +} diff --git a/package.json b/package.json index cc28b0a..d9bd7a9 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "async": "^0.9.0", "brfs": "^1.2.0", "eventemitter3": "^0.1.6", - "extend": "^2.0.0", + "object-assign": "^2.0.0", "resource-loader": "^1.3.0" }, "devDependencies": { diff --git a/src/core/index.js b/src/core/index.js index 2134d92..1da113b 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -5,8 +5,7 @@ * @license {@link https://github.com/GoodBoyDigital/pixi.js/blob/master/LICENSE|MIT License} */ -var extend = require('extend'), - utils = require('./utils'); +var utils = require('./utils'); /** * @namespace PIXI @@ -86,5 +85,5 @@ } }; -// export core and const. We extend into const so that the non-reference types in const remain in-tact -module.exports = extend(require('./const'), core); +// export core and const. We assign core to const so that the non-reference types in const remain in-tact +module.exports = Object.assign(require('./const'), core); diff --git a/src/index.js b/src/index.js index fab2ef9..d279952 100644 --- a/src/index.js +++ b/src/index.js @@ -1,17 +1,17 @@ // run the polyfills require('./polyfill'); -var extend = require('extend'), - core = require('./core'); +var core = require('./core'), + assign = Object.assign; -extend(core, require('./core/math')); -extend(core, require('./extras')); -extend(core, require('./mesh')); -extend(core, require('./filters')); -extend(core, require('./interaction')); -extend(core, require('./loaders')); -extend(core, require('./spine')); -extend(core, require('./text')); -extend(core, require('./deprecation')); +assign(core, require('./core/math')); +assign(core, require('./extras')); +assign(core, require('./mesh')); +assign(core, require('./filters')); +assign(core, require('./interaction')); +assign(core, require('./loaders')); +assign(core, require('./spine')); +assign(core, require('./text')); +assign(core, require('./deprecation')); module.exports = core; diff --git a/src/polyfill/Object.assign.js b/src/polyfill/Object.assign.js new file mode 100644 index 0000000..9615210 --- /dev/null +++ b/src/polyfill/Object.assign.js @@ -0,0 +1,3 @@ +if (!Object.assign) { + Object.assign = require('object-assign'); +} diff --git a/src/polyfill/index.js b/src/polyfill/index.js index c6679da..3567efc 100644 --- a/src/polyfill/index.js +++ b/src/polyfill/index.js @@ -1 +1,2 @@ +require('./Object.assign'); require('./requestAnimationFrame');