Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/node_modules

# Build
/build
/dist

# Test coverage
Expand Down
50 changes: 12 additions & 38 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@ sudo: false
language: node_js
node_js:
- "lts/*"
cache:
directories:
- node_modules
cache: false
notifications:
email: false
branches:
only:
- master
- develop
- /^greenkeeper/.*$/

# Build stages
stages:
Expand All @@ -27,59 +24,34 @@ jobs:
include:

- stage: build
env:
- ANGULAR=5.0.x
install:
- npm install
- npm install @angular/common@$ANGULAR @angular/core@$ANGULAR
script:
- npm run build:js
- npm run build:sass
- npm run build:css
-
env:
- ANGULAR=5.1.x
before_install:
- npm install -g npm
install:
- npm install
- npm install @angular/common@$ANGULAR @angular/core@$ANGULAR
- npm ci
script:
- npm run build:js
- npm run build:sass
- npm run build:css
- npm run build

- stage: test
env:
- ANGULAR=5.0.x
install:
- npm install
- npm install @angular/common@$ANGULAR @angular/core@$ANGULAR
script:
- npm run test
-
env:
- ANGULAR=5.1.x
before_install:
- npm install -g npm
install:
- npm install
- npm install @angular/common@$ANGULAR @angular/core@$ANGULAR
- npm ci
script:
- npm run test
after_success:
- npm run test:coverage

- stage: release
before_install:
- npm install -g npm
# Clone the whole repository because we also need the develop branch for releasing (Travis only gives us the master by default)
- git clone "https://github.com/$TRAVIS_REPO_SLUG.git" "$TRAVIS_REPO_SLUG";
- cd "$TRAVIS_REPO_SLUG";
- git checkout -qf "$TRAVIS_COMMIT";
# Fix Travis CI issue of detached heads in git
- git checkout master
install:
- npm install
script:
- npm run build:js
- npm run build:sass
- npm run build:css
- npm ci
before_deploy:
# Login to Git to be able to make commits (required by automatic-release)
- git config --global user.name "dominique-mueller";
Expand All @@ -88,6 +60,8 @@ jobs:
- echo "https://$GH_TOKEN:@github.com" > .git/credentials;
# Do release
- npm run release
- npm run build
- npm run release:copy
# Publish the dist folder
- cd dist
deploy:
Expand Down
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,14 @@ npm install angular-notifier

### Angular versions

The following list describes the Angular compatibility:

- **angular-notifier `1.x`**  is compatible with  **Angular `2.x`**
- **angular-notifier `2.x`**  is compatible with  **Angular `4.x`**
- **angular-notifier `3.x`**  is compatible with  **Angular `5.x`**
The following list describes the compatibility with Angular:

| Angular Notifier | Angular |
| ----------------- | ------- |
| `1.x` | `2.x` |
| `2.x` | `4.x` |
| `3.x` | `5.x` |
| `4.x` | `6.x` |

<br>

Expand Down
6 changes: 5 additions & 1 deletion jest.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
},
"__TRANSFORM_HTML__": true
},
"modulePathIgnorePatterns": [
"/dist/"
],
"preset": "jest-preset-angular",
"setupTestFrameworkScriptFile": "./jest.setup.ts"
"setupTestFrameworkScriptFile": "./jest.setup.ts",
"verbose": true
}
2 changes: 1 addition & 1 deletion jest.setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'jest-preset-angular';
// mocked away by Jest anyway.

// tslint:disable no-any
( <any> window ).Element.prototype.animate = ( keyframes: any, options: any ): any => {
( <any> window ).Element.prototype.animate = (): any => {
// Nothing to implement
};
// tslint:enable no-any
Loading