Skip to content

Commit 2191f51

Browse files
committed
Merge branch 'release/3.1.8'
2 parents 6668e4a + a209717 commit 2191f51

File tree

16 files changed

+1939
-1280
lines changed

16 files changed

+1939
-1280
lines changed

.github/renovate.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"github>brdgm/renovate-config"
5+
]
6+
}

.github/workflows/build.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ name: Build
22

33
on:
44
push:
5-
branches-ignore:
6-
- experimental/**
7-
- master
5+
branches:
6+
- develop
87
pull_request:
9-
branches-ignore:
10-
- experimental/**
11-
- master
128
workflow_dispatch:
139

1410
jobs:
@@ -19,4 +15,4 @@ jobs:
1915
- uses: brdgm/github-action-build@v1
2016
with:
2117
sonar-token: ${{ secrets.SONARCLOUD_TOKEN }}
22-
github-token: ${{ secrets.GITHUB_TOKEN }}
18+
github-token: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Release Drafter
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
update_release_draft:
13+
permissions:
14+
contents: write
15+
pull-requests: read
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: brdgm/github-action-release-drafter@v1
19+
with:
20+
github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Release and Deploy
33
on:
44
workflow_dispatch:
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
release:
811
runs-on: ubuntu-latest
@@ -12,13 +15,14 @@ jobs:
1215

1316
permissions:
1417
contents: write
18+
pull-requests: read
1519

1620
steps:
17-
- uses: brdgm/github-action-release@v1
21+
- uses: brdgm/github-action-release@v2
1822
id: release
1923
with:
2024
github-token: ${{ secrets.GITHUB_TOKEN }}
2125
gh-site-deploy-pat: ${{ secrets.GH_SITE_DEPLOY_PAT }}
2226
gh-site-deploy-username: ${{ secrets.GH_SITE_DEPLOY_USERNAME }}
2327
gh-site-deploy-email: ${{ secrets.GH_SITE_DEPLOY_EMAIL }}
24-
gh-site-deploy-name: ${{ secrets.GH_SITE_DEPLOY_NAME }}
28+
gh-site-deploy-name: ${{ secrets.GH_SITE_DEPLOY_NAME }}

.github/workflows/test-e2e.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Test E2E
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
pull_request:
8+
workflow_dispatch:
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
container:
14+
image: mcr.microsoft.com/playwright:v1.51.1-noble
15+
options: --user 1001
16+
17+
steps:
18+
- uses: brdgm/github-action-test-e2e@v1

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,6 @@ npm-debug.log
3535
.brackets.json
3636

3737
dist/
38-
coverage/
38+
coverage/
39+
test-results/
40+
playwright-report/

eslint.config.js

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import pluginVue from 'eslint-plugin-vue'
2-
import vueTsEslintConfig from '@vue/eslint-config-typescript'
2+
import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript'
33
import pluginVitest from '@vitest/eslint-plugin'
4+
import pluginPlaywright from 'eslint-plugin-playwright'
5+
import i18nJsonPlugin from 'eslint-plugin-i18n-json'
6+
import path from 'path'
47

5-
export default [
8+
export default defineConfigWithVueTs(
69
{
710
name: 'app/files-to-lint',
811
files: ['**/*.{ts,mts,tsx,vue}'],
@@ -13,9 +16,9 @@ export default [
1316
ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**'],
1417
},
1518

16-
...pluginVue.configs['flat/essential'],
17-
...vueTsEslintConfig(),
18-
19+
pluginVue.configs['flat/essential'],
20+
vueTsConfigs.recommended,
21+
1922
{
2023
...pluginVitest.configs.recommended,
2124
files: [
@@ -27,4 +30,40 @@ export default [
2730
},
2831
},
2932

30-
]
33+
{
34+
...pluginPlaywright.configs['flat/recommended'],
35+
files: ['tests/e2e/**/*.{test,spec}.{js,ts,jsx,tsx}'],
36+
},
37+
38+
{
39+
files: ['src/locales/*.json'],
40+
plugins: { 'i18n-json': i18nJsonPlugin },
41+
processor: {
42+
meta: { name: '.json' },
43+
...i18nJsonPlugin.processors['.json'],
44+
},
45+
rules: {
46+
'i18n-json/valid-json': 2,
47+
'i18n-json/identical-placeholders': [2, {
48+
filePath: path.resolve('src/locales/en.json'),
49+
ignoreTags: true,
50+
}],
51+
},
52+
},
53+
// ignore missing translation keys in incomplete locale files
54+
{
55+
files: ['src/locales/*.json'],
56+
ignores: ['**/ca.json','**/fr.json','**/nl.json'],
57+
plugins: { 'i18n-json': i18nJsonPlugin },
58+
processor: {
59+
meta: { name: '.json' },
60+
...i18nJsonPlugin.processors['.json'],
61+
},
62+
rules: {
63+
'i18n-json/identical-keys': [2, {
64+
filePath: path.resolve('src/locales/en.json'),
65+
}],
66+
},
67+
},
68+
69+
)

0 commit comments

Comments
 (0)