From ad9daf0329c108aae32e213bae2fbb5665bf00c7 Mon Sep 17 00:00:00 2001 From: almeidx Date: Mon, 7 Apr 2025 20:45:27 +0100 Subject: [PATCH 1/2] chore: move pnpm settings to pnpm-workspace.yaml --- .npmrc | 6 ------ package.json | 36 +----------------------------------- pnpm-workspace.yaml | 42 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 41 insertions(+), 43 deletions(-) delete mode 100644 .npmrc diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 344e3ff53d18..000000000000 --- a/.npmrc +++ /dev/null @@ -1,6 +0,0 @@ -auto-install-peers=false -resolution-mode=highest -public-hoist-pattern[]=*eslint* -public-hoist-pattern[]=*prettier* -public-hoist-pattern[]=*@rushstack/node-core-library* -public-hoist-pattern[]=*jju* diff --git a/package.json b/package.json index afcab3a362a9..d02871221192 100644 --- a/package.json +++ b/package.json @@ -75,42 +75,8 @@ "vercel": "^41.4.1", "vitest": "^3.1.1" }, - "pnpm": { - "peerDependencyRules": { - "ignoreMissing": [ - "*" - ], - "allowAny": [ - "*" - ] - }, - "overrides": { - "@contentlayer/utils>@opentelemetry/core": "^1.15.1", - "@contentlayer/utils>@opentelemetry/exporter-trace-otlp-grpc": "^0.41.1", - "@contentlayer/utils>@opentelemetry/resources": "^1.15.1", - "@contentlayer/utils>@opentelemetry/sdk-trace-base": "^1.15.1", - "@contentlayer/utils>@opentelemetry/sdk-trace-node": "^1.15.1", - "@contentlayer/utils>@opentelemetry/semantic-conventions": "^1.15.1" - }, - "patchedDependencies": { - "@microsoft/tsdoc-config": "patches/@microsoft__tsdoc-config.patch" - }, - "ignoredBuiltDependencies": [ - "core-js-pure" - ], - "onlyBuiltDependencies": [ - "@discordjs/opus", - "bufferutil", - "contentlayer", - "esbuild", - "protobufjs", - "sharp", - "utf-8-validate", - "zlib-sync" - ] - }, "engines": { "node": ">=22.12.0" }, - "packageManager": "pnpm@10.7.1" + "packageManager": "pnpm@10.8.0" } diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index e9b0dad63bac..6d550a947412 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,3 +1,41 @@ +autoInstallPeers: false + +ignoredBuiltDependencies: + - core-js-pure + +onlyBuiltDependencies: + - '@discordjs/opus' + - bufferutil + - contentlayer + - esbuild + - protobufjs + - sharp + - utf-8-validate + - zlib-sync + +overrides: + '@contentlayer/utils>@opentelemetry/core': ^1.15.1 + '@contentlayer/utils>@opentelemetry/exporter-trace-otlp-grpc': ^0.41.1 + '@contentlayer/utils>@opentelemetry/resources': ^1.15.1 + '@contentlayer/utils>@opentelemetry/sdk-trace-base': ^1.15.1 + '@contentlayer/utils>@opentelemetry/sdk-trace-node': ^1.15.1 + '@contentlayer/utils>@opentelemetry/semantic-conventions': ^1.15.1 + packages: - - 'apps/*' - - 'packages/*' + - apps/* + - packages/* + +patchedDependencies: + '@microsoft/tsdoc-config': patches/@microsoft__tsdoc-config.patch + +peerDependencyRules: + ignoreMissing: + - '*' + allowAny: + - '*' + +publicHoistPattern: + - '*eslint*' + - '*prettier*' + - '*@rushstack/node-core-library*' + - '*jju*' From 02b031ee8abbc9ef3ec1425433be33293da2e49c Mon Sep 17 00:00:00 2001 From: Almeida Date: Thu, 10 Apr 2025 13:53:23 +0000 Subject: [PATCH 2/2] chore: remove contentlayer remains --- apps/website/.gitignore | 1 - biome.json | 1 - pnpm-lock.yaml | 8 -------- pnpm-workspace.yaml | 9 --------- turbo.json | 15 ++++----------- unocss.config.ts | 2 +- 6 files changed, 5 insertions(+), 31 deletions(-) diff --git a/apps/website/.gitignore b/apps/website/.gitignore index 529c998d82d5..395dbf7ff55a 100644 --- a/apps/website/.gitignore +++ b/apps/website/.gitignore @@ -16,7 +16,6 @@ pids .env*.local # Dist -.contentlayer .next public/searchIndex src/assets/readme diff --git a/biome.json b/biome.json index d13d488f4bc3..b4a4e5f7c328 100644 --- a/biome.json +++ b/biome.json @@ -10,7 +10,6 @@ "ignore": [ ".turbo", ".vercel", - ".contentlayer", ".next", "coverage", "dist", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bfebf4d82e6e..3f2cf966134c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,14 +4,6 @@ settings: autoInstallPeers: false excludeLinksFromLockfile: false -overrides: - '@contentlayer/utils>@opentelemetry/core': ^1.15.1 - '@contentlayer/utils>@opentelemetry/exporter-trace-otlp-grpc': ^0.41.1 - '@contentlayer/utils>@opentelemetry/resources': ^1.15.1 - '@contentlayer/utils>@opentelemetry/sdk-trace-base': ^1.15.1 - '@contentlayer/utils>@opentelemetry/sdk-trace-node': ^1.15.1 - '@contentlayer/utils>@opentelemetry/semantic-conventions': ^1.15.1 - patchedDependencies: '@microsoft/tsdoc-config': hash: 96d7f4c962bda3b7fefb9be332eb6b1de236ee66cf4d00de1441904355148331 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 6d550a947412..6ab9b55a1fd6 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -6,21 +6,12 @@ ignoredBuiltDependencies: onlyBuiltDependencies: - '@discordjs/opus' - bufferutil - - contentlayer - esbuild - protobufjs - sharp - utf-8-validate - zlib-sync -overrides: - '@contentlayer/utils>@opentelemetry/core': ^1.15.1 - '@contentlayer/utils>@opentelemetry/exporter-trace-otlp-grpc': ^0.41.1 - '@contentlayer/utils>@opentelemetry/resources': ^1.15.1 - '@contentlayer/utils>@opentelemetry/sdk-trace-base': ^1.15.1 - '@contentlayer/utils>@opentelemetry/sdk-trace-node': ^1.15.1 - '@contentlayer/utils>@opentelemetry/semantic-conventions': ^1.15.1 - packages: - apps/* - packages/* diff --git a/turbo.json b/turbo.json index 50aebbf3746e..55d91f97c7f4 100644 --- a/turbo.json +++ b/turbo.json @@ -23,12 +23,11 @@ "public/**", "src/**", "!src/styles/unocss.css", - "contentlayer.config.ts", "next.config.js", "package.json", "tsconfig.json" ], - "outputs": [".next/**", ".next/cache/**", ".contentlayer/**"], + "outputs": [".next/**", ".next/cache/**"], "outputLogs": "full" }, "@discordjs/guide#build:prod": { @@ -37,12 +36,11 @@ "public/**", "src/**", "!src/styles/unocss.css", - "contentlayer.config.ts", "next.config.js", "package.json", "tsconfig.json" ], - "outputs": [".next/**", ".next/cache/**", ".contentlayer/**"], + "outputs": [".next/**", ".next/cache/**"], "outputLogs": "full" }, "@discordjs/website#build:local": { @@ -79,11 +77,6 @@ "outputs": [".next/**", ".next/cache/**", "src/assets/readme/**"], "outputLogs": "full" }, - "@discordjs/guide#generate:contentlayer": { - "inputs": ["src/**/*.mdx"], - "outputs": [".contentlayer/**"], - "outputLogs": "errors-only" - }, "test": { "dependsOn": ["^build"], "inputs": ["__mocks__/**", "__tests__/**", "src/**", "jest.config.js", "package.json", "tsconfig.json"], @@ -107,7 +100,7 @@ "outputLogs": "errors-only" }, "@discordjs/guide#lint": { - "dependsOn": ["^build", "build:local", "generate:contentlayer"], + "dependsOn": ["^build", "build:local"], "inputs": [ "../../eslint.config.js", "../../.prettierrc.json", @@ -151,7 +144,7 @@ "outputLogs": "errors-only" }, "@discordjs/guide#format": { - "dependsOn": ["^build", "generate:contentlayer"], + "dependsOn": ["^build"], "inputs": [ "../../eslint.config.js", "../../.prettierrc.json", diff --git a/unocss.config.ts b/unocss.config.ts index badb0a5d8398..32f9fa93e684 100644 --- a/unocss.config.ts +++ b/unocss.config.ts @@ -3,7 +3,7 @@ import { defineConfig, presetTypography, presetUno } from 'unocss'; export default defineConfig({ content: { - filesystem: ['src/**/*.tsx', 'contentlayer.config.ts', '../../packages/ui/src/lib/components/**/*.tsx'], + filesystem: ['src/**/*.tsx', '../../packages/ui/src/lib/components/**/*.tsx'], }, theme: { colors: {