Skip to content

Commit c91a255

Browse files
committed
Merge branch 'master' into demo-site-crash-fix
2 parents dcad809 + 3d7aa9f commit c91a255

File tree

7 files changed

+673
-952
lines changed

7 files changed

+673
-952
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
3434
restore-keys: |
3535
${{ runner.os }}-yarn-
36-
- run: yarn install --frozen-lockfile --prefer-offline
36+
- run: yarn dev
3737
- run: yarn lint
3838
test:
3939
name: Run tests
@@ -108,8 +108,7 @@ jobs:
108108
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
109109
restore-keys: |
110110
${{ runner.os }}-yarn-
111-
- run: yarn install --frozen-lockfile --prefer-offline
112-
- run: yarn compile
111+
- run: yarn dev
113112
- run: yarn publish
114113
env:
115114
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -138,9 +137,7 @@ jobs:
138137
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
139138
restore-keys: |
140139
${{ runner.os }}-yarn-
141-
- run: yarn install --frozen-lockfile --prefer-offline
142-
- run: yarn compile
143-
- run: yarn --cwd ./website install --frozen-lockfile --prefer-offline
140+
- run: yarn dev
144141
- run: yarn --cwd ./website build
145142
- name: Deploy to GitHub Pages
146143
uses: JamesIves/github-pages-deploy-action@4.0.0

test-projects/browser/jest.config.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import type { Config } from '@jest/types';
22
// @ts-expect-error: Missing types
33
import presetTSJest from 'ts-jest/jest-preset';
4-
import presetJestPuppeteer from 'jest-puppeteer/jest-preset.json';
4+
// @ts-expect-error: Missing types
5+
import presetJestPuppeteer from 'jest-puppeteer/jest-preset.js';
56
import merge from 'merge';
67

78
const config: Config.InitialOptions = merge.recursive(presetTSJest, presetJestPuppeteer, {

test-projects/browser/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
"@types/node": "^14.0.0",
1111
"@types/react": "link:../../node_modules/@types/react",
1212
"@types/react-dom": "link:../../node_modules/@types/react-dom",
13-
"jest-puppeteer": "^4.4.0",
13+
"jest-puppeteer": "^5.0.2",
1414
"merge": "^2.1.1",
15-
"puppeteer": "^8.0.0",
15+
"puppeteer": "^9.0.0",
1616
"react": "link:../../node_modules/react",
1717
"react-accessible-dropdown-menu-hook": "link:../..",
1818
"react-dom": "link:../../node_modules/react-dom",
19-
"react-scripts": "4.0.1",
19+
"react-scripts": "4.0.3",
2020
"ts-jest": "^26.5.4",
2121
"ts-node": "^9.1.1",
2222
"typescript": "^4.1.2"

0 commit comments

Comments
 (0)