Commit Graph

107 Commits

Author SHA1 Message Date
Nathan Shively-Sanders
daf9bd392f Merge branch 'master' into types-merges-20161123 2016-11-23 15:48:06 -08:00
Shi Yan
d4b2e37e1c Export LocationDescriptor 2016-11-17 21:43:53 +08:00
Shi Yan
4499a752a5 Fixed LocationDescriptor and pathOrLoc types. 2016-11-17 15:08:46 +08:00
Yui
f6cf80c8ad Merge pull request #12291 from KostyaEsmukov/react-router-render-prop
react-router: added render prop and fixed applyRouterMiddleware types
2016-11-10 16:26:59 -08:00
Kostya Esmukov
6e4467c379
react-router: added render prop and fixed applyRouterMiddleware types 2016-10-27 15:35:59 +03:00
feng zhi hao
38960a30f9 add @types/history dependency 2016-10-21 16:43:35 +08:00
Stefan Dobrev
ce70e15ee4 [react-router] Update getComponents signatures (#11319)
Update `getComponent(s)` all over the place. See #9530 for more info.
2016-09-28 22:02:02 +09:00
Andy Hanson
b02b9903cc Merge commit 'origin/master~100' into merge_21sep 2016-09-21 08:13:15 -07:00
Andy
be4a803ad0 Merge pull request #10697 from minodisk/update-react-router
Update react-router
2016-09-20 11:44:47 -07:00
Andy
e3c57dbe79 Merge pull request #11215 from thegaryroberts/patch-1
Update react-router.d.ts
2016-09-19 11:11:33 -07:00
Andy Hanson
28ef3d201b Remove <reference path="../xxx/xxx.d.ts"> from definitions files and replace it with import * as Xxx from "xxx" or <reference types="xxx"/> 2016-09-16 08:59:57 -07:00
zhengbli
c2a54db3e9 Merge branch 'master' into types-2.0
# Conflicts:
#	amcharts/AmCharts.d.ts
#	angular-gettext/angular-gettext.d.ts
#	angular-jwt/angular-jwt.d.ts
#	angular-material/angular-material.d.ts
#	angularjs/angular.d.ts
#	auth0-js/auth0-js.d.ts
#	aws-lambda/aws-lambda.d.ts
#	aws-sdk/aws-sdk.d.ts
#	azure-mobile-apps/azure-mobile-apps.d.ts
#	azure-mobile-services-client/AzureMobileServicesClient.d.ts
#	blessed/blessed-tests.ts
#	blessed/blessed.d.ts
#	bootbox/bootbox.d.ts
#	bowser/bowser.d.ts
#	cache-manager/cache-manager.d.ts
#	chai-things/chai-things.d.ts
#	colors/colors.d.ts
#	cordova/cordova-tests.ts
#	cordova/plugins/Contacts.d.ts
#	cordova/plugins/FileSystem.d.ts
#	couchbase/couchbase.d.ts
#	cucumber/cucumber-tests.ts
#	cucumber/cucumber.d.ts
#	d3/d3.d.ts
#	dojo/dojo.d.ts
#	dustjs-linkedin/dustjs-linkedin.d.ts
#	esprima/esprima.d.ts
#	express-serve-static-core/express-serve-static-core.d.ts
#	express-session/express-session.d.ts
#	fetch-mock/fetch-mock.d.ts
#	fs-extra/fs-extra.d.ts
#	fullCalendar/fullCalendar.d.ts
#	github-electron/github-electron.d.ts
#	gulp-uglify/gulp-uglify.d.ts
#	gulp/gulp.d.ts
#	highcharts/highcharts.d.ts
#	imap/imap.d.ts
#	incremental-dom/incremental-dom.d.ts
#	inversify/inversify.d.ts
#	ionic/ionic.d.ts
#	ioredis/ioredis.d.ts
#	isomorphic-fetch/isomorphic-fetch-tests.ts
#	jake/jake.d.ts
#	joi/joi.d.ts
#	jquery-mockjax/jquery-mockjax.d.ts
#	jquery/jquery.d.ts
#	js-data-http/js-data-http-tests.ts
#	js-data-http/js-data-http.d.ts
#	js-data/js-data.d.ts
#	jsdom/jsdom.d.ts
#	jsts/jsts-tests.ts
#	knex/knex.d.ts
#	koa-favicon/koa-favicon.d.ts
#	koa-router/koa-router-tests.ts
#	koa-router/koa-router.d.ts
#	lodash/lodash.d.ts
#	mailparser/mailparser.d.ts
#	maquette/maquette.d.ts
#	material-ui/material-ui.d.ts
#	matter-js/matter-js.d.ts
#	moment/moment.d.ts
#	mongoose-promise/mongoose-promise-tests.ts
#	mongoose/mongoose-tests.ts
#	mongoose/mongoose.d.ts
#	multer/multer.d.ts
#	ncp/ncp.d.ts
#	nock/nock.d.ts
#	node/node-tests.ts
#	node/node.d.ts
#	nvd3/nvd3.d.ts
#	object-assign/object-assign.d.ts
#	openlayers/openlayers.d.ts
#	parse/parse.d.ts
#	pdf/pdf.d.ts
#	pdfkit/pdfkit.d.ts
#	pg/pg.d.ts
#	pixi.js/pixi.js.d.ts
#	progress/progress.d.ts
#	pusher-js/pusher-js.d.ts
#	quill/quill-tests.ts
#	quill/quill.d.ts
#	radium/radium.d.ts
#	ravenjs/ravenjs-tests.ts
#	react-dropzone/react-dropzone.d.ts
#	react-mdl/react-mdl.d.ts
#	react-native/react-native.d.ts
#	react-notification-system/react-notification-system.d.ts
#	react-router/history-tests.ts
#	react-router/react-router-tests.tsx
#	react-router/react-router.d.ts
#	react-select/react-select-tests.tsx
#	react-select/react-select.d.ts
#	react/react.d.ts
#	redux-form/redux-form.d.ts
#	request-promise/request-promise.d.ts
#	resolve-from/resolve-from.d.ts
#	riot-api-nodejs/riot-api-nodejs.d.ts
#	sanitize-html/sanitize-html.d.ts
#	segment-analytics/segment-analytics.d.ts
#	simple-assign/simple-assign-tests.ts
#	simple-assign/simple-assign.d.ts
#	slate-irc/slate-irc.d.ts
#	soap/soap.d.ts
#	socket.io/socket.io.d.ts
#	sql.js/sql.js-tests.ts
#	sql.js/sql.js.d.ts
#	steam/steam.d.ts
#	stylus/stylus.d.ts
#	swiper/swiper.d.ts
#	tedious/tedious.d.ts
#	threejs/three.d.ts
#	twilio/twilio.d.ts
#	underscore/underscore.d.ts
#	ws/ws.d.ts
#	yeoman-generator/yeoman-generator.d.ts
2016-09-14 18:44:24 -07:00
Marcin Kral
874a60bc68 Add Pure and Stateless components to withRouter definition (#10959)
* Add Pure and Stateless components to withRouter definition

* Add missing type parameter
2016-09-14 20:39:53 +09:00
Gary Roberts
feae95f169 Update react-router.d.ts
Changed react-router RouteComponentProps comment to properly reflect routeParams resolving to type string (not number). As per documentation here: 
https://github.com/ReactTraining/react-router/blob/master/docs/API.md#routeparams
2016-09-14 09:03:34 +01:00
Ryan Cavanaugh
e718ddaf48 Merge pull request #10869 from jtmthf/master
react-router: Fix for MatchState
2016-08-30 20:12:31 -07:00
Jan Bevers
b83a05d335 Added missing method getCurrentLocation to react-router/history 2016-08-30 17:07:55 +02:00
Jack Moore
0bfbcce5f3 Added router and createElement to MatchState. Added tests to demonstrate SSR using match and RouterContext 2016-08-28 18:27:36 -05:00
Andy Hanson
a2d726de56 Apply some changes that had been applied to react-router.d.ts instead of index
(This is everything from https://github.com/DefinitelyTyped/DefinitelyTyped/commits/types-2.0/react-router/react-router.d.ts that came after index's creation on May 9)
2016-08-24 11:44:24 -07:00
Andy Hanson
69e4f6f196 Merge branch 'types-2.0' into duplicate_react_router 2016-08-23 07:42:00 -07:00
minodisk
35324f1700 Add applyRouterMiddleware to react-router 2016-08-19 09:46:37 +09:00
minodisk
7a7510a12d Format react-router.d.ts 2016-08-19 09:46:30 +09:00
Paul van Brenk
f82fc68a94 Merge pull request #10662 from DefinitelyTyped/types-2.0-20160816
Types 2.0 20160816
2016-08-17 15:45:00 -07:00
Mohamed Hegazy
5c91ef6ad6 Fix react-router use of react (#10663) 2016-08-17 09:44:50 -07:00
Paul van Brenk
145b71ff22 Clean up for typings-2.0 2016-08-16 16:20:29 -07:00
Paul van Brenk
68eea6297d Merge branch 'master' into types-2.0-20160816
# Conflicts:
#	acl/index.d.ts
#	anydb-sql-migrations/anydb-sql-migrations.d.ts
#	asana/asana.d.ts
#	blue-tape/blue-tape-tests.ts
#	bluebird-retry/bluebird-retry-tests.ts
#	bluebird-retry/bluebird-retry.d.ts
#	bluebird/index.d.ts
#	bookshelf/bookshelf.d.ts
#	consolidate/consolidate.d.ts
#	documentdb/documentdb.d.ts
#	fs-extra-promise/fs-extra-promise.d.ts
#	graphene-pk11/graphene-pk11.d.ts
#	inline-css/inline-css.d.ts
#	inversify/index.d.ts
#	java/java-tests.ts
#	karma/karma.d.ts
#	knex/knex.d.ts
#	koa-router/koa-router.d.ts
#	libxmljs/libxmljs-tests.ts
#	lru-cache/lru-cache.d.ts
#	mz/index.d.ts
#	node-mysql-wrapper/node-mysql-wrapper-tests.ts
#	node-mysql-wrapper/node-mysql-wrapper.d.ts
#	nodemailer/nodemailer.d.ts
#	pify/pify-tests.ts
#	project-oxford/project-oxford-tests.ts
#	project-oxford/project-oxford.d.ts
#	react-router/react-router-tests.tsx
#	react-scroll/react-scroll.d.ts
#	redlock/redlock.d.ts
#	request-promise/index.d.ts
#	rethinkdb/rethinkdb.d.ts
#	sequelize/sequelize.d.ts
#	stamplay-js-sdk/index.d.ts
#	stripe-node/stripe-node.d.ts
#	umzug/umzug.d.ts
2016-08-16 13:56:22 -07:00
Andy Hanson
fe2e8b30e8 Remove old react-router.d.ts that was shadowing newer index.d.ts 2016-08-16 11:26:26 -07:00
Alex Wendland
be9ecbf1d9 Add withRouter to react-router 2016-08-13 16:30:16 -07:00
Ryan Cavanaugh
b9245fba39 Merge commit 'upstream/master~350' into merge_7_25 2016-07-26 17:24:39 -07:00
Ryan Cavanaugh
c73630c9a3 Merge commit 'upstream/master~400' into merge_7_25
# Conflicts:
#	angular-translate/angular-translate.d.ts
#	knex/knex.d.ts
#	redux-logger/index.d.ts
#	simplestorage.js/index.d.ts
#	underscore/underscore.d.ts
#	yargs/yargs.d.ts
2016-07-26 13:53:00 -07:00
Ryan Cavanaugh
11d624e656 Merge commit 'upstream/master~500' into merge_7_25 2016-07-26 12:17:32 -07:00
Ryan Cavanaugh
ede3f0a99c Merge commit 'upstream/master~550' into merge_7_25 2016-07-26 11:29:27 -07:00
Ryan Cavanaugh
347311a5f0 Partial merge remote-tracking branch 'upstream/master' into merge_7_25 2016-07-25 14:26:20 -07:00
Mohamed Hegazy
c60e17576e Fix use of generic React attributes and event handlers 2016-07-13 22:30:45 -07:00
Ryan Cavanaugh
a5f4d50ccc Fix tsconfig files for new option name / behavior.
Also fixes some inconsistent whitespace.
2016-07-12 13:54:56 -07:00
Raghav Katyal
395c4e1639 Turning on consistent casing flag and fixing failures 2016-06-30 15:14:49 -07:00
Mohamed Hegazy
d5282ee8f1 Merge pull request #9530 from rogierschouten/react-router-getcomponents
getComponent/getComponents now takes state parameter instead of location
2016-06-21 14:53:00 -07:00
ephoton
93c443f2c1 Export type RouteProps 2016-06-21 00:46:37 +08:00
Artur Eshenbrener
f20a05ba43 react-router: History.Location missed prop "hash" (#9567) 2016-06-08 19:27:30 +09:00
Artur Eshenbrener
df9065dc6e react-router: export routerShape and historyShape (#9551)
0616f6e143/modules/PropTypes.js (L9)
0616f6e143/modules/PropTypes.js (L19)
2016-06-08 19:17:47 +09:00
François Guillot
1737fbff88 Typing Location.Query to K,V dictionary (#9524)
* Typing Location.Query to K,V dictionary

Location.Query is actually typed as 'Object', which forces to cast it to 'any' anytime you need to access one of your own query string parameter.

    const clientId = (this.props.location.query as any).clientId;

It should be typed as '{ [key: string]: string; }' since it's a dictionary where you can get your arbitrary named query string parameters.

* Fixing travis build
2016-06-03 00:49:05 +09:00
Rogier Schouten
fceb0e37c0 getComponent/getComponents now takes state parameter instead of location
see
0cdee03a54
2016-06-02 12:00:24 +02:00
Ryan Cavanaugh
2847235610 More fixes around __React 2016-05-12 17:07:04 -07:00
Ryan Cavanaugh
cdf9aa4e1d Convert react-router 2016-05-11 16:33:19 -07:00
Ryan Cavanaugh
72a319137e Split out react addons 2016-05-11 16:32:53 -07:00
Ryan Cavanaugh
bfd400a8f8 Add noEmit to all config files 2016-05-10 12:24:49 -07:00
Ryan Cavanaugh
e808e8e062 Remove unneeded references 2016-05-10 12:22:25 -07:00
Ryan Cavanaugh
50387d4046 Change relative reference paths to types references. Errors incoming... 2016-05-09 18:06:27 -07:00
Ryan Cavanaugh
49b1ac6a38 Rename all entry points to index.d.ts and explicitify all file lists 2016-05-09 17:29:10 -07:00
Ryan Cavanaugh
ab2b4191c5 Add typesRoot to all config files 2016-05-09 13:52:25 -07:00
Ryan Cavanaugh
290d5dfb4d More fixes 2016-05-04 18:42:46 -07:00