Skip to content

Commit 52ff0f9

Browse files
authoredFeb 9, 2025··
chore: fix build and speed up ci (#119)
1 parent 44aafa8 commit 52ff0f9

File tree

3 files changed

+690
-560
lines changed

3 files changed

+690
-560
lines changed
 

‎.github/workflows/ci.yml

+22-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
branches:
88
- main
99
jobs:
10-
ci:
11-
name: CI
10+
test:
11+
name: Run tests
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
matrix:
@@ -21,10 +21,10 @@ jobs:
2121
- name: Setup Node.js environment
2222
uses: actions/setup-node@v4
2323
with:
24-
node-version: 20.x
24+
node-version: 22.x
2525

2626
- name: Install Dependencies
27-
run: yarn bootstrap
27+
run: yarn --network-timeout 100000
2828

2929
- name: Install Playwright Browsers
3030
run: yarn playwright install --with-deps
@@ -37,5 +37,23 @@ jobs:
3737
- name: Codecov
3838
uses: codecov/codecov-action@v4
3939

40+
build-lint:
41+
name: Build and lint
42+
runs-on: ubuntu-latest
43+
steps:
44+
- name: Checkout
45+
uses: actions/checkout@v4
46+
47+
- name: Setup Node.js environment
48+
uses: actions/setup-node@v4
49+
with:
50+
node-version: 22.x
51+
52+
- name: Install Dependencies
53+
run: yarn --network-timeout 100000
54+
55+
- name: Lint
56+
run: yarn lint
57+
4058
- name: Build Project
4159
run: yarn build

‎package.json

+23-26
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,10 @@
6767
"scripts": {
6868
"bootstrap": "yarn --network-timeout 100000 && yarn --cwd www --network-timeout 100000",
6969
"build": "rimraf lib && yarn build:esm && yarn build:cjs && yarn build:popper",
70-
"build:esm": "babel src --out-dir lib --delete-dir-on-start --extensions '.ts,.tsx' --ignore='**/*.d.ts' && yarn build:esm:types",
71-
"build:cjs": "babel src --out-dir cjs --env-name cjs --delete-dir-on-start --extensions '.ts,.tsx' --ignore='**/*.d.ts' && yarn build:cjs:types && echo '{\"type\": \"commonjs\"}' > cjs/package.json",
70+
"build:esm": "babel src --out-dir lib --delete-dir-on-start --extensions .ts,.tsx --ignore '**/*.d.ts' && yarn build:esm:types",
71+
"build:cjs": "babel src --out-dir cjs --env-name cjs --delete-dir-on-start --extensions .ts,.tsx --ignore '**/*.d.ts' && yarn build:cjs:types && echo '{\"type\": \"commonjs\"}' > cjs/package.json",
7272
"build:esm:types": "tsc -p . --emitDeclarationOnly --declaration --outDir lib",
7373
"build:cjs:types": "tsc -p . --emitDeclarationOnly --declaration --outDir cjs",
74-
"build:pick": "cherry-pick --cwd=lib --input-dir=../src --cjs-dir=cjs --esm-dir=esm",
7574
"build:popper": "rollup src/popper.ts --file cjs/popper.js --format cjs --name popper --plugin @rollup/plugin-node-resolve && rollup src/popper.ts --file lib/popper.js --format esm --name popper --plugin @rollup/plugin-node-resolve",
7675
"deploy-docs": "yarn --cwd www deploy",
7776
"lint": "eslint src test",
@@ -97,8 +96,7 @@
9796
"conventionalCommits": true
9897
},
9998
"dependencies": {
100-
"@babel/eslint-parser": "^7.25.9",
101-
"@babel/runtime": "^7.26.0",
99+
"@babel/runtime": "^7.26.7",
102100
"@popperjs/core": "^2.11.8",
103101
"@restart/hooks": "^0.6.2",
104102
"@types/warning": "^3.0.3",
@@ -116,46 +114,45 @@
116114
"@4c/rollout": "^4.0.2",
117115
"@4c/tsconfig": "^0.4.1",
118116
"@babel/cli": "^7.26.4",
119-
"@babel/core": "^7.26.0",
117+
"@babel/core": "^7.26.7",
118+
"@babel/eslint-parser": "^7.26.5",
120119
"@babel/preset-react": "^7.26.3",
121120
"@babel/preset-typescript": "^7.26.0",
122-
"@eslint/js": "^9.17.0",
121+
"@eslint/js": "^9.20.0",
123122
"@rollup/plugin-node-resolve": "^16.0.0",
124123
"@testing-library/dom": "^10.4.0",
125-
"@testing-library/react": "^16.1.0",
126-
"@testing-library/user-event": "^14.5.2",
127-
"@types/classnames": "^2.3.4",
128-
"@types/react": "^19.0.4",
129-
"@types/react-dom": "^19.0.2",
124+
"@testing-library/react": "^16.2.0",
125+
"@testing-library/user-event": "^14.6.1",
126+
"@types/react": "^19.0.8",
127+
"@types/react-dom": "^19.0.3",
130128
"@types/react-transition-group": "^4.4.12",
131-
"@typescript-eslint/eslint-plugin": "^8.19.1",
132-
"@typescript-eslint/parser": "^8.19.1",
129+
"@typescript-eslint/eslint-plugin": "^8.23.0",
130+
"@typescript-eslint/parser": "^8.23.0",
133131
"@vitejs/plugin-react": "^4.3.4",
134-
"@vitest/browser": "^2.1.8",
135-
"@vitest/coverage-istanbul": "2.1.8",
132+
"@vitest/browser": "^3.0.5",
133+
"@vitest/coverage-istanbul": "3.0.5",
136134
"babel-eslint": "^10.1.0",
137135
"babel-preset-env-modules": "^1.0.1",
138136
"cross-env": "^7.0.3",
139-
"eslint": "^9.17.0",
140-
"eslint-config-4catalyzer-typescript": "^3.3.0",
141-
"eslint-config-prettier": "^9.1.0",
142-
"eslint-plugin-prettier": "^5.2.1",
143-
"eslint-plugin-react": "^7.37.3",
137+
"eslint": "^9.20.0",
138+
"eslint-config-prettier": "^10.0.1",
139+
"eslint-plugin-prettier": "^5.2.3",
140+
"eslint-plugin-react": "^7.37.4",
144141
"eslint-plugin-react-hooks": "^5.1.0",
145142
"gh-pages": "^3.1.0",
146143
"globals": "^15.14.0",
147144
"hookem": "^3.0.4",
148-
"lint-staged": "^15.3.0",
149-
"playwright": "^1.49.1",
145+
"lint-staged": "^15.4.3",
146+
"playwright": "^1.50.1",
150147
"prettier": "^3.4.2",
151148
"react": "^19.0.0",
152149
"react-dom": "^19.0.0",
153150
"react-transition-group": "^4.4.5",
154151
"rimraf": "^6.0.1",
155-
"rollup": "^4.30.1",
152+
"rollup": "^4.34.6",
156153
"typescript": "^5.7.3",
157-
"typescript-eslint": "^8.19.1",
158-
"vitest": "^2.1.8"
154+
"typescript-eslint": "^8.23.0",
155+
"vitest": "^3.0.5"
159156
},
160157
"bugs": {
161158
"url": "https://github.com/react-restart/ui/issues"

‎yarn.lock

+645-530
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.