Skip to content

Commit 3efe5ff

Browse files
Merge pull request #22 from LottieFiles/develop
Changesets + dual-deployment and bounce mode
2 parents 54af26c + da393cf commit 3efe5ff

File tree

10 files changed

+849
-306
lines changed

10 files changed

+849
-306
lines changed

.changeset/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Changesets
2+
3+
Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
4+
with multi-package repos, or single-package repos to help you version and publish your code. You can
5+
find the full documentation for it [in our repository](https://github.com/changesets/changesets)
6+
7+
We have a quick list of common questions to get you started engaging with this project in
8+
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/config.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
3+
"changelog": "@changesets/cli/changelog",
4+
"commit": false,
5+
"fixed": [],
6+
"linked": [],
7+
"access": "public",
8+
"baseBranch": "master",
9+
"updateInternalDependencies": "patch",
10+
"ignore": []
11+
}

.changeset/moody-onions-prove.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@lottiefiles/vue-lottie-player": patch
3+
---
4+
5+
added changesets and dual deploy

.github/workflows/release.yml

Lines changed: 46 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,22 @@ name: Release
22

33
on:
44
push:
5-
branches: [master, beta]
5+
branches: [master]
66

77
jobs:
8-
release:
9-
name: Release
10-
8+
build:
119
runs-on: ubuntu-latest
10+
timeout-minutes: 15
1211

1312
strategy:
1413
matrix:
15-
node-version: [12.x]
14+
node-version: [14.x]
1615

1716
steps:
1817
- name: Checkout
1918
uses: actions/checkout@v2
2019
with:
2120
fetch-depth: 0
22-
2321
- name: Cache NPM
2422
uses: actions/cache@v2
2523
env:
@@ -33,12 +31,10 @@ jobs:
3331
uses: actions/setup-node@v1
3432
with:
3533
node-version: ${{ matrix.node-version }}
36-
registry-url: 'https://npm.pkg.github.com'
37-
34+
registry-url: "https://npm.pkg.github.com"
3835
- name: Install dependencies
39-
run:
40-
yarn |
41-
cd example && yarn
36+
run: yarn |
37+
cd example && yarn
4238
env:
4339
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
4440

@@ -47,6 +43,7 @@ jobs:
4743
run: yarn run serve-app
4844
env:
4945
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
46+
5047
- name: Build project and run tests
5148
continue-on-error: false
5249
run: yarn run run-tests
@@ -56,8 +53,44 @@ jobs:
5653
- name: Build project
5754
run: yarn build
5855

59-
- name: Release
60-
run: yarn release
56+
release-npm:
57+
needs: build
58+
name: Release npm
59+
runs-on: ubuntu-latest
60+
steps:
61+
- uses: actions/checkout@v1
62+
- uses: actions/setup-node@v1
63+
with:
64+
node-version: ${{ matrix.node-version }}
65+
registry-url: https://registry.npmjs.org/
66+
- run: yarn install --frozen-lockfile
67+
- run: npm publish --access public
68+
env:
69+
NODE_AUTH_TOKEN: ${{ secrets.NPMJS_TOKEN }}
70+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
71+
NPM_TOKEN: ${{ secrets.NPMJS_TOKEN }}
72+
GIT_COMMIT: ${{ github.sha }}
73+
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
74+
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
75+
GIT_COMMITTER_NAME: ${{ secrets.GIT_COMMITTER_NAME }}
76+
GIT_COMMITTER_EMAIL: ${{ secrets.GIT_COMMITTER_EMAIL }}
77+
78+
release-gpr:
79+
needs: build
80+
name: Release gpr
81+
runs-on: ubuntu-latest
82+
steps:
83+
- uses: actions/checkout@v1
84+
- uses: actions/setup-node@v1
85+
with:
86+
node-version: ${{ matrix.node-version }}
87+
registry-url: https://npm.pkg.github.com/
88+
scope: "@lottiefiles"
89+
- run: yarn install --frozen-lockfile
90+
- run:
91+
echo "//npm.pkg.github.com:_authToken=${{ secrets.GITHUB_TOKEN }}" >
92+
~/.npmrc
93+
- run: npm publish --@lottiefiles:registry=https://npm.pkg.github.com/
6194
env:
6295
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
6396
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,82 @@
11
# Changelog
2-
All notable changes to this project will be documented in this file.
3-
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), enforced with [semantic-release](https://github.com/semantic-release/semantic-release).
42

3+
## 1.0.6
54

6-
## [1.0.1](https://github.com/LottieFiles/lottie-vue/compare/v1.0.0...v1.0.1) (2022-03-08)
5+
### Patch Changes
6+
7+
- added bounce mode and changesets
8+
- 49df023: added changesets and dual deploy
9+
All notable changes to this project will be documented in this file.
10+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), enforced with [semantic-release](https://github.com/semantic-release/semantic-release).
711

12+
## [1.0.1](https://github.com/LottieFiles/lottie-vue/compare/v1.0.0...v1.0.1) (2022-03-08)
813

914
### Bug Fixes
1015

11-
* fixed css overriding page css ([80e29fd](https://github.com/LottieFiles/lottie-vue/commit/80e29fd31bb601ea12370c5a3252c9c78ad56d5a))
12-
* fixed missing spinner animation ([8405c26](https://github.com/LottieFiles/lottie-vue/commit/8405c2623df51969918ac832f8a8e3daf30ea989))
13-
* fixing deps issue in gh workflow ([020a5d2](https://github.com/LottieFiles/lottie-vue/commit/020a5d2ad8f89cee829932d3361dc818dc74eb6d))
14-
* restored default values to those of the readme ([1cb2f26](https://github.com/LottieFiles/lottie-vue/commit/1cb2f261f2a8a7bb6bf9bae018fc1dacfdf7ffe9))
15-
* updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
16+
- fixed css overriding page css ([80e29fd](https://github.com/LottieFiles/lottie-vue/commit/80e29fd31bb601ea12370c5a3252c9c78ad56d5a))
17+
- fixed missing spinner animation ([8405c26](https://github.com/LottieFiles/lottie-vue/commit/8405c2623df51969918ac832f8a8e3daf30ea989))
18+
- fixing deps issue in gh workflow ([020a5d2](https://github.com/LottieFiles/lottie-vue/commit/020a5d2ad8f89cee829932d3361dc818dc74eb6d))
19+
- restored default values to those of the readme ([1cb2f26](https://github.com/LottieFiles/lottie-vue/commit/1cb2f261f2a8a7bb6bf9bae018fc1dacfdf7ffe9))
20+
- updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
1621

1722
## [1.0.1](https://github.com/LottieFiles/lottie-vue/compare/v1.0.0...v1.0.1) (2022-03-04)
1823

19-
2024
### Bug Fixes
2125

22-
* fixed css overriding page css ([80e29fd](https://github.com/LottieFiles/lottie-vue/commit/80e29fd31bb601ea12370c5a3252c9c78ad56d5a))
23-
* restored default values to those of the readme ([1cb2f26](https://github.com/LottieFiles/lottie-vue/commit/1cb2f261f2a8a7bb6bf9bae018fc1dacfdf7ffe9))
24-
* updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
26+
- fixed css overriding page css ([80e29fd](https://github.com/LottieFiles/lottie-vue/commit/80e29fd31bb601ea12370c5a3252c9c78ad56d5a))
27+
- restored default values to those of the readme ([1cb2f26](https://github.com/LottieFiles/lottie-vue/commit/1cb2f261f2a8a7bb6bf9bae018fc1dacfdf7ffe9))
28+
- updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
2529

2630
## [1.0.1](https://github.com/LottieFiles/lottie-vue/compare/v1.0.0...v1.0.1) (2022-02-23)
2731

28-
2932
### Bug Fixes
3033

31-
* fixed css overriding page css ([80e29fd](https://github.com/LottieFiles/lottie-vue/commit/80e29fd31bb601ea12370c5a3252c9c78ad56d5a))
32-
* restored default values to those of the readme ([1cb2f26](https://github.com/LottieFiles/lottie-vue/commit/1cb2f261f2a8a7bb6bf9bae018fc1dacfdf7ffe9))
33-
* updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
34+
- fixed css overriding page css ([80e29fd](https://github.com/LottieFiles/lottie-vue/commit/80e29fd31bb601ea12370c5a3252c9c78ad56d5a))
35+
- restored default values to those of the readme ([1cb2f26](https://github.com/LottieFiles/lottie-vue/commit/1cb2f261f2a8a7bb6bf9bae018fc1dacfdf7ffe9))
36+
- updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
3437

3538
## [1.0.1](https://github.com/LottieFiles/lottie-vue/compare/v1.0.0...v1.0.1) (2022-02-23)
3639

37-
3840
### Bug Fixes
3941

40-
* fixed css overriding page css ([80e29fd](https://github.com/LottieFiles/lottie-vue/commit/80e29fd31bb601ea12370c5a3252c9c78ad56d5a))
41-
* restored default values to those of the readme ([1cb2f26](https://github.com/LottieFiles/lottie-vue/commit/1cb2f261f2a8a7bb6bf9bae018fc1dacfdf7ffe9))
42-
* updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
42+
- fixed css overriding page css ([80e29fd](https://github.com/LottieFiles/lottie-vue/commit/80e29fd31bb601ea12370c5a3252c9c78ad56d5a))
43+
- restored default values to those of the readme ([1cb2f26](https://github.com/LottieFiles/lottie-vue/commit/1cb2f261f2a8a7bb6bf9bae018fc1dacfdf7ffe9))
44+
- updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
4345

4446
## [1.0.4](https://github.com/LottieFiles/lottie-vue/compare/v1.0.0...v1.0.1) (2022-02-21)
4547

46-
4748
### Bug Fixes
4849

49-
* fixed css overriding page css ([80e29fd](https://github.com/LottieFiles/lottie-vue/commit/80e29fd31bb601ea12370c5a3252c9c78ad56d5a))
50-
* restored default values to those of the readme ([1cb2f26](https://github.com/LottieFiles/lottie-vue/commit/1cb2f261f2a8a7bb6bf9bae018fc1dacfdf7ffe9))
51-
* updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
50+
- fixed css overriding page css ([80e29fd](https://github.com/LottieFiles/lottie-vue/commit/80e29fd31bb601ea12370c5a3252c9c78ad56d5a))
51+
- restored default values to those of the readme ([1cb2f26](https://github.com/LottieFiles/lottie-vue/commit/1cb2f261f2a8a7bb6bf9bae018fc1dacfdf7ffe9))
52+
- updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
5253

5354
## [1.0.3](https://github.com/LottieFiles/lottie-vue/compare/v1.0.0...v1.0.1) (2022-02-16)
5455

55-
5656
### Bug Fixes
5757

58-
* fixed css overriding page css ([80e29fd](https://github.com/LottieFiles/lottie-vue/commit/80e29fd31bb601ea12370c5a3252c9c78ad56d5a))
59-
* updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
58+
- fixed css overriding page css ([80e29fd](https://github.com/LottieFiles/lottie-vue/commit/80e29fd31bb601ea12370c5a3252c9c78ad56d5a))
59+
- updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
6060

6161
## [1.0.2](https://github.com/LottieFiles/lottie-vue/compare/v1.0.1...v1.0.2) (2022-01-19)
6262

63-
6463
### Bug Fixes
6564

66-
* changed token var ([757798f](https://github.com/LottieFiles/lottie-vue/commit/757798f906b6ce594154187d0273b108197eb3af))
65+
- changed token var ([757798f](https://github.com/LottieFiles/lottie-vue/commit/757798f906b6ce594154187d0273b108197eb3af))
6766

6867
## [1.0.1](https://github.com/LottieFiles/lottie-vue/compare/v1.0.0...v1.0.1) (2022-01-18)
6968

70-
7169
### Bug Fixes
7270

73-
* updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
71+
- updated packages, fixed player bug with controls, fixed css bundling bug ([47bbdb0](https://github.com/LottieFiles/lottie-vue/commit/47bbdb0ee51dd8771a078fb7370ce75acbf00d40))
7472

7573
# 1.0.0 (2021-06-01)
7674

77-
7875
### Bug Fixes
7976

80-
* **removed dot lottie player:** removed dot lottie player ([5b5c0b5](https://github.com/LottieFiles/lottie-vue/commit/5b5c0b5f91fa96c6501e69c62d7473b18b3e9dd3))
81-
77+
- **removed dot lottie player:** removed dot lottie player ([5b5c0b5](https://github.com/LottieFiles/lottie-vue/commit/5b5c0b5f91fa96c6501e69c62d7473b18b3e9dd3))
8278

8379
### Features
8480

85-
* **bundling:** added bundling scripts and processes ([4ae9f6f](https://github.com/LottieFiles/lottie-vue/commit/4ae9f6fd101aaa10da2dfd23bf9d752ab9a71293))
86-
* example for using lottievue player done ([79f146a](https://github.com/LottieFiles/lottie-vue/commit/79f146a91fed1717c4df7a6b81d3ba7561cdacd2))
81+
- **bundling:** added bundling scripts and processes ([4ae9f6f](https://github.com/LottieFiles/lottie-vue/commit/4ae9f6fd101aaa10da2dfd23bf9d752ab9a71293))
82+
- example for using lottievue player done ([79f146a](https://github.com/LottieFiles/lottie-vue/commit/79f146a91fed1717c4df7a6b81d3ba7561cdacd2))

README.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,37 @@ set background color.
184184
#### Returns
185185

186186
Type: `void`
187+
188+
## Contributing
189+
190+
We use changesets to maintain a changelog for this repository. When making any change to the codebase that impacts functionality or performance we require a changeset to be present.
191+
192+
To add a changeset run:
193+
194+
```
195+
yarn run changeset
196+
```
197+
198+
And select the type of version bump you'd like (major, minor, path).
199+
200+
You can document the change in detail and format it properly using Markdown by opening the ".md" file that the "yarn changeset" command created in the ".changeset" folder. Open the file, it should look something like this:
201+
202+
```
203+
---
204+
"@lottiefiles/pkg1": minor
205+
"@lottiefiles/pkg2": major
206+
---
207+
208+
This is where you document your **changes** using Markdown.
209+
210+
- You can write
211+
- However you'd like
212+
- In as much detail as you'd like
213+
214+
Aim to provide enough details so that team mates and future you can understand the changes and the context of the change.
215+
```
216+
217+
You can commit your changes and the changeset to your branch and then create a pull request on the develop branch.
187218
## License
188219

189220
MIT License © LottieFiles.com

example/components/Home.vue

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
<template>
22
<div>
3-
<div style="display: flex; justify-content: center; align-content: center">
4-
</div>
3+
<div
4+
style="display: flex; justify-content: center; align-content: center"
5+
></div>
56
<div style="display: flex; justify-content: center; align-content: center">
67
<h1>Welcome to LottieVue example</h1>
78
</div>
89
<br />
910
<lottie-vue-player
1011
id="player-one"
11-
:src="`https://assets10.lottiefiles.com/packages/lf20_tzjfwgud.json`"
12+
:src="`https://assets9.lottiefiles.com/private_files/lf30_w3ku1h1i.json`"
1213
:theme="options.theme"
1314
:player-size="options.playerSize"
1415
:player-controls="true"
1516
:showColorPicker="true"
1617
:loop="true"
18+
:speed="3"
1719
:autoplay="true"
20+
mode="normal"
21+
:background-color="options.backgroundColor"
1822
style="width: 100%; height: 400px"
1923
></lottie-vue-player>
2024
</div>
@@ -28,7 +32,7 @@ export default {
2832
options: {
2933
minimizable: false,
3034
playerSize: "standard",
31-
backgroundColor: "#fff",
35+
backgroundColor: "#9dff97",
3236
backgroundStyle: "color",
3337
theme: {
3438
controlsView: "standard",

package.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"description": "Lottie player wrapper for Vue.js by LottieFiles",
55
"scripts": {
66
"build": "vue-cli-service build --target lib --name @lottiefiles/vue-lottie-player ./src/index.js && rm ./dist/demo.html",
7+
"build:dev": "vue-cli-service build --watch --inline-vue --target lib --name @lottiefiles/vue-lottie-player ./src/index.js && rm ./dist/demo.html",
78
"build-with-coverage": "CODE_COVERAGE=true vue-cli-service build --target lib --name @lottiefiles/vue-lottie-player ./src/index.js && rm ./dist/demo.html",
89
"release": "semantic-release",
910
"run-tests": "yarn run build-with-coverage && yarn run start-cypress",
@@ -13,15 +14,20 @@
1314
"serve-app": "cd example && yarn && yarn run serve &",
1415
"start-cypress": "yarn run cypress run"
1516
},
17+
"repository": {
18+
"type": "git",
19+
"url": "git+https://github.com/LottieFiles/lottie-vue.git"
20+
},
1621
"main": "dist/@lottiefiles/vue-lottie-player.common.js",
1722
"files": [
1823
"dist"
1924
],
2025
"dependencies": {
21-
"@lottiefiles/lottie-player": "^1.0.4",
26+
"@lottiefiles/lottie-player": "^1.5.7",
2227
"vue": "^2.6.12"
2328
},
2429
"devDependencies": {
30+
"@changesets/cli": "^2.22.0",
2531
"@commitlint/cli": "^12.1.1",
2632
"@commitlint/config-conventional": "^12.1.1",
2733
"@cypress/code-coverage": "^3.9.12",
@@ -72,4 +78,4 @@
7278
"lottiefiles"
7379
],
7480
"license": "MIT"
75-
}
81+
}

0 commit comments

Comments
 (0)