From 26995e2082f468a67415bc413ea571fee698d529 Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Tue, 4 Nov 2025 19:03:39 +0000 Subject: [PATCH] fix(docs-infra): properly expose the prerendered routes for sitemap generation Properly expose the prerendered routes for sitemap generation rather than only copying the browser directory --- .github/actions/deploy-docs-site/lib/deploy.mts | 2 +- .github/actions/deploy-docs-site/lib/main.mts | 2 +- .github/actions/deploy-docs-site/main.js | 4 ++-- .github/workflows/ci.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/deploy-docs-site/lib/deploy.mts b/.github/actions/deploy-docs-site/lib/deploy.mts index 4ecead62a76..2c7b50975b4 100644 --- a/.github/actions/deploy-docs-site/lib/deploy.mts +++ b/.github/actions/deploy-docs-site/lib/deploy.mts @@ -23,7 +23,7 @@ export async function deployToFirebase( const config = JSON.parse(await readFile(configPath, {encoding: 'utf-8'})) as { hosting: {public: string}; }; - config['hosting']['public'] = './dist'; + config['hosting']['public'] = './browser'; await writeFile(deployConfigPath, JSON.stringify(config, null, 2)); diff --git a/.github/actions/deploy-docs-site/lib/main.mts b/.github/actions/deploy-docs-site/lib/main.mts index 18cfc25cb69..a8677de254b 100644 --- a/.github/actions/deploy-docs-site/lib/main.mts +++ b/.github/actions/deploy-docs-site/lib/main.mts @@ -36,7 +36,7 @@ async function deployDocs() { const stagingDir = await mkdtemp(join(tmpdir(), 'deploy-directory')); // Copy all files from the distDir into stagingDir and modify the permissions for editing - await cp(getInput('distDir'), join(stagingDir, 'dist'), {recursive: true}); + await cp(getInput('distDir'), stagingDir, {recursive: true}); spawnSync(`chmod 777 -R ${stagingDir}`, {encoding: 'utf-8', shell: true}); const deployment = (await getDeployments()).get(currentBranch); diff --git a/.github/actions/deploy-docs-site/main.js b/.github/actions/deploy-docs-site/main.js index 68fbe0f78d3..614ed4c4278 100644 --- a/.github/actions/deploy-docs-site/main.js +++ b/.github/actions/deploy-docs-site/main.js @@ -33478,7 +33478,7 @@ async function deployToFirebase(deployment, configPath, stagingDir) { console.log("Preparing for deployment to firebase..."); const deployConfigPath = join(stagingDir, "firebase.json"); const config = JSON.parse(await readFile(configPath, { encoding: "utf-8" })); - config["hosting"]["public"] = "./dist"; + config["hosting"]["public"] = "./browser"; await writeFile(deployConfigPath, JSON.stringify(config, null, 2)); firebase(`target:clear --config ${deployConfigPath} --project angular-dev-site hosting angular-docs`, stagingDir); firebase(`target:apply --config ${deployConfigPath} --project angular-dev-site hosting angular-docs ${deployment.destination}`, stagingDir); @@ -48236,7 +48236,7 @@ async function deployDocs() { const currentBranch = matchedRef[1]; const configPath = (0, import_core3.getInput)("configPath"); const stagingDir = await mkdtemp2(join5(tmpdir2(), "deploy-directory")); - await cp((0, import_core3.getInput)("distDir"), join5(stagingDir, "dist"), { recursive: true }); + await cp((0, import_core3.getInput)("distDir"), stagingDir, { recursive: true }); spawnSync3(`chmod 777 -R ${stagingDir}`, { encoding: "utf-8", shell: true }); const deployment = (await getDeployments()).get(currentBranch); if (deployment === void 0) { diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46c47ec4db0..114ada0c1f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -231,7 +231,7 @@ jobs: serviceKey: ${{ secrets.ANGULAR_DEV_SITE_DEPLOY }} githubReleaseTrainReadToken: ${{ secrets.DOCS_DEPLOY_GITHUB_RELEASE_TRAIN_TOKEN }} configPath: 'adev/firebase.json' - distDir: 'dist/bin/adev/dist/browser' + distDir: 'dist/bin/adev/dist' - name: Update Algolia synonym record run: pnpm tsx adev/scripts/synonyms/update-synonyms.mts env: