Restructure

.drone.yml

@@ -7,16 +7,29 @@ platform:
 
 steps:
 - name: cache:restore
-  image: node:12
+  image: codercom/nbin:centos
   commands:
+    - yum install -y libxkbfile-devel libsecret-devel
+    - . /opt/rh/devtoolset-6/enable
     - ./scripts/cacher.sh
 
+- name: lint
+  image: node:12
+  commands:
+    - yarn lint
+
+- name: test
+  image: codercom/nbin:centos
+  commands:
+    - yum install -y openssl
+    - yarn test
+
 - name: build
   image: codercom/nbin:centos
   commands:
     - yum install -y libxkbfile-devel libsecret-devel
     - . /opt/rh/devtoolset-6/enable
-    - timeout 50m ./scripts/ci.bash || echo 'Timed out or failed; continuing so we can preserve cache for the next run'
+    - timeout 50m ./scripts/ci.bash || echo 'Timed out or failed; continuing to preserve cache for the next run'
 
 - name: cache:package
   image: node:12
@@ -35,10 +48,10 @@ steps:
   when:
     event: push
 
-- name: test
-  image: node:12
+- name: test:build
+  image: codercom/nbin:centos
   commands:
-    - yarn test
+    - yarn test:build
 
 - name: publish:github
   image: plugins/github-release
@@ -69,7 +82,7 @@ steps:
 - name: publish:gcs
   image: plugins/gcs
   settings:
-    source: gcs_bucket
+    source: binary-upload
     target: codesrv-ci.cdr.sh/
     token:
       from_secret: gcs-token
@@ -88,13 +101,25 @@ steps:
 - name: cache:restore
   image: node:12-alpine
   commands:
+    - apk add libxkbfile-dev libsecret-dev build-base git bash python
     - ./scripts/cacher.sh
 
+- name: lint
+  image: node:12-alpine
+  commands:
+    - yarn lint
+
+- name: test
+  image: node:12-alpine
+  commands:
+    - apk add openssl
+    - yarn test
+
 - name: build
   image: node:12-alpine
   commands:
     - apk add libxkbfile-dev libsecret-dev build-base git bash python
-    - timeout 50m ./scripts/ci.bash || echo 'Timed out or failed; continuing so we can preserve cache for the next run'
+    - timeout 50m ./scripts/ci.bash || echo 'Timed out or failed; continuing to preserve cache for the next run'
 
 - name: cache:package
   image: node:12-alpine
@@ -113,10 +138,10 @@ steps:
   when:
     event: push
 
-- name: test
+- name: test:build
   image: node:12-alpine
   commands:
-    - yarn test
+    - yarn test:build
 
 - name: publish:github
   image: plugins/github-release
@@ -133,7 +158,7 @@ steps:
 - name: publish:gcs
   image: plugins/gcs
   settings:
-    source: gcs_bucket
+    source: binary-upload
     target: codesrv-ci.cdr.sh/
     token:
       from_secret: gcs-token
@@ -152,13 +177,24 @@ steps:
 - name: cache:restore
   image: node:12
   commands:
+    - apt update && apt install -y build-essential git libsecret-1-dev libx11-dev libxkbfile-dev
     - ./scripts/cacher.sh
 
+- name: lint
+  image: node:12
+  commands:
+    - yarn lint
+
+- name: test
+  image: node:12
+  commands:
+    - yarn test
+
 - name: build
   image: node:12
   commands:
     - apt update && apt install -y build-essential git libsecret-1-dev libx11-dev libxkbfile-dev
-    - timeout 50m ./scripts/ci.bash || echo 'Timed out or failed; continuing so we can preserve cache for the next run'
+    - timeout 50m ./scripts/ci.bash || echo 'Timed out or failed; continuing to preserve cache for the next run'
 
 - name: cache:package
   image: node:12
@@ -177,10 +213,10 @@ steps:
   when:
     event: push
 
-- name: test
+- name: test:build
   image: node:12
   commands:
-    - yarn test
+    - yarn test:build
 
 - name: publish:github
   image: plugins/github-release
@@ -211,7 +247,7 @@ steps:
 - name: publish:gcs
   image: plugins/gcs
   settings:
-    source: gcs_bucket
+    source: binary-upload
     target: codesrv-ci.cdr.sh/
     token:
       from_secret: gcs-token
@@ -230,13 +266,25 @@ steps:
 - name: cache:restore
   image: node:12-alpine
   commands:
+    - apk add libxkbfile-dev libsecret-dev build-base git bash python
     - ./scripts/cacher.sh
 
+- name: lint
+  image: node:12-alpine
+  commands:
+    - yarn lint
+
+- name: test
+  image: node:12-alpine
+  commands:
+    - apk add openssl
+    - yarn test
+
 - name: build
   image: node:12-alpine
   commands:
     - apk add libxkbfile-dev libsecret-dev build-base git bash python
-    - timeout 50m ./scripts/ci.bash || echo 'Timed out or failed; continuing so we can preserve cache for the next run'
+    - timeout 50m ./scripts/ci.bash || echo 'Timed out or failed; continuing to preserve cache for the next run'
 
 - name: cache:package
   image: node:12-alpine
@@ -255,10 +303,10 @@ steps:
   when:
     event: push
 
-- name: test
+- name: test:build
   image: node:12-alpine
   commands:
-    - yarn test
+    - yarn test:build
 
 - name: publish:github
   image: plugins/github-release
@@ -275,134 +323,9 @@ steps:
 - name: publish:gcs
   image: plugins/gcs
   settings:
-    source: gcs_bucket
+    source: binary-upload
     target: codesrv-ci.cdr.sh/
     token:
       from_secret: gcs-token
   when:
     event: tag
-
----
-kind: pipeline
-type: docker
-name: arm:linux
-
-platform:
-  arch: arm
-
-steps:
-- name: cache:restore
-  image: node:12
-  commands:
-    - ./scripts/cacher.sh
-
-- name: build
-  image: node:12
-  commands:
-    - apt update && apt install -y build-essential git libsecret-1-dev libx11-dev libxkbfile-dev
-    - timeout 50m ./scripts/ci.bash || echo 'Timed out or failed; continuing so we can preserve cache for the next run'
-
-- name: cache:package
-  image: node:12
-  commands:
-    - ./scripts/cacher.sh
-  when:
-    event: push
-
-- name: cache:push
-  image: plugins/gcs
-  settings:
-     source: cache-upload/
-     target: codesrv-ci.cdr.sh
-     token:
-       from_secret: gcs-token
-  when:
-    event: push
-
-- name: test
-  image: node:12
-  failure: ignore
-  commands:
-    - yarn test
-
-# - name: publish:github
-#   image: plugins/github-release
-#   settings:
-#    api_key:
-#      from_secret: github_token
-#    files: release/*.tar.gz
-#    draft: true
-#    overwrite: true
-#    title: ${DRONE_TAG}
-#   when:
-#    event: tag
-
-# - name: publish:docker
-#   image: plugins/docker
-#   settings:
-#     username:
-#       from_secret: docker_user
-#     password:
-#       from_secret: docker_pass
-#     repo: codercom/code-server
-#     dockerfile: scripts/ci.dockerfile
-#     tags:
-#       - ${DRONE_TAG}-arm
-#   when:
-#     event: tag
-
----
-kind: pipeline
-type: docker
-name: arm:alpine
-
-platform:
-  arch: arm
-
-steps:
-- name: cache:restore
-  image: node:12-alpine
-  commands:
-    - ./scripts/cacher.sh
-
-- name: build
-  image: node:12-alpine
-  commands:
-    - apk add libxkbfile-dev libsecret-dev build-base git bash python
-    - timeout 50m ./scripts/ci.bash || echo 'Timed out or failed; continuing so we can preserve cache for the next run'
-
-- name: cache:package
-  image: node:12-alpine
-  commands:
-    - ./scripts/cacher.sh
-  when:
-    event: push
-
-- name: cache:push
-  image: plugins/gcs
-  settings:
-     source: cache-upload/
-     target: codesrv-ci.cdr.sh
-     token:
-       from_secret: gcs-token
-  when:
-    event: push
-
-- name: test
-  image: node:12-alpine
-  failure: ignore
-  commands:
-    - yarn test
-
-# - name: publish:github
-#   image: plugins/github-release
-#   failure: ignore
-#   settings:
-#    api_key:
-#      from_secret: github_token
-#    files: release/*.tar.gz
-#    draft: true
-#    overwrite: true
-#    title: ${DRONE_TAG}
-#   when:
-#    event: tag

.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*]
+indent_style = space
+trim_trailing_whitespace = true
+indent_size = 2

.eslintrc.yaml

@@ -0,0 +1,39 @@
+parser: "@typescript-eslint/parser"
+env:
+  browser: true
+  es6: true   # Map, etc.
+  mocha: true
+  node: true
+
+parserOptions:
+  ecmaVersion: 2018
+  sourceType: module
+  ecmaFeatures:
+    jsx: true
+
+extends:
+  - eslint:recommended
+  - plugin:@typescript-eslint/recommended
+  - plugin:import/recommended
+  - plugin:import/typescript
+  - plugin:react/recommended
+  - plugin:prettier/recommended
+  - prettier # Removes eslint rules that conflict with prettier.
+  - prettier/@typescript-eslint # Remove conflicts again.
+
+plugins:
+  - react-hooks
+
+# Need to set this explicitly for the eslint-plugin-react.
+settings:
+  react:
+    version: detect
+
+rules:
+  # For overloads.
+  no-dupe-class-members: off
+
+  # https://www.npmjs.com/package/eslint-plugin-react-hooks
+  react-hooks/rules-of-hooks: error
+
+  react/prop-types: off # We use Typescript to verify prop types.

.gitignore

@@ -1,5 +1,14 @@
+*.tsbuildinfo
+.cache
+binaries
+binary-upload
+build
+cache-upload
+dist
+dist-build
 node_modules
-/build
-/release
-/binaries
-/lib
+out
+out-build
+release
+source
+yarn-cache

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/vscode"]
+	path = lib/vscode
+	url = https://github.com/microsoft/vscode