Skip to content

Commit d90bdf9

Browse files
author
hubert
committed
chore: merge branch 'master' into dev
2 parents f0834df + 2f8abb4 commit d90bdf9

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

.github/workflows/check-pr-title.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ on:
99

1010
jobs:
1111
lint:
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-latest
13+
permissions:
14+
statuses: write
1315
steps:
14-
- uses: aslafy-z/conventional-pr-title-action@main
16+
- uses: aslafy-z/conventional-pr-title-action@v3
1517
with:
16-
preset: conventional-changelog-angular@^5.0.6
18+
preset: "@commitlint/config-conventional@^12.1.4"
1719
env:
1820
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

clients/vue-web/src/fetch/index.ts

+10-5
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,16 @@ afetch.use(
122122
return data;
123123
},
124124
handler: (error) => {
125-
errorRef.value = new SharedError(
126-
error.message || 'System error!',
127-
(axios.isAxiosError(error) ? error.response?.status : (error as any).code) || 500,
128-
);
129-
return new Promise(() => {});
125+
errorRef.value =
126+
error instanceof SharedError
127+
? error
128+
: new SharedError(
129+
error.message || 'System error!',
130+
(axios.isAxiosError(error) ? error.response?.status : (error as any).code) || 500,
131+
);
132+
return new Promise(() => {
133+
// stop next
134+
});
130135
},
131136
}),
132137
);

0 commit comments

Comments
 (0)