Skip to content

Commit

Permalink
feat: update
Browse files Browse the repository at this point in the history
  • Loading branch information
foryuki committed Sep 20, 2018
1 parent 4dc6cdc commit 4b726cd
Show file tree
Hide file tree
Showing 9 changed files with 74 additions and 31 deletions.
34 changes: 13 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,24 @@
version: 2
jobs:
build:
working_directory: ~/project
docker:
- image: circleci/node:latest

branches:
only:
- master
- /^greenkeeper/.*$/

working_directory: ~/repo

ignore:
- gh-pages # list of branches to ignore
- /release\/.*/ # or ignore regexes
steps:
- checkout

# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- run: npm install

key: dependency-cache-{{ checksum "yarn.lock" }}
- run:
name: install dependences
command: npm install
- save_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
paths:
- node_modules
key: v1-dependencies-{{ checksum "package.json" }}

# run tests!
- run: npm run test
- ./node_modules
- run:
name: test
command: npm run test
16 changes: 13 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,20 @@ after_success:
- npm run coverage
- npm install -g travis-deploy-once
- travis-deploy-once "npm run semantic-release"
- cd examples
- npm install
- npm run deploy -- --ci --host-token-env-variable=GITHUB_TOKEN
branches:
only:
- master
- dev
- /^greenkeeper/.*$/
before_deploy:
- cd examples
- npm install
- npm run build
deploy:
provider: pages
skip-cleanup: true
github-token: $GITHUB_TOKEN
keep-history: false
local-dir: site
on:
branch: master
27 changes: 27 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Jest All",
"program": "${workspaceFolder}/node_modules/jest/bin/jest",
"args": [
"--runInBand"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
},
{
"type": "node",
"request": "launch",
"name": "Jest Current File",
"program": "${workspaceFolder}/node_modules/jest/bin/jest",
"args": [
"${relativeFile}"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
}
]
}
1 change: 1 addition & 0 deletions examples/.storybook/addons.js
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
import '@storybook/addon-options/register'
import '@storybook/addon-actions/register'
2 changes: 1 addition & 1 deletion examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "index.js",
"scripts": {
"dev": "start-storybook -p 9001 -c .storybook",
"build-storybook": "build-storybook -s public",
"build": "build-storybook -s public -o site",
"predeploy": "npm run build",
"deploy": "storybook-to-ghpages"
},
Expand Down
10 changes: 10 additions & 0 deletions greenkeeper.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"groups": {
"default": {
"packages": [
"examples/package.json",
"package.json"
]
}
}
}
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"build:es": "npm run build:es:types && NODE_ENV=es babel src --out-dir es --copy-files --extensions '.ts,.tsx'",
"build:es:types": "tsc --emitDeclarationOnly --declarationDir es",
"watch": "babel src --watch --out-dir lib",
"lint": "tslint src",
"lint": "tslint src/**/*.ts{,x} examples/stories/**/*.ts{,x}",
"semantic-release": "semantic-release",
"coverage": "codecov"
},
Expand All @@ -39,7 +39,6 @@
"@babel/preset-typescript": "^7.0.0",
"@commitlint/cli": "^7.1.2",
"@commitlint/config-angular": "^7.1.2",
"@commitlint/config-conventional": "^7.1.2",
"@types/enzyme": "^3.1.14",
"@types/enzyme-adapter-react-16": "^1.0.3",
"@types/jest": "^23.3.2",
Expand Down
6 changes: 3 additions & 3 deletions src/a.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export default 'world!'

export class C {
public x = 10
public getX = () => this.x
public setX = (newVal: number) => {
x = 10
getX = () => this.x
setX = (newVal: number) => {
this.x = newVal
}
}
Expand Down
6 changes: 5 additions & 1 deletion tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
"no-this-assignment": false,
"only-arrow-functions": false,
"no-submodule-imports": false,
"object-literal-sort-keys": false
"object-literal-sort-keys": false,
"no-implicit-dependencies": false,
"jsdoc-format": false,
"interface-name": false,
"member-access": [true, "no-public"]
}
}

0 comments on commit 4b726cd

Please sign in to comment.