Skip to content
This repository has been archived by the owner on Dec 13, 2018. It is now read-only.

Commit

Permalink
chore(format): upgrade kcd-scripts and format all the things
Browse files Browse the repository at this point in the history
  • Loading branch information
Kent C. Dodds committed Sep 25, 2017
1 parent ea831b1 commit 8fb386d
Show file tree
Hide file tree
Showing 17 changed files with 1,967 additions and 1,013 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Expand Up @@ -4,9 +4,8 @@ dist
.opt-in
.opt-out
test-ts
typings/*.js
*.log
yarn.lock
package-lock.json
.vscode
preact/**/*
preact/
10 changes: 2 additions & 8 deletions examples/with-jest/package.json
Expand Up @@ -6,11 +6,7 @@
"scripts": {
"test": "jest --coverage"
},
"keywords": [
"glamorous",
"jest",
"react"
],
"keywords": ["glamorous", "jest", "react"],
"author": "pksjce",
"license": "ISC",
"dependencies": {
Expand All @@ -25,9 +21,7 @@
},
"jest": {
"testEnvironment": "jsdom",
"snapshotSerializers": [
"enzyme-to-json/serializer"
],
"snapshotSerializers": ["enzyme-to-json/serializer"],
"setupTestFrameworkScriptFile": "./testSetup.js"
}
}
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -54,7 +54,7 @@
"enzyme-to-json": "^2.0.0",
"glamor": "^2.20.37",
"jest-glamor-react": "^3.1.1",
"kcd-scripts": "^0.23.1",
"kcd-scripts": "^0.23.2",
"npm-run-all": "^4.1.1",
"preact": "^8.2.5",
"preval.macro": "^1.0.1",
Expand Down
13 changes: 7 additions & 6 deletions test/glamorous-exports.test.ts
@@ -1,21 +1,22 @@
import {
CSSProperties,
CSSPropertiesCompleteSingle, CSSPropertiesComplete, CSSPropertiesPseudo, CSSPropertiesLossy,
CSSPropertiesCompleteSingle,
CSSPropertiesComplete,
CSSPropertiesPseudo,
CSSPropertiesLossy,
SVGProperties,
SVGPropertiesCompleteSingle, SVGPropertiesComplete, SVGPropertiesLossy,

SVGPropertiesCompleteSingle,
SVGPropertiesComplete,
SVGPropertiesLossy,
GlamorousComponent,
GlamorousComponentProps,
ExtraGlamorousProps,

StyleFunction,
StyleArray,
StyleArgument,

BuiltInGlamorousComponentFactory,
KeyGlamorousComponentFactory,
GlamorousComponentFactory,

HTMLComponentFactory,
HTMLKey,
SVGComponentFactory,
Expand Down
38 changes: 19 additions & 19 deletions tsconfig.json
@@ -1,20 +1,20 @@
{
"compilerOptions": {
"allowJs": false,
"declaration": true,
"inlineSources": true,
"jsx": "react",
"module": "commonjs",
"moduleResolution": "node",
"noEmit": false,
"noImplicitAny": true,
"noImplicitReturns": true,
"noUnusedLocals": false,
"noUnusedParameters": false,
"outDir": "./test-ts",
"removeComments": false,
"sourceMap": true,
"strictNullChecks": true,
"target": "es6"
}
}
"compilerOptions": {
"allowJs": false,
"declaration": true,
"inlineSources": true,
"jsx": "react",
"module": "commonjs",
"moduleResolution": "node",
"noEmit": false,
"noImplicitAny": true,
"noImplicitReturns": true,
"noUnusedLocals": false,
"noUnusedParameters": false,
"outDir": "./test-ts",
"removeComments": false,
"sourceMap": true,
"strictNullChecks": true,
"target": "es6"
}
}
2 changes: 1 addition & 1 deletion tslint.json
@@ -1,3 +1,3 @@
{
// "extends": "tslint-microsoft-contrib"
}
}
26 changes: 16 additions & 10 deletions typings/built-in-component-factories.d.ts
@@ -1,14 +1,20 @@
import { SVGProperties } from './svg-properties'
import { CSSProperties } from './css-properties'
import {
BuiltInGlamorousComponentFactory,
} from './component-factory'
import {SVGProperties} from './svg-properties'
import {CSSProperties} from './css-properties'
import {BuiltInGlamorousComponentFactory} from './component-factory'

export type HTMLGlamorousComponentFactory<HTMLElement> =
BuiltInGlamorousComponentFactory<React.HTMLProps<HTMLElement>, CSSProperties>
export type HTMLGlamorousComponentFactory<
HTMLElement
> = BuiltInGlamorousComponentFactory<
React.HTMLProps<HTMLElement>,
CSSProperties
>

export type SVGGlamorousComponentFactory<SVGElement> =
BuiltInGlamorousComponentFactory<React.SVGAttributes<SVGElement>, SVGProperties>
export type SVGGlamorousComponentFactory<
SVGElement
> = BuiltInGlamorousComponentFactory<
React.SVGAttributes<SVGElement>,
SVGProperties
>

export interface HTMLComponentFactory {
a: HTMLGlamorousComponentFactory<HTMLAnchorElement>
Expand Down Expand Up @@ -121,7 +127,7 @@ export interface HTMLComponentFactory {
track: HTMLGlamorousComponentFactory<HTMLTrackElement>
u: HTMLGlamorousComponentFactory<HTMLElement>
ul: HTMLGlamorousComponentFactory<HTMLUListElement>
"var": HTMLGlamorousComponentFactory<HTMLElement>
var: HTMLGlamorousComponentFactory<HTMLElement>
video: HTMLGlamorousComponentFactory<HTMLVideoElement>
wbr: HTMLGlamorousComponentFactory<HTMLElement>
}
Expand Down

0 comments on commit 8fb386d

Please sign in to comment.