diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 2c326d53..7e7836d3 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -6,6 +6,7 @@ on: env: HUSKY: 0 CI: true + NUXT_SITE_ENV: production # used for NuxtSEO to disable things like indexing on staging concurrency: group: production diff --git a/.husky/pre-commit b/.husky/pre-commit index 49190d4f..84aec536 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,2 @@ -bun install -git add bun.lockb bun lint-staged diff --git a/bun.lockb b/bun.lockb index baa295eb..c84efd27 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/nuxt.config.ts b/nuxt.config.ts index 88666e94..a6dcd9b6 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -1,10 +1,10 @@ // https://nuxt.com/docs/api/configuration/nuxt-config export default defineNuxtConfig({ extends: [['@matterlabs/docs-nuxt-template']], - modules: ['@nuxt/content', '@nuxt/ui', '@nuxt/eslint', '@nuxtjs/seo', 'nuxt-gtag'], + modules: ['nuxt-gtag'], site: { name: 'Community Code', - url: process.env.NUXT_SITE_ENV ? 'https://staging-code.zksync.io' : 'https://code.zksync.io', + url: process.env.NUXT_SITE_ENV === 'production' ? 'https://code.zksync.io' : 'https://staging-code.zksync.io', }, nitro: { plugins: ['./plugins/content.ts'], @@ -49,11 +49,12 @@ export default defineNuxtConfig({ }, }, }, - $production: process.env.NUXT_SITE_ENV - ? {} - : { - gtag: { - id: 'G-QHP3K0NN1M', - }, - }, + $production: + process.env.NUXT_SITE_ENV === 'production' + ? { + gtag: { + id: 'G-QHP3K0NN1M', + }, + } + : { gtag: { enabled: false } }, }); diff --git a/package.json b/package.json index a9f89147..9b682625 100644 --- a/package.json +++ b/package.json @@ -20,44 +20,32 @@ "release": "semantic-release" }, "dependencies": { - "@matterlabs/docs-nuxt-template": "2.9.1", - "@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.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.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.66", - "rehype-katex": "^7.0.1", - "remark-math": "^6.0.0", - "vue-tsc": "^2.1.4" + "@matterlabs/docs-nuxt-template": "2.9.2", + "dayjs": "1.11.13", + "nuxt": "3.13.2", + "nuxt-gtag": "3.0.1", + "rehype-katex": "7.0.1", + "remark-math": "6.0.0", + "vue-tsc": "2.1.6" }, "devDependencies": { - "@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.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.3.3", - "prettier-eslint": "^16.3.0", - "prettier-plugin-tailwindcss": "^0.5.14", - "zksync-ethers": "^6.12.0" + "@commitlint/cli": "19.5.0", + "@commitlint/config-conventional": "19.5.0", + "@playwright/test": "1.47.2", + "@vue/test-utils": "2.4.6", + "cspell": "8.14.4", + "eslint": "9.11.1", + "ethers": "6.13.3", + "hardhat": "2.22.12", + "husky": "9.1.6", + "lint-staged": "15.2.10", + "markdownlint": "0.35.0", + "markdownlint-cli2": "0.14.0", + "node-pty": "1.0.0", + "pm2": "5.4.2", + "prettier": "3.3.3", + "prettier-eslint": "16.3.0", + "prettier-plugin-tailwindcss": "0.6.8", + "zksync-ethers": "6.13.0" } } diff --git a/renovate.json b/renovate.json index f11cf9cf..6e490c6d 100644 --- a/renovate.json +++ b/renovate.json @@ -1,13 +1,15 @@ { - "extends": [ - "github>nuxt/renovate-config-nuxt", - "config:recommended", - "group:allNonMajor", - ":semanticCommitTypeAll(chore)" - ], + "extends": ["config:best-practices", ":semanticCommitTypeAll(chore)", "group:allNonMajor"], "timezone": "Europe/London", - "schedule": ["every weekend"], + "schedule": ["before 5am on monday"], "semanticCommits": "enabled", + "npm": { + "minimumReleaseAge": "1 week" + }, + "lockFileMaintenance": { + "enabled": true, + "automerge": true + }, "packageRules": [ { "groupName": "Nuxt Dependencies", @@ -15,24 +17,24 @@ "matchPackageNames": [ "@matterlabs/docs-nuxt-template", "@iconify-json/**", - "@nuxt**", - "nuxt**", + "/@*(nuxt)(js)*/", "vue-easy-lightbox", - "@docsearch/**", "rehype-katex", "remark-math", + "@vite-pwa/nuxt", "dayjs" ] }, { - "groupName": "ZK Dependencies", - "groupSlug": "zk-deps", - "matchPackageNames": ["ethers", "hardhat", "zksync-ethers"] + "groupName": "web3", + "groupSlug": "web3-deps", + "matchPackageNames": ["/openzeppelin/", "/zksync/", "/hardhat/"] }, { "groupName": "Tooling Dependencies", "groupSlug": "tooling-deps", "matchPackageNames": [ + "@playwright/test", "eslint", "@commitlint/**", "cspell",