Merge pull request #1276 from github/jm_upgrades_and_local_dev

github · Dec 9, 2024 · 98e00e1 · 98e00e1
2 parents 938adef + 08edccb
commit 98e00e1
Show file tree

Hide file tree

Showing 29 changed files with 779 additions and 1,268 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,14 @@
+{
+  "name": "opensource friday",
+  "image": "mcr.microsoft.com/vscode/devcontainers/jekyll",
+  "features": {
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "23.3.0"
+    },
+    "ghcr.io/devcontainers/features/ruby:1": {
+      "version": "3.3.6"
+    }
+  },
+  "forwardPorts": [4000],
+  "postCreateCommand": "bundle exec jekyll serve --watch --incremental --baseurl ''"
+}
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-12.14.0
+23.3.0
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.1.0
+3.3.6
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,10 @@
 source "https://rubygems.org"
 
-gem "github-pages", group: :jekyll_plugins
+gem "github-pages", "~> 232", group: :jekyll_plugins
 
-gem "webrick"
+group :development do
+  gem "webrick"
+end
 
 group :test do
   gem "html-proofer"

diff --git a/README.md b/README.md
@@ -39,6 +39,10 @@ To start up the local Jekyll server run:
 
 Now point your browser to <http://localhost:4000> to view the site.
 
+### Devcontainer
+
+This project includes a `.devcontainer` folder with a `Dockerfile` and `devcontainer.json` to use with [Visual Studio Code Remote - Containers](https://code.visualstudio.com/docs/remote/containers). This will set up a development environment with all the necessary dependencies.
+
 ### Note on Patches/Pull Requests
 
 * Fork the project.

diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/node_modules/primer-base/package.json b/node_modules/primer-base/package.json