feat: add support for biome v2

Author: nhedger

.github/workflows/build-images.yaml

@@ -13,7 +13,6 @@ on:
       - main
 
 jobs:
-
   generate-jobs:
     name: Generate jobs
     runs-on: ubuntu-latest
@@ -65,6 +64,7 @@ jobs:
           cache-to: type=gha,mode=max,scope=${{ matrix.versions.patch}}-arm64
           build-args: |
             BIOME_VERSION=${{ matrix.versions.patch }}
+            BIOME_TAG_START=${{ matrix.versions.major == '2' && '@biomejs/biome@' || 'cli/v'  }}
 
   build-images-amd64:
     name: ${{ matrix.versions.patch }} (amd64)
@@ -98,7 +98,8 @@ jobs:
           cache-from: type=gha,scope=${{ matrix.versions.patch}}-amd64
           cache-to: type=gha,mode=max,scope=${{ matrix.versions.patch}}-amd64
           build-args: |
-            BIOME_VERSION=${{ matrix.versions.patch }}  
+            BIOME_VERSION=${{ matrix.versions.patch }}
+            BIOME_TAG_START=${{ matrix.versions.major == '2' && '@biomejs/biome@' || 'cli/v'  }}
 
   stitch-images:
     name: Stitch images (${{ matrix.versions.patch }})
@@ -146,9 +147,11 @@ jobs:
           docker manifest push ghcr.io/biomejs/biome:${{ matrix.versions.patch }}
 
       - name: Create latest (${{ matrix.versions.patch }}) manifest
-        if: ${{ matrix.versions.patch == fromJson(needs.generate-jobs.outputs.biome-versions)[0].patch }}
+        if:
+          ${{ matrix.versions.patch ==
+          fromJson(needs.generate-jobs.outputs.biome-versions)[0].patch }}
         run: |
           docker manifest create ghcr.io/biomejs/biome:latest \
             ghcr.io/biomejs/biome:${{ matrix.versions.patch }}-arm64 \
             ghcr.io/biomejs/biome:${{ matrix.versions.patch }}-amd64
-          docker manifest push ghcr.io/biomejs/biome:latest
+          docker manifest push ghcr.io/biomejs/biome:latest

Dockerfile

@@ -3,15 +3,18 @@ ARG ALPINE_VERSION=3.20
 FROM rust:1.81.0-alpine${ALPINE_VERSION} AS builder
 
 ARG BIOME_VERSION=1.9.2
+ARG BIOME_TAG_START="cli/v"
+
 ENV BIOME_VERSION=${BIOME_VERSION}
+ENV BIOME_TAG_START=${BIOME_TAG_START}
 
 WORKDIR /usr/src/biome
 
 # Install build dependencies
 RUN apk add --no-cache musl-dev make
 
 # Downloads the tarball for the version of Biome we want to build from GitHub Releases
-ADD https://github.com/biomejs/biome/archive/refs/tags/cli/v${BIOME_VERSION}.tar.gz /tmp/biome.tar.gz
+ADD https://github.com/biomejs/biome/archive/refs/tags/${BIOME_TAG_START}${BIOME_VERSION}.tar.gz /tmp/biome.tar.gz
 
 # Extract the tarball into the working directory
 RUN tar -xzvf /tmp/biome.tar.gz -C /usr/src/biome/ --strip-components=1

bun.lockb

@@ -1,16 +1,16 @@
 {
-        "name": "biome-docker",
-        "type": "module",
-        "devDependencies": {
-                "@types/bun": "latest",
-                "@types/semver": "^7.5.8"
-        },
-        "peerDependencies": {
-                "typescript": "^5.0.0"
-        },
-        "dependencies": {
-                "@biomejs/biome": "^1.9.4",
-                "@biomejs/version-utils": "^0.4.0",
-                "semver": "^7.6.3"
-        }
+	"name": "biome-docker",
+	"type": "module",
+	"devDependencies": {
+		"@types/bun": "latest",
+		"@types/semver": "^7.5.8"
+	},
+	"peerDependencies": {
+		"typescript": "^5.0.0"
+	},
+	"dependencies": {
+		"@biomejs/biome": "^1.9.4",
+		"@biomejs/version-utils": "^0.4.0",
+		"semver": "^7.7.2"
+	}
 }

package.json

@@ -3,10 +3,13 @@ import { type SemVer, coerce, gt, gte } from "semver";
 
 const yankedVersions: string[] = [];
 
-const semverVersions = ((await getAllVersions(false)) ?? [])
-	?.map((v) => coerce(v))
+const semverVersions = ((await getAllVersions(true)) ?? [])
+	?.map((v) => coerce(v, { includePrerelease: true }))
 	.filter((v) => v !== null)
 	.filter((v) => gte(v, "1.7.0"))
+	.filter(
+		(v) => !v.prerelease.some((pre) => pre.toString().includes("nightly")),
+	)
 	.filter((v) => !yankedVersions.includes(v.format()));
 
 const getGreatestMinorForMajor = (versions: SemVer[]): Map<string, string> => {
@@ -90,16 +93,21 @@ const greatestPatchForMajorMinor =
 /**
  * Generate a list of all verions of Biome for which we want to create
  * Docker images.
+ *
+ * For beta versions, we only create images for the patch versions.
  */
-export const versions = semverVersions.map((version: SemVer) => ({
-	major: `${version.major}`,
-	minor: `${version.major}.${version.minor}`,
-	patch: version.format(),
-	createMajor:
-		greatestMinorForMajor.get(`${version.major}`) === version.format(),
-	createMinor:
-		greatestPatchForMajorMinor.get(`${version.major}.${version.minor}`) ===
-		version.format(),
-}));
+export const versions = semverVersions.map((version: SemVer) => {
+	return {
+		major: `${version.major}`,
+		minor: `${version.major}.${version.minor}`,
+		patch: version.format(),
+		createMajor:
+			greatestMinorForMajor.get(`${version.major}`) === version.format() &&
+			!version.prerelease.includes("beta"),
+		createMinor:
+			greatestPatchForMajorMinor.get(`${version.major}.${version.minor}`) ===
+				version.format() && !version.prerelease.includes("beta"),
+	};
+});
 
 console.log(JSON.stringify(versions));

scripts/generate-versions.ts

@@ -1,27 +1,27 @@
 {
-  "compilerOptions": {
-    // Enable latest features
-    "lib": ["ESNext", "DOM"],
-    "target": "ESNext",
-    "module": "ESNext",
-    "moduleDetection": "force",
-    "jsx": "react-jsx",
-    "allowJs": true,
+	"compilerOptions": {
+		// Enable latest features
+		"lib": ["ESNext", "DOM"],
+		"target": "ESNext",
+		"module": "ESNext",
+		"moduleDetection": "force",
+		"jsx": "react-jsx",
+		"allowJs": true,
 
-    // Bundler mode
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "verbatimModuleSyntax": true,
-    "noEmit": true,
+		// Bundler mode
+		"moduleResolution": "bundler",
+		"allowImportingTsExtensions": true,
+		"verbatimModuleSyntax": true,
+		"noEmit": true,
 
-    // Best practices
-    "strict": true,
-    "skipLibCheck": true,
-    "noFallthroughCasesInSwitch": true,
+		// Best practices
+		"strict": true,
+		"skipLibCheck": true,
+		"noFallthroughCasesInSwitch": true,
 
-    // Some stricter flags (disabled by default)
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    "noPropertyAccessFromIndexSignature": false
-  }
+		// Some stricter flags (disabled by default)
+		"noUnusedLocals": false,
+		"noUnusedParameters": false,
+		"noPropertyAccessFromIndexSignature": false
+	}
 }