Skip to content

Commit

Permalink
Update dependencies and devcontainer stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
hanjoosten committed Jan 1, 2025
1 parent 56a1cba commit d0e610c
Show file tree
Hide file tree
Showing 6 changed files with 5,776 additions and 2,780 deletions.
8 changes: 4 additions & 4 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.191.0/containers/typescript-node/.devcontainer/base.Dockerfile

# [Choice] Node.js version: 16, 14, 12
ARG VARIANT="16-buster"
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
ARG TYPESCRIPT_NODE_VARIANT
ARG PROTOTYPE_FRAMEWORK_VERSION
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:${TYPESCRIPT_NODE_VARIANT}

COPY --from=ampersandtarski/ampersand:v4.7 /bin/ampersand /usr/local/bin
COPY --from=ampersandtarski/prototype-framework:2.0.0-alpha.4 /usr/local/bin/ampersand /usr/local/bin
RUN chmod +x /usr/local/bin/ampersand
RUN apt-get update && apt-get install -y graphviz

Expand Down
19 changes: 14 additions & 5 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,31 @@
"name": "Node.js & TypeScript",
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick a Node version: 12, 14, 16
"args": {
"VARIANT": "16"
"TYPESCRIPT_NODE_VARIANT": "22",
"PROTOTYPE_FRAMEWORK_VERSION": "2.0.0-alpha.4"
}
},
"postAttachCommand":"sh .devcontainer/startup.sh",
"postAttachCommand": "sh .devcontainer/startup.sh",
"features": {
"ghcr.io/devcontainers-extra/features/typescript:2": {}
},
// Set *default* container specific settings.json values on container create.
"customizations": {
"vscode": {
// Set *default* container specific settings.json values on container create.
"settings": {},
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"dbaeumer.vscode-eslint"
"dbaeumer.vscode-eslint", // ESLint extension
"esbenp.prettier-vscode", // Prettier extension
"mhutchie.git-graph",
"huizhou.githd",
"amodio.tsl-problem-matcher"
]
}
}
},
"postCreateCommand": "sh .devcontainer/startup.sh",
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
Expand Down
14 changes: 9 additions & 5 deletions .devcontainer/startup.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
# Exit immediately if a command exits with a non-zero status.
set -e

npm install
npm install --global npm@latest
npm install --global @vscode/vsce
npm install --global typescript
npm install @types/node
npm i --global esbuild

git restore .
# git restore .

npm run esbuild
vsce package 0.0.0
code --install-extension language-ampersand-0.0.0.vsix
# npm run esbuild
# vsce package 0.0.0
# echo "Aap"
# code --version
# echo "Noot"
# code --install-extension language-ampersand-0.0.0.vsix
18 changes: 9 additions & 9 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"dbaeumer.vscode-eslint",
"amodio.tsl-problem-matcher",
"huizhou.githd",
"mhutchie.git-graph",
"christian-kohler.npm-intellisense"
]
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"dbaeumer.vscode-eslint",
"amodio.tsl-problem-matcher",
"huizhou.githd",
"mhutchie.git-graph",
"christian-kohler.npm-intellisense"
]
}
Loading

0 comments on commit d0e610c

Please sign in to comment.