Merge pull request #15 from remcoros/cloudflared-2025.1.1

update cloudflared to 2025.1.1 / update bundling to use Deno emit

Makefile

@@ -1,4 +1,4 @@
-CLOUDFLARED_IMAGE := cloudflare/cloudflared:2024.12.2
+CLOUDFLARED_IMAGE := cloudflare/cloudflared:2025.1.1
 # sha256 hashes can be found in https://github.com/mikefarah/yq/releases/download/v4.40.7/checksums-bsd
 YQ_VERSION := 4.40.7
 YQ_SHA_AMD64 := 4f13ee9303a49f7e8f61e7d9c87402e07cc920ae8dfaaa8c10d7ea1b8f9f48ed
@@ -37,7 +37,7 @@ clean:
 	rm -f scripts/*.js
 
 scripts/embassy.js: $(TS_FILES)
-	deno bundle scripts/embassy.ts scripts/embassy.js
+	deno run --allow-read --allow-write --allow-env --allow-net scripts/bundle.ts
 
 docker-images/aarch64.tar: manifest.yaml Dockerfile docker_entrypoint.sh tmp/yq_linux_arm64
 ifeq ($(ARCH),x86_64)

manifest.yaml

@@ -1,8 +1,9 @@
 id: cloudflared
 title: "Cloudflare Tunnel"
-version: 2024.12.2
+version: 2025.1.1
 release-notes: |
-  * Update to cloudflared 2024.12.2 - See [full changelog](https://github.com/cloudflare/cloudflared/blob/2024.12.2/RELEASE_NOTES)
+  * Update to cloudflared 2025.1.1 - See [full changelog](https://github.com/cloudflare/cloudflared/blob/2025.1.1/RELEASE_NOTES)
+  * Update bundling process to use Deno emit module
 license: Apache 2.0
 wrapper-repo: "https://github.com/remcoros/cloudflared-startos"
 upstream-repo: "https://github.com/cloudflare/cloudflared"

scripts/bundle.ts

@@ -0,0 +1,3 @@
+import { bundle } from "https://deno.land/x/[email protected]/mod.ts";
+const result = await bundle("scripts/embassy.ts");
+await Deno.writeTextFile("scripts/embassy.js", result.code);

scripts/procedures/migrations.ts

@@ -1,4 +1,4 @@
 import { compat, types as T } from "../deps.ts";
 
 export const migration: T.ExpectedExports.migration = compat.migrations
-    .fromMapping({}, "2024.12.2" );
+    .fromMapping({}, "2025.1.1" );