Merge branch 'develop' into canary

cs50 · Aug 31, 2024 · a61748a · a61748a
2 parents 3035fbe + d6b20b4
commit a61748a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # Build stage
 ARG TAG
-FROM cs50/cli:${TAG} as builder
+FROM cs50/cli:${TAG} AS builder
 ARG DEBIAN_FRONTEND=noninteractive
 
 
@@ -91,6 +91,13 @@ RUN npm install --global @vscode/vsce yarn && \
     mv style50-0.0.1.vsix /opt/cs50/extensions && \
     cd /tmp && \
     rm --force --recursive style50.vsix && \
+    git clone https://github.com/cs50/design50.vsix.git && \
+    cd design50.vsix && \
+    npm install && \
+    vsce package && \
+    mv design50-1.0.0.vsix /opt/cs50/extensions && \
+    cd /tmp && \
+    rm --force --recursive design50.vsix && \
     npm uninstall --global vsce yarn
 
 

diff --git a/devcontainer.json b/devcontainer.json
@@ -12,6 +12,7 @@
             "extensions": [
                 "/opt/cs50/extensions/explain50-1.0.0.vsix",
                 "/opt/cs50/extensions/cs50-0.0.1.vsix",
+                "/opt/cs50/extensions/design50-1.0.0.vsix",
                 "/opt/cs50/extensions/ddb50-2.0.0.vsix",
                 "/opt/cs50/extensions/phpliteadmin-0.0.1.vsix",
                 "/opt/cs50/extensions/style50-0.0.1.vsix",
@@ -69,10 +70,11 @@
                 "editor.formatOnSave": false,
                 "editor.guides.indentation": false,
                 "editor.hover.enabled": false,
-                "editor.lightbulb.enabled": false,
+                "editor.lightbulb.enabled": "off",
                 "editor.matchBrackets": "never",
+                "editor.mouseWheelZoom": true,
                 "editor.minimap.enabled": false,
-                "editor.occurrencesHighlight": false,
+                "editor.occurrencesHighlight": "off",
                 "editor.parameterHints.enabled": false,
                 "editor.quickSuggestions": {
                     "other": "off",
@@ -95,6 +97,7 @@
                 },
                 "editor.suggestOnTriggerCharacters": false,
                 "extensions.ignoreRecommendations": true,
+                "explorer.autoOpenDroppedFile": false,
                 "explorer.compactFolders": false,
                 "extension-uninstaller.uninstall": [
                     "Codeium.codeium",