Skip to content

Commit 6368f70

Browse files
philibeaphilibea
authored
fix(github): merge group (#2047)
Signed-off-by: Alexandre Philibeaux <[email protected]>
1 parent ee846aa commit 6368f70

File tree

9 files changed

+98
-120
lines changed

9 files changed

+98
-120
lines changed

‎.github/workflows/changesets-renovate.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Generate changeset for Renovate
22

33
on:
4+
merge_group:
45
pull_request_target:
56
paths:
67
- '.github/workflows/changesets-renovate.yml'

‎.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
- run: pnpm run build
5454
- run: pnpm run test:coverage
5555
- uses: codecov/[email protected]
56-
with:
56+
with:
5757
files: packages/**/coverage/cobertura-coverage.xml
58-
token: ${{ secrets.CODECOV_TOKEN }}
58+
token: ${{ secrets.CODECOV_TOKEN }}
5959
verbose: true
6060

6161
test-types:
@@ -75,4 +75,3 @@ jobs:
7575
- run: pnpm install
7676
- run: pnpm run build
7777
- run: pnpm run test:types
78-

‎.github/workflows/pull_request_title.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
1-
21
name: Pull Request
32
on:
43
pull_request:
54
types: ['opened', 'edited', 'reopened', 'synchronize']
5+
merge_group:
66

77
jobs:
88
check-title:
99
runs-on: ubuntu-22.04
1010
steps:
11-
- uses: actions/[email protected]
12-
- uses: pnpm/[email protected]
13-
- name: Use Node.js
14-
uses: actions/[email protected]
15-
with:
16-
node-version: 20
17-
check-latest: true
18-
cache: 'pnpm'
19-
- run: pnpm install
20-
- name: Check PR title
21-
env:
22-
TITLE: ${{ github.event.pull_request.title }}
23-
run: echo "$TITLE" | pnpm commitlint
24-
11+
- uses: actions/[email protected]
12+
- uses: pnpm/[email protected]
13+
- name: Use Node.js
14+
uses: actions/[email protected]
15+
with:
16+
node-version: 20
17+
check-latest: true
18+
cache: 'pnpm'
19+
- run: pnpm install
20+
- name: Check PR title
21+
env:
22+
TITLE: ${{ github.event.pull_request.title }}
23+
run: echo "$TITLE" | pnpm commitlint

‎eslint.config.mjs

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
import babelParser from "@babel/eslint-parser";
2-
import scw from "@scaleway/eslint-config-react/javascript";
3-
import scwTypescript from "@scaleway/eslint-config-react/typescript";
4-
import globals from "globals";
1+
import babelParser from '@babel/eslint-parser'
2+
import scw from '@scaleway/eslint-config-react/javascript'
3+
import scwTypescript from '@scaleway/eslint-config-react/typescript'
4+
import globals from 'globals'
55

66
export default [
77
{
88
ignores: [
9-
"**/node_modules/",
10-
"**/dist/",
11-
"**/build/",
12-
"**/__typetests__/",
13-
"**/packages_deprecated/",
14-
"**/coverage/",
9+
'**/node_modules/',
10+
'**/dist/',
11+
'**/build/',
12+
'**/__typetests__/',
13+
'**/packages_deprecated/',
14+
'**/coverage/',
1515
],
1616
},
1717
{
@@ -21,89 +21,89 @@ export default [
2121
},
2222
},
2323
},
24-
...scw.map((config) => ({ ...config, files: ["**/*.js"] })),
24+
...scw.map(config => ({ ...config, files: ['**/*.js'] })),
2525
{
26-
files: ["**/*.js"],
26+
files: ['**/*.js'],
2727

2828
languageOptions: {
2929
parser: babelParser,
3030
parserOptions: {
31-
configFile: "./babel.config.json",
31+
configFile: './babel.config.json',
3232
},
3333
},
3434
},
35-
...scwTypescript.map((config) => ({
35+
...scwTypescript.map(config => ({
3636
...config,
37-
files: ["**/*.ts", "**/*.tsx"],
37+
files: ['**/*.ts', '**/*.tsx'],
3838
})),
3939

4040
{
41-
files: ["**/*.ts", "**/*.tsx"],
41+
files: ['**/*.ts', '**/*.tsx'],
4242

4343
languageOptions: {
4444
ecmaVersion: 5,
45-
sourceType: "script",
45+
sourceType: 'script',
4646

4747
parserOptions: {
48-
project: ["tsconfig.json"],
48+
project: ['tsconfig.json'],
4949
},
5050
},
5151
},
52-
...scwTypescript.map((config) => ({
52+
...scwTypescript.map(config => ({
5353
...config,
5454
files: [
55-
"packages/changesets-renovate/**/*.ts{x,}",
56-
"packages/validate-icu-locales/**/*.ts{x,}",
57-
"**/__tests__/**/*.ts{x,}",
55+
'packages/changesets-renovate/**/*.ts{x,}',
56+
'packages/validate-icu-locales/**/*.ts{x,}',
57+
'**/__tests__/**/*.ts{x,}',
5858
],
5959

6060
languageOptions: {
6161
ecmaVersion: 5,
62-
sourceType: "script",
62+
sourceType: 'script',
6363

6464
parserOptions: {
65-
project: ["tsconfig.json"],
65+
project: ['tsconfig.json'],
6666
},
6767
},
6868
})),
69-
...scwTypescript.map((config) => ({
69+
...scwTypescript.map(config => ({
7070
...config,
7171
files: [
72-
"packages/changesets-renovate/**/*.ts{x,}",
73-
"packages/validate-icu-locales/**/*.ts{x,}",
74-
"**/__tests__/**/*.ts{x,}",
72+
'packages/changesets-renovate/**/*.ts{x,}',
73+
'packages/validate-icu-locales/**/*.ts{x,}',
74+
'**/__tests__/**/*.ts{x,}',
7575
],
7676

7777
languageOptions: {
7878
ecmaVersion: 5,
79-
sourceType: "script",
79+
sourceType: 'script',
8080

8181
parserOptions: {
82-
project: ["tsconfig.json"],
82+
project: ['tsconfig.json'],
8383
},
8484
},
8585

8686
rules: {
8787
...config.rules,
88-
"no-console": "off",
89-
"@typescript-eslint/no-explicit-any": "warn",
90-
"@typescript-eslint/no-floating-promises": "warn",
88+
'no-console': 'off',
89+
'@typescript-eslint/no-explicit-any': 'warn',
90+
'@typescript-eslint/no-floating-promises': 'warn',
9191
},
9292
})),
9393

9494
{
9595
files: [
96-
"packages/jest-helpers/**/*.ts{x,}",
97-
"**/__tests__/**/*.ts{x,}",
98-
"**/vitest.setup.ts",
99-
"**/*.config.ts",
100-
"**/__mocks__/**/*.ts{x,}",
96+
'packages/jest-helpers/**/*.ts{x,}',
97+
'**/__tests__/**/*.ts{x,}',
98+
'**/vitest.setup.ts',
99+
'**/*.config.ts',
100+
'**/__mocks__/**/*.ts{x,}',
101101
],
102102

103103
rules: {
104-
"import/no-extraneous-dependencies": "off",
105-
"react/jsx-key": "off",
106-
"import/no-relative-packages": "off",
104+
'import/no-extraneous-dependencies': 'off',
105+
'react/jsx-key': 'off',
106+
'import/no-relative-packages': 'off',
107107
},
108108
},
109-
];
109+
]

‎package.json

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{
22
"name": "root",
33
"private": true,
4-
"workspaces": [
5-
"packages/*"
6-
],
4+
"workspaces": ["packages/*"],
75
"type": "module",
86
"packageManager": "[email protected]",
97
"engines": {
@@ -74,21 +72,13 @@
7472
}
7573
},
7674
"commitlint": {
77-
"extends": [
78-
"@commitlint/config-conventional"
79-
]
75+
"extends": ["@commitlint/config-conventional"]
8076
},
8177
"lint-staged": {
82-
"*.(j|t)s?(x)": [
83-
"biome format --write .",
84-
"eslint --fix"
85-
],
86-
"*.json": [
87-
"biome format --write ."
88-
],
89-
"*.mdx": [
90-
"biome format --write ."
91-
]
78+
"*.(j|t)s?(x)": ["biome format --write .", "eslint --fix"],
79+
"*.json": ["biome format --write ."],
80+
"*.y(a)ml,": ["pnpm dlx prettier --write '**/*.{yml,yaml}' --single-quote"],
81+
"*.mdx": ["biome format --write ."]
9282
},
9383
"config": {
9484
"commitizen": {
@@ -97,21 +87,10 @@
9787
},
9888
"jest": {
9989
"testEnvironment": "jsdom",
100-
"setupFiles": [
101-
"jest-localstorage-mock"
102-
],
103-
"collectCoverageFrom": [
104-
"packages/*/src/**/*.{ts,tsx,js,jsx}"
105-
],
106-
"modulePathIgnorePatterns": [
107-
"locales",
108-
"__typetests__",
109-
"dist"
110-
],
111-
"coverageReporters": [
112-
"text",
113-
"cobertura"
114-
],
90+
"setupFiles": ["jest-localstorage-mock"],
91+
"collectCoverageFrom": ["packages/*/src/**/*.{ts,tsx,js,jsx}"],
92+
"modulePathIgnorePatterns": ["locales", "__typetests__", "dist"],
93+
"coverageReporters": ["text", "cobertura"],
11594
"transformIgnorePatterns": [
11695
"node_modules/(?!(.*(query-string|decode-uri-component|split-on-first|filter-obj)))"
11796
],

‎packages/eslint-config-react/index.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import emotion from "./emotion.mjs";
2-
import javascript from "./javascript.mjs";
3-
import typescript from "./typescript.mjs";
1+
import emotion from './emotion.mjs'
2+
import javascript from './javascript.mjs'
3+
import typescript from './typescript.mjs'
44

5-
export { emotion, javascript, typescript };
5+
export { emotion, javascript, typescript }

‎packages/eslint-config-react/javascript.mjs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
import { fixupConfigRules } from "@eslint/compat";
2-
import { FlatCompat } from "@eslint/eslintrc";
3-
import airbnb from "eslint-config-airbnb";
4-
import path from "node:path";
5-
import { fileURLToPath } from "node:url";
6-
import shared from "./shared.mjs";
1+
import { fixupConfigRules } from '@eslint/compat'
2+
import { FlatCompat } from '@eslint/eslintrc'
3+
import airbnb from 'eslint-config-airbnb'
4+
import path from 'node:path'
5+
import { fileURLToPath } from 'node:url'
6+
import shared from './shared.mjs'
77

8-
const filename = fileURLToPath(import.meta.url);
9-
const dirname = path.dirname(filename);
8+
const filename = fileURLToPath(import.meta.url)
9+
const dirname = path.dirname(filename)
1010

1111
const compat = new FlatCompat({
12-
baseDirectory: dirname,
13-
});
12+
baseDirectory: dirname,
13+
})
1414

1515
export default [
16-
...fixupConfigRules(compat.config(airbnb)),
17-
...shared,
18-
{
19-
rules: {
20-
"react/jsx-filename-extension": [
21-
"error",
22-
{
23-
extensions: [".js"],
24-
},
25-
],
26-
},
27-
},
28-
];
16+
...fixupConfigRules(compat.config(airbnb)),
17+
...shared,
18+
{
19+
rules: {
20+
'react/jsx-filename-extension': [
21+
'error',
22+
{
23+
extensions: ['.js'],
24+
},
25+
],
26+
},
27+
},
28+
]

‎packages/validate-icu-locales/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable eslint-comments/disable-enable-pair */
2-
2+
33
import { defineConfig, mergeConfig } from 'vite'
44
import { defaultConfig } from '../../vite.config'
55

‎pnpm-workspace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
packages:
2-
- 'packages/*'
2+
- 'packages/*'

0 commit comments

Comments
 (0)