Skip to content
This repository has been archived by the owner on Jul 20, 2020. It is now read-only.

Commit

Permalink
[core] Update for React 15.5.3
Browse files Browse the repository at this point in the history
It works?!??!? I must have gone completely mad.
  • Loading branch information
toxicFork committed Apr 8, 2017
1 parent f23fd11 commit 6bb62ee
Show file tree
Hide file tree
Showing 3 changed files with 466 additions and 390 deletions.
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,34 @@
],
"license": "MIT",
"dependencies": {
"fbjs": "0.8.9"
"fbjs": "0.8.12"
},
"peerDependencies": {
"react": "~15.4.0",
"react-dom": "~15.4.0",
"three": "~0.82.1"
},
"devDependencies": {
"babel-cli": "6.23.0",
"babel-core": "6.23.1",
"babel-eslint": "7.1.1",
"babel-loader": "6.3.2",
"babel-cli": "6.24.1",
"babel-core": "6.24.1",
"babel-eslint": "7.2.1",
"babel-loader": "6.4.1",
"babel-plugin-transform-decorators-legacy": "1.3.4",
"babel-plugin-transform-runtime": "6.23.0",
"babel-polyfill": "6.23.0",
"babel-preset-es2015": "6.22.0",
"babel-preset-react": "6.23.0",
"babel-preset-stage-0": "6.22.0",
"babel-register": "6.23.0",
"babel-preset-es2015": "6.24.1",
"babel-preset-react": "6.24.1",
"babel-preset-stage-0": "6.24.1",
"babel-register": "6.24.1",
"babel-runtime": "6.23.0",
"chai": "3.5.0",
"del": "2.2.2",
"dirty-chai": "1.2.2",
"eslint": "3.16.1",
"eslint": "3.19.0",
"eslint-config-airbnb": "14.1.0",
"eslint-plugin-import": "2.2.0",
"eslint-plugin-jsx-a11y": "4.0.0",
"eslint-plugin-react": "6.10.0",
"eslint-plugin-react": "6.10.3",
"estraverse-fb": "1.3.1",
"ghooks": "2.0.0",
"gulp": "gulpjs/gulp#4.0",
Expand All @@ -52,26 +52,26 @@
"gulp-util": "3.0.8",
"in-publish": "^2.0.0",
"isparta-loader": "2.0.0",
"karma": "1.5.0",
"karma": "1.6.0",
"karma-chai": "0.1.0",
"karma-chrome-launcher": "2.0.0",
"karma-coverage": "1.1.1",
"karma-mocha": "1.3.0",
"karma-sourcemap-loader": "0.3.7",
"karma-spec-reporter": "0.0.30",
"karma-travis-fold-reporter": "1.0.1",
"karma-webpack": "2.0.2",
"karma-webpack": "2.0.3",
"mocha": "3.2.0",
"mocha-loader": "1.1.1",
"pngjs2": "2.0.0",
"react": "15.4.2",
"react-dom": "15.4.2",
"sinon": "2.0.0-pre",
"source-map-support": "0.4.11",
"react": "15.5.3",
"react-dom": "15.5.3",
"sinon": "2.1.0",
"source-map-support": "0.4.14",
"stream-to-string": "1.1.0",
"three": "0.84.0",
"webpack": "2.2.1",
"webpack-dev-server": "2.4.1"
"webpack": "2.3.3",
"webpack-dev-server": "2.4.2"
},
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions tests/src/descriptors/Texture.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ module.exports = (type) => {
});

it('Should call image loader with the URL and no cross origin', () => {
const loadStub = sinon.stub(THREE.TextureLoader.prototype, 'load', loadSpy);
const loadStub = sinon.stub(THREE.TextureLoader.prototype, 'load').callsFake(loadSpy);

try {
mockConsole.expect('Cross origin (set: false): undefined');
Expand All @@ -123,7 +123,7 @@ module.exports = (type) => {
});

it('Should set cross origin property for image loader', () => {
const loadStub = sinon.stub(THREE.TextureLoader.prototype, 'load', loadSpy);
const loadStub = sinon.stub(THREE.TextureLoader.prototype, 'load').callsFake(loadSpy);

try {
mockConsole.expect('Cross origin (set: true): \'\'');
Expand Down
Loading

0 comments on commit 6bb62ee

Please sign in to comment.