Skip to content

Commit d83c0fc

Browse files
authored
Merge branch 'styled-components:main' into master
2 parents 60bb28f + 94f60af commit d83c0fc

File tree

94 files changed

+22530
-19400
lines changed

Some content is hidden

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

94 files changed

+22530
-19400
lines changed

.babelrc

Lines changed: 0 additions & 20 deletions
This file was deleted.

.eslintignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

.eslintrc.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,53 +2,18 @@ name: ci
22
on: push
33

44
jobs:
5-
build:
6-
runs-on: ubuntu-latest
7-
steps:
8-
- uses: actions/checkout@v2
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-
14-
- uses: actions/cache@v2
15-
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
16-
with:
17-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
18-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
19-
restore-keys: |
20-
${{ runner.os }}-yarn-
21-
22-
- name: Install
23-
run: yarn
24-
25-
- name: Build
26-
run: yarn build
27-
28-
- name: Check size
29-
run: yarn size
305
test:
316
runs-on: ubuntu-latest
327
steps:
33-
- uses: actions/checkout@v2
8+
- uses: actions/checkout@v3
349

35-
- name: Get yarn cache directory path
36-
id: yarn-cache-dir-path
37-
run: echo "::set-output name=dir::$(yarn cache dir)"
38-
39-
- uses: actions/cache@v2
40-
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
10+
- uses: actions/setup-node@v3
4111
with:
42-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
43-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
44-
restore-keys: |
45-
${{ runner.os }}-yarn-
12+
cache: yarn
13+
node-version-file: ".nvmrc"
4614

4715
- name: Install
48-
run: yarn
16+
run: yarn install --immutable
4917

5018
- name: Jest
5119
run: yarn test
52-
53-
- name: Lint
54-
run: yarn lint

.gitignore

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,13 @@ __diff_output__
1414
.DS_Store
1515

1616
# build
17-
.next
17+
.next
18+
19+
# Yarn 3
20+
.pnp.*
21+
.yarn/*
22+
!.yarn/patches
23+
!.yarn/plugins
24+
!.yarn/releases
25+
!.yarn/sdks
26+
!.yarn/versions

.husky/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.husky/pre-commit

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
2-
. "$(dirname "$0")/_/husky.sh"
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
33

4-
npm run precommit
4+
yarn precommit

.jest.config.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
/** @type {import('ts-jest').JestConfigWithTsJest} */
12
module.exports = {
2-
setupFilesAfterEnv: ['<rootDir>test/setup.js'],
3+
setupFilesAfterEnv: ['<rootDir>test/setup.ts'],
34
snapshotSerializers: ['enzyme-to-json/serializer'],
45
testEnvironment: 'jsdom',
56
testPathIgnorePatterns: ['/node_modules/', '/integration-test/'],
7+
transform: {
8+
'^.+\\.[tj]sx?$': ['ts-jest', { tsconfig: { jsx: 'react-jsx' } }],
9+
},
610
};

.lintstagedrc.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
module.exports = {
2-
'**/*.js?(x)': [
3-
'jest -c .jest.config.js --findRelatedTests',
4-
(filenames) => `next lint --fix --file ${filenames.map((file) => file.split(process.cwd())[1]).join(' --file ')}`,
5-
'prettier --write',
6-
],
7-
'*.md': ['prettier --write'],
2+
'**/*.{js,jsx,ts,tsx}': ['jest -c .jest.config.js --findRelatedTests', 'prettier --write'],
83
};

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v18

0 commit comments

Comments
 (0)