Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

React 16 #14

Closed
wants to merge 2 commits into from
Closed

React 16 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7debf4c
React 16
A-gambit Sep 13, 2017
9ee6d52
Merge branch 'master' into react-16
A-gambit Sep 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions examples/all/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@
"devDependencies": {
"@grammarly/focal": "file:../../",
"@grammarly/tslint-config": "^0.3.1",
"@types/react": "15.0.38",
"@types/react-dom": "15.5.1",
"@types/react": "16.0.5",
"@types/react-dom": "15.5.4",
"react": "16.0.0-beta.5",
"react-dom": "16.0.0-beta.5",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not RC?

Copy link
Member Author

@A-gambit A-gambit Sep 14, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch) It is only for the test case.

"css-loader": "^0.26.1",
"express": "^4.14.0",
"react": "15.6.1",
"react-dom": "15.6.1",
"react-transform-catch-errors": "^1.0.2",
"react-transform-hmr": "^1.0.4",
"redbox-react": "^1.3.0",
"redbox-react": "1.5.0",
"rxjs": "5.4.2",
"style-loader": "^0.13.1",
"styled-components": "1.4.4",
"styled-components": "2.1.2",
"todomvc-app-css": "^2.0.6",
"ts-loader": "^2.3.0",
"tslint": "^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/all/src/player/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const audioSrc = 'http://api.audiotool.com/track/volution/play.mp3'

export class AudioModel {
private audio: HTMLAudioElement
private durationSubscription: Subscription
private durationSubscription: Subscription
private timeSubscription: Subscription
private statusSubscription: Subscription
private volumeSubscription: Subscription
Expand Down
10 changes: 5 additions & 5 deletions examples/todomvc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
"devDependencies": {
"@grammarly/focal": "file:../../",
"@grammarly/tslint-config": "^0.3.1",
"@types/react": "15.0.38",
"@types/react-dom": "15.5.1",
"@types/react": "16.0.5",
"@types/react-dom": "15.5.4",
"react": "16.0.0-beta.5",
"react-dom": "16.0.0-beta.5",
"express": "^4.14.0",
"react": "15.6.1",
"react-dom": "15.6.1",
"react-transform-catch-errors": "^1.0.2",
"react-transform-hmr": "^1.0.4",
"redbox-react": "^1.3.0",
"redbox-react": "1.5.0",
"rxjs": "5.4.2",
"todomvc-app-css": "^2.0.6",
"ts-loader": "^2.3.0",
Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,17 @@
"tslint": "5.2.0",
"typescript": "2.4.1",
"watch": "^0.18.0",
"@types/react": "15.0.38",
"@types/react-dom": "15.5.1",
"react": "15.6.1",
"react-dom": "15.6.1",
"@types/react": "16.0.5",
"@types/react-dom": "15.5.4",
"react": "16.0.0-beta.5",
"react-dom": "16.0.0-beta.5",
"rxjs": "5.4.2"
},
"peerDependencies": {
"@types/react": "15.0.38",
"@types/react-dom": "15.5.1",
"react": "15.6.1",
"react-dom": "15.6.1",
"@types/react": "16.0.5",
"@types/react-dom": "15.5.4",
"react": "16.0.0-beta.5",
"react-dom": "16.0.0-beta.5",
"rxjs": "5.4.2"
}
}
10 changes: 5 additions & 5 deletions test/manual/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
"devDependencies": {
"@grammarly/focal": "file:../../",
"@grammarly/tslint-config": "^0.3.1",
"@types/react": "15.0.38",
"@types/react-dom": "15.5.1",
"@types/react": "16.0.5",
"@types/react-dom": "15.5.4",
"react": "16.0.0-beta.5",
"react-dom": "16.0.0-beta.5",
"express": "^4.14.0",
"react": "15.6.1",
"react-dom": "15.6.1",
"react-transform-catch-errors": "^1.0.2",
"react-transform-hmr": "^1.0.4",
"redbox-react": "^1.3.0",
"redbox-react": "1.5.0",
"rxjs": "5.4.2",
"todomvc-app-css": "^2.0.6",
"ts-loader": "^2.3.0",
Expand Down
6 changes: 3 additions & 3 deletions test/test_react.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ test('react', t => {

testRender(t,
<F.span style={fromConst({ color: 'red' })}></F.span>,
'<span style="color:red;"></span>',
'<span style="color:red"></span>',
'Render F element with observable in style'
)

testRender(t,
<F.span style={fromConst({ color: 'red' })}>{fromConst('test')}</F.span>,
'<span style="color:red;">test</span>',
'<span style="color:red">test</span>',
'Render F element with 2 observables'
)

Expand Down Expand Up @@ -103,7 +103,7 @@ test('react', t => {
<F.div onClick={() => { /* no-op */ }} style={{ display: 'block', color: fromConst('red') }}>
<F.span>Hello</F.span>
</F.div>,
'<div style="display:block;color:red;"><span>Hello</span></div>',
'<div style="display:block;color:red"><span>Hello</span></div>',
'div with onClick'
)

Expand Down
Loading