fix: rspress preview URL

fi3ework · fi3ework · commit fafd7cf6e374 · 2025-11-04T20:06:18.000+08:00
diff --git a/.github/workflows/rspress-ecosystem-ci-from-commit.yml b/.github/workflows/rspress-ecosystem-ci-from-commit.yml
@@ -24,7 +24,6 @@ on:
         type: choice
         options:
           - "-"
-          - netlify
           - rsbuild
           - rslib
           - rspack
@@ -78,8 +77,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - suite: netlify
-            os: ubuntu-latest
           - suite: rsbuild
             os: ubuntu-latest
           - suite: rslib
diff --git a/.github/workflows/rspress-ecosystem-ci-from-pr.yml b/.github/workflows/rspress-ecosystem-ci-from-pr.yml
@@ -29,7 +29,6 @@ on:
         type: choice
         options:
           - "-"
-          - netlify
           - rsbuild
           - rslib
           - rspack
@@ -75,8 +74,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - suite: netlify
-            os: ubuntu-latest
           - suite: rsbuild
             os: ubuntu-latest
           - suite: rslib
diff --git a/.github/workflows/rspress-ecosystem-ci-selected.yml b/.github/workflows/rspress-ecosystem-ci-selected.yml
@@ -35,7 +35,6 @@ on:
         type: choice
         options:
           - "-"
-          - netlify
           - rsbuild
           - rslib
           - rspack
@@ -87,8 +86,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - suite: netlify
-            os: ubuntu-latest
           - suite: rsbuild
             os: ubuntu-latest
           - suite: rslib
diff --git a/ecosystem-ci.ts b/ecosystem-ci.ts
@@ -22,6 +22,7 @@ const STACK_CHOICES: Stack[] = [
   'rslib',
   'rsdoctor',
   'rslint',
+  'rspress',
 ];
 
 const cli = cac();
@@ -85,6 +86,7 @@ registerBuildAlias('build-rstest', 'rstest');
 registerBuildAlias('build-rslib', 'rslib');
 registerBuildAlias('build-rsdoctor', 'rsdoctor');
 registerBuildAlias('build-rslint', 'rslint');
+registerBuildAlias('build-rspress', 'rspress');
 
 cli
   .command(
@@ -316,5 +318,8 @@ function assignStackAliases(
   } else if (stack === 'rslint') {
     runOptions.rslintPath = stackPath;
     runOptions.rslintMajor = stackMajor;
+  } else if (stack === 'rspress') {
+    runOptions.rspressPath = stackPath;
+    runOptions.rspressMajor = stackMajor;
   }
 }
diff --git a/tests/rspress/rsbuild.ts b/tests/rspress/rsbuild.ts
@@ -1,8 +1,7 @@
 import type { RunOptions } from '../../types';
 import { cd, runInRepo } from '../../utils';
-import { deployPreviewToNetlify } from './netlify';
+import { MESSAGE, deployPreviewToNetlify } from './utils/_netlify';
 
-const MESSAGE = 'rspress-rsbuild-preview';
 const SITE_ID_ENV = 'RSPRESS_NETLIFY_SITE_ID_RSBUILD';
 
 export async function test(options: RunOptions) {
diff --git a/tests/rspress/rslib.ts b/tests/rspress/rslib.ts
@@ -1,8 +1,7 @@
 import type { RunOptions } from '../../types';
 import { cd, runInRepo } from '../../utils';
-import { deployPreviewToNetlify } from './netlify';
+import { MESSAGE, deployPreviewToNetlify } from './utils/_netlify';
 
-const MESSAGE = 'rspress-rslib-preview';
 const SITE_ID_ENV = 'RSPRESS_NETLIFY_SITE_ID_RSLIB';
 
 export async function test(options: RunOptions) {
diff --git a/tests/rspress/rspack.ts b/tests/rspress/rspack.ts
@@ -1,16 +1,15 @@
 import type { RunOptions } from '../../types';
 import { cd, runInRepo } from '../../utils';
-import { deployPreviewToNetlify } from './netlify';
+import { MESSAGE, deployPreviewToNetlify } from './utils/_netlify';
 
-const MESSAGE = 'rspress-rspack-preview';
 const SITE_ID_ENV = 'RSPRESS_NETLIFY_SITE_ID_RSPACK';
 
 export async function test(options: RunOptions) {
   await runInRepo({
     ...options,
     repo: 'web-infra-dev/rspack',
     branch: process.env.RSTEST ?? 'main',
-    build: ['build:cli:release'],
+    build: ['echo "Build step placeholder for rspack"'],
     beforeTest: async () => {
       cd('./website');
     },
diff --git a/tests/rspress/rstest.ts b/tests/rspress/rstest.ts
@@ -1,8 +1,7 @@
 import type { RunOptions } from '../../types';
 import { cd, runInRepo } from '../../utils';
-import { deployPreviewToNetlify } from './netlify';
+import { MESSAGE, deployPreviewToNetlify } from './utils/_netlify';
 
-const MESSAGE = 'rspress-rstest-preview';
 const SITE_ID_ENV = 'RSPRESS_NETLIFY_SITE_ID_RSTEST';
 
 export async function test(options: RunOptions) {
diff --git a/tests/rspress/utils/_netlify.ts b/tests/rspress/utils/_netlify.ts
@@ -1,4 +1,4 @@
-import { $ } from '../../utils';
+import { $ } from '../../../utils';
 
 interface DeployOptions {
   alias?: string;
@@ -10,19 +10,28 @@ interface DeployOptions {
 const DEFAULT_OUTPUT_DIR = 'dist';
 const DEFAULT_NETLIFY_CLI = 'netlify-cli@17.38.1';
 const DEFAULT_ALIAS = process.env.RSPRESS_NETLIFY_ALIAS ?? 'ecosystem-ci';
+export const MESSAGE = `${process.env.ECOSYSTEM_CI_TYPE}:${process.env.ECOSYSTEM_CI_REF}`;
 
 export async function deployPreviewToNetlify(options: DeployOptions) {
   const { message, outputDir = DEFAULT_OUTPUT_DIR, siteIdEnvVar } = options;
-  const alias = options.alias ?? DEFAULT_ALIAS;
+  const defaultAlias =
+    process.env.ECOSYSTEM_CI_TYPE === 'commit'
+      ? DEFAULT_ALIAS
+      : (process.env.ECOSYSTEM_CI_REF ?? DEFAULT_ALIAS);
+  const alias = options.alias ?? defaultAlias;
   const authToken = process.env.NETLIFY_AUTH_TOKEN;
   const siteId = siteIdEnvVar ? process.env[siteIdEnvVar] : undefined;
+  const missingVars: string[] = [];
+  if (!authToken) {
+    missingVars.push('NETLIFY_AUTH_TOKEN');
+  }
+  if (!siteId) {
+    missingVars.push(siteIdEnvVar || 'site ID');
+  }
 
-  if (!authToken || !siteId) {
-    const siteHint = siteIdEnvVar
-      ? `${siteIdEnvVar} or NETLIFY_SITE_ID`
-      : 'NETLIFY_SITE_ID';
+  if (missingVars.length > 0) {
     console.log(
-      `[rspress][netlify] Missing NETLIFY_AUTH_TOKEN or ${siteHint}, skip deploying alias ${alias}`,
+      `[rspress][netlify] Missing ${missingVars.join(', ')}, skip deploying alias ${alias}`,
     );
     return;
   }
diff --git a/types.d.ts b/types.d.ts
@@ -7,7 +7,8 @@ export type Stack =
   | 'rstest'
   | 'rslib'
   | 'rsdoctor'
-  | 'rslint';
+  | 'rslint'
+  | 'rspress';
 
 export interface EnvironmentData {
   stack: Stack;
@@ -23,6 +24,7 @@ export interface EnvironmentData {
   rslibPath?: string;
   rsdoctorPath?: string;
   rslintPath?: string;
+  rspressPath?: string;
 }
 
 export interface RunOptions {
@@ -39,12 +41,14 @@ export interface RunOptions {
   rslibPath?: string;
   rsdoctorPath?: string;
   rslintPath?: string;
+  rspressPath?: string;
   rsbuildMajor?: number;
   rspackMajor?: number;
   rstestMajor?: number;
   rslibMajor?: number;
   rsdoctorMajor?: number;
   rslintMajor?: number;
+  rspressMajor?: number;
   verify?: boolean;
   skipGit?: boolean;
   release?: string;
diff --git a/utils.ts b/utils.ts
@@ -26,6 +26,7 @@ const STACK_WORKSPACE_DIR: Record<Stack, string> = {
   rslib: 'rslib',
   rsdoctor: 'rsdoctor',
   rslint: 'rslint',
+  rspress: 'rspress',
 };
 
 const STACK_DEFAULT_REPO: Record<Stack, string> = {
@@ -35,6 +36,7 @@ const STACK_DEFAULT_REPO: Record<Stack, string> = {
   rslib: 'web-infra-dev/rslib',
   rsdoctor: 'web-infra-dev/rsdoctor',
   rslint: 'web-infra-dev/rslint',
+  rspress: 'web-infra-dev/rspress',
 };
 
 let activeStack: Stack = 'rsbuild';
@@ -45,7 +47,7 @@ let env: NodeJS.ProcessEnv;
 
 const monorepoPackagesCache: Partial<
   Record<
-    'rsbuild' | 'rstest' | 'rslib' | 'rsdoctor' | 'rslint',
+    'rsbuild' | 'rstest' | 'rslib' | 'rsdoctor' | 'rslint' | 'rspress',
     { name: string; directory: string }[]
   >
 > = {};
@@ -180,6 +182,8 @@ export async function setupEnvironment(stack: Stack): Promise<EnvironmentData> {
     data.rsdoctorPath = stackPath;
   } else if (stack === 'rslint') {
     data.rslintPath = stackPath;
+  } else if (stack === 'rspress') {
+    data.rspressPath = stackPath;
   }
   return data;
 }
@@ -291,7 +295,7 @@ function toCommand(
 }
 
 async function getMonorepoPackages(
-  stack: 'rsbuild' | 'rstest' | 'rslib' | 'rsdoctor' | 'rslint',
+  stack: 'rsbuild' | 'rstest' | 'rslib' | 'rsdoctor' | 'rslint' | 'rspress',
 ) {
   const cached = monorepoPackagesCache[stack];
   if (cached) {
@@ -418,7 +422,8 @@ export async function runInRepo(options: RunOptions & RepoOptions) {
     activeStack === 'rstest' ||
     activeStack === 'rslib' ||
     activeStack === 'rsdoctor' ||
-    activeStack === 'rslint'
+    activeStack === 'rslint' ||
+    activeStack === 'rspress'
   ) {
     const packages = await getMonorepoPackages(activeStack);
     if (options.release) {
@@ -519,7 +524,8 @@ export async function setupStackRepo(options: Partial<RepoOptions> = {}) {
     activeStack === 'rstest' ||
     activeStack === 'rslib' ||
     activeStack === 'rsdoctor' ||
-    activeStack === 'rslint'
+    activeStack === 'rslint' ||
+    activeStack === 'rspress'
   ) {
     delete monorepoPackagesCache[activeStack];
   } else if (activeStack === 'rspack') {
