From 641900615aa9a9a128d6934e65a57ba89e503cfd Mon Sep 17 00:00:00 2001 From: Vedanta-krit das (Alex Vedmedenko) Date: Thu, 7 Sep 2023 14:00:25 +0300 Subject: fixes issue #674 (#676) Co-authored-by: Chris Swithinbank --- .changeset/polite-kids-bow.md | 5 ++++ packages/starlight/components/Search.astro | 2 +- packages/starlight/index.ts | 2 +- packages/starlight/package.json | 4 +-- pnpm-lock.yaml | 46 +++++++++++++++--------------- 5 files changed, 32 insertions(+), 27 deletions(-) create mode 100644 .changeset/polite-kids-bow.md diff --git a/.changeset/polite-kids-bow.md b/.changeset/polite-kids-bow.md new file mode 100644 index 00000000..9fec22c4 --- /dev/null +++ b/.changeset/polite-kids-bow.md @@ -0,0 +1,5 @@ +--- +"@astrojs/starlight": patch +--- + +Upgrade and pin Pagefind to latest beta release. diff --git a/packages/starlight/components/Search.astro b/packages/starlight/components/Search.astro index be8997a8..ea2ae84a 100644 --- a/packages/starlight/components/Search.astro +++ b/packages/starlight/components/Search.astro @@ -110,7 +110,7 @@ const pagefindTranslations = { new PagefindUI({ element: '#starlight__search', baseUrl: import.meta.env.BASE_URL, - bundlePath: import.meta.env.BASE_URL.replace(/\/$/, '') + '/_pagefind/', + bundlePath: import.meta.env.BASE_URL.replace(/\/$/, '') + '/pagefind/', showImages: false, translations, }); diff --git a/packages/starlight/index.ts b/packages/starlight/index.ts index 2198f13f..50e37d04 100644 --- a/packages/starlight/index.ts +++ b/packages/starlight/index.ts @@ -68,7 +68,7 @@ export default function StarlightIntegration(opts: StarlightUserConfig): AstroIn const cwd = dirname(fileURLToPath(import.meta.url)); const relativeDir = relative(cwd, targetDir); return new Promise((resolve) => { - spawn('npx', ['-y', 'pagefind', '--source', relativeDir], { + spawn('npx', ['-y', 'pagefind', '--site', relativeDir], { stdio: 'inherit', shell: true, cwd, diff --git a/packages/starlight/package.json b/packages/starlight/package.json index 0d21e882..cabf756a 100644 --- a/packages/starlight/package.json +++ b/packages/starlight/package.json @@ -43,13 +43,13 @@ "dependencies": { "@astrojs/mdx": "^1.0.0", "@astrojs/sitemap": "^3.0.0", - "@pagefind/default-ui": "^1.0.0-alpha.5", + "@pagefind/default-ui": "1.0.0-beta.2", "@types/mdast": "^3.0.11", "bcp-47": "^2.1.0", "execa": "^7.1.1", "hast-util-select": "^5.0.5", "hastscript": "^7.2.0", - "pagefind": "^1.0.0-alpha.5", + "pagefind": "1.0.0-beta.2", "rehype": "^12.0.1", "remark-directive": "^2.0.1", "unified": "^10.1.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e131dbc0..6bd38926 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -142,8 +142,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 '@pagefind/default-ui': - specifier: ^1.0.0-alpha.5 - version: 1.0.0-alpha.5 + specifier: 1.0.0-beta.2 + version: 1.0.0-beta.2 '@types/mdast': specifier: ^3.0.11 version: 3.0.11 @@ -160,8 +160,8 @@ importers: specifier: ^7.2.0 version: 7.2.0 pagefind: - specifier: ^1.0.0-alpha.5 - version: 1.0.0-alpha.5 + specifier: 1.0.0-beta.2 + version: 1.0.0-beta.2 rehype: specifier: ^12.0.1 version: 12.0.1 @@ -1244,44 +1244,44 @@ packages: '@nodelib/fs.scandir': 2.1.5 fastq: 1.15.0 - /@pagefind/darwin-arm64@1.0.0-alpha.5: - resolution: {integrity: sha512-peZTl2+ndCupYkJ2qg16UDMKijosAU4BBFhpDv1ckjW49BE0Lh4vXHY12DxTvKaHrEu2XvC5blSjC+fkMe64vg==} + /@pagefind/darwin-arm64@1.0.0-beta.2: + resolution: {integrity: sha512-r9aSd1PreWJeGwrdK92udvySHfJSSvKyV6T+4YONh9lGKS3K2+YbX8K584IotFKB/60XLkdzmFIFLoK3CjOZ7w==} cpu: [arm64] os: [darwin] requiresBuild: true dev: false optional: true - /@pagefind/darwin-x64@1.0.0-alpha.5: - resolution: {integrity: sha512-3M35um77sLndK+nBS0eyYf9FvdzwFQ0BPhVu5Gs6pP7vPAtayzBkwtLsdrbRBeHpCODwF8Eg4zvxTQBc2+nhAg==} + /@pagefind/darwin-x64@1.0.0-beta.2: + resolution: {integrity: sha512-1YjlJu75oScva4PPDH2Q/FWAzfvP15XAxCmfqsMl6dtwfaZ4oqZ0Vx2jQ5CAxX2/FeDzqGQg7xkdngLekGiQwA==} cpu: [x64] os: [darwin] requiresBuild: true dev: false optional: true - /@pagefind/default-ui@1.0.0-alpha.5: - resolution: {integrity: sha512-swifkGRaPijH7mwMfQ7eNUxPh9Uvxzhi2sgmA9ipcc3Kcptu/O8em0jdCOwynyBIb5gJC6Paq3Hr+i2hJ5o1Hw==} + /@pagefind/default-ui@1.0.0-beta.2: + resolution: {integrity: sha512-x75qS7ywD8iG95CLyCTmfn07tMIfAhWTuu6mT56WGpl9Ci3Z4PTfqMRhzhRDTinHEAIKO3aAtQ5TrXuCCnXVoQ==} dev: false - /@pagefind/linux-arm64@1.0.0-alpha.5: - resolution: {integrity: sha512-LkOCsyhw15X87eJLHiHPcZmhM7QON4Au/68j0e7y6zCnXhzqjvs/26GqSfUdXhVIdGydxiKiPbSp9scbu15mKQ==} + /@pagefind/linux-arm64@1.0.0-beta.2: + resolution: {integrity: sha512-vPBFjWsmI9CBsZctmXSGc2qT7O8OPv9iLoXlQcmUrXSirwY4kESmi2W/t2Cpq6Theatyb+D7zMd0KZc6u0bX3w==} cpu: [arm64] os: [linux] requiresBuild: true dev: false optional: true - /@pagefind/linux-x64@1.0.0-alpha.5: - resolution: {integrity: sha512-k4k5hDX1zVejCby+f58/Ymx2ftQ/Misb31T0Zje0aO7n41GeWAimfZVetHOpHmBsyXBXm+afHwXdpWHL5vUkuA==} + /@pagefind/linux-x64@1.0.0-beta.2: + resolution: {integrity: sha512-jUyS6+OH8x8q8Sn4OPi1Br7DkTlUqeaiDBAqGmfcQARonD5lf/JpNidTSM+YYa/1cRgTijOyX1RbrwQE749LUg==} cpu: [x64] os: [linux] requiresBuild: true dev: false optional: true - /@pagefind/windows-x64@1.0.0-alpha.5: - resolution: {integrity: sha512-lXvE/4hsfF0tRkvPV+RkmAdysFcqlfGCTh/326E5NMtaQr9zILf9skuX3/1GwkmeojBAZssIQm2w+MdtULIzMA==} + /@pagefind/windows-x64@1.0.0-beta.2: + resolution: {integrity: sha512-I7vrQQswID6+9MdjSwnugqY9xBrSaCDdVJ9YCQMobsv5PONzdVXRjDUwDR72MAli0y/KxDYWGzBpDfKMSsvz6g==} cpu: [x64] os: [win32] requiresBuild: true @@ -4903,15 +4903,15 @@ packages: - utf-8-validate dev: true - /pagefind@1.0.0-alpha.5: - resolution: {integrity: sha512-uf0AMnxoAwiyn5a8mfaCk7skeXCRoZEh6E8JeX4NX3aUOoVyQNA2hJ2VGGbtM85mYT2AdiaG89zh7EqzakeDIw==} + /pagefind@1.0.0-beta.2: + resolution: {integrity: sha512-YwtoH63JRdh4ZoEeo4aPEKXyUyNR8l/wgH9up4HVB0xaGEz4R0BgefHC2MAvkIAX1sq4TgITgInqunL0wQWumA==} hasBin: true optionalDependencies: - '@pagefind/darwin-arm64': 1.0.0-alpha.5 - '@pagefind/darwin-x64': 1.0.0-alpha.5 - '@pagefind/linux-arm64': 1.0.0-alpha.5 - '@pagefind/linux-x64': 1.0.0-alpha.5 - '@pagefind/windows-x64': 1.0.0-alpha.5 + '@pagefind/darwin-arm64': 1.0.0-beta.2 + '@pagefind/darwin-x64': 1.0.0-beta.2 + '@pagefind/linux-arm64': 1.0.0-beta.2 + '@pagefind/linux-x64': 1.0.0-beta.2 + '@pagefind/windows-x64': 1.0.0-beta.2 dev: false /parse-entities@4.0.1: -- cgit