Skip to content

Commit

Permalink
Merge branch 'release-v0.7.4'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
fizruk committed Apr 1, 2024
2 parents 8e0af0c + 5dbeb98 commit 0ac6736
Show file tree
Hide file tree
Showing 15 changed files with 650 additions and 219 deletions.
27 changes: 13 additions & 14 deletions .github/workflows/ghcjs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 📥 Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: ❄️ Install Nix
uses: nixbuild/nix-quick-install-action@v25
Expand All @@ -43,26 +43,26 @@ jobs:
keep-outputs = true
- name: 👝 Restore and Cache Nix store
uses: nix-community/cache-nix-action@v4
uses: nix-community/cache-nix-action@v5
with:
key: ${{ runner.os }}-nix-${{ hashfiles('./flake.nix', './flake.lock', '.github/workflows/ghcjs.yml', './rzk/rzk.cabal') }}
restore-keys: |
primary-key: ${{ runner.os }}-nix-${{ hashfiles('./flake.nix', './flake.lock', '.github/workflows/ghcjs.yml', './rzk/rzk.cabal') }}
restore-prefixes-first-match: |
${{ runner.os }}-nix-${{ hashfiles('./flake.nix', './flake.lock', '.github/workflows/ghcjs.yml', './rzk/rzk.cabal') }}
${{ runner.os }}-nix-
gc-linux: true
gc-max-store-size-linux: 7000000000
gc-max-store-size: 7000000000
purge: true
purge-created-max-age: 1209600
purge-prefixes: ${{ runner.os }}-nix-
purge-created: 0
purge-primary-key: never

- name: 👝 Restore and Cache NextJS cache
uses: actions/cache@v3
- name: 👝 Restore and cache NodeJS deps
uses: actions/cache@v4
with:
key: ${{ runner.os }}-next-${{ hashFiles('**/package-lock.json') }}
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-next-
${{ runner.os }}-node-
path: |
~/.npm
rzk-playground/.next/cache
- name: 🔨 Remove lexer and parser generator files
run: |
Expand All @@ -76,8 +76,7 @@ jobs:
- name: 🔨 Build Playground
env:
ASSET_URL: /${{ github.event.repository.name }}/${{ github.ref_name }}/playground
run: |
nix run .#release-rzk-playground
run: nix run .#release-rzk-playground

- name: 🔨 Save flake from garbage collection
run: nix run .#save-flake
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ authors:
- family-names: Danko
given-names: Danila
title: "Rzk: a proof assistant for synthetic $\\infty$-categories"
version: 0.7.3
version: 0.7.4
url: "https://github.com/rzk-lang/rzk"
2 changes: 1 addition & 1 deletion docs/config/en/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ nav:
- getting-started/index.md
- Install: getting-started/install.md
- Quickstart: getting-started/quickstart.rzk.md
- Depedent Types: getting-started/dependent-types.rzk.md
- Dependent Types: getting-started/dependent-types.rzk.md
- Setting up an Rzk project: getting-started/project.md
- Reference:
- Introduction: reference/introduction.rzk.md
Expand Down
50 changes: 22 additions & 28 deletions rzk-playground/README.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,30 @@
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).
# React + TypeScript + Vite

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

First, run the development server:
Currently, two official plugins are available:

```bash
npm run dev
# or
yarn dev
# or
pnpm dev
# or
bun dev
```

Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.

This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.
- [@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
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh

## Learn More
## Expanding the ESLint configuration

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

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

You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!

## Deploy on Vercel

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.
```js
export default {
// other rules...
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
project: ['./tsconfig.json', './tsconfig.node.json'],
tsconfigRootDir: __dirname,
},
}
```

Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
- Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
- 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
Loading

0 comments on commit 0ac6736

Please sign in to comment.