Skip to content

Commit

Permalink
fixup: updates to npm versions for fable packages and refine settings…
Browse files Browse the repository at this point in the history
… and devcontainer to ensure vscode tests pass
  • Loading branch information
chrissimon-au committed Nov 15, 2023
1 parent fd6e174 commit f136df3
Show file tree
Hide file tree
Showing 8 changed files with 708 additions and 12 deletions.
3 changes: 1 addition & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ COPY setup_tools.sh /tmp/setup_tools.sh
RUN chmod +x /tmp/setup_tools.sh && su - vscode -c "/tmp/setup_tools.sh"

# This must be last in the .bashrc to ensure the paths are adjusted earlier
COPY _dotnet_bash_complete.sh /tmp/_dotnet_bash_complete.sh
RUN su - vscode -c "cat /tmp/_dotnet_bash_complete.sh >> /home/vscode/.bashrc"
RUN su - vscode -c "dotnet-suggest script bash >> ~/.bashrc"

COPY post_start_command.sh /home/vscode/post_start_command.sh
RUN chmod +x /home/vscode/post_start_command.sh
1 change: 1 addition & 0 deletions .devcontainer/post_start_command.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ rm /tmp/.X99-lock -f
/usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &

find ./ -type f -name "*.fsproj" -print0 | xargs -r0 /bin/bash -c 'for f in "$@"; do echo "$f"; dotnet restore "$f"; done;' ''
dotnet tool restore
cd src/vscode/contextive
npm install
2 changes: 1 addition & 1 deletion .devcontainer/setup_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ echo "export PATH=$PATH:~/.dotnet/tools" >> /home/vscode/.bashrc
PATH=$PATH:~/.dotnet/tools
echo
dotnet new --install Fable.Template
dotnet tool install dotnet-suggest
dotnet tool install dotnet-suggest --global
dotnet tool install paket --global
dotnet tool install fable --global
dotnet tool install femto --global
Expand Down
2 changes: 2 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"name": "VsCode Extension Tests (Single-Root)",
"type": "extensionHost",
"request": "launch",
"cwd": "${workspaceFolder}/${config:vsCodeExtensionPath}",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}/${config:vsCodeExtensionPath}",
"--extensionTestsPath=${workspaceFolder}/${config:vsCodeExtensionPath}/out/index",
Expand All @@ -55,6 +56,7 @@
"name": "VsCode Extension Tests (Multi-Root)",
"type": "extensionHost",
"request": "launch",
"cwd": "${workspaceFolder}/${config:vsCodeExtensionPath}",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}/${config:vsCodeExtensionPath}",
"--extensionTestsPath=${workspaceFolder}/${config:vsCodeExtensionPath}/out/index",
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"Contextive",
"danielsanmedium",
"dbaeumer",
"devcontainers",
"devcycles",
"dorny",
"dotnettools",
Expand Down Expand Up @@ -45,8 +46,8 @@
"mochaExplorer.autoload": true,
"mochaExplorer.ipcTimeout": 20000,
"mochaExplorer.ipcRole": "server",
"mochaExplorer.cwd": "src/vscode/contextive",
"mochaExplorer.env": {
"VSCODE_VERSION": "insiders",
"ELECTRON_RUN_AS_NODE": null,
"DISPLAY": ":99.0",
"XDG_RUNTIME_DIR":"/tmp",
Expand Down
12 changes: 12 additions & 0 deletions src/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "8.0.0",
"commands": [
"paket"
]
}
}
}
Loading

0 comments on commit f136df3

Please sign in to comment.