Skip to content

Commit e5ad151

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/rest-no-infer
2 parents 7be81d5 + b33d372 commit e5ad151

File tree

14,980 files changed

+809739
-402042
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

14,980 files changed

+809739
-402042
lines changed

.devcontainer/Dockerfile

Lines changed: 0 additions & 7 deletions
This file was deleted.

.devcontainer/devcontainer.json

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
13
{
24
"name": "Node.js",
3-
"build": {
4-
"dockerfile": "Dockerfile",
5-
"args": {
6-
"VARIANT": "18"
7-
}
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/javascript-node:1-22-bookworm",
7+
8+
// Features to add to the dev container. More info: https://containers.dev/features.
9+
"features": {
10+
"ghcr.io/devcontainers/features/go:1": {}
11+
},
12+
13+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
14+
// "forwardPorts": [],
15+
16+
// Use 'postCreateCommand' to run commands after the container is created.
17+
"postCreateCommand": {
18+
"Configure Build Tools": "sudo corepack enable npm; sudo npm install -g hereby; npm ci",
19+
"Install pprof": "go install github.com/google/pprof@latest",
20+
"Install Graphviz": "sudo apt install graphviz"
821
},
22+
23+
// Configure tool-specific properties.
924
"customizations": {
1025
"vscode": {
1126
"settings": {
@@ -23,5 +38,7 @@
2338
]
2439
}
2540
},
41+
42+
// More info: https://aka.ms/dev-containers-non-root.
2643
"remoteUser": "node"
2744
}

.dprint.jsonc

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,9 @@
2929
"exportDeclaration.sortNamedExports": "caseInsensitive",
3030
"importDeclaration.sortNamedImports": "caseInsensitive"
3131
},
32-
"prettier": {
33-
"newLineKind": "lf",
34-
"associations": [
35-
"**/*.{yaml,yml}"
36-
],
37-
"yml.tabWidth": 2,
38-
"yaml.tabWidth": 2,
39-
"yml.singleQuote": true,
40-
"yaml.singleQuote": true
32+
"yaml": {
33+
"indentWidth": 2,
34+
"quotes": "preferSingle"
4135
},
4236
"json": {
4337
// This would be good to do in known-JSONC files, but VS Code warns on trailing commas.
@@ -59,8 +53,8 @@
5953
// Note: if adding new languages, make sure settings.template.json is updated too.
6054
// Also, if updating typescript, update the one in package.json.
6155
"plugins": [
62-
"https://plugins.dprint.dev/typescript-0.91.6.wasm",
63-
"https://plugins.dprint.dev/json-0.19.3.wasm",
64-
"https://plugins.dprint.dev/prettier-0.46.1.json@e5bd083088a8dfc6e5ce2d3c9bee81489b065bd5345ef55b59f5d96627928b7a"
56+
"https://plugins.dprint.dev/typescript-0.93.4.wasm",
57+
"https://plugins.dprint.dev/json-0.19.4.wasm",
58+
"https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm"
6559
]
6660
}
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
name: CodeQL Configuration
22

3-
paths:
4-
- src
5-
- scripts
6-
- Herebyfile.mjs
73
paths-ignore:
84
- src/lib
5+
- tests
6+
7+
query-filters:
8+
# Falls over on our dynamic RegExp generation
9+
- exclude:
10+
id: js/regex-injection

0 commit comments

Comments
 (0)