Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# RUN git config --global --add safe.directory /opt/app
# WORKDIR /opt/app

# Prior `@astrojs/starlight` verison `[0.37.4](https://github.com/withastro/starlight/blob/main/packages/starlight/CHANGELOG.md)`, NodeJS was used as base image because `astro build` would call `npx`. If `npx` wasn't present, `pagefind` page would not get generated.
# Before `@astrojs/starlight` version `[0.37.4](https://github.com/withastro/starlight/blob/main/packages/starlight/CHANGELOG.md)`, NodeJS was used as base image because `astro build` would call `npx`. If `npx` wasn't present, `pagefind` page would not get generated.
FROM denoland/deno:debian
RUN apt update \
&& apt install -y git curl make \
Expand Down
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ noTargetGuard:

COMPOSE_PULL_BUSYBOX = docker compose pull busybox
COMPOSE_RUN_BUSYBOX = docker compose run --rm busybox
COMPOSE_BUILD_BASE = docker compose build --no-cache base
COMPOSE_BUILD_BASE = docker compose build --no-cache --pull base
# COMPOSE_RUN_CI = COMPOSE_ENVFILE=$(ENVFILE) docker compose run --rm ci
COMPOSE_RUN_CI = COMPOSE_ENVFILE=.env docker compose run --rm ci
COMPOSE_UP_CI = COMPOSE_ENVFILE=.env docker compose up ci -d
Expand Down Expand Up @@ -44,9 +44,16 @@ check \
build \
deploy \
toc \
update:
outdated:
$(COMPOSE_RUN_CI) deno task $@

# Update deps to latest.
# This is a workaround as the command `deno update --latest --frozen=false` should work as per Deno's documentation but fails.
# https://docs.deno.com/runtime/fundamentals/modules/#frozen-lockfile
# Using `deno task --frozen=false` does work. Similar to `deno install --frozen=false`
update:
$(COMPOSE_RUN_CI) deno task --frozen=false update

dev:
COMPOSE_COMMAND="deno task $@" $(COMPOSE_UP_DEV)

Expand Down
17 changes: 10 additions & 7 deletions deno.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
// - https://github.com/withastro/astro/issues/13060
// @todo:
// - Add `astro check` to the task `check`
// - May want to upgrade with command like `npx @astrojs/upgrade`
"tasks": {
"install": "deno install --quiet && deno audit --ignore-unfixable",
"outdated": "deno outdated",
Expand Down Expand Up @@ -40,7 +41,9 @@
"/opt/package.json",
"/opt/pnpm-workspace.yaml",
"/package.json",
"/pnpm-workspace.yaml"
"/pnpm-workspace.yaml",
"/proc",
"/run"
],
"ignore": [
"/"
Expand All @@ -57,8 +60,8 @@
"sys": true,
// Paths require update whenever rollup and sharp change version, as well as when running on different architecture (arm, x86)
"ffi": [
"/opt/app/node_modules/.deno/@rollup+rollup-linux-x64-gnu@4.56.0/node_modules/@rollup/rollup-linux-x64-gnu/rollup.linux-x64-gnu.node",
"/opt/app/node_modules/.deno/@rollup+rollup-linux-arm64-gnu@4.56.0/node_modules/@rollup/rollup-linux-arm64-gnu/rollup.linux-arm64-gnu.node",
"/opt/app/node_modules/.deno/@rollup+rollup-linux-x64-gnu@4.57.1/node_modules/@rollup/rollup-linux-x64-gnu/rollup.linux-x64-gnu.node",
"/opt/app/node_modules/.deno/@rollup+rollup-linux-arm64-gnu@4.57.1/node_modules/@rollup/rollup-linux-arm64-gnu/rollup.linux-arm64-gnu.node",
"/opt/app/node_modules/.deno/@img+sharp-linuxmusl-arm64@0.34.5/node_modules/@img/sharp-linuxmusl-arm64/lib/sharp-linuxmusl-arm64.node",
"/opt/app/node_modules/.deno/@img+sharp-linux-arm64@0.34.5/node_modules/@img/sharp-linux-arm64/lib/sharp-linux-arm64.node"
],
Expand Down Expand Up @@ -122,11 +125,11 @@
"frozen": true
},
"imports": {
"@astrojs/starlight": "npm:@astrojs/starlight@0.37.4",
"astro": "npm:astro@5.16.15",
"doctoc": "npm:doctoc@^2.2.1",
"@astrojs/starlight": "npm:@astrojs/starlight@0.37.6",
"astro": "npm:astro@5.17.3",
"doctoc": "npm:doctoc@^2.3.0",
"sharp": "npm:sharp@0.34.5",
"wrangler": "npm:wrangler@^4.60.0"
"wrangler": "npm:wrangler@^4.67.0"
},
"allowScripts": {
"allow": [
Expand Down
Loading