Commit 0d30c75

committed

Merge branch 'master' of github.com:javivelasco/react-css-themr

* 'master' of github.com:javivelasco/react-css-themr: update babel-core, babel-preset-es2015, babel-preset-stage-0 TypeScript definitions

2 parents 0bef61c + d522c36 commit 0d30c75Copy full SHA for 0d30c75

File tree

+30

-3

lines changed

+30

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"homepage": "https://github.com/javivelasco/react-css-themr#readme",`
`5`	`5`	`"version": "1.5.0",`
`6`	`6`	`"main": "./lib",`
	`7`	`+ "typings": "./src/index.d.ts",`
`7`	`8`	`"author": {`
`8`	`9`	`"email": "javier.velasco86@gmail.com",`
`9`	`10`	`"name": "Javi Velasco",`
`@@ -28,12 +29,12 @@`
`28`	`29`	`},`
`29`	`30`	`"devDependencies": {`
`30`	`31`	`"babel-cli": "^6.7.7",`
`31`		`- "babel-core": "^6.7.7",`
	`32`	`+ "babel-core": "^6.18.0",`
`32`	`33`	`"babel-eslint": "^6.0.3",`
`33`	`34`	`"babel-plugin-transform-decorators-legacy": "^1.3.4",`
`34`		`- "babel-preset-es2015": "^6.6.0",`
	`35`	`+ "babel-preset-es2015": "^6.18.0",`
`35`	`36`	`"babel-preset-react": "^6.5.0",`
`36`		`- "babel-preset-stage-0": "^6.5.0",`
	`37`	`+ "babel-preset-stage-0": "^6.16.0",`
`37`	`38`	`"eslint": "^2.8.0",`
`38`	`39`	`"eslint-config-rackt": "^1.1.1",`
`39`	`40`	`"eslint-plugin-babel": "^3.2.0",`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,26 @@`
	`1`	`+declare module "react-css-themr"`
	`2`	`+{`
	`3`	`+ export interface IThemrOptions`
	`4`	`+ {`
	`5`	`+ /** @default "deeply" */`
	`6`	`+ composeTheme?: "deeply" \| "softly" \| false,`
	`7`	`+ /** @default false */`
	`8`	`+ withRef?: boolean`
	`9`	`+ }`
	`10`	`+`
	`11`	`+ export interface ThemeProviderProps`
	`12`	`+ {`
	`13`	`+ theme: {}`
	`14`	`+ }`
	`15`	`+`
	`16`	`+ export class ThemeProvider extends React.Component<ThemeProviderProps, any>`
	`17`	`+ {`
	`18`	`+`
	`19`	`+ }`
	`20`	`+`
	`21`	`+ export function themr(`
	`22`	`+ identifier: string,`
	`23`	`+ defaultTheme?: {},`
	`24`	`+ options?: IThemrOptions`
	`25`	`+ );`
	`26`	`+}`

Comments

(0)