Skip to content

Commit

Permalink
Merge branch 'main' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
mm-zk authored Sep 10, 2024
2 parents 8d8777e + a832ee0 commit 419b9ec
Show file tree
Hide file tree
Showing 13 changed files with 88 additions and 62 deletions.
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Production license for @nuxt/ui-pro, get one at https://ui.nuxt.com/pro/purchase
# Only required for building the project, running dev will work without it
NUXT_UI_PRO_LICENSE=
2 changes: 1 addition & 1 deletion .github/workflows/check-pr-title.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
statuses: write
contents: read
steps:
- uses: amannn/[email protected].2
- uses: amannn/[email protected].3
id: lint_pr_title
env:
GITHUB_TOKEN: ${{ github.token }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/deploy-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
build_and_preview:
env:
NUXT_UI_PRO_LICENSE: ${{ secrets.NUXT_UI_PRO_LICENSE }}
ALGOLIA_SEARCH_API_KEY: ${{ secrets.ALGOLIA_SEARCH_API_KEY }}
ALGOLIA_APPLICATION_ID: ${{ secrets.ALGOLIA_APPLICATION_ID }}
if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.head.repo.full_name == github.repository }}
runs-on: ubuntu-latest
outputs:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
build_and_deploy:
env:
NUXT_UI_PRO_LICENSE: ${{ secrets.NUXT_UI_PRO_LICENSE }}
ALGOLIA_SEARCH_API_KEY: ${{ secrets.ALGOLIA_SEARCH_API_KEY }}
ALGOLIA_APPLICATION_ID: ${{ secrets.ALGOLIA_APPLICATION_ID }}
if: ${{ github.event.repository.full_name == github.repository }}
runs-on: ubuntu-latest
environment: production
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
build_and_deploy:
env:
NUXT_UI_PRO_LICENSE: ${{ secrets.NUXT_UI_PRO_LICENSE }}
ALGOLIA_SEARCH_API_KEY: ${{ secrets.ALGOLIA_SEARCH_API_KEY }}
ALGOLIA_APPLICATION_ID: ${{ secrets.ALGOLIA_APPLICATION_ID }}
if: ${{ github.event.repository.full_name == github.repository }}
environment: staging
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/secrets_scanner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0
- name: TruffleHog OSS
uses: trufflesecurity/trufflehog@f2a0ea0b70288cf25ba46d906034417555a207a8 # v3.69.0
uses: trufflesecurity/trufflehog@06bbd6fd493fcac4a6db0e4850a92bcf932fafed # v3.81.10
with:
path: ./
base: ${{ github.event.repository.default_branch }}
Expand Down
16 changes: 1 addition & 15 deletions app.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<script setup lang="ts">
import type { ParsedContent } from '@nuxt/content/types';
provideHeadlessUseId(() => useId());
const { seo } = useAppConfig();
Expand Down Expand Up @@ -33,18 +31,13 @@ useSeoMeta({
});
defineOgImageComponent('OgImageZK');
const { data: files } = useLazyFetch<ParsedContent[]>('/api/search.json', {
default: () => [],
server: false,
});
</script>

<template>
<div>
<NuxtLoadingIndicator />

<HeaderComponent :search="true" />
<HeaderComponent />

<UMain>
<NuxtLayout>
Expand All @@ -54,13 +47,6 @@ const { data: files } = useLazyFetch<ParsedContent[]>('/api/search.json', {

<FooterComponent />

<ClientOnly>
<LazyUContentSearch
:files="files"
:navigation="navigation || []"
/>
</ClientOnly>

<UNotifications />
</div>
</template>
Binary file modified bun.lockb
Binary file not shown.
14 changes: 1 addition & 13 deletions error.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script setup lang="ts">
import type { NuxtError } from '#app';
import type { ParsedContent } from '@nuxt/content/dist/runtime/types';
useSeoMeta({
title: 'Page not found',
Expand All @@ -21,17 +20,13 @@ useHead({
});
const { data: navigation } = await useAsyncData('navigation', () => fetchContentNavigation());
const { data: files } = useLazyFetch<ParsedContent[]>('/api/search.json', {
default: () => [],
server: false,
});
provide('navigation', navigation);
</script>

<template>
<div>
<HeaderComponent :search="true" />
<HeaderComponent />

<UMain>
<UContainer>
Expand All @@ -43,13 +38,6 @@ provide('navigation', navigation);

<FooterComponent />

<ClientOnly>
<LazyUContentSearch
:files="files"
:navigation="navigation"
/>
</ClientOnly>

<UNotifications />
</div>
</template>
1 change: 0 additions & 1 deletion nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ export default defineNuxtConfig({
},
},
routeRules: {
'/api/search.json': { prerender: true },
'*-surround': { robots: false },
'/*/*-surround': { robots: false },
'/tutorials/*/_dir': { robots: false },
Expand Down
47 changes: 25 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,41 +20,44 @@
"release": "semantic-release"
},
"dependencies": {
"@matterlabs/docs-nuxt-template": "2.7.1",
"@matterlabs/docs-nuxt-template": "2.8.5",
"@iconify-json/heroicons": "^1.2.0",
"@iconify-json/simple-icons": "^1.2.1",
"@iconify-json/vscode-icons": "^1.2.0",
"@nuxt/content": "^2.13.2",
"@nuxt/eslint": "^0.5.3",
"@nuxt/fonts": "^0.5.1",
"@nuxt/image": "^1.7.0",
"@nuxt/eslint": "^0.5.5",
"@nuxt/fonts": "^0.7.2",
"@nuxt/image": "^1.8.0",
"@nuxt/ui": "^2.18.4",
"@nuxt/ui-pro": "^1.4.1",
"@nuxtjs/seo": "^2.0.0-rc.10",
"dayjs": "^1.11.10",
"nuxt": "^3.12.4",
"nuxt-gtag": "^2.0.6",
"@nuxtjs/seo": "^2.0.0-rc.20",
"dayjs": "^1.11.13",
"nuxt": "^3.13.1",
"nuxt-gtag": "^2.1.0",
"nuxt-headlessui": "^1.2.0",
"nuxt-og-image": "^3.0.0-rc.53",
"rehype-katex": "^7.0.0",
"nuxt-og-image": "^3.0.0-rc.66",
"rehype-katex": "^7.0.1",
"remark-math": "^6.0.0",
"vue-tsc": "^2.0.16"
"vue-tsc": "^2.1.4"
},
"devDependencies": {
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@playwright/test": "^1.45.2",
"@vue/test-utils": "^2.4.5",
"cspell": "^8.7.0",
"@commitlint/cli": "^19.4.1",
"@commitlint/config-conventional": "^19.4.1",
"@playwright/test": "^1.46.1",
"@vue/test-utils": "^2.4.6",
"cspell": "^8.14.2",
"eslint": "^8.57.0",
"ethers": "^6.13.1",
"hardhat": "^2.22.6",
"husky": "^9.0.11",
"lint-staged": "^15.2.4",
"ethers": "^6.13.2",
"hardhat": "^2.22.10",
"husky": "^9.1.5",
"lint-staged": "^15.2.10",
"markdownlint": "^0.34.0",
"markdownlint-cli2": "^0.13.0",
"node-pty": "^1.0.0",
"pm2": "^5.4.2",
"prettier": "^3.2.5",
"prettier": "^3.3.3",
"prettier-eslint": "^16.3.0",
"prettier-plugin-tailwindcss": "^0.5.14",
"zksync-ethers": "^6.11.0"
"zksync-ethers": "^6.12.0"
}
}
52 changes: 51 additions & 1 deletion renovate.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,53 @@
{
"extends": ["github>nuxt/renovate-config-nuxt"]
"extends": [
"github>nuxt/renovate-config-nuxt",
"config:recommended",
"group:allNonMajor",
":semanticCommitTypeAll(chore)"
],
"timezone": "Europe/London",
"schedule": ["every weekend"],
"semanticCommits": "enabled",
"packageRules": [
{
"groupName": "Nuxt Dependencies",
"groupSlug": "template-deps",
"matchPackageNames": [
"@matterlabs/docs-nuxt-template",
"@iconify-json/**",
"@nuxt**",
"nuxt**",
"vue-easy-lightbox",
"@docsearch/**",
"rehype-katex",
"remark-math",
"dayjs"
]
},
{
"groupName": "ZK Dependencies",
"groupSlug": "zk-deps",
"matchPackageNames": ["ethers", "hardhat", "zksync-ethers"]
},
{
"groupName": "Tooling Dependencies",
"groupSlug": "tooling-deps",
"matchPackageNames": [
"eslint",
"@commitlint/**",
"cspell",
"husky",
"lint-staged",
"semantic-release",
"markdownlint**",
"prettier**",
"typescript",
"vue-tsc",
"@playwright/test",
"@vue/test-utils",
"node-pty",
"pm2"
]
}
]
}
7 changes: 0 additions & 7 deletions server/api/search.json.get.ts

This file was deleted.

0 comments on commit 419b9ec

Please sign in to comment.