Skip to content

Commit 9392833

Browse files
authored
Merge pull request #35 from wednesday-solutions/feat/fix-antd
Feat/fix antd
2 parents 65b606d + a75baad commit 9392833

File tree

7 files changed

+448
-302
lines changed

7 files changed

+448
-302
lines changed

.github/workflows/cd-beta-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ jobs:
6363
EP_DRAFT: false
6464
EP_PRE_RELEASE: true
6565
run: |
66-
yarn run electron-builder -- --publish always --linux
66+
yarn run electron-builder -- --publish always --win --mac --linux

.github/workflows/cd-latest-release.yml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -32,44 +32,6 @@ jobs:
3232
- name: Build
3333
run: yarn build
3434

35-
- name: Get Commit Message
36-
run: |
37-
declare -A category=( [fix]="" [chore]="" [revert]="" [build]="" [docs]="" [feat]="" [perf]="" [refactor]="" [style]="" [temp]="" [test]="" [ci]="" [others]="")
38-
declare -A categoryTitle=( [fix]="<h5>Bug Fixes</h5>" [build]="<h5>Build</h5>" [docs]="<h5>Documentation</h5>" [feat]="<h5>New Features</h5>" [chore]="<h5>Changes to build process or aux tools</h5>" [ci]="<h5>Changes to CI config</h5>" [temp]="<h5>Temporary commit</h5>" [perf]="<h5>Performance Enhancement</h5>" [revert]="<h5>Revert Commits</h5>" [refactor]="<h5>Refactored</h5>" [style]="<h5>Changed Style</h5>" [test]="<h5>Added Tests</h5>" [others]="<h5>Others</h5>")
39-
msg="#${{ steps.getMergedPR.outputs.number}} ${{ steps.getMergedPR.outputs.title}}"
40-
for i in $(git log --format=%h $(git merge-base HEAD^1 HEAD^2)..HEAD^2)
41-
do
42-
IFS=":" read -r type cmmsg <<< $(git log --format=%B -n 1 $i)
43-
type="${type}" | xargs
44-
text_msg="&nbsp;&nbsp;&nbsp;&nbsp;&#8226; $i - ${cmmsg}<br/>"
45-
flag=1
46-
for i in "${!category[@]}"
47-
do
48-
if [ "${type}" == "$i" ]
49-
then
50-
category[$i]+="${text_msg}"
51-
flag=0
52-
break
53-
fi
54-
done
55-
if [ $flag -eq 1 ]
56-
then
57-
category[others]+="${text_msg}"
58-
fi
59-
done
60-
for i in "${!category[@]}"
61-
do
62-
if [ ! -z "${category[$i]}" ] && [ "others" != "$i" ]
63-
then
64-
msg+="${categoryTitle[$i]}${category[$i]}"
65-
fi
66-
done
67-
if [ ! -z "${category[others]}" ]
68-
then
69-
msg+="${categoryTitle[others]}${category[others]}"
70-
fi
71-
echo "COMMIT_MESSAGE=${msg}" >> $GITHUB_ENV
72-
7335
- name: Bump version and push tag
7436
run: |
7537
cd "$GITHUB_WORKSPACE"

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
node-version: [12.x]
11+
node-version: [14.x]
1212

1313
steps:
1414
- uses: actions/checkout@v2

app/containers/HomeContainer/tests/__snapshots__/index.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ exports[`<HomeContainer /> tests should render and match the snapshot 1`] = `
4848
class="HomeContainer__ButtonBox-sc-1ly6omb-3 gSuRgZ"
4949
>
5050
<button
51-
class="ant-btn"
51+
class="ant-btn ant-btn-default"
5252
data-testid="clear-sort"
5353
disabled=""
5454
type="button"

babel.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ module.exports = {
1919
'@babel/plugin-syntax-optional-chaining',
2020
'styled-components',
2121
'@babel/plugin-proposal-class-properties',
22-
'@babel/plugin-syntax-dynamic-import'
22+
'@babel/plugin-syntax-dynamic-import',
23+
'@babel/plugin-transform-runtime'
2324
],
2425
env: {
2526
production: {

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-graphql-ts-template",
3-
"version": "1.0.8-alpha.6",
3+
"version": "1.0.8",
44
"description": "A React Typescript GraphQL application",
55
"repository": {
66
"type": "git",
@@ -199,6 +199,7 @@
199199
"@babel/plugin-transform-modules-commonjs": "7.14.5",
200200
"@babel/plugin-transform-react-constant-elements": "7.14.5",
201201
"@babel/plugin-transform-react-inline-elements": "7.14.5",
202+
"@babel/plugin-transform-runtime": "^7.21.0",
202203
"@babel/preset-env": "^7.14.7",
203204
"@babel/preset-react": "^7.14.5",
204205
"@babel/preset-typescript": "^7.16.7",

0 commit comments

Comments
 (0)