Upgrade Go to 1.25 (#1192)

ije · web-flow · commit 0358f14c1221 · 2025-08-17T23:53:59.000+08:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.x
+          go-version: 1.25.x
 
       - name: Run Deploy Script
         run: ./scripts/deploy-ci.sh
@@ -101,7 +101,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.x
+          go-version: 1.25.x
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.x
+          go-version: 1.25.x
 
       - name: Run Deploy Script
         run: ./scripts/deploy-ci.sh
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.x
+          go-version: 1.25.x
 
       - name: Setup Deno
         uses: denoland/setup-deno@main
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine AS builder
+FROM golang:1.25-alpine AS builder
 
 ARG SERVER_VERSION="v136"
 
@@ -8,31 +8,25 @@ RUN git clone --branch $SERVER_VERSION --depth 1 https://github.com/esm-dev/esm.
 WORKDIR /tmp/esm.sh
 RUN go build -ldflags="-s -w -X 'github.com/esm-dev/esm.sh/server.VERSION=${SERVER_VERSION}'" -o esmd server/esmd/main.go
 
-# ------
-
 FROM alpine:latest
 
-RUN apk update && \
-    apk add --no-cache git && \
-    addgroup -g 1000 esm && \
-    adduser -u 1000 -G esm -D esm && \
-    mkdir /esmd && \
-    chown -R esm:esm /esmd
+RUN apk update && apk add --no-cache git
+RUN addgroup -g 1000 esm && adduser -u 1000 --home=/esm -G esm -D esm
 
 COPY --from=builder /tmp/esm.sh/esmd /bin/esmd
-COPY --from=denoland/deno:bin-2.1.4 --chown=esm:esm /deno /esmd/bin/deno
+COPY --from=denoland/deno:bin-2.4.4 --chown=esm:esm /deno /esm/bin/deno
 
 # deno desn't provider musl build yet, the hack below makes the gnu build working in alpine
 # see https://github.com/denoland/deno_docker/blob/main/alpine.dockerfile
 COPY --from=gcr.io/distroless/cc --chown=root:root --chmod=755 /lib/*-linux-gnu/* /usr/local/lib/
 COPY --from=gcr.io/distroless/cc --chown=root:root --chmod=755 /lib/ld-linux-* /lib/
 RUN mkdir /lib64 && ln -s /usr/local/lib/ld-linux-* /lib64/
-ENV LD_LIBRARY_PATH="/usr/local/lib"
 
-ENV ESMDIR="/esmd"
-ENV ESMPORT="8080"
+ENV DENO_USE_CGROUPS=1
+ENV LD_LIBRARY_PATH="/usr/local/lib"
+ENV ESMDIR="/esm"
 
-WORKDIR /esmd
-EXPOSE 8080
+WORKDIR /esm
+EXPOSE 80
 USER esm
 CMD ["esmd"]
diff --git a/HOSTING.md b/HOSTING.md
@@ -60,18 +60,15 @@ Recommended hosting requirements:
 esm.sh provides a Docker image for fast deployment. You can pull the container image from <https://ghcr.io/esm-dev/esm.sh>.
 
 ```bash
-docker pull ghcr.io/esm-dev/esm.sh      # latest version
-docker pull ghcr.io/esm-dev/esm.sh:v136 # specific version
+docker pull ghcr.io/esm-dev/esm.sh      # latest stable version
+docker pull ghcr.io/esm-dev/esm.sh:v136 # specific stable version
+docker pull ghcr.io/esm-dev/esm.sh:dev  # latest dev version
 ```
 
 Run the container:
 
 ```bash
-docker run -p 8080:8080 \
-  -e NPM_REGISTRY=https://registry.npmjs.org/ \
-  -e NPM_TOKEN=****** \
-  -v MY_VOLUME:/esmd \
-  ghcr.io/esm-dev/esm.sh:latest
+docker run -p 80:80 ghcr.io/esm-dev/esm.sh:latest
 ```
 
 Available environment variables:
@@ -95,7 +92,7 @@ Available environment variables:
 - `STORAGE_ACCESS_KEY_ID`: The access key for S3 storage.
 - `STORAGE_SECRET_ACCESS_KEY`: The secret key for S3 storage.
 
-You can also create your own Dockerfile based on `ghcr.io/esm-dev/esm.sh`:
+You can also create your own Dockerfile with a `config.json` file:
 
 ```dockerfile
 FROM ghcr.io/esm-dev/esm.sh:latest
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/esm-dev/esm.sh
 
-go 1.23.0
+go 1.25.0
 
 require (
 	github.com/Masterminds/semver/v3 v3.4.0
@@ -13,15 +13,15 @@ require (
 	github.com/yuin/goldmark v1.7.13
 	github.com/yuin/goldmark-meta v1.1.0
 	go.etcd.io/bbolt v1.4.2
-	golang.org/x/net v0.42.0
-	golang.org/x/term v0.33.0
+	golang.org/x/net v0.43.0
+	golang.org/x/term v0.34.0
 )
 
 require (
 	github.com/andybalholm/brotli v1.2.0 // indirect
 	github.com/rs/cors v1.11.1 // indirect
-	golang.org/x/crypto v0.40.0 // indirect
-	golang.org/x/sys v0.34.0 // indirect
-	golang.org/x/text v0.27.0 // indirect
+	golang.org/x/crypto v0.41.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -30,19 +30,19 @@ github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUei
 github.com/yuin/goldmark-meta v1.1.0/go.mod h1:U4spWENafuA7Zyg+Lj5RqK/MF+ovMYtBvXi1lBb2VP0=
 go.etcd.io/bbolt v1.4.2 h1:IrUHp260R8c+zYx/Tm8QZr04CX+qWS5PGfPdevhdm1I=
 go.etcd.io/bbolt v1.4.2/go.mod h1:Is8rSHO/b4f3XigBC0lL0+4FwAQv3HXEEIgFMuKHceM=
-golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
-golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
-golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
-golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
+golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
+golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
+golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
+golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
 golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
 golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
-golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
-golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
-golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
-golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
+golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
diff --git a/internal/deno/deno.go b/internal/deno/deno.go
@@ -1,4 +1,4 @@
-package jsrt
+package deno
 
 import (
 	"archive/zip"
@@ -16,6 +16,8 @@ import (
 	"github.com/ije/gox/utils"
 )
 
+const DenoVersion = "2.4.4"
+
 func GetDenoPath(workDir string) (denoPath string, err error) {
 	if workDir == "" {
 		return "", errors.New("workDir is empty")
@@ -31,7 +33,7 @@ func GetDenoPath(workDir string) (denoPath string, err error) {
 		return denoPath, nil
 	}
 
-	err = installDeno(denoPath, "2.2.2")
+	err = installDeno(denoPath, DenoVersion)
 	if err != nil {
 		return "", err
 	}
@@ -69,7 +71,7 @@ func installDeno(installPath string, version string) (err error) {
 		}
 	}
 
-	url, err := getDenoInstallURL(version)
+	url, err := getDenoDotZipURL(version)
 	if err != nil {
 		return
 	}
@@ -129,7 +131,7 @@ func installDeno(installPath string, version string) (err error) {
 	return nil
 }
 
-func getDenoInstallURL(version string) (string, error) {
+func getDenoDotZipURL(version string) (string, error) {
 	var arch string
 	var os string
 
diff --git a/scripts/deploy-ci.sh b/scripts/deploy-ci.sh
@@ -42,12 +42,6 @@ ssh esm.sh << EOF
     apt-get install -y git
   fi
 
-  ufw version
-  if [ "\$?" == "0" ]; then
-    ufw allow http
-    ufw allow https
-  fi
-
   configjson=/etc/esmd/config.json
   servicerc=/etc/systemd/system/esmd.service
   reload=no
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -83,12 +83,6 @@ ssh -p $sshPort ${user}@${host} << EOF
     apt-get install -y git
   fi
 
-  ufw version
-  if [ "\$?" == "0" ]; then
-    ufw allow http
-    ufw allow https
-  fi
-
   configjson=/etc/esmd/config.json
   servicerc=/etc/systemd/system/esmd.service
 
diff --git a/server/cjs_module_lexer.go b/server/cjs_module_lexer.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/esm-dev/esm.sh/internal/jsrt"
+	"github.com/esm-dev/esm.sh/internal/deno"
 	"github.com/ije/gox/set"
 	"github.com/ije/gox/term"
 	"github.com/ije/gox/utils"
@@ -83,7 +83,7 @@ func cjsModuleLexer(b *BuildContext, cjsEntry string) (ret cjsModuleLexerResult,
 
 	if cjsModuleLexerIgnoredPackages.Has(b.esmPath.PkgName) {
 		err = doOnce("check-deno", func() (err error) {
-			_, err = jsrt.GetDenoPath(config.WorkDir)
+			_, err = deno.GetDenoPath(config.WorkDir)
 			return err
 		})
 		if err != nil {
@@ -104,7 +104,7 @@ func cjsModuleLexer(b *BuildContext, cjsEntry string) (ret cjsModuleLexerResult,
 			"--no-lock",
 			"--quiet",
 			js)
-		cmd.Env = []string{"DENO_NO_UPDATE_CHECK=1"}
+		cmd.Env = append(os.Environ(), "DENO_NO_UPDATE_CHECK=1")
 		data, err = cmd.CombinedOutput()
 		if err != nil {
 			msg := err.Error()
diff --git a/server/config.go b/server/config.go
@@ -108,11 +108,6 @@ func DefaultConfig() *Config {
 func normalizeConfig(config *Config) {
 	if config.Port == 0 {
 		config.Port = 80
-		if v := os.Getenv("ESMPORT"); v != "" {
-			if p, e := strconv.Atoi(v); e == nil && p >= 80 && p < 65536 {
-				config.Port = uint16(p)
-			}
-		}
 	}
 	if config.WorkDir == "" {
 		if v := os.Getenv("ESMDIR"); v != "" && existsDir(v) {
diff --git a/server/embed/x.ts b/server/embed/x.ts
@@ -6,8 +6,8 @@
 ((document, location) => {
   const currentScript = document.currentScript as HTMLScriptElement | null;
   const $: typeof document.querySelector = (s: string) => document.querySelector(s);
-  if (location.protocol == "file:" || ["localhost", "127.0.0.1"].includes(location.hostname)) {
-    console.error("[esm.sh/x] Please start your app with `npx esm.sh serve` in development env.");
+  if (location.protocol == "file:" || /^((\w+\.)?localhost|127\.0\.0\.1)$/.test(location.hostname)) {
+    console.error("[esm.sh/x] Please start your app with `npx esm.sh serve` in development mode.");
     return;
   }
   let main = currentScript?.getAttribute("href");
diff --git a/server/loader.go b/server/loader.go
@@ -7,7 +7,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/esm-dev/esm.sh/internal/jsrt"
+	"github.com/esm-dev/esm.sh/internal/deno"
 	esbuild "github.com/ije/esbuild-internal/api"
 )
 
@@ -19,7 +19,7 @@ type LoaderOutput struct {
 
 func runLoader(loaderJsPath string, filename string, code string) (out *LoaderOutput, err error) {
 	err = doOnce("check-deno", func() (err error) {
-		_, err = jsrt.GetDenoPath(config.WorkDir)
+		_, err = deno.GetDenoPath(config.WorkDir)
 		return err
 	})
 	if err != nil {
diff --git a/server/loader_implements.go b/server/loader_implements.go
@@ -4,13 +4,14 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
+	"os"
 	"os/exec"
 	"path"
 	"strconv"
 	"strings"
 
+	"github.com/esm-dev/esm.sh/internal/deno"
 	"github.com/esm-dev/esm.sh/internal/importmap"
-	"github.com/esm-dev/esm.sh/internal/jsrt"
 	"github.com/esm-dev/esm.sh/internal/npm"
 	"github.com/ije/gox/term"
 )
@@ -173,7 +174,7 @@ func resolveVueVersion(npmrc *NpmRC, importMap importmap.ImportMap) (vueVersion
 }
 
 func generateUnoCSS(npmrc *NpmRC, configCSS string, content string) (out *LoaderOutput, err error) {
-	loaderVersion := "0.5.0"
+	loaderVersion := "0.5.1"
 	loaderExecPath := path.Join(config.WorkDir, "bin", "unocss-"+loaderVersion)
 
 	err = doOnce(loaderExecPath, func() (err error) {
@@ -266,7 +267,7 @@ func compileUnocssLoader(npmrc *NpmRC, loaderVersion string, loaderExecPath stri
 	}
 
 	err = doOnce("check-deno", func() (err error) {
-		_, err = jsrt.GetDenoPath(config.WorkDir)
+		_, err = deno.GetDenoPath(config.WorkDir)
 		return err
 	})
 	if err != nil {
@@ -289,7 +290,7 @@ func compileUnocssLoader(npmrc *NpmRC, loaderVersion string, loaderExecPath stri
 		"--output", loaderExecPath,
 		path.Join(wd, "loader.js"),
 	)
-	cmd.Env = []string{"DENO_NO_UPDATE_CHECK=1"}
+	cmd.Env = append(os.Environ(), "DENO_NO_UPDATE_CHECK=1")
 	_, err = cmd.Output()
 	if err != nil {
 		err = fmt.Errorf("failed to compile %s: %s", path.Base(loaderExecPath), err.Error())
diff --git a/server/router.go b/server/router.go
@@ -573,14 +573,14 @@ func esmRouter(db Database, esmStorage storage.Storage, logger *log.Logger) rex.
 				}
 				res, err := fetchClient.Fetch(ctxUrl, nil)
 				if err != nil {
-					return rex.Status(500, "Failed to fetch unocss context page content")
+					return rex.Status(500, "unocss: Failed to fetch page content")
 				}
 				defer res.Body.Close()
 				if res.StatusCode != 200 {
 					if res.StatusCode == 404 {
-						return rex.Status(404, "Unocss context page not found")
+						return rex.Status(404, "unocss: context page not found")
 					}
-					return rex.Status(500, "Failed to fetch unocss context page content")
+					return rex.Status(500, "unocss: Failed to fetch page content: "+res.Status)
 				}
 				tokenizer := html.NewTokenizer(io.LimitReader(res.Body, 5*MB))
 				content := []string{}
diff --git a/server/utils.go b/server/utils.go
@@ -74,7 +74,7 @@ func isAbsPathSpecifier(specifier string) bool {
 
 // checks if the given hostname is a local address.
 func isLocalhost(hostname string) bool {
-	return hostname == "localhost" || hostname == "127.0.0.1" || (valid.IsIPv4(hostname) && strings.HasPrefix(hostname, "192.168."))
+	return hostname == "localhost" || strings.HasSuffix(hostname, ".localhost") || hostname == "127.0.0.1" || (valid.IsIPv4(hostname) && strings.HasPrefix(hostname, "192.168."))
 }
 
 // semverLessThan returns true if the version a is less than the version b.
diff --git a/web/internal/loader.js b/web/internal/loader.js
@@ -143,7 +143,7 @@ async function unocss(_id, content, config) {
   }
   let uno = once.unoGenerators.get(generatorId);
   if (!uno || uno.configCSS !== config?.css) {
-    uno = import("npm:@esm.sh/unocss@0.5.0").then(({ init }) => init({ configCSS: config?.css }));
+    uno = import("npm:@esm.sh/unocss@0.5.1").then(({ init }) => init({ configCSS: config?.css }));
     uno.configCSS = config?.css;
     once.unoGenerators.set(generatorId, uno);
   }
diff --git a/web/worker.go b/web/worker.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package jsrt`
	`1`	`+package deno`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"archive/zip"`
`@@ -16,6 +16,8 @@ import (`
`16`	`16`	`"github.com/ije/gox/utils"`
`17`	`17`	`)`
`18`	`18`
	`19`	`+const DenoVersion = "2.4.4"`
	`20`	`+`
`19`	`21`	`func GetDenoPath(workDir string) (denoPath string, err error) {`
`20`	`22`	`if workDir == "" {`
`21`	`23`	`return "", errors.New("workDir is empty")`
`@@ -31,7 +33,7 @@ func GetDenoPath(workDir string) (denoPath string, err error) {`
`31`	`33`	`return denoPath, nil`
`32`	`34`	`}`
`33`	`35`
`34`		`- err = installDeno(denoPath, "2.2.2")`
	`36`	`+ err = installDeno(denoPath, DenoVersion)`
`35`	`37`	`if err != nil {`
`36`	`38`	`return "", err`
`37`	`39`	`}`
`@@ -69,7 +71,7 @@ func installDeno(installPath string, version string) (err error) {`
`69`	`71`	`}`
`70`	`72`	`}`
`71`	`73`
`72`		`- url, err := getDenoInstallURL(version)`
	`74`	`+ url, err := getDenoDotZipURL(version)`
`73`	`75`	`if err != nil {`
`74`	`76`	`return`
`75`	`77`	`}`
`@@ -129,7 +131,7 @@ func installDeno(installPath string, version string) (err error) {`
`129`	`131`	`return nil`
`130`	`132`	`}`
`131`	`133`
`132`		`-func getDenoInstallURL(version string) (string, error) {`
	`134`	`+func getDenoDotZipURL(version string) (string, error) {`
`133`	`135`	`var arch string`
`134`	`136`	`var os string`
`135`	`137`