Skip to content

Commit 0ac6736

Browse files
committed
Merge branch 'release-v0.7.4'
* release-v0.7.4: Bump version and update changelog fix(rzk-playground): update package-lock fix(ci > ghcjs): caching fix(rzk-playground): add type annotation fix(package): dependency versions fix(rzk-playground): use default vite readme Fix caching in presence of errors Use proper record, not anonymous triple fix typo Add type errors to the cache Move changed files handler to the handlers module Move semantic tokens provider to handlers module
2 parents 8e0af0c + 5dbeb98 commit 0ac6736

File tree

15 files changed

+650
-219
lines changed

15 files changed

+650
-219
lines changed

.github/workflows/ghcjs.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: 📥 Checkout repository
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636

3737
- name: ❄️ Install Nix
3838
uses: nixbuild/nix-quick-install-action@v25
@@ -43,26 +43,26 @@ jobs:
4343
keep-outputs = true
4444
4545
- name: 👝 Restore and Cache Nix store
46-
uses: nix-community/cache-nix-action@v4
46+
uses: nix-community/cache-nix-action@v5
4747
with:
48-
key: ${{ runner.os }}-nix-${{ hashfiles('./flake.nix', './flake.lock', '.github/workflows/ghcjs.yml', './rzk/rzk.cabal') }}
49-
restore-keys: |
48+
primary-key: ${{ runner.os }}-nix-${{ hashfiles('./flake.nix', './flake.lock', '.github/workflows/ghcjs.yml', './rzk/rzk.cabal') }}
49+
restore-prefixes-first-match: |
5050
${{ runner.os }}-nix-${{ hashfiles('./flake.nix', './flake.lock', '.github/workflows/ghcjs.yml', './rzk/rzk.cabal') }}
5151
${{ runner.os }}-nix-
52-
gc-linux: true
53-
gc-max-store-size-linux: 7000000000
52+
gc-max-store-size: 7000000000
5453
purge: true
55-
purge-created-max-age: 1209600
54+
purge-prefixes: ${{ runner.os }}-nix-
55+
purge-created: 0
56+
purge-primary-key: never
5657

57-
- name: 👝 Restore and Cache NextJS cache
58-
uses: actions/cache@v3
58+
- name: 👝 Restore and cache NodeJS deps
59+
uses: actions/cache@v4
5960
with:
60-
key: ${{ runner.os }}-next-${{ hashFiles('**/package-lock.json') }}
61+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
6162
restore-keys: |
62-
${{ runner.os }}-next-
63+
${{ runner.os }}-node-
6364
path: |
6465
~/.npm
65-
rzk-playground/.next/cache
6666
6767
- name: 🔨 Remove lexer and parser generator files
6868
run: |
@@ -76,8 +76,7 @@ jobs:
7676
- name: 🔨 Build Playground
7777
env:
7878
ASSET_URL: /${{ github.event.repository.name }}/${{ github.ref_name }}/playground
79-
run: |
80-
nix run .#release-rzk-playground
79+
run: nix run .#release-rzk-playground
8180

8281
- name: 🔨 Save flake from garbage collection
8382
run: nix run .#save-flake

CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ authors:
88
- family-names: Danko
99
given-names: Danila
1010
title: "Rzk: a proof assistant for synthetic $\\infty$-categories"
11-
version: 0.7.3
11+
version: 0.7.4
1212
url: "https://github.com/rzk-lang/rzk"

docs/config/en/mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ nav:
1919
- getting-started/index.md
2020
- Install: getting-started/install.md
2121
- Quickstart: getting-started/quickstart.rzk.md
22-
- Depedent Types: getting-started/dependent-types.rzk.md
22+
- Dependent Types: getting-started/dependent-types.rzk.md
2323
- Setting up an Rzk project: getting-started/project.md
2424
- Reference:
2525
- Introduction: reference/introduction.rzk.md

rzk-playground/README.md

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,30 @@
1-
This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).
1+
# React + TypeScript + Vite
22

3-
## Getting Started
3+
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
44

5-
First, run the development server:
5+
Currently, two official plugins are available:
66

7-
```bash
8-
npm run dev
9-
# or
10-
yarn dev
11-
# or
12-
pnpm dev
13-
# or
14-
bun dev
15-
```
16-
17-
Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
18-
19-
You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
20-
21-
This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.
7+
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
8+
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
229

23-
## Learn More
10+
## Expanding the ESLint configuration
2411

25-
To learn more about Next.js, take a look at the following resources:
12+
If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
2613

27-
- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
28-
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
14+
- Configure the top-level `parserOptions` property like this:
2915

30-
You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
31-
32-
## Deploy on Vercel
33-
34-
The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
16+
```js
17+
export default {
18+
// other rules...
19+
parserOptions: {
20+
ecmaVersion: 'latest',
21+
sourceType: 'module',
22+
project: ['./tsconfig.json', './tsconfig.node.json'],
23+
tsconfigRootDir: __dirname,
24+
},
25+
}
26+
```
3527

36-
Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
28+
- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
29+
- Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
30+
- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list

0 commit comments

Comments
 (0)