Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
kKen94 committed Jan 10, 2021
2 parents 3483294 + 5f40155 commit 9b2983b
Show file tree
Hide file tree
Showing 4 changed files with 270 additions and 205 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dist: trusty
language: node_js
node_js:
- "12.13.0"
- "14.15.3"

os:
- linux
Expand Down
52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"adjust-version:main": "rjp package.json version $VERSION",
"format:check": "prettier --list-different \"projects/**/*.ts\"",
"format:write": "prettier --write \"projects/**/*.ts\"",
"postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points --tsconfig \"tsconfig.json\""
"postinstall": "ngcc"
},
"husky": {
"hooks": {
Expand All @@ -41,47 +41,47 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~11.0.2",
"@angular/cdk": "~11.0.0",
"@angular/common": "~11.0.2",
"@angular/compiler": "~11.0.2",
"@angular/core": "~11.0.2",
"@angular/animations": "~11.0.7",
"@angular/cdk": "~11.0.3",
"@angular/common": "~11.0.7",
"@angular/compiler": "~11.0.7",
"@angular/core": "~11.0.7",
"@angular/flex-layout": "^11.0.0-beta.33",
"@angular/forms": "~11.0.2",
"@angular/material": "^11.0.0",
"@angular/platform-browser": "~11.0.2",
"@angular/platform-browser-dynamic": "~11.0.2",
"@angular/router": "~11.0.2",
"copyfiles": "^2.1.1",
"ngx-color": "^6.0.1",
"@angular/forms": "~11.0.7",
"@angular/material": "^11.0.3",
"@angular/platform-browser": "~11.0.7",
"@angular/platform-browser-dynamic": "~11.0.7",
"@angular/router": "~11.0.7",
"copyfiles": "^2.4.1",
"ngx-color": "^6.2.0",
"rxjs": "~6.6.3",
"tslib": "^2.0.0",
"tslib": "^2.1.0",
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1100.2",
"@angular/cli": "~11.0.2",
"@angular/compiler-cli": "~11.0.2",
"@angular/language-service": "~11.0.2",
"@angular-devkit/build-angular": "~0.1100.6",
"@angular/cli": "~11.0.6",
"@angular/compiler-cli": "~11.0.7",
"@angular/language-service": "~11.0.7",
"@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0",
"@commitlint/prompt": "^11.0.0",
"@semantic-release/changelog": "^5.0.0",
"@semantic-release/exec": "^5.0.0",
"@semantic-release/git": "^9.0.0",
"@types/node": "^12.11.1",
"angular-cli-ghpages": "^0.6.0",
"@types/node": "^14.14.20",
"angular-cli-ghpages": "^1.0.0-rc.1",
"angular-tslint-rules": "^1.20.1",
"codelyzer": "^6.0.0",
"husky": "^4.0.9",
"lint-staged": "^10.0.2",
"husky": "^4.3.7",
"lint-staged": "^10.5.3",
"ng-packagr": "^11.0.3",
"npm-run-all": "^4.1.5",
"prettier": "^2.0.5",
"prettier": "^2.2.1",
"pretty-quick": "^3.0.2",
"replace-json-property": "^1.4.1",
"semantic-release": "^17.2.3",
"ts-node": "^9.0.0",
"replace-json-property": "^1.6.3",
"semantic-release": "^17.3.1",
"ts-node": "^9.1.1",
"tslint": "~6.1.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "4.0.5"
Expand Down
30 changes: 29 additions & 1 deletion projects/lib/package.json
Original file line number Diff line number Diff line change
@@ -1 +1,29 @@
{"name":"@kken94/ngx-progress","version":"2.1.0","description":"The most powerful and customizable progress bar for Angular ✨","license":"MIT","homepage":"https://kken94.github.io/ngx-progress/","repository":{"type":"git","url":"https://github.com/kKen94/ngx-progress.git"},"bugs":{"url":"https://github.com/kKen94/ngx-progress/issues","email":"nicola.taddei.94@gmail.com"},"author":{"name":"Nicola Taddei","email":"nicola.taddei.94@gmail.com","url":"nicolataddei.com"},"private":false,"keywords":["angular","ng2","ng4","ng5","ng6","ng7","ng8","ng9","ngx","typescript","library","loader","progressbar","spinner","interceptor"],"peerDependencies":{"@angular/core":"~10.0.9","rxjs":"~6.6.2"},"dependencies":{"tslib":"^2.0.0"}}
{
"name":"@kken94/ngx-progress",
"version":"2.1.0",
"description":"The most powerful and customizable progress bar for Angular ✨",
"license":"MIT",
"homepage":"https://kken94.github.io/ngx-progress/",
"repository":{
"type":"git",
"url":"https://github.com/kKen94/ngx-progress.git"
},
"bugs":{
"url":"https://github.com/kKen94/ngx-progress/issues",
"email":"nicola.taddei.94@gmail.com"
},
"author":{
"name":"Nicola Taddei",
"email":"nicola.taddei.94@gmail.com",
"url":"nicolataddei.com"
},
"private":false,
"keywords":["angular","ng2","ng4","ng5","ng6","ng7","ng8","ng9","ngx","typescript","library","loader","progressbar","spinner","interceptor"],
"peerDependencies":{
"@angular/core":"~11.0.7",
"rxjs":"~6.6.3"
},
"dependencies":{
"tslib":"^2.0.0"
}
}
Loading

0 comments on commit 9b2983b

Please sign in to comment.