Skip to content

Commit

Permalink
merge main and resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
charliepark committed Dec 16, 2024
2 parents ea9d6e7 + c1ebd8d commit c5d3353
Show file tree
Hide file tree
Showing 267 changed files with 9,101 additions and 11,869 deletions.
1 change: 1 addition & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ module.exports = {
'warn',
{ assertFunctionNames: ['expectVisible', 'expectRowVisible', 'expectOptions'] },
],
'playwright/no-force-option': 'off',
},
},
],
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lintBuildTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
id: cache-node-modules
with:
path: node_modules
key: modules-${{ hashFiles('package-lock.json') }}
key: modules-${{ hashFiles('package-lock.json', 'patches/**') }}
- name: npm install
if: steps.cache-node-modules.outputs.cache-hit != 'true'
run: npm install
Expand All @@ -39,7 +39,7 @@ jobs:
id: cache-node-modules
with:
path: node_modules
key: modules-${{ hashFiles('package-lock.json') }}
key: modules-${{ hashFiles('package-lock.json', 'patches/**') }}
- name: Typecheck
run: npx tsc
- name: Lint
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
uses: actions/cache@v4
with:
path: node_modules
key: modules-${{ hashFiles('package-lock.json') }}
key: modules-${{ hashFiles('package-lock.json', 'patches/**') }}
- name: Set env.PLAYWRIGHT_VERSION
run: |
PLAYWRIGHT_VERSION=$(npm ls --json @playwright/test | jq --raw-output '.dependencies["@playwright/test"].version')
Expand Down
3 changes: 2 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
npx lint-staged
# use path directly instead of npx or npm run because it's way faster
node_modules/.bin/oxlint --deny-warnings
10 changes: 0 additions & 10 deletions .ladle/components.tsx

This file was deleted.

3 changes: 0 additions & 3 deletions .ladle/config.mjs

This file was deleted.

18 changes: 0 additions & 18 deletions .ladle/head.html

This file was deleted.

1 change: 0 additions & 1 deletion .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ header:
- '**/*.md'
- 'LICENSE'
- 'OMICRON_VERSION'
- '.ladle'
- '.husky'
- 'mockServiceWorker.js'

Expand Down
17 changes: 17 additions & 0 deletions .oxlintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "./node_modules/oxlint/configuration_schema.json",
"plugins": ["react", "react-hooks", "unicorn", "typescript", "oxc"],
"rules": {
"react-hooks/exhaustive-deps": "error",
// turning this off because it's more sensitive than eslint currently
// "react-hooks/rules-of-hooks": "error",
"no-unused-vars": [
"error",
{
"argsIgnorePattern": "^_",
"varsIgnorePattern": "^_",
"caughtErrorsIgnorePattern": "^_"
}
]
}
}
2 changes: 1 addition & 1 deletion OMICRON_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
122eccf9a76749776b91a42f81735b6f0ec40f5a
c6d4c55ffece9faf167e2da5aee044341ffdc24e
10 changes: 0 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ The web console has no special privileges as an API consumer. Logging in sets a
- [Mock Service Worker](https://mswjs.io/) for mock API server
- [Vitest](https://vitest.dev/) for unit tests
- [Playwright](https://playwright.dev/) for E2E browser tests
- [Ladle](https://ladle.dev/), a lightweight Storybook clone based on Vite

## Directory structure

Expand Down Expand Up @@ -109,14 +108,6 @@ document.cookie = 'session=d9b1a96e151092eb0ea08b1a0d8c4788441f1894;domain=local

Go to https://localhost:4000 again and you should be logged in.

### Run [Ladle](https://ladle.dev/)

```
npm run ladle
```

This will start a preview environment for UI components at `http://localhost:61000`.

### E2E tests with [Playwright](https://playwright.dev/)

Playwright tests live in [`test/e2e`](test/e2e/). `npm run e2e` runs the tests in Chrome, Firefox, and Safari, but this is rarely necessary in local dev. `npm run e2ec` is a shortcut for `playwright test --project=chrome`, which runs the tests in Chrome only (the fastest one, useful for local dev). Playwright has an excellent [UI mode](https://playwright.dev/docs/test-ui-mode) for running and debugging tests that you can get to by running `npm run e2e -- --ui`.
Expand All @@ -133,7 +124,6 @@ To debug end-to-end failures on CI, check out the branch with the failure and ru
| `npm run lint` | ESLint |
| `npx tsc` | Check types |
| `npm run ci` | Lint, tests (unit and e2e), and types |
| `npm run ladle` | Run Ladle (Storybook) |
| `npm run fmt` | Format everything. Rarely necessary thanks to editor integration |
| `npm run gen-api` | Generate API client (see [`docs/update-pinned-api.md`](docs/update-pinned-api.md)) |
| `npm run start:mock-api` | Serve mock API on port 12220 |
Expand Down
74 changes: 50 additions & 24 deletions app/api/__generated__/Api.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/api/__generated__/OMICRON_VERSION

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 30 additions & 11 deletions app/api/__generated__/msw-handlers.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c5d3353

Please sign in to comment.