Skip to content

Commit

Permalink
Merge pull request #12 from carbonblack/update-react16-references
Browse files Browse the repository at this point in the history
Update react16 references
  • Loading branch information
snowak-cb authored Nov 30, 2017
2 parents 89f3fc3 + 40e2d22 commit fcb2259
Show file tree
Hide file tree
Showing 12 changed files with 3,502 additions and 3,303 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,6 @@ typings

# github token
.token.json

# ignore intellij project directory
.idea
Binary file modified dist/dist-min.tar.gz
Binary file not shown.
Binary file modified dist/dist-min.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/dist-min/react-console.min.js.map

Large diffs are not rendered by default.

Binary file modified dist/dist.tar.gz
Binary file not shown.
Binary file modified dist/dist.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/dist/react-console.js.map

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ module.exports = function(config) {
// list of files / patterns to load in the browser
files: [
'./node_modules/phantomjs-polyfill-object-assign/object-assign-polyfill.js', //HOPE one day ditch PhantomJS polyfill
'test/*.tsx'
'./node_modules/babel-polyfill/dist/polyfill.js',
'test/*.tsx',
],


Expand Down
2 changes: 1 addition & 1 deletion lib/react-console.js.map

Large diffs are not rendered by default.

6,771 changes: 3,480 additions & 3,291 deletions package-lock.json

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@
"postversion": "git push && git push --tags && ./release.js"
},
"devDependencies": {
"babel-polyfill": "^6.26.0",
"chai": "^3.5.0",
"changelog-parser": "^2.0.2",
"css-loader": "^0.23.1",
"enzyme": "^2.4.1",
"enzyme": "^3.2.0",
"enzyme-adapter-react-16": "^1.1.0",
"exports-loader": "^0.6.3",
"express": "^4.14.0",
"extract-text-webpack-plugin": "^1.0.1",
Expand All @@ -50,9 +52,8 @@
"mocha": "^3.0.1",
"node-sass": "^4.7.2",
"phantomjs-polyfill-object-assign": "0.0.2",
"react": "^15.1.0",
"react-addons-test-utils": "^15.3.0",
"react-dom": "^15.1.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"sass-loader": "^4.0.0",
"semver": "^5.3.0",
"source-map-loader": "^0.1.5",
Expand All @@ -65,7 +66,7 @@
"webpack-node-externals": "^1.3.3"
},
"peerDependencies": {
"react": "^15.1.0",
"react-dom": "^15.1.0"
"react": "^16.2.0",
"react-dom": "^16.2.0"
}
}
9 changes: 7 additions & 2 deletions test/test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,21 @@

import * as React from 'react';
import { assert, expect } from 'chai';
import * as enzyme from 'enzyme';
// for some reason the latest version of enzyme can't do es6 imports properly and since we don't need fancy
// es6 module imports/tree shaking for test files we're just going to use es5 syntax which actually works.
const enzyme = require('enzyme');
const adapter = require('enzyme-adapter-react-16');

import {
ConsolePrompt,
ConsoleMessage,
default as Console
} from 'exports?ConsolePrompt&ConsoleMessage!../src/react-console.tsx';

// configure the react 16 adapter for the latest version of enzyme
enzyme.configure({ adapter: new adapter() });

describe('<ConsolePrompt />', function() {
describe('<ConsolePrompt />', function() {
describe('[Property] point: ', function () {
it('Has no cursor when point is not passed', function() {
var wrapper = enzyme.shallow(<ConsolePrompt />);
Expand Down

0 comments on commit fcb2259

Please sign in to comment.