config improvement

leecade · leecade · commit 44a40377c1a3 · 2016-05-18T18:32:01.000+08:00
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,21 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+
+[{**.js,**.css,**.styl,.babelrc,package.json}]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+
+[**.html]
+indent_size = 2
+
+[.pre-commit]
+indent_style = space
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,4 @@
+*
+!lib/
+!package.json
+!README.md
diff --git a/.pre-commit b/.pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Ensure all javascript files staged for commit pass standard code style
+git diff --name-only --cached --relative | grep '\.jsx\?$' | xargs standard
+if [ $? -ne 0 ]; then exit 1; fi
diff --git a/README.md b/README.md
@@ -1 +1 @@
-
+@TODO
diff --git a/demo/index.js b/demo/index.js
@@ -1,23 +1,36 @@
 import React from 'react'
-import { storiesOf, action } from '@kadira/storybook'
+import {
+  storiesOf
+  // action
+} from '@kadira/storybook'
 import Alert from '../src/'
 
 storiesOf('Alert', module)
   .add('with text', () => (
-    <Alert prop='text' />
+    <div>
+      <Alert prop='xxx' />
+      <button>test</button>
+    </div>
   ))
   .add('with long text', () => (
     <Alert prop='long text.......' />
   ))
+  .add('11111', () => (
+    <Alert prop='1111.......' />
+  ))
 
-storiesOf('Alert2', module)
+storiesOf('Table', module)
   .add('more example', () => (
     <Alert prop='more example' />
   ))
   .add('more example', () => (
     <Alert prop='more example' />
   ))
 
-if (module.hot) {
-  module.hot.accept();
-}
+storiesOf('Sug', module)
+  .add('more example', () => (
+    <Alert prop='more example' />
+  ))
+  .add('more example', () => (
+    <Alert prop='more example' />
+  ))
diff --git a/lib/index.css b/lib/index.css
@@ -1,4 +1,4 @@
 ._1W_PBhqheDoZ7jBEcfxzm0 {
-  background: #eee;
+  background: #efe;
   border: 1px solid #aaa;
 }
diff --git a/lib/index.js b/lib/index.js
diff --git a/lib/index.js.map b/lib/index.js.map
diff --git a/package.json b/package.json
@@ -4,10 +4,14 @@
   "description": "",
   "main": "lib/index.js",
   "scripts": {
+    "hook": "[ -d .git ] && chmod +x .pre-commit && mkdir -p .git/hooks && ln -sf ../../.pre-commit .git/hooks/pre-commit && echo \"\\x1B[01;93mAdd git pre-commit hook successed.\\x1B[0m\" || echo \"\\x1B[31mWarning: Add git pre-commit hook failed.\\x1B[0m\"",
+    "postinstall": "npm run hook",
     "dev": "NODE_ENV=development start-storybook -p 9001",
     "build": "NODE_ENV=production webpack --config ./webpack/webpack.config.prod.babel.js",
     "update": "updtr",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "lint": "standard | snazzy",
+    "test": "npm run lint && ava --require ./test/helpers/setup-test-env.js \"@(src|test)/**/*test.@(js|jsx)\" --verbose",
+    "test:watch": "npm run test -- --watch --watch-extensions jsx"
   },
   "repository": {
     "type": "git",
@@ -76,7 +80,9 @@
     ],
     "ignore": [
       "dist/",
-      "mock/"
+      "mock/",
+      "lib/",
+      ".storybook/"
     ]
   },
   "ava": {
diff --git a/src/index.js b/src/index.js
@@ -1,6 +1,6 @@
 import React, { Component, PropTypes } from 'react'
 import CSSModules from 'react-css-modules'
-import log from './utils'
+import { log } from './utils'
 import styles from './index.styl'
 
 @CSSModules(styles, { allowMultiple: true, errorWhenNotFound: false })
@@ -13,12 +13,12 @@ export default class extends Component {
   }
   state = {
   }
-  componentDidMont () {
-    log('mount')
+  componentDidMount () {
+    log('mount1')
   }
   render () {
     return (
-      <div styleName='wrap'>{this.props.prop}</div>
+      <div styleName='wrap'>22{this.props.prop}</div>
     )
   }
 }
diff --git a/src/index.styl b/src/index.styl
@@ -1,3 +1,3 @@
 .wrap
-  background #eee
+  background #efe
   border 1px solid #aaa
diff --git a/test/index.test.js b/test/index.test.js
@@ -0,0 +1,23 @@
+import React from 'react'
+import test from 'ava'
+import {
+  shallow,
+  mount
+} from 'enzyme'
+import Alert from '../src/'
+
+test('fails with an JSX contain expectation', t => {
+  var actual = shallow(<Alert />)
+  var child = <div className='foo' />
+  t.true(actual.contains(child))
+})
+
+test('fails with a tag expectation', t => {
+  var actual = shallow(<Alert />)
+  t.is(actual.type(), 'span')
+})
+
+test('is a success with a mount and a child expectation', t => {
+  var actual = mount(<Alert />)
+  t.is(actual.find('.foo').length, 1)
+})
diff --git a/webpack/webpack.config.dev.babel.js b/webpack/webpack.config.dev.babel.js
@@ -1,4 +1,4 @@
-import path from 'path'
+// import path from 'path'
 import webpack from 'webpack'
 import paths from './paths'
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +*
 +!lib/
 +!package.json
 +!README.md
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`._1W_PBhqheDoZ7jBEcfxzm0 {`
`2`		`- background: #eee;`
	`2`	`+ background: #efe;`
`3`	`3`	`border: 1px solid #aaa;`
`4`	`4`	`}`