Skip to content

Commit a0a26d5

Browse files
Merge pull request #77 from shiftcode/#55-fix-model-inheritance
#55 fix model inheritance
2 parents bf77678 + 9f2cb69 commit a0a26d5

File tree

71 files changed

+1687
-909
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1687
-909
lines changed

.lintstagedrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
linters:
2-
"{src,test}/**/*.ts":
2+
"src/**/*(!spec).ts":
33
- prettier --write --config ./.prettierrc.yml
44
- tslint --project ./tsconfig.json -t codeFrame --fix
55
- git add

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ language: node_js
22
node_js:
33
- lts/*
44

5-
cache:
6-
directories:
7-
- $HOME/.npm
8-
- node_modules
5+
cache: npm
6+
# directories:
7+
# - $HOME/.npm
8+
# - node_modules
99

1010
#before_install:
1111
#- npm install npm@^6.0.0 -g
@@ -16,19 +16,19 @@ cache:
1616
# of updating the package lock.
1717
install:
1818
# decide if running on greenkeeper branch or not
19-
#- case $TRAVIS_BRANCH in greenkeeper*) npm i;; *) npm ci;; esac;
19+
- case $TRAVIS_BRANCH in greenkeeper*) npm i;; *) npm ci;; esac;
2020
# somehow the above command fails when we have a cache available on travis - needs some more investigation, stick with
2121
# npm i for now
22-
- npm i
22+
#- npm ci
2323

2424
notifications:
2525
email: false
2626

2727
before_script: npx greenkeeper-lockfile-update
2828

2929
script:
30-
- npm run lint
31-
- npm run test:prod
30+
- npm run lint:ci
31+
- npm run test:coverage
3232
- npm run build
3333
- npm run build:docs
3434

0 commit comments

Comments
 (0)