Skip to content

Commit

Permalink
Merge pull request #284 from maxisam/fix/lock-version
Browse files Browse the repository at this point in the history
🐛  fix: lock version for V14 #282
  • Loading branch information
maxisam authored Nov 17, 2021
2 parents 5d346eb + 1c63792 commit 43e0b40
Show file tree
Hide file tree
Showing 5 changed files with 436 additions and 58 deletions.
21 changes: 11 additions & 10 deletions .github/workflows/ngx-clipboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,20 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/cache@v1
id: yarn-cache
- uses: actions/setup-node@v2
with:
path: node_modules
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-yarn
node-version: 14.15.0
cache: 'yarn'

- uses: actions/setup-node@v1
- uses: actions/cache@v2
id: angular-cache
with:
node-version: 12.12
path: |
.angular/cache
key: ${{ runner.os }}-ng-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-ng

- name: Install dependencies
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: yarn --pure-lockfile --non-interactive --no-progress

# Fix linting errors first
Expand All @@ -36,8 +37,8 @@ jobs:
- name: Run tests
run: yarn test --configuration=ci

- name: Build integration app
run: yarn build --prod
- name: Build host app
run: yarn ng build library-host --prod

- name: Build library
run: yarn build
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ testem.log
.DS_Store
Thumbs.db
package-lock.json
.angular/cache
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[![Financial Contributors on Open Collective](https://opencollective.com/ngx-clipboard/all/badge.svg?label=financial+contributors)](https://opencollective.com/ngx-clipboard) [![travis build](https://img.shields.io/travis/maxisam/ngx-clipboard.svg?style=flat-square)](https://travis-ci.org/maxisam/ngx-clipboard)
[![Financial Contributors on Open Collective](https://opencollective.com/ngx-clipboard/all/badge.svg?label=financial+contributors)](https://opencollective.com/ngx-clipboard)
[![ngx-clipboard](https://github.com/maxisam/ngx-clipboard/actions/workflows/ngx-clipboard.yml/badge.svg)](https://github.com/maxisam/ngx-clipboard/actions/workflows/ngx-clipboard.yml)
[![npm](https://img.shields.io/npm/dt/ngx-clipboard.svg?style=flat-square)](https://www.npmjs.com/package/ngx-clipboard)
[![GitHub release](https://img.shields.io/github/release/maxisam/ngx-clipboard.svg?style=flat-square)](https://github.com/maxisam/ngx-clipboard/releases)
[![npm](https://img.shields.io/npm/l/ngx-clipboard.svg?style=flat-square)]()
Expand All @@ -17,12 +18,12 @@ To make more sense with the future versioning scheme of Angular, the directive s

## Dependencies

- If you need to use it on 2.x, please use version 7.x.x.
- If you need to use it on 4.x, please use version 8.x.x.
- If you need to use it on 5.x, please use version 10.x.x.
- If you need to use it on 8.x, please use version 12.x.x.
- If you need to use it on 9.x, please use version 13.x.x.
- If you need to use it on 10.x, please use version 14.x.x.
- If you need to use it on 2.x, please use version 7.x.x.
- If you need to use it on 4.x, please use version 8.x.x.
- If you need to use it on 5.x, please use version 10.x.x.
- If you need to use it on 8.x, please use version 12.x.x.
- If you need to use it on 9.x, please use version 13.x.x.
- If you need to use it on 10.x - 12.x, please use version 14.0.2.

The code are pretty much the same, in v8.0.0 it uses InjectionToken which requires angular4 and above.

Expand Down
8 changes: 4 additions & 4 deletions projects/ngx-clipboard/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ngx-clipboard",
"description": "angular 2 clipboard",
"version": "14.0.1",
"version": "14.0.2",
"author": {
"name": "Sam Lin",
"email": "maxisam@gmail.com"
Expand All @@ -22,11 +22,11 @@
"copy"
],
"dependencies": {
"ngx-window-token": ">=4.0.0",
"ngx-window-token": ">=4.0.0 <6.0.0",
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/common": ">=10.0.0",
"@angular/core": ">=10.0.0"
"@angular/common": ">=10.0.0 <13.0.0",
"@angular/core": ">=10.0.0 <13.0.0"
}
}
Loading

0 comments on commit 43e0b40

Please sign in to comment.