Skip to content
This repository has been archived by the owner on Apr 11, 2024. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/live' into fix/collections-nits
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekNonGeneric committed Mar 1, 2024
2 parents a67839e + 097af95 commit f006769
Show file tree
Hide file tree
Showing 8 changed files with 185 additions and 31 deletions.
7 changes: 0 additions & 7 deletions .deepsource.toml
Expand Up @@ -12,13 +12,6 @@ enabled = true
name = "secrets"
enabled = true

[[analyzers]]
name = "docker"
enabled = true

[analyzers.meta]
dockerfile_paths = [".devcontainer/Dockerfile"]

[[analyzers]]
name = "javascript"
enabled = true
6 changes: 2 additions & 4 deletions .devcontainer/devcontainer.json
Expand Up @@ -2,10 +2,8 @@
// see documentation located at the following URL:
// https://github.com/OpenINF/docker-fisher
{
"name": "Debianzsz Fisher (OpenINF Community)",
"build": {
"dockerfile": "openinf/debianzsz-fisher:latest"
},
"name": "🦞 OpenINF GrimesAI Salvage Tex: Lunar (OpenINF Community)",
"image": "openinf/grimesai-salvage-tex:lunar",
"runArgs": [
"--cap-add=SYS_ADMIN",
"--security-opt",
Expand Down
10 changes: 10 additions & 0 deletions .devcontainer/post-create.fish
Expand Up @@ -39,6 +39,16 @@ end
if test -e package.json
corepack enable
corepack prepare pnpm@latest --activate

# Same thing as running "pnpm setup", but written in fish.
# Needed for global CLIs & filesystem file permission issues.
set -Ux PNPM_HOME $HOME/.local/share/pnpm
echo 'set -Ux PNPM_HOME "$HOME/.local/share/pnpm"' >> ~/.config/fish/config.fish

set -Ux fish_user_paths $PNPM_HOME $fish_user_paths
echo 'set -Ux fish_user_paths $PNPM_HOME $fish_user_paths' >> ~/.config/fish/config.fish

sudo pnpm add -g pnpm
pnpm install
end

Expand Down
11 changes: 7 additions & 4 deletions .vscode/extensions.json
Expand Up @@ -8,7 +8,7 @@
// https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint
"dbaeumer.vscode-eslint",
// https://marketplace.visualstudio.com/items?itemName=dprint.dprint
// "dprint.dprint",
"dprint.dprint",
// https://marketplace.visualstudio.com/items?itemName=editorconfig.editorconfig
"editorconfig.editorconfig",
// https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode
Expand All @@ -23,14 +23,17 @@
"KatjanaKosic.vscode-json5",
// https://marketplace.visualstudio.com/items?itemName=redhat.vscode-xml
"redhat.vscode-xml",
// https://marketplace.visualstudio.com/items?itemName=Shopify.theme-check-vscode
"Shopify.theme-check-vscode",
// https://marketplace.visualstudio.com/items?itemName=sissel.shopify-liquid
"sissel.shopify-liquid",
// https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker
"streetsidesoftware.code-spell-checker",
// https://marketplace.visualstudio.com/items?itemName=tamasfe.even-better-toml
"tamasfe.even-better-toml",
// https://marketplace.visualstudio.com/items?itemName=unifiedjs.vscode-remark
"unifiedjs.vscode-remark"
],
"unwantedRecommendations": []
"unwantedRecommendations": [
// https://marketplace.visualstudio.com/items?itemName=Shopify.theme-check-vscode
"Shopify.theme-check-vscode"
]
}
28 changes: 13 additions & 15 deletions .vscode/settings.json
Expand Up @@ -45,16 +45,18 @@
"editor.defaultFormatter": "esbenp.prettier-vscode"
},


"[liquid]": {
"editor.defaultFormatter": "Shopify.theme-check-vscode"
"editor.formatOnSave": true,
"editor.defaultFormatter": "sissel.shopify-liquid"
},

// "[toml]": {
// "editor.codeActionsOnSave": {
// "source.fixAll.dprint": "explicit"
// },
// "editor.defaultFormatter": "dprint.dprint"
// },
"[toml]": {
"editor.codeActionsOnSave": {
"source.fixAll.dprint": "explicit"
},
"editor.defaultFormatter": "dprint.dprint"
},

"[markdown]": {
"editor.codeActionsOnSave": {
Expand Down Expand Up @@ -186,8 +188,9 @@
".prettierrc.json": "json5",
".prettierrc.json5": "json5",
".deepsource.toml": "toml",
".renovaterc.json": "json5",
".snyk": "yaml"
".renovaterc.json5": "json5",
".snyk": "yaml",
".html": "liquid"
},

// Configure glob patterns for excluding files and folders. For example, the
Expand Down Expand Up @@ -266,7 +269,7 @@
// Dprint
/////////////////////////////////////////////

// "dprint.path": "~/.dprint/bin/dprint",
"dprint.path": "~/.dprint/bin/dprint",

// EditorConfig (https://editorconfig.org/)
/////////////////////////////////////////////
Expand Down Expand Up @@ -295,11 +298,6 @@
"./"
],

// Liquid
/////////////////////////////////////////////
// Controls whether formatting is enabled or disabled
"liquid.format.enable": true,

// Remote
/////////////////////////////////////////////
"remote.SSH.defaultForwardedPorts": [
Expand Down
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Expand Up @@ -16,7 +16,7 @@
{
"label": "Build",
"type": "shell",
"command": "bundle exec jekyll build",
"command": "bundle exec jekyll build && cp _redirects _site/_redirects",
"group": {
"kind": "build",
"isDefault": true
Expand Down
139 changes: 139 additions & 0 deletions Gemfile.lock
@@ -0,0 +1,139 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
cgi (0.4.1)
charlock_holmes (0.7.7)
colorator (1.1.0)
concurrent-ruby (1.2.3)
dotenv (3.1.0)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.16.3)
forwardable-extended (2.6.0)
github-linguist (7.28.0)
cgi
charlock_holmes (~> 0.7.7)
mini_mime (~> 1.0)
rugged (~> 1.0)
google-protobuf (3.25.3)
google-protobuf (3.25.3-aarch64-linux)
google-protobuf (3.25.3-arm64-darwin)
google-protobuf (3.25.3-x86-linux)
google-protobuf (3.25.3-x86_64-darwin)
google-protobuf (3.25.3-x86_64-linux)
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-relative-links (0.7.0)
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.4)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_mime (1.1.5)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.4)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.6)
rouge (4.2.0)
rugged (1.7.2)
safe_yaml (1.0.5)
sass-embedded (1.71.1-aarch64-linux-android)
google-protobuf (~> 3.25)
sass-embedded (1.71.1-aarch64-linux-gnu)
google-protobuf (~> 3.25)
sass-embedded (1.71.1-aarch64-linux-musl)
google-protobuf (~> 3.25)
sass-embedded (1.71.1-arm-linux-androideabi)
google-protobuf (~> 3.25)
sass-embedded (1.71.1-arm-linux-gnueabihf)
google-protobuf (~> 3.25)
sass-embedded (1.71.1-arm-linux-musleabihf)
google-protobuf (~> 3.25)
sass-embedded (1.71.1-arm64-darwin)
google-protobuf (~> 3.25)
sass-embedded (1.71.1-x86-linux-android)
google-protobuf (~> 3.25)
sass-embedded (1.71.1-x86-linux-gnu)
google-protobuf (~> 3.25)
sass-embedded (1.71.1-x86-linux-musl)
google-protobuf (~> 3.25)
sass-embedded (1.71.1-x86_64-darwin)
google-protobuf (~> 3.25)
sass-embedded (1.71.1-x86_64-linux-android)
google-protobuf (~> 3.25)
sass-embedded (1.71.1-x86_64-linux-gnu)
google-protobuf (~> 3.25)
sass-embedded (1.71.1-x86_64-linux-musl)
google-protobuf (~> 3.25)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.5.0)
webrick (1.8.1)
yaml-lint (0.1.2)

PLATFORMS
aarch64-linux
aarch64-linux-android
aarch64-linux-gnu
aarch64-linux-musl
arm-linux-androideabi
arm-linux-gnueabihf
arm-linux-musleabihf
arm64-darwin
x86-linux
x86-linux-android
x86-linux-gnu
x86-linux-musl
x86_64-darwin
x86_64-linux-android
x86_64-linux-gnu
x86_64-linux-musl

DEPENDENCIES
dotenv
github-linguist (~> 7.24)
jekyll (~> 4.3.0)
jekyll-redirect-from
jekyll-relative-links
kramdown-parser-gfm (~> 1.1)
rb-inotify
webrick
yaml-lint

BUNDLED WITH
2.5.6
13 changes: 13 additions & 0 deletions _redirects
@@ -0,0 +1,13 @@
/home301 / 301
/home302 / 302
/querystrings /?query=string 301
/trailing /trailing/ 301
/notrailing/ /nottrailing 301
/blog/* /news/:splat 200
/products/:code/:name /products?code=:code&name=:name
/humans.txt /403 302
/robots.txt /403 302
/security.txt /403 302
/license /403 302
/authors /403 302
/contributors /403 302

0 comments on commit f006769

Please sign in to comment.