From df015b52b86fea247e577bcae3bf2bdfe4afa48c Mon Sep 17 00:00:00 2001 From: Jon Harrell <4829245+jharrell@users.noreply.github.com> Date: Fri, 5 Apr 2024 22:23:36 -0500 Subject: [PATCH] update wrangler and add wrangler.toml --- .github/workflows/lost-pixel.yml | 7 +-- docusaurus.config.ts | 2 +- package-lock.json | 78 ++++++++++++++++---------------- package.json | 12 ++--- wrangler.toml | 10 ++++ 5 files changed, 57 insertions(+), 52 deletions(-) create mode 100644 wrangler.toml diff --git a/.github/workflows/lost-pixel.yml b/.github/workflows/lost-pixel.yml index 76cd037641..e70a57fa63 100644 --- a/.github/workflows/lost-pixel.yml +++ b/.github/workflows/lost-pixel.yml @@ -16,7 +16,7 @@ jobs: run: npm install - name: Build docs - run: npm run clean & npm run build + run: npm run clean && npm run build - name: Start docs run: npm run serve & @@ -24,11 +24,8 @@ jobs: - name: Generate sitemap run: npx lost-pixel page-sitemap-gen http://172.17.0.1:3000/sitemap.xml "./lost-pixel-pages.json" - - name: Edit sitemap urls - run: sed -i -e 's|"/docs|"|g' lost-pixel-pages.json - - name: Edit page names - run: sed -i -e 's/_/\//g' -e 's|prisma\.io\/docs||g' -re 's/(name.+)(\/)(\")/\1-\3/g' lost-pixel-pages.json + run: sed -i -e 's/_/\//g' -e 's|prisma\.io||g' -re 's/(name.+)(\/)(\")/\1-\3/g' lost-pixel-pages.json - name: Lost Pixel uses: lost-pixel/lost-pixel@v3.16.0 diff --git a/docusaurus.config.ts b/docusaurus.config.ts index cdf99293f1..0d2525bb14 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -11,7 +11,7 @@ const config: Config = { url: 'https://www.prisma.io', // Set the // pathname under which your site is served // For GitHub pages deployment, it is often '//' - baseUrl: '/', + baseUrl: process.env.DOCUSAURUS_BASE_URL ?? '/', trailingSlash: false, onBrokenLinks: 'warn', diff --git a/package-lock.json b/package-lock.json index bba66f336f..a11ee96e79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "@docusaurus/tsconfig": "^3.1.1", "@docusaurus/types": "^3.1.1", "typescript": "~5.2.2", - "wrangler": "^3.28.2" + "wrangler": "^3.48.0" }, "engines": { "node": ">=18.0" @@ -2140,9 +2140,9 @@ } }, "node_modules/@cloudflare/workerd-darwin-64": { - "version": "1.20240129.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20240129.0.tgz", - "integrity": "sha512-DfVVB5IsQLVcWPJwV019vY3nEtU88c2Qu2ST5SQxqcGivZ52imagLRK0RHCIP8PK4piSiq90qUC6ybppUsw8eg==", + "version": "1.20240404.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20240404.0.tgz", + "integrity": "sha512-rc/ov3I9GwgKRtUnkShNW3TIoZEPHzExrMRNlHq1VpXQRBSchHdMw8meMn54+oqgxW1AKLmPWj/c0A7EnYAsIw==", "cpu": [ "x64" ], @@ -2156,9 +2156,9 @@ } }, "node_modules/@cloudflare/workerd-darwin-arm64": { - "version": "1.20240129.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20240129.0.tgz", - "integrity": "sha512-t0q8ABkmumG1zRM/MZ/vIv/Ysx0vTAXnQAPy/JW5aeQi/tqrypXkO9/NhPc0jbF/g/hIPrWEqpDgEp3CB7Da7Q==", + "version": "1.20240404.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20240404.0.tgz", + "integrity": "sha512-V9oPjeC2PYBCoAYnjbO2bsjT7PtzxfUHnh780FUi1r59Hwxd7FNlojwsIidA0nS/1WV5UKeJusIdrYlQbsketA==", "cpu": [ "arm64" ], @@ -2172,9 +2172,9 @@ } }, "node_modules/@cloudflare/workerd-linux-64": { - "version": "1.20240129.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20240129.0.tgz", - "integrity": "sha512-sFV1uobHgDI+6CKBS/ZshQvOvajgwl6BtiYaH4PSFSpvXTmRx+A9bcug+6BnD+V4WgwxTiEO2iR97E1XuwDAVw==", + "version": "1.20240404.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20240404.0.tgz", + "integrity": "sha512-ndO7q6G2X8uYd5byGFzow4SWPqINQcmJ7pKKATNa+9vh/YMO0of2ihPntnm9uv577l8nRiAwRkHbnsWoEI33qQ==", "cpu": [ "x64" ], @@ -2188,9 +2188,9 @@ } }, "node_modules/@cloudflare/workerd-linux-arm64": { - "version": "1.20240129.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20240129.0.tgz", - "integrity": "sha512-O7q7htHaFRp8PgTqNJx1/fYc3+LnvAo6kWWB9a14C5OWak6AAZk42PNpKPx+DXTmGvI+8S1+futBGUeJ8NPDXg==", + "version": "1.20240404.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20240404.0.tgz", + "integrity": "sha512-hto5pjKYFqFu2Rvxnh84TzgDwalBRXQSwOVHltcgqo48en9TJDCN48ZtLj2G7QTGUOMW88h+nqdbj8+P7S/GXQ==", "cpu": [ "arm64" ], @@ -2204,9 +2204,9 @@ } }, "node_modules/@cloudflare/workerd-windows-64": { - "version": "1.20240129.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20240129.0.tgz", - "integrity": "sha512-YqGno0XSqqqkDmNoGEX6M8kJlI2lEfWntbTPVtHaZlaXVR9sWfoD7TEno0NKC95cXFz+ioyFLbgbOdnfWwmVAA==", + "version": "1.20240404.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20240404.0.tgz", + "integrity": "sha512-DpCLvNkOeFinKGJwv9qbyT7RLZ1168dhPx85IHSqAYVWZIszNSmNOkEDqklvoJoab01AqETrrEhwBdmjCA7qfA==", "cpu": [ "x64" ], @@ -3381,9 +3381,9 @@ } }, "node_modules/@fastify/busboy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.0.tgz", - "integrity": "sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz", + "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==", "dev": true, "engines": { "node": ">=14" @@ -12067,9 +12067,9 @@ } }, "node_modules/miniflare": { - "version": "3.20240129.2", - "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-3.20240129.2.tgz", - "integrity": "sha512-BPUg8HsPmWQlRFUeiQk274i8M9L0gOvzbkjryuTvCX+M53EwBpP0gM2wyrRr/HokQoJcxWGh3InBu6L8+0bbPw==", + "version": "3.20240404.0", + "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-3.20240404.0.tgz", + "integrity": "sha512-+FOTcztPMW3akmucX4vE0PWMNvP4JBwl4s9ieA84fcOaDtTbtfU1rHXpcacj16klpUpvSnD6xd8Sjsn6SJXPfg==", "dev": true, "dependencies": { "@cspotcode/source-map-support": "0.8.1", @@ -12080,7 +12080,7 @@ "glob-to-regexp": "^0.4.1", "stoppable": "^1.1.0", "undici": "^5.28.2", - "workerd": "1.20240129.0", + "workerd": "1.20240404.0", "ws": "^8.11.0", "youch": "^3.2.2", "zod": "^3.20.6" @@ -15800,9 +15800,9 @@ } }, "node_modules/undici": { - "version": "5.28.3", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.3.tgz", - "integrity": "sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==", + "version": "5.28.4", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz", + "integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==", "dev": true, "dependencies": { "@fastify/busboy": "^2.0.0" @@ -16699,9 +16699,9 @@ "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==" }, "node_modules/workerd": { - "version": "1.20240129.0", - "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20240129.0.tgz", - "integrity": "sha512-t4pnsmjjk/u+GdVDgH2M1AFmJaBUABshYK/vT/HNrAXsHSwN6VR8Yqw0JQ845OokO34VLkuUtYQYyxHHKpdtsw==", + "version": "1.20240404.0", + "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20240404.0.tgz", + "integrity": "sha512-U4tfnvBcPMsv7pmRGuF0J5UnoZi6tbc64tXNfyijI74r6w6Vlb2+a6eibdQL8g0g46+4vjuTKME9G5RvSvdc8g==", "dev": true, "hasInstallScript": true, "bin": { @@ -16711,17 +16711,17 @@ "node": ">=16" }, "optionalDependencies": { - "@cloudflare/workerd-darwin-64": "1.20240129.0", - "@cloudflare/workerd-darwin-arm64": "1.20240129.0", - "@cloudflare/workerd-linux-64": "1.20240129.0", - "@cloudflare/workerd-linux-arm64": "1.20240129.0", - "@cloudflare/workerd-windows-64": "1.20240129.0" + "@cloudflare/workerd-darwin-64": "1.20240404.0", + "@cloudflare/workerd-darwin-arm64": "1.20240404.0", + "@cloudflare/workerd-linux-64": "1.20240404.0", + "@cloudflare/workerd-linux-arm64": "1.20240404.0", + "@cloudflare/workerd-windows-64": "1.20240404.0" } }, "node_modules/wrangler": { - "version": "3.28.2", - "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-3.28.2.tgz", - "integrity": "sha512-hlD4f2avBZuR1+qo9Um6D1prdWrSRtGTo9h6o/AKce+bHQEJWoJgJKHeLmrpZlLtHg/gGR1Xa1xzrexhuIzeJw==", + "version": "3.48.0", + "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-3.48.0.tgz", + "integrity": "sha512-Wv7JS6FyX1j9HkaM6WL3fmTzBMAYc4hPSyZCuxuH55hkJDX/7ts+YAgsaN1U8rKoDrV3FVSgBfI9TyqP9iuM8Q==", "dev": true, "dependencies": { "@cloudflare/kv-asset-handler": "0.3.1", @@ -16730,7 +16730,7 @@ "blake3-wasm": "^2.1.5", "chokidar": "^3.5.3", "esbuild": "0.17.19", - "miniflare": "3.20240129.2", + "miniflare": "3.20240404.0", "nanoid": "^3.3.3", "path-to-regexp": "^6.2.0", "resolve": "^1.22.8", @@ -16750,7 +16750,7 @@ "fsevents": "~2.3.2" }, "peerDependencies": { - "@cloudflare/workers-types": "^4.20230914.0" + "@cloudflare/workers-types": "^4.20240404.0" }, "peerDependenciesMeta": { "@cloudflare/workers-types": { diff --git a/package.json b/package.json index b3e3d3f176..6bb48e0eaf 100644 --- a/package.json +++ b/package.json @@ -5,16 +5,14 @@ "scripts": { "docusaurus": "docusaurus", "start": "docusaurus start", - "build": "docusaurus build && sed -re 's|(prisma\\.io)|\\1/docs|g' build/sitemap.xml > build/sitemap.xml.tmp && mv build/sitemap.xml.tmp build/sitemap.xml", + "build": "docusaurus build", "swizzle": "docusaurus swizzle", - "deploy": "docusaurus deploy", + "deploy": "npm run build && wrangler pages deploy ./build", "clean": "docusaurus clear", + "clear": "docusaurus clear", "serve": "docusaurus serve", "write-translations": "docusaurus write-translations", - "write-heading-ids": "docusaurus write-heading-ids", - "typecheck": "tsc", - "pages:dev": "wrangler pages dev --compatibility-date=2024-01-17 --proxy 3000 -- npm run start", - "pages:deploy": "npm run build && wrangler pages deploy ./build" + "write-heading-ids": "docusaurus write-heading-ids" }, "dependencies": { "@docusaurus/core": "^3.1.1", @@ -37,7 +35,7 @@ "@docusaurus/tsconfig": "^3.1.1", "@docusaurus/types": "^3.1.1", "typescript": "~5.2.2", - "wrangler": "^3.28.2" + "wrangler": "^3.48.0" }, "browserslist": { "production": [ diff --git a/wrangler.toml b/wrangler.toml new file mode 100644 index 0000000000..30dfcebf42 --- /dev/null +++ b/wrangler.toml @@ -0,0 +1,10 @@ +# Generated by Wrangler on Fri Apr 05 2024 19:27:05 GMT-0500 (Central Daylight Time) +name = "docs" +pages_build_output_dir = "build" +compatibility_date = "2024-03-18" + +[vars] +DOCUSAURUS_BASE_URL='/' + +[env.production.vars] +DOCUSAURUS_BASE_URL='/docs/'