Skip to content

Commit

Permalink
chore: update repo
Browse files Browse the repository at this point in the history
  • Loading branch information
pi0 committed Apr 23, 2021
1 parent 42df406 commit 602e5fa
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 36 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ name: ci
on:
push:
branches:
- master
- dev
- main
pull_request:
branches:
- master
- dev
- main

jobs:
ci:
Expand All @@ -17,7 +15,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [12, 14]
node: [14]

steps:
- uses: actions/setup-node@v1
Expand Down
54 changes: 27 additions & 27 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,43 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [3.2.2](https://github.com/nuxt-contrib/defu/compare/v3.2.1...v3.2.2) (2020-11-10)
### [3.2.2](https://github.com/unjs/defu/compare/v3.2.1...v3.2.2) (2020-11-10)


### Bug Fixes

* switch back to bili for es5 support till fixing in siroc ([07786c2](https://github.com/nuxt-contrib/defu/commit/07786c270f9bf49529d8203f31b4b9bd696a6ee3))
* switch back to bili for es5 support till fixing in siroc ([07786c2](https://github.com/unjs/defu/commit/07786c270f9bf49529d8203f31b4b9bd696a6ee3))

### [3.2.1](https://github.com/nuxt-contrib/defu/compare/v3.2.0...v3.2.1) (2020-11-09)
### [3.2.1](https://github.com/unjs/defu/compare/v3.2.0...v3.2.1) (2020-11-09)


### Bug Fixes

* **types:** correct type inference where merged types are same ([#26](https://github.com/nuxt-contrib/defu/issues/26)) ([f322607](https://github.com/nuxt-contrib/defu/commit/f322607515a5bd19b1a2f28d7e3336fee9194520))
* **types:** correct type inference where merged types are same ([#26](https://github.com/unjs/defu/issues/26)) ([f322607](https://github.com/unjs/defu/commit/f322607515a5bd19b1a2f28d7e3336fee9194520))

## [3.2.0](https://github.com/nuxt-contrib/defu/compare/v3.1.0...v3.2.0) (2020-11-09)
## [3.2.0](https://github.com/unjs/defu/compare/v3.1.0...v3.2.0) (2020-11-09)


### Features

* add type inference for defu result ([#24](https://github.com/nuxt-contrib/defu/issues/24)) ([934d736](https://github.com/nuxt-contrib/defu/commit/934d736da31f4824d9e135d925cece361b73c533))
* pass namespace to custom merger ([#25](https://github.com/nuxt-contrib/defu/issues/25)) ([6bd7ef5](https://github.com/nuxt-contrib/defu/commit/6bd7ef59ce3e94b68108355942dba9ac49284523))
* add type inference for defu result ([#24](https://github.com/unjs/defu/issues/24)) ([934d736](https://github.com/unjs/defu/commit/934d736da31f4824d9e135d925cece361b73c533))
* pass namespace to custom merger ([#25](https://github.com/unjs/defu/issues/25)) ([6bd7ef5](https://github.com/unjs/defu/commit/6bd7ef59ce3e94b68108355942dba9ac49284523))

## [3.1.0](https://github.com/nuxt-contrib/defu/compare/v3.0.1...v3.1.0) (2020-08-04)
## [3.1.0](https://github.com/unjs/defu/compare/v3.0.1...v3.1.0) (2020-08-04)


### Features

* add defu.arrayFn ([#21](https://github.com/nuxt-contrib/defu/issues/21)) ([df05ed0](https://github.com/nuxt-contrib/defu/commit/df05ed04088d6e0f0bc1a8cd9603fae46fb59268))
* add defu.arrayFn ([#21](https://github.com/unjs/defu/issues/21)) ([df05ed0](https://github.com/unjs/defu/commit/df05ed04088d6e0f0bc1a8cd9603fae46fb59268))

### [3.0.1](https://github.com/nuxt-contrib/defu/compare/v3.0.0...v3.0.1) (2020-07-29)
### [3.0.1](https://github.com/unjs/defu/compare/v3.0.0...v3.0.1) (2020-07-29)


### Bug Fixes

* recursively pass merger ([ec09394](https://github.com/nuxt-contrib/defu/commit/ec09394d77533cd0a4753a943a5d6fbd25ef308d))
* recursively pass merger ([ec09394](https://github.com/unjs/defu/commit/ec09394d77533cd0a4753a943a5d6fbd25ef308d))

## [3.0.0](https://github.com/nuxt-contrib/defu/compare/v2.0.4...v3.0.0) (2020-07-28)
## [3.0.0](https://github.com/unjs/defu/compare/v2.0.4...v3.0.0) (2020-07-28)


### ⚠ BREAKING CHANGES
Expand All @@ -47,55 +47,55 @@ All notable changes to this project will be documented in this file. See [standa

### Features

* extend and custom merger ([#19](https://github.com/nuxt-contrib/defu/issues/19)) ([4932232](https://github.com/nuxt-contrib/defu/commit/493223278840132a6de2c3291b60f7b00b3fa477))
* merge arrays ([#18](https://github.com/nuxt-contrib/defu/issues/18)) ([22c631e](https://github.com/nuxt-contrib/defu/commit/22c631e354d9bc50380ce7beb8914bd44feb2309))
* extend and custom merger ([#19](https://github.com/unjs/defu/issues/19)) ([4932232](https://github.com/unjs/defu/commit/493223278840132a6de2c3291b60f7b00b3fa477))
* merge arrays ([#18](https://github.com/unjs/defu/issues/18)) ([22c631e](https://github.com/unjs/defu/commit/22c631e354d9bc50380ce7beb8914bd44feb2309))

### [2.0.4](https://github.com/nuxt-contrib/defu/compare/v2.0.3...v2.0.4) (2020-05-22)
### [2.0.4](https://github.com/unjs/defu/compare/v2.0.3...v2.0.4) (2020-05-22)


### Bug Fixes

* correct path to types ([33d4bf0](https://github.com/nuxt-contrib/defu/commit/33d4bf0331e70b69a3a2a392f18a8f890d45d4f9))
* correct path to types ([33d4bf0](https://github.com/unjs/defu/commit/33d4bf0331e70b69a3a2a392f18a8f890d45d4f9))

### [2.0.3](https://github.com/nuxt-contrib/defu/compare/v2.0.2...v2.0.3) (2020-05-22)
### [2.0.3](https://github.com/unjs/defu/compare/v2.0.2...v2.0.3) (2020-05-22)


### Bug Fixes

* specify type declaration file more precisely ([#15](https://github.com/nuxt-contrib/defu/issues/15)) ([6aa47d4](https://github.com/nuxt-contrib/defu/commit/6aa47d4a06a117b34b5e9231b04f8403056c2685))
* specify type declaration file more precisely ([#15](https://github.com/unjs/defu/issues/15)) ([6aa47d4](https://github.com/unjs/defu/commit/6aa47d4a06a117b34b5e9231b04f8403056c2685))

### [2.0.2](https://github.com/nuxt-contrib/defu/compare/v2.0.1...v2.0.2) (2020-04-19)
### [2.0.2](https://github.com/unjs/defu/compare/v2.0.1...v2.0.2) (2020-04-19)

### [2.0.1](https://github.com/nuxt-contrib/defu/compare/v2.0.0...v2.0.1) (2020-04-19)
### [2.0.1](https://github.com/unjs/defu/compare/v2.0.0...v2.0.1) (2020-04-19)

### Docs

* Add note about `null`

## [2.0.0](https://github.com/nuxt-contrib/defu/compare/v1.0.0...v2.0.0) (2020-04-19)
## [2.0.0](https://github.com/unjs/defu/compare/v1.0.0...v2.0.0) (2020-04-19)

### Features

* Support passing multiple defaults ([89ef702](https://github.com/nuxt-contrib/defu/commit/89ef702736b49cd48ca99a0dc64aa6ef3bd74e2d))
* Typescript rewrite ([9c906e6](https://github.com/nuxt-contrib/defu/commit/9c906e64459da64d77124224edb66034ce92f20c))
* Support passing multiple defaults ([89ef702](https://github.com/unjs/defu/commit/89ef702736b49cd48ca99a0dc64aa6ef3bd74e2d))
* Typescript rewrite ([9c906e6](https://github.com/unjs/defu/commit/9c906e64459da64d77124224edb66034ce92f20c))

<a name="1.0.0"></a>
# [1.0.0](https://github.com/nuxt-contrib/defu/compare/v0.0.4...v1.0.0) (2020-02-02)
# [1.0.0](https://github.com/unjs/defu/compare/v0.0.4...v1.0.0) (2020-02-02)



<a name="0.0.4"></a>
## [0.0.4](https://github.com/nuxt-contrib/defu/compare/v0.0.3...v0.0.4) (2020-01-01)
## [0.0.4](https://github.com/unjs/defu/compare/v0.0.3...v0.0.4) (2020-01-01)


### Bug Fixes

* improve es5 compatibility ([#2](https://github.com/nuxt-contrib/defu/issues/2), [#9](https://github.com/nuxt-contrib/defu/issues/9)) ([5a6de7c](https://github.com/nuxt-contrib/defu/commit/5a6de7c))
* improve es5 compatibility ([#2](https://github.com/unjs/defu/issues/2), [#9](https://github.com/unjs/defu/issues/9)) ([5a6de7c](https://github.com/unjs/defu/commit/5a6de7c))



<a name="0.0.3"></a>
## [0.0.3](https://github.com/nuxt-contrib/defu/compare/v0.0.1...v0.0.3) (2019-05-25)
## [0.0.3](https://github.com/unjs/defu/compare/v0.0.1...v0.0.3) (2019-05-25)



Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ MIT. Made with 💖
[bundlephobia-src]: https://flat.badgen.net/bundlephobia/min/defu
[bundlephobia-href]: https://bundlephobia.com/result?p=defu

[david-src]: https://flat.badgen.net/david/dep/nuxt-contrib/defu
[david-href]: https://david-dm.org/nuxt-contrib/defu
[david-src]: https://flat.badgen.net/david/dep/unjs/defu
[david-href]: https://david-dm.org/unjs/defu

[codecov-src]: https://flat.badgen.net/codecov/c/github/nuxt-contrib/defu/master
[codecov-href]: https://codecov.io/gh/nuxt-contrib/defu
[codecov-src]: https://flat.badgen.net/codecov/c/github/unjs/defu/master
[codecov-href]: https://codecov.io/gh/unjs/defu

0 comments on commit 602e5fa

Please sign in to comment.