Skip to content

Commit 4b726cd

Browse files
committed
feat: update
1 parent 4dc6cdc commit 4b726cd

File tree

9 files changed

+74
-31
lines changed

9 files changed

+74
-31
lines changed

.circleci/config.yml

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
11
version: 2
22
jobs:
33
build:
4+
working_directory: ~/project
45
docker:
56
- image: circleci/node:latest
6-
77
branches:
8-
only:
9-
- master
10-
- /^greenkeeper/.*$/
11-
12-
working_directory: ~/repo
13-
8+
ignore:
9+
- gh-pages # list of branches to ignore
10+
- /release\/.*/ # or ignore regexes
1411
steps:
1512
- checkout
16-
17-
# Download and cache dependencies
1813
- restore_cache:
19-
keys:
20-
- v1-dependencies-{{ checksum "package.json" }}
21-
# fallback to using the latest cache if no exact match is found
22-
- v1-dependencies-
23-
24-
- run: npm install
25-
14+
key: dependency-cache-{{ checksum "yarn.lock" }}
15+
- run:
16+
name: install dependences
17+
command: npm install
2618
- save_cache:
19+
key: dependency-cache-{{ checksum "yarn.lock" }}
2720
paths:
28-
- node_modules
29-
key: v1-dependencies-{{ checksum "package.json" }}
30-
31-
# run tests!
32-
- run: npm run test
21+
- ./node_modules
22+
- run:
23+
name: test
24+
command: npm run test

.travis.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,20 @@ after_success:
1717
- npm run coverage
1818
- npm install -g travis-deploy-once
1919
- travis-deploy-once "npm run semantic-release"
20-
- cd examples
21-
- npm install
22-
- npm run deploy -- --ci --host-token-env-variable=GITHUB_TOKEN
2320
branches:
2421
only:
2522
- master
23+
- dev
2624
- /^greenkeeper/.*$/
25+
before_deploy:
26+
- cd examples
27+
- npm install
28+
- npm run build
29+
deploy:
30+
provider: pages
31+
skip-cleanup: true
32+
github-token: $GITHUB_TOKEN
33+
keep-history: false
34+
local-dir: site
35+
on:
36+
branch: master

.vscode/launch.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"type": "node",
6+
"request": "launch",
7+
"name": "Jest All",
8+
"program": "${workspaceFolder}/node_modules/jest/bin/jest",
9+
"args": [
10+
"--runInBand"
11+
],
12+
"console": "integratedTerminal",
13+
"internalConsoleOptions": "neverOpen"
14+
},
15+
{
16+
"type": "node",
17+
"request": "launch",
18+
"name": "Jest Current File",
19+
"program": "${workspaceFolder}/node_modules/jest/bin/jest",
20+
"args": [
21+
"${relativeFile}"
22+
],
23+
"console": "integratedTerminal",
24+
"internalConsoleOptions": "neverOpen"
25+
}
26+
]
27+
}

examples/.storybook/addons.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
import '@storybook/addon-options/register'
2+
import '@storybook/addon-actions/register'

examples/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "index.js",
66
"scripts": {
77
"dev": "start-storybook -p 9001 -c .storybook",
8-
"build-storybook": "build-storybook -s public",
8+
"build": "build-storybook -s public -o site",
99
"predeploy": "npm run build",
1010
"deploy": "storybook-to-ghpages"
1111
},

greenkeeper.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"groups": {
3+
"default": {
4+
"packages": [
5+
"examples/package.json",
6+
"package.json"
7+
]
8+
}
9+
}
10+
}

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"build:es": "npm run build:es:types && NODE_ENV=es babel src --out-dir es --copy-files --extensions '.ts,.tsx'",
1515
"build:es:types": "tsc --emitDeclarationOnly --declarationDir es",
1616
"watch": "babel src --watch --out-dir lib",
17-
"lint": "tslint src",
17+
"lint": "tslint src/**/*.ts{,x} examples/stories/**/*.ts{,x}",
1818
"semantic-release": "semantic-release",
1919
"coverage": "codecov"
2020
},
@@ -39,7 +39,6 @@
3939
"@babel/preset-typescript": "^7.0.0",
4040
"@commitlint/cli": "^7.1.2",
4141
"@commitlint/config-angular": "^7.1.2",
42-
"@commitlint/config-conventional": "^7.1.2",
4342
"@types/enzyme": "^3.1.14",
4443
"@types/enzyme-adapter-react-16": "^1.0.3",
4544
"@types/jest": "^23.3.2",

src/a.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
export default 'world!'
22

33
export class C {
4-
public x = 10
5-
public getX = () => this.x
6-
public setX = (newVal: number) => {
4+
x = 10
5+
getX = () => this.x
6+
setX = (newVal: number) => {
77
this.x = newVal
88
}
99
}

tslint.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
"no-this-assignment": false,
99
"only-arrow-functions": false,
1010
"no-submodule-imports": false,
11-
"object-literal-sort-keys": false
11+
"object-literal-sort-keys": false,
12+
"no-implicit-dependencies": false,
13+
"jsdoc-format": false,
14+
"interface-name": false,
15+
"member-access": [true, "no-public"]
1216
}
1317
}

0 commit comments

Comments
 (0)