Perpare v136 (#1000)

esm-dev · Jan 13, 2025 · 552eb0a · 552eb0a
1 parent 27e0d57
commit 552eb0a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 23 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,8 +25,8 @@ jobs:
         env:
           GOOS: ${{ secrets.DEPLOY_HOST_OS }}
           GOARCH: ${{ secrets.DEPLOY_HOST_ARCH }}
-          DEPLOY_HOST_NAME: ${{ secrets.DEPLOY_HOST_NAME }}
-          DEPLOY_HOST_PORT: ${{ secrets.DEPLOY_HOST_PORT }}
+          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+          DEPLOY_SSH_PORT: ${{ secrets.DEPLOY_SSH_PORT }}
           DEPLOY_SSH_USER: ${{ secrets.DEPLOY_SSH_USER }}
           DEPLOY_SSH_PRIVATE_KEY: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
           SERVER_CONFIG: ${{ secrets.SERVER_CONFIG }}
@@ -87,9 +87,6 @@ jobs:
           - os: linux
             arch: amd64
             ext: ''
-          - os: windows
-            arch: amd64
-            ext: '.exe'
 
     permissions:
       contents: read

diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
@@ -24,8 +24,8 @@ jobs:
         env:
           GOOS: ${{ secrets.DEPLOY_HOST_OS }}
           GOARCH: ${{ secrets.DEPLOY_HOST_ARCH }}
-          DEPLOY_HOST_NAME: ${{ secrets.DEPLOY_HOST_NAME }}
-          DEPLOY_HOST_PORT: ${{ secrets.DEPLOY_HOST_PORT }}
+          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+          DEPLOY_SSH_PORT: ${{ secrets.DEPLOY_SSH_PORT }}
           DEPLOY_SSH_USER: ${{ secrets.DEPLOY_SSH_USER }}
           DEPLOY_SSH_PRIVATE_KEY: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
           SERVER_VERSION: ${{ github.sha }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## v136(Unreleased)
+## v136
 
 * Add two builtin registries:
   * [jsr](https://jsr.io) - The open-source package registry for modern JavaScript and TypeScript, created by the Deno team. ([32cd2bd](https://github.com/esm-dev/esm.sh/commit/32cd2bd931f33118cbc96ee89583f20718c58fbf))
@@ -115,12 +115,13 @@
   * Use target `es2022` for browsers by default ([#903](https://github.com/esm-dev/esm.sh/pull/903))
   * Replace `window` with `globalThis` to make Deno 2 happy ([#964](https://github.com/esm-dev/esm.sh/pull/964))
   * Use `.mjs` extenstion for sub-module build ([#917](https://github.com/esm-dev/esm.sh/pull/917))
-  * dts-transformer: support `.d` extension
+  * dts-transformer: support `.d` and `d.cts` extension ([#987](https://github.com/esm-dev/esm.sh/pull/987))
+  * Support `major.minor.patch+build` versioning ([#985](https://github.com/esm-dev/esm.sh/pull/985))
+  * Support import attributes ([#976](https://github.com/esm-dev/esm.sh/pull/976))
+  * config: Support **S3-compatible** storage ([#886](https://github.com/esm-dev/esm.sh/pull/886))
   * config: Add `corsAllowOrigins` config
   * config: Add `customLandingPage` config ([#928](https://github.com/esm-dev/esm.sh/pull/928))
   * config: Add `npmQueryCacheTTL` config ([#921](https://github.com/esm-dev/esm.sh/pull/921))
-  * config: Add npmQueryCacheTTL config ([#921](https://github.com/esm-dev/esm.sh/pull/921))
-  * config: Support **S3-compatible** storage ([#886](https://github.com/esm-dev/esm.sh/pull/886))
 
 ## v135
 
@@ -1053,6 +1054,6 @@ For Deno:
 - Fix `__setImmediate$` is not defined
 - Support exports define in package.json
 - Support mjs extension
-- Improve NpmPackage resolve (**fix** [#41](https://github.com/esm-dev/esm.sh/issues/41))
+- Improve NpmPackage resolve (close [#41](https://github.com/esm-dev/esm.sh/issues/41))
 - Upgrade esbuild to **0.11.4**
 - Upgrade rex to **1.3.0**
diff --git a/cli/npm/package.json b/cli/npm/package.json
@@ -17,8 +17,7 @@
     "@esm.sh/cli-darwin-arm64": "*",
     "@esm.sh/cli-darwin-amd64": "*",
     "@esm.sh/cli-linux-arm64": "*",
-    "@esm.sh/cli-linux-amd64": "*",
-    "@esm.sh/cli-windows-amd64": "*"
+    "@esm.sh/cli-linux-amd64": "*"
   },
   "engines": {
     "node": ">=18"

diff --git a/scripts/deploy-ci.sh b/scripts/deploy-ci.sh
@@ -3,10 +3,10 @@
 mkdir -p ~/.ssh
 echo "${DEPLOY_SSH_PRIVATE_KEY}" >> ~/.ssh/id_ed25519
 chmod 600 ~/.ssh/id_ed25519
-ssh-keyscan $DEPLOY_HOST_NAME >> ~/.ssh/known_hosts
-echo "Host d.esm.sh" >> ~/.ssh/config
-echo "  HostName ${DEPLOY_HOST_NAME}" >> ~/.ssh/config
-echo "  Port ${DEPLOY_HOST_PORT}" >> ~/.ssh/config
+ssh-keyscan $DEPLOY_HOST >> ~/.ssh/known_hosts
+echo "Host esm.sh" >> ~/.ssh/config
+echo "  HostName ${DEPLOY_HOST}" >> ~/.ssh/config
+echo "  Port ${DEPLOY_SSH_PORT}" >> ~/.ssh/config
 echo "  User ${DEPLOY_SSH_USER}" >> ~/.ssh/config
 echo "  IdentityFile ~/.ssh/id_ed25519" >> ~/.ssh/config
 echo "  IdentitiesOnly yes" >> ~/.ssh/config
@@ -20,19 +20,23 @@ du -h esmd
 
 echo "--- uploading server build..."
 tar -czf esmd.tar.gz esmd
-scp esmd.tar.gz d.esm.sh:/tmp/esmd.tar.gz
+scp esmd.tar.gz esm.sh:/tmp/esmd.tar.gz
 if [ "$?" != "0" ]; then
   exit 1
 fi
 
 echo "--- installing server..."
-ssh d.esm.sh << EOF
-  gv=\$(git version)
-  if [ "\$?" != "0" ]; then
+ssh esm.sh << EOF
+  git version
+  if [ "\$?" == "127" ]; then
     apt update
     apt install -y git
   fi
-  echo \$gv
+
+  ufw version
+  if [ "\$?" == "0" ]; then
+    ufw allow http
+  fi
 
   configfile=/etc/esmd/config.json
   servicefile=/etc/systemd/system/esmd.service