Merge branch 'main' into jsjoeio/refactor-open

Author: jsjoeio

.github/workflows/ci.yaml

@@ -509,7 +509,7 @@ jobs:
           fetch-depth: 0
 
       - name: Run Trivy vulnerability scanner in repo mode
-        uses: aquasecurity/trivy-action@df3fb7d00b594d641478ba45b867f5cbb32108be
+        uses: aquasecurity/trivy-action@e27605859b9550f81ddd818eb816c8cb83cf9650
         with:
           scan-type: "fs"
           scan-ref: "."

.github/workflows/trivy-docker.yaml

@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Run Trivy vulnerability scanner in image mode
-        uses: aquasecurity/trivy-action@df3fb7d00b594d641478ba45b867f5cbb32108be
+        uses: aquasecurity/trivy-action@e27605859b9550f81ddd818eb816c8cb83cf9650
         with:
           image-ref: "docker.io/codercom/code-server:latest"
           ignore-unfixed: true

docs/README.md

@@ -14,8 +14,9 @@ access it in the browser.
 - Preserve battery life when you're on the go; all intensive tasks run on your
   server
 
-| 🔔 code-server is a free browser-based IDE while [Coder](https://coder.com/) is our enterprise developer workspace platform. For more information, visit [Coder.com](https://coder.com/docs/comparison)
-| ---
+> **Note**
+> To manage multiple IDEs, workspaces, and teams, see
+> our new project: [coder/coder](http://cdr.co/coder-github)
 
 ## Requirements
 

package.json

@@ -100,7 +100,7 @@
     "limiter": "^1.1.5",
     "pem": "^1.14.2",
     "proxy-agent": "^5.0.0",
-    "qs": "6.10.3",
+    "qs": "6.10.5",
     "rotating-file-stream": "^3.0.0",
     "safe-buffer": "^5.1.1",
     "safe-compare": "^1.1.4",

test/unit/node/util.test.ts

@@ -538,6 +538,12 @@ describe("isWsl", () => {
   })
 })
 
+describe("open", () => {
+  it("should throw an error if address is a string", async () => {
+    const address = "localhost:3000"
+    await expect(util.open(address)).rejects.toThrow("Cannot open socket paths")
+  })
+})
 describe("constructOpenOptions", () => {
   it("should return options for darwin", () => {
     const platform: NodeJS.Platform | "wsl" = "darwin"

yarn.lock

@@ -3513,10 +3513,10 @@ punycode@^2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-[email protected].3:
-  version "6.10.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
-  integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
+[email protected].5:
+  version "6.10.5"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4"
+  integrity sha512-O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ==
   dependencies:
     side-channel "^1.0.4"