From 187541c46b5efc2c0b5a6bed02fd6add6b1c2d86 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Wed, 17 Mar 2021 11:32:40 -0700 Subject: [PATCH 1/7] docs: update hiring section in readme --- README.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/README.md b/README.md index 7050250c2..fbfe1bbfc 100644 --- a/README.md +++ b/README.md @@ -70,13 +70,7 @@ See [CONTRIBUTING](./docs/CONTRIBUTING.md) for details. ## Hiring -We ([@cdr](https://github.com/cdr)) are looking for engineers to help [maintain -code-server](https://jobs.lever.co/coder/e40becde-2cbd-4885-9029-e5c7b0a734b8), innovate on open source, and streamline dev workflows. - -Our main office is in Austin, Texas. Remote is ok as long as -you're in North America or Europe. - -Please get in [touch](mailto:jobs@coder.com) with your resume/GitHub if interested. +Interested in working at [@cdr](https://github.com/cdr)? Check out our [jobs page](https://jobs.lever.co/coder)! ## For Organizations From 02134c01f6f112c64d17ea417b282f1fb99d0f94 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Wed, 17 Mar 2021 13:43:57 -0700 Subject: [PATCH 2/7] Update README.md Co-authored-by: Jonathan Yu --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fbfe1bbfc..662556566 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ See [CONTRIBUTING](./docs/CONTRIBUTING.md) for details. ## Hiring -Interested in working at [@cdr](https://github.com/cdr)? Check out our [jobs page](https://jobs.lever.co/coder)! +Interested in [working at Coder](https://coder.com)? Check out [our open positions](https://jobs.lever.co/coder)! ## For Organizations From 4c6cf8414c1b5a06aaf2495d57c700c7a9130bda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Mar 2021 16:29:14 -0500 Subject: [PATCH 3/7] chore(deps-dev): bump @types/parcel-bundler from 1.12.1 to 1.12.3 (#2926) Bumps [@types/parcel-bundler](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/parcel-bundler) from 1.12.1 to 1.12.3. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/parcel-bundler) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 99534ec83..5ae8d690a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1178,9 +1178,9 @@ integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== "@types/parcel-bundler@^1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@types/parcel-bundler/-/parcel-bundler-1.12.1.tgz#21c16a4912393b2d6414d1f1f9e886a30f79f2e6" - integrity sha512-I7Cy3Uy/HqMa3E7dyPxTkiPFx0gi3bIQxAcZCP8v1vFx+esdVFgbZBnusa6VfoIeFk61/fnVl25RyYKgDHVLtw== + version "1.12.3" + resolved "https://registry.yarnpkg.com/@types/parcel-bundler/-/parcel-bundler-1.12.3.tgz#29512506ac6db43351e8dc8c019d30342088cecc" + integrity sha512-ogGPp2RMVgNBGl/swDtKS954VG2SbWJfSL22sgNg42QH8dTS6uvQHPquodkHjl8nvPuq0FC71bGIl/MKIwEkaw== dependencies: "@types/express-serve-static-core" "*" From a8e2ede4f58855b0208c5d7c04d010e656b254ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Mar 2021 16:30:10 -0500 Subject: [PATCH 4/7] chore(deps): bump js-yaml from 3.14.0 to 4.0.0 (#2920) * chore(deps): bump js-yaml from 3.14.0 to 4.0.0 Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.14.0 to 4.0.0. - [Release notes](https://github.com/nodeca/js-yaml/releases) - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/3.14.0...4.0.0) Signed-off-by: dependabot[bot] * fix(src/node): replace yaml.safeLoad with load Also update @types/yaml to ^4.0.0. Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Akash Satheesan --- package.json | 4 ++-- src/node/cli.ts | 2 +- yarn.lock | 20 ++++++++++++++++---- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 87ad2c46e..615f604c8 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@types/cookie-parser": "^1.4.2", "@types/express": "^4.17.8", "@types/http-proxy": "^1.17.4", - "@types/js-yaml": "^3.12.3", + "@types/js-yaml": "^4.0.0", "@types/node": "^12.12.7", "@types/parcel-bundler": "^1.12.1", "@types/pem": "^1.9.5", @@ -84,7 +84,7 @@ "express": "^5.0.0-alpha.8", "http-proxy": "^1.18.0", "httpolyglot": "^0.1.2", - "js-yaml": "^3.13.1", + "js-yaml": "^4.0.0", "limiter": "^1.1.5", "node-fetch": "^2.6.1", "pem": "^1.14.2", diff --git a/src/node/cli.ts b/src/node/cli.ts index 6a8aab0cd..cf3ad4734 100644 --- a/src/node/cli.ts +++ b/src/node/cli.ts @@ -536,7 +536,7 @@ export function parseConfigFile(configFile: string, configPath: string): ConfigA return { _: [], config: configPath } } - const config = yaml.safeLoad(configFile, { + const config = yaml.load(configFile, { filename: configPath, }) if (!config || typeof config === "string") { diff --git a/yarn.lock b/yarn.lock index 5ae8d690a..5d65f7c65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1135,10 +1135,10 @@ dependencies: "@types/node" "*" -"@types/js-yaml@^3.12.3": - version "3.12.5" - resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.5.tgz#136d5e6a57a931e1cce6f9d8126aa98a9c92a6bb" - integrity sha512-JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww== +"@types/js-yaml@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.0.tgz#d1a11688112091f2c711674df3a65ea2f47b5dfb" + integrity sha512-4vlpCM5KPCL5CfGmTbpjwVKbISRYhduEJvvUWsH5EB7QInhEj94XPZ3ts/9FPiLZFqYO0xoW4ZL8z2AabTGgJA== "@types/json-schema@^7.0.3": version "7.0.6" @@ -1491,6 +1491,11 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" @@ -4479,6 +4484,13 @@ js-yaml@^3.10.0, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" + integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== + dependencies: + argparse "^2.0.1" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" From a41b47c1de37f3e4832a3485128384ecb82dc37d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Mar 2021 16:30:41 -0500 Subject: [PATCH 5/7] chore(deps-dev): bump ts-node from 9.0.0 to 9.1.1 (#2919) Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 9.0.0 to 9.1.1. - [Release notes](https://github.com/TypeStrong/ts-node/releases) - [Commits](https://github.com/TypeStrong/ts-node/compare/v9.0.0...v9.1.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Akash Satheesan --- yarn.lock | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5d65f7c65..7d075c221 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2415,6 +2415,11 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + cross-spawn@^6.0.4: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -7525,11 +7530,12 @@ trough@^1.0.0: integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== ts-node@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" - integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== + version "9.1.1" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d" + integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg== dependencies: arg "^4.1.0" + create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" source-map-support "^0.5.17" From 923ef2f3c4461bd79afddf3edac97f724849532a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Mar 2021 16:31:23 -0500 Subject: [PATCH 6/7] chore(deps-dev): bump eslint-config-prettier from 6.12.0 to 8.1.0 (#2918) * chore(deps-dev): bump eslint-config-prettier from 6.12.0 to 8.1.0 Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.12.0 to 8.1.0. - [Release notes](https://github.com/prettier/eslint-config-prettier/releases) - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.12.0...v8.1.0) Signed-off-by: dependabot[bot] * fix(eslintrc): remove prettier/@typescript extend Removed by upstream in v8.0. Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Akash Satheesan --- .eslintrc.yaml | 1 - package.json | 2 +- yarn.lock | 15 ++++----------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.eslintrc.yaml b/.eslintrc.yaml index edb20bfe1..c9261cef9 100644 --- a/.eslintrc.yaml +++ b/.eslintrc.yaml @@ -16,7 +16,6 @@ extends: - plugin:import/typescript - plugin:prettier/recommended - prettier # Removes eslint rules that conflict with prettier. - - prettier/@typescript-eslint # Remove conflicts again. rules: # Sometimes you need to add args to implement a function signature even diff --git a/package.json b/package.json index 615f604c8..823af3d95 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "@typescript-eslint/parser": "^4.7.0", "doctoc": "^2.0.0", "eslint": "^7.7.0", - "eslint-config-prettier": "^6.0.0", + "eslint-config-prettier": "^8.1.0", "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.18.2", "eslint-plugin-prettier": "^3.1.0", diff --git a/yarn.lock b/yarn.lock index 7d075c221..0263aa661 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3088,12 +3088,10 @@ escodegen@~1.9.0: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^6.0.0: - version "6.12.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz#9eb2bccff727db1c52104f0b49e87ea46605a0d2" - integrity sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw== - dependencies: - get-stdin "^6.0.0" +eslint-config-prettier@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz#4ef1eaf97afe5176e6a75ddfb57c335121abc5a6" + integrity sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw== eslint-import-resolver-alias@^1.1.2: version "1.1.2" @@ -3646,11 +3644,6 @@ get-port@^3.2.0: resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc" integrity sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw= -get-stdin@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" - integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g== - get-stdin@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" From 32d882a50740e200eb1ba169d3a0bdcf2eeffc1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Mar 2021 16:31:59 -0500 Subject: [PATCH 7/7] chore(deps-dev): bump @types/express from 4.17.8 to 4.17.11 (#2916) * chore(deps-dev): bump @types/express from 4.17.8 to 4.17.11 Bumps [@types/express](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/express) from 4.17.8 to 4.17.11. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/express) Signed-off-by: dependabot[bot] * chore(dev-deps):bump @types/serve-static to 1.13.9 Cherry-pick required to fix upgrade for @types/express. Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Akash Satheesan --- yarn.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0263aa661..7852e7125 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1109,22 +1109,22 @@ dependencies: "@types/express" "*" -"@types/express-serve-static-core@*": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz#d9af025e925fc8b089be37423b8d1eac781be084" - integrity sha512-RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA== +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": + version "4.17.19" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d" + integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA== dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" "@types/express@*", "@types/express@^4.17.8": - version "4.17.8" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.8.tgz#3df4293293317e61c60137d273a2e96cd8d5f27a" - integrity sha512-wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ== + version "4.17.11" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545" + integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg== dependencies: "@types/body-parser" "*" - "@types/express-serve-static-core" "*" + "@types/express-serve-static-core" "^4.17.18" "@types/qs" "*" "@types/serve-static" "*" @@ -1157,10 +1157,10 @@ dependencies: "@types/unist" "*" -"@types/mime@*": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.3.tgz#c893b73721db73699943bfc3653b1deb7faa4a3a" - integrity sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q== +"@types/mime@^1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== "@types/minimist@^1.2.0": version "1.2.1" @@ -1229,12 +1229,12 @@ integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ== "@types/serve-static@*": - version "1.13.5" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.5.tgz#3d25d941a18415d3ab092def846e135a08bbcf53" - integrity sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ== + version "1.13.9" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e" + integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA== dependencies: - "@types/express-serve-static-core" "*" - "@types/mime" "*" + "@types/mime" "^1" + "@types/node" "*" "@types/split2@^2.1.6": version "2.1.6"