Skip to content

Commit 3af4fdc

Browse files
veghdevveghdev
authored
Merge pull request #461 from vizzuhq/cicd
Using shared vizzu prettier and eslint config, rename integration to e2e test
2 parents f3f46dc + 7a57a3f commit 3af4fdc

File tree

2,687 files changed

+141846
-141575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,687 files changed

+141846
-141575
lines changed

‎.eslintrc.cjs‎

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
11
module.exports = {
2-
env: {
3-
browser: true,
4-
jest: true
5-
},
6-
extends: ['standard', 'prettier'],
7-
root: true,
8-
parserOptions: {
9-
ecmaVersion: 'latest'
10-
},
11-
overrides: [
12-
{
13-
files: ['test/integration/test_cases/**', 'test/integration/test_data/**'],
14-
rules: {
15-
camelcase: 'off'
16-
}
17-
},
18-
{
19-
files: ['*.ts', '*.tsx'],
20-
extends: ['standard', 'prettier', 'plugin:@typescript-eslint/recommended'],
21-
parser: '@typescript-eslint/parser',
22-
plugins: ['@typescript-eslint'],
23-
rules: {
24-
'no-use-before-define': 'off',
25-
'@typescript-eslint/no-use-before-define': 'error',
26-
'@typescript-eslint/explicit-function-return-type': ['error']
27-
}
28-
}
29-
],
30-
ignorePatterns: ['**/dist/**', '!.puppeteerrc.cjs']
2+
overrides: [
3+
{
4+
files: ['*.ts', '*.tsx'],
5+
extends: ['@vizzu/eslint-config/typescript'],
6+
rules: {
7+
'no-use-before-define': 'off',
8+
'@typescript-eslint/no-use-before-define': 'error',
9+
'@typescript-eslint/explicit-function-return-type': ['error']
10+
}
11+
},
12+
{
13+
files: ['*.js', '*.mjs', '*.cjs'],
14+
extends: ['@vizzu/eslint-config/standard']
15+
},
16+
{
17+
files: ['test/e2e/test_cases/**', 'test/e2e/test_data/**'],
18+
extends: ['@vizzu/eslint-config/standard'],
19+
rules: {
20+
camelcase: 'off'
21+
}
22+
}
23+
],
24+
ignorePatterns: ['**/dist/**']
3125
}

‎.github/workflows/cd.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: CD
22

33
on:
4-
release:
5-
types: [published]
4+
release:
5+
types: [published]
66

77
jobs:
8-
release:
9-
runs-on: ubuntu-22.04
8+
publish:
9+
runs-on: ubuntu-22.04
1010

11-
steps:
12-
- name: Trigger Cloud Build
13-
run: |
14-
curl -X POST -H "Content-type: application/json" "https://cloudbuild.googleapis.com/v1/projects/vizzu-ci/triggers/vizzu-lib-release:webhook?key=${{ secrets.VIZZUHQ_GCP_BUILD }}" -d "{}"
11+
steps:
12+
- name: Trigger Cloud Build
13+
run: |
14+
curl -X POST -H "Content-type: application/json" "https://cloudbuild.googleapis.com/v1/projects/vizzu-ci/triggers/vizzu-lib-release:webhook?key=${{ secrets.VIZZUHQ_GCP_BUILD }}" -d "{}"

‎.github/workflows/docker-vizzu-dev-desktop.yml‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
1-
name: Docker Build and Push vizzu-dev-desktop
1+
name: Docker publish vizzu-dev-desktop
22

33
on:
4-
push:
5-
branches-ignore:
6-
- main
7-
paths:
8-
- '**/vizzu-dev-desktop'
9-
- '**/docker-vizzu-dev-desktop.yml'
4+
push:
5+
branches-ignore:
6+
- main
7+
paths:
8+
- '**/vizzu-dev-desktop'
9+
- '**/docker-vizzu-dev-desktop.yml'
1010

1111
jobs:
12-
build-and-push:
13-
runs-on: ubuntu-22.04
12+
publish:
13+
runs-on: ubuntu-22.04
1414

15-
steps:
16-
- name: Checkout code
17-
uses: actions/checkout@v3
15+
steps:
16+
- name: Checkout repo
17+
uses: actions/checkout@v3
18+
with:
19+
fetch-depth: 1
1820

19-
- name: Login to Docker Hub
20-
run: echo ${{ secrets.VIZZUHQ_DOCKER_API }} | docker login -u ${{ secrets.VIZZUHQ_DOCKER_USER }} --password-stdin
21+
- name: Login to Docker
22+
run: echo ${{ secrets.VIZZUHQ_DOCKER_API }} | docker login -u ${{ secrets.VIZZUHQ_DOCKER_USER }} --password-stdin
2123

22-
- name: Build and Push Docker Image
23-
run: |
24-
IMAGE="vizzu-dev-desktop"
25-
IMAGE_NAME="vizzu/$IMAGE:0.9"
26-
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE .
27-
docker push $IMAGE_NAME
24+
- name: Build and Publish
25+
run: |
26+
IMAGE="vizzu-dev-desktop"
27+
IMAGE_NAME="vizzu/$IMAGE:0.9"
28+
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE .
29+
docker push $IMAGE_NAME

‎.github/workflows/docker-vizzu-dev-wasm.yml‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
1-
name: Docker Build and Push vizzu-dev-wasm
1+
name: Docker publish vizzu-dev-wasm
22

33
on:
4-
push:
5-
branches-ignore:
6-
- main
7-
paths:
8-
- '**/vizzu-dev-wasm'
9-
- '**/docker-vizzu-dev-wasm.yml'
4+
push:
5+
branches-ignore:
6+
- main
7+
paths:
8+
- '**/vizzu-dev-wasm'
9+
- '**/docker-vizzu-dev-wasm.yml'
1010

1111
jobs:
12-
build-and-push:
13-
runs-on: ubuntu-22.04
12+
publish:
13+
runs-on: ubuntu-22.04
1414

15-
steps:
16-
- name: Checkout code
17-
uses: actions/checkout@v3
15+
steps:
16+
- name: Checkout repo
17+
uses: actions/checkout@v3
18+
with:
19+
fetch-depth: 1
1820

19-
- name: Login to Docker Hub
20-
run: echo ${{ secrets.VIZZUHQ_DOCKER_API }} | docker login -u ${{ secrets.VIZZUHQ_DOCKER_USER }} --password-stdin
21+
- name: Login to Docker
22+
run: echo ${{ secrets.VIZZUHQ_DOCKER_API }} | docker login -u ${{ secrets.VIZZUHQ_DOCKER_USER }} --password-stdin
2123

22-
- name: Build and Push Docker Image
23-
run: |
24-
IMAGE="vizzu-dev-wasm"
25-
IMAGE_NAME="vizzu/$IMAGE:0.9"
26-
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE .
27-
docker push $IMAGE_NAME
24+
- name: Build and Publish
25+
run: |
26+
IMAGE="vizzu-dev-wasm"
27+
IMAGE_NAME="vizzu/$IMAGE:0.9"
28+
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE .
29+
docker push $IMAGE_NAME

‎.prettierrc‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.puppeteerrc.cjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { join } = require('path')
22

33
module.exports = {
4-
cacheDirectory: join(__dirname, 'node_modules', '.cache', 'puppeteer')
4+
cacheDirectory: join(__dirname, 'node_modules', '.cache', 'puppeteer')
55
}

‎CHANGELOG.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
### Fixed
66

7-
- Type-fest dependency added as normal instead of dev.
8-
- Added missing `cvizzu.d.ts` and `cvizzu.types.d.ts` to the `npm` package.
9-
- When only logo rendered chart resized, the previous drawn logo position was not deleted.
10-
- At the mouse events the lib is not queried the exact rendered chart position through API.
11-
- On axis labels sometimes missed a space character between value and unit.
12-
- Rendered label units are suddenly disappeared when target plot does not contain a unit.
13-
- Remove "rotate" setting, add "angle" setting.
7+
- Corrected listing of Type-fest dependency from development to normal.
8+
- Added missing `cvizzu.d.ts` and `cvizzu.types.d.ts` to the npm package.
9+
- Logo positioning issue in charts when only the logo is rendered and the chart is resized.
10+
- API issue where exact chart position was not accurately queried during mouse events.
11+
- Missing space between value and unit in axis labels.
12+
- Bug fixed where rendered label units disappeared when target plot did not contain a unit.
13+
- Configuration of experimental plot rotation feature changed from relative `rotate` to absolute `angle`.
1414

1515
### Added
1616

17-
- Units on legend.
17+
- Units on legend.
1818

1919
## [0.9.2] - 2023-11-22
2020

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,14 @@ script: `type:tools`.
213213

214214
#### Testing
215215

216-
Run the following command to start integration testing:
216+
Run the following command to start e2e testing:
217217

218218
```sh
219219
npm test
220220
```
221221

222-
For information on how integration testing works and what options it has, please
223-
see the program help:
222+
For information on how e2e testing works and what options it has, please see the
223+
program help:
224224

225225
```sh
226226
npm test -- --help

‎docs/assets/data/music_data.js‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
const data = {
2-
series: [
3-
{
4-
name: 'Genres',
5-
type: 'dimension',
6-
values: [
7-
'Pop',
8-
'Rock',
9-
'Jazz',
10-
'Metal',
11-
'Pop',
12-
'Rock',
13-
'Jazz',
14-
'Metal',
15-
'Pop',
16-
'Rock',
17-
'Jazz',
18-
'Metal'
19-
]
20-
},
21-
{
22-
name: 'Kinds',
23-
type: 'dimension',
24-
values: [
25-
'Hard',
26-
'Hard',
27-
'Hard',
28-
'Hard',
29-
'Smooth',
30-
'Experimental',
31-
'Smooth',
32-
'Smooth',
33-
'Experimental',
34-
'Experimental',
35-
'Experimental',
36-
'Experimental'
37-
]
38-
},
39-
{
40-
name: 'Popularity',
41-
type: 'measure',
42-
values: [114, 96, 78, 52, 56, 36, 174, 121, 127, 83, 94, 58]
43-
}
44-
]
2+
series: [
3+
{
4+
name: 'Genres',
5+
type: 'dimension',
6+
values: [
7+
'Pop',
8+
'Rock',
9+
'Jazz',
10+
'Metal',
11+
'Pop',
12+
'Rock',
13+
'Jazz',
14+
'Metal',
15+
'Pop',
16+
'Rock',
17+
'Jazz',
18+
'Metal'
19+
]
20+
},
21+
{
22+
name: 'Kinds',
23+
type: 'dimension',
24+
values: [
25+
'Hard',
26+
'Hard',
27+
'Hard',
28+
'Hard',
29+
'Smooth',
30+
'Experimental',
31+
'Smooth',
32+
'Smooth',
33+
'Experimental',
34+
'Experimental',
35+
'Experimental',
36+
'Experimental'
37+
]
38+
},
39+
{
40+
name: 'Popularity',
41+
type: 'measure',
42+
values: [114, 96, 78, 52, 56, 36, 174, 121, 127, 83, 94, 58]
43+
}
44+
]
4545
}
4646

4747
export default data

‎docs/assets/data/music_data.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
2-
"dimensions": [
3-
{ "name": "Genres", "values": ["Pop", "Rock", "Jazz", "Metal"] },
4-
{ "name": "Kinds", "values": ["Hard", "Smooth", "Experimental"] }
5-
],
6-
"measures": [
7-
{
8-
"name": "Popularity",
9-
"values": [
10-
[114, 96, 78, 52],
11-
[56, 36, 174, 121],
12-
[127, 83, 94, 58]
13-
]
14-
}
15-
]
2+
"dimensions": [
3+
{ "name": "Genres", "values": ["Pop", "Rock", "Jazz", "Metal"] },
4+
{ "name": "Kinds", "values": ["Hard", "Smooth", "Experimental"] }
5+
],
6+
"measures": [
7+
{
8+
"name": "Popularity",
9+
"values": [
10+
[114, 96, 78, 52],
11+
[56, 36, 174, 121],
12+
[127, 83, 94, 58]
13+
]
14+
}
15+
]
1616
}

0 commit comments

Comments
 (0)