Skip to content

Commit 95726a9

Browse files
srmagurasrmagura
authored
Merge pull request #2816 from srmagura/ts-merge-0710
Merge `main` into `ts-migration`
2 parents 8ed0042 + 8c6ad60 commit 95726a9

Some content is hidden

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

67 files changed

+744
-468
lines changed

‎.changeset/big-years-relate.md

-5
This file was deleted.

‎.changeset/empty-terms-beam.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@emotion/jest': patch
3+
---
4+
5+
Fix a dependency conflict when `@emotion/jest` was installed alongside `@types/jest@^28`.

‎.changeset/five-balloons-sneeze.md

-6
This file was deleted.

‎.changeset/friendly-carrots-buy.md

-5
This file was deleted.

‎.github/actions/ci-setup/action.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: 'CI setup'
2+
runs:
3+
using: 'composite'
4+
steps:
5+
- name: Set Node.js 16.x
6+
uses: actions/setup-node@v3
7+
with:
8+
node-version: 16.x
9+
10+
- name: Get yarn cache directory path
11+
id: yarn-cache-dir-path
12+
run: echo "::set-output name=dir::$(yarn cache dir)"
13+
shell: bash
14+
15+
- uses: actions/cache@v3
16+
id: yarn-cache
17+
with:
18+
path: |
19+
${{ steps.yarn-cache-dir-path.outputs.dir }}
20+
node_modules
21+
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
22+
restore-keys: |
23+
${{ runner.os }}-yarn-
24+
25+
- name: Install Dependencies
26+
run: yarn --frozen-lockfile
27+
shell: bash

‎.github/workflows/main.yml

+15-162
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,8 @@ jobs:
1818
- windows-latest
1919
runs-on: ${{matrix.platform}}
2020
steps:
21-
- uses: actions/checkout@main
22-
with:
23-
fetch-depth: 0
24-
25-
- name: Set Node.js 12.x
26-
uses: actions/setup-node@main
27-
with:
28-
node-version: 12.x
29-
30-
- name: Get yarn cache directory path
31-
id: yarn-cache-dir-path
32-
run: echo "::set-output name=dir::$(yarn cache dir)"
33-
34-
- uses: actions/cache@v2
35-
id: yarn-cache
36-
with:
37-
path: |
38-
${{ steps.yarn-cache-dir-path.outputs.dir }}
39-
node_modules
40-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
41-
restore-keys: |
42-
${{ runner.os }}-yarn-
43-
44-
- name: Install Dependencies
45-
run: yarn
21+
- uses: actions/checkout@v3
22+
- uses: ./.github/actions/ci-setup
4623

4724
- name: Run Tests
4825
run: yarn test:ci --color
@@ -55,29 +32,8 @@ jobs:
5532
name: TypeScript
5633
runs-on: ubuntu-latest
5734
steps:
58-
- uses: actions/checkout@main
59-
60-
- name: Set Node.js 12.x
61-
uses: actions/setup-node@main
62-
with:
63-
node-version: 12.x
64-
65-
- name: Get yarn cache directory path
66-
id: yarn-cache-dir-path
67-
run: echo "::set-output name=dir::$(yarn cache dir)"
68-
69-
- uses: actions/cache@v2
70-
id: yarn-cache
71-
with:
72-
path: |
73-
${{ steps.yarn-cache-dir-path.outputs.dir }}
74-
node_modules
75-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
76-
restore-keys: |
77-
${{ runner.os }}-yarn-
78-
79-
- name: Install Dependencies
80-
run: yarn
35+
- uses: actions/checkout@v3
36+
- uses: ./.github/actions/ci-setup
8137

8238
- name: Check Types
8339
run: yarn tsc
@@ -86,29 +42,8 @@ jobs:
8642
name: Test React 18
8743
runs-on: ubuntu-latest
8844
steps:
89-
- uses: actions/checkout@main
90-
91-
- name: Set Node.js 12.x
92-
uses: actions/setup-node@main
93-
with:
94-
node-version: 12.x
95-
96-
- name: Get yarn cache directory path
97-
id: yarn-cache-dir-path
98-
run: echo "::set-output name=dir::$(yarn cache dir)"
99-
100-
- uses: actions/cache@v2
101-
id: yarn-cache
102-
with:
103-
path: |
104-
${{ steps.yarn-cache-dir-path.outputs.dir }}
105-
node_modules
106-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
107-
restore-keys: |
108-
${{ runner.os }}-yarn-
109-
110-
- name: Install Dependencies
111-
run: yarn
45+
- uses: actions/checkout@v3
46+
- uses: ./.github/actions/ci-setup
11247

11348
- name: Run Tests with React 18
11449
run: yarn test:react18:ci
@@ -117,29 +52,8 @@ jobs:
11752
name: Test Dist
11853
runs-on: ubuntu-latest
11954
steps:
120-
- uses: actions/checkout@main
121-
122-
- name: Set Node.js 12.x
123-
uses: actions/setup-node@main
124-
with:
125-
node-version: 12.x
126-
127-
- name: Get yarn cache directory path
128-
id: yarn-cache-dir-path
129-
run: echo "::set-output name=dir::$(yarn cache dir)"
130-
131-
- uses: actions/cache@v2
132-
id: yarn-cache
133-
with:
134-
path: |
135-
${{ steps.yarn-cache-dir-path.outputs.dir }}
136-
node_modules
137-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
138-
restore-keys: |
139-
${{ runner.os }}-yarn-
140-
141-
- name: Install Dependencies
142-
run: yarn
55+
- uses: actions/checkout@v3
56+
- uses: ./.github/actions/ci-setup
14357

14458
- name: Dist Tests
14559
run: yarn test:prod
@@ -148,79 +62,18 @@ jobs:
14862
name: Linting
14963
runs-on: ubuntu-latest
15064
steps:
151-
- uses: actions/checkout@main
152-
153-
- name: Set Node.js 12.x
154-
uses: actions/setup-node@main
155-
with:
156-
node-version: 12.x
157-
158-
- name: Get yarn cache directory path
159-
id: yarn-cache-dir-path
160-
run: echo "::set-output name=dir::$(yarn cache dir)"
161-
162-
- uses: actions/cache@v2
163-
id: yarn-cache
164-
with:
165-
path: |
166-
${{ steps.yarn-cache-dir-path.outputs.dir }}
167-
node_modules
168-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
169-
restore-keys: |
170-
${{ runner.os }}-yarn-
171-
172-
- name: Install Dependencies
173-
run: yarn
65+
- uses: actions/checkout@v3
66+
- uses: ./.github/actions/ci-setup
17467

17568
- name: ESLint
17669
run: yarn lint:check
17770

17871
dtslint:
179-
name: DTSLint
72+
name: dtslint
18073
runs-on: ubuntu-latest
181-
strategy:
182-
fail-fast: false
183-
matrix:
184-
package:
185-
- cache
186-
- css
187-
- hash
188-
- is-prop-valid
189-
- jest
190-
- memoize
191-
- native
192-
- react
193-
- serialize
194-
- server
195-
- sheet
196-
- styled
197-
- utils
198-
- weak-memoize
199-
20074
steps:
201-
- uses: actions/checkout@main
202-
203-
- name: Set Node.js 12.x
204-
uses: actions/setup-node@main
205-
with:
206-
node-version: 12.x
207-
208-
- name: Get yarn cache directory path
209-
id: yarn-cache-dir-path
210-
run: echo "::set-output name=dir::$(yarn cache dir)"
211-
212-
- uses: actions/cache@v2
213-
id: yarn-cache
214-
with:
215-
path: |
216-
${{ steps.yarn-cache-dir-path.outputs.dir }}
217-
node_modules
218-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
219-
restore-keys: |
220-
${{ runner.os }}-yarn-
221-
222-
- name: Install Dependencies
223-
run: yarn
75+
- uses: actions/checkout@v3
76+
- uses: ./.github/actions/ci-setup
22477

225-
- name: TypeScript
226-
run: cd packages/${{ matrix.package }} && yarn test:typescript
78+
- name: dtslint
79+
run: yarn test:typescript

‎.github/workflows/release.yml

+3-16
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,11 @@ jobs:
1313
name: Release
1414
runs-on: ubuntu-latest
1515
steps:
16-
- name: Checkout Repo
17-
uses: actions/checkout@master
18-
with:
19-
fetch-depth: 0
20-
21-
- name: Setup Node.js 12.x
22-
uses: actions/setup-node@master
23-
with:
24-
node-version: 12.x
25-
26-
- name: Install Yarn
27-
run: npm install --global yarn
28-
29-
- name: Install Dependencies
30-
run: yarn --frozen-lockfile
16+
- uses: actions/checkout@v3
17+
- uses: ./.github/actions/ci-setup
3118

3219
- name: Create Release Pull Request or Publish to npm
33-
uses: changesets/action@master
20+
uses: changesets/action@v1
3421
with:
3522
publish: yarn release
3623
env:

0 commit comments

Comments
 (0)