Merge pull request #4 from cdr/main

update

Author: foxsir

.eslintrc.yaml

@@ -15,9 +15,6 @@ extends:
   - plugin:import/recommended
   - plugin:import/typescript
   - plugin:prettier/recommended
-  # Recommended by jest-playwright
-  # https://github.com/playwright-community/jest-playwright#globals
-  - plugin:jest-playwright/recommended
   # Prettier should always be last
   # Removes eslint rules that conflict with prettier.
   - prettier

.github/ISSUE_TEMPLATE/bug-report.md

@@ -10,9 +10,14 @@ assignees: ""
 
 Hi there! 👋
 
-Thanks for reporting a bug. Please see https://github.com/cdr/code-server/blob/main/docs/FAQ.md#how-do-i-debug-issues-with-code-server and include any logging information relevant to the issue.
-
-Please search for existing issues before filing, as they may contain additional information about the problem and descriptions of workarounds. Provide as much information as you can, so that we can reproduce the issue. Otherwise, we may not be able to help diagnose the problem, and may close the issue as unreproducible or incomplete. For visual defects, please include screenshots to help us understand the issue.
+Thanks for reporting a bug.
+
+Please search for existing issues before filing, as they may contain additional
+information about the problem and descriptions of workarounds. Provide as much
+information as you can, so that we can reproduce the issue. Otherwise, we may
+not be able to help diagnose the problem, and may close the issue as
+unreproducible or incomplete. For visual defects, please include screenshots to
+help us understand the issue.
 -->
 
 ## OS/Web Information
@@ -37,9 +42,29 @@ Please search for existing issues before filing, as they may contain additional
 
 <!-- What actually happens? -->
 
+## Logs
+
+<!--
+First run code-server with at least debug logging (or trace to be really
+thorough) by setting the --log flag or the LOG_LEVEL environment variable. -vvv
+and --verbose are aliases for --log trace. For example:
+
+code-server --log debug
+
+Once this is done, replicate the issue you're having then collect logging
+information from the following places:
+
+    1. The most recent files from ~/.local/share/code-server/coder-logs.
+    2. The browser console.
+    3. The browser network tab.
+
+Additionally, collecting core dumps (you may need to enable them first) if
+code-server crashes can be helpful.
+-->
+
 ## Screenshot
 
-<!-- Ideally provide a screenshot, gif, video or screenrecording -->
+<!-- Ideally provide a screenshot, gif, video or screen recording. -->
 
 ## Notes
 

.github/codeql-config.yml

@@ -0,0 +1,4 @@
+name: "code-server CodeQL config"
+
+paths-ignore:
+  - lib/vscode

.github/dependabot.yml

@@ -9,6 +9,7 @@ updates:
       # GitHub always delivers the latest versions for each major
       # release tag, so handle updates manually
       - dependency-name: "actions/*"
+      - dependency-name: "github/codeql-action/*"
 
   - package-ecosystem: "npm"
     directory: "/"
@@ -17,7 +18,7 @@ updates:
       time: "11:00"
     ignore:
       - dependency-name: "@types/node"
-        versions: ["14.x", "13.x"]
+        versions: ["15.x", "14.x", "13.x"]
       - dependency-name: "xdg-basedir"
         # 5.0.0 has breaking changes as they switch to named exports
         # and convert the module to ESM

.github/ranger.yml

@@ -26,7 +26,7 @@ labels:
   extension-request:
     action: close
     delay: 5s
-    message: >
+    comment: >
       Thanks for opening an extension request!
       We are currently in the process of switching extension
       marketplaces and transitioning over to [Open VSX](https://open-vsx.org/).

.github/workflows/ci.yaml

@@ -18,6 +18,8 @@ jobs:
   prebuild:
     name: Pre-build checks
     runs-on: ubuntu-latest
+    env:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -57,6 +59,10 @@ jobs:
         run: yarn test:unit
         if: success()
 
+      - name: Upload coverage report to Codecov
+        run: yarn coverage
+        if: success()
+
   build:
     name: Build
     needs: prebuild

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,33 @@
+name: "Code Scanning"
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [main]
+  schedule:
+    # Runs every Monday morning PST
+    - cron: "17 15 * * 1"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          config-file: ./.github/codeql-config.yml
+          languages: javascript
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

README.md

@@ -1,6 +1,6 @@
 # code-server · [!["GitHub Discussions"](https://img.shields.io/badge/%20GitHub-%20Discussions-gray.svg?longCache=true&logo=github&colorB=purple)](https://github.com/cdr/code-server/discussions) [!["Join us on Slack"](https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=brightgreen)](https://cdr.co/join-community) [![Twitter Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=social)](https://twitter.com/coderhq)
 
-![Lines](https://img.shields.io/badge/Coverage-51.47%25-green.svg)
+[![codecov](https://codecov.io/gh/cdr/code-server/branch/main/graph/badge.svg?token=5iM9farjnC)](https://codecov.io/gh/cdr/code-server)
 [![See latest docs](https://img.shields.io/static/v1?label=Docs&message=see%20latest%20&color=blue)](https://github.com/cdr/code-server/tree/v3.9.3/docs)
 
 Run [VS Code](https://github.com/Microsoft/vscode) on any machine anywhere and access it in the browser.

ci/README.md

@@ -24,8 +24,7 @@ Any file or directory in this subdirectory should be documented here.
    - It will upload them to the draft release.
 6. Run some basic sanity tests on one of the released packages.
    - Especially make sure the terminal works fine.
-7. Make sure the github release tag is the commit with the artifacts. This is a bug in
-   `hub` where uploading assets in step 5 will break the tag.
+7. Make sure the github release tag is the commit with the artifacts.
 8. Publish the release and merge the PR.
    1. CI will automatically grab the artifacts and then:
       1. Publish the NPM package from `npm-package`.
@@ -37,20 +36,6 @@ Any file or directory in this subdirectory should be documented here.
     1. Install [homebrew](https://brew.sh/)
     2. Run `brew bump-formula-pr --version=3.8.1 code-server` and update the version accordingly. This will bump the version and open a PR. Note: this will only work once the version is published on npm.
 
-## Updating Code Coverage in README
-
-Currently, we run a command to manually generate the code coverage shield. Follow these steps:
-
-1. Run `yarn test:unit` and make sure all the tests are passing
-2. Run `yarn badges`
-3. Go into the README and change the color from `red` to `green` in this line:
-
-```
-![Lines](https://img.shields.io/badge/Coverage-46.71%25-red.svg)
-```
-
-NOTE: we have to manually change the color because the default is red if coverage is less than 80. See code [here](https://github.com/olavoparno/istanbul-badges-readme/blob/develop/src/editor.ts#L24-L33).
-
 ## dev
 
 This directory contains scripts used for the development of code-server.
@@ -106,10 +91,10 @@ You can disable minification by setting `MINIFY=`.
 - [./ci/build/code-server.service](./build/code-server.service)
   - systemd user service packaged into the `.deb` and `.rpm`.
 - [./ci/build/release-github-draft.sh](./build/release-github-draft.sh) (`yarn release:github-draft`)
-  - Uses [hub](https://github.com/github/hub) to create a draft release with a template description.
+  - Uses [gh](https://github.com/cli/cli) to create a draft release with a template description.
 - [./ci/build/release-github-assets.sh](./build/release-github-assets.sh) (`yarn release:github-assets`)
   - Downloads the release-package artifacts for the current commit from CI.
-  - Uses [hub](https://github.com/github/hub) to upload the artifacts to the release
+  - Uses [gh](https://github.com/cli/cli) to upload the artifacts to the release
     specified in `package.json`.
 - [./ci/build/npm-postinstall.sh](./build/npm-postinstall.sh)
   - Post install script for the npm package.

ci/build/build-vscode.sh

@@ -10,8 +10,7 @@ main() {
   cd "$(dirname "${0}")/../.."
   cd lib/vscode
 
-  yarn gulp compile-build
-  yarn gulp compile-extensions-build
+  yarn gulp compile-build compile-extensions-build
   yarn gulp optimize --gulpfile ./coder.js
   if [[ $MINIFY ]]; then
     yarn gulp minify --gulpfile ./coder.js