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
3 changes: 3 additions & 0 deletions .devcontainer/dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
FROM docker.io/rockylinux:9

ARG BUN_BIN
ARG USERNAME=vscode
ARG USER_UID=1000
ARG USER_GID=${USER_UID}
ARG WORK_DIR=/workspace
ARG HOME_MAIN="/HOME_MAIN/${USERNAME}"
ENV CONTAINER="container"
ENV PATH="${HOME_MAIN}/${BUN_BIN}:${HOME_MAIN}/.local/bin:${PATH}"

ARG BIN_DEPLOY_PREP
ARG BIN_DEPLOY_REQ
Expand Down
1 change: 1 addition & 0 deletions .devcontainer/dev.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ services:
WORK_DIR: /workspace
BIN_DEPLOY_PREP: ${BIN_DEPLOY_PREP}
BIN_DEPLOY_REQ: ${BIN_DEPLOY_REQ}
BUN_BIN: ${BUN_BIN_R}
volumes:
- .:/workspace
- ~/.config/git/config:/etc/gitconfig
Expand Down
5 changes: 4 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ BIN_RUN_ENV_LINT=bin/lint/lint_env.sh
BIN_NGINX_ENTRY=bin/nginx/entry.sh

NODE_VER=22
BUN_VER=v1.2.5
BUN_VER=v1.2.22

BUN_DIR_R=.bun
BUN_BIN_R=.bun/bin

CONFIG_SHELL=configs/lint/shellcheckrc
CONFIG_PRETTIER=configs/lint/prettierrc.cjs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ jobs:
sudo apt install -y curl git-lfs
- name: lint and test
run: |
export CONTAINER="container"
make dev
export GITHUB_WORKER='true'
make runChecks
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ARG NODE_VER="22"
FROM docker.io/rockylinux:9 AS appbuilder

ARG BIN_DEPLOY
ARG CONTAINER="container"

COPY . /tmp/app

Expand Down
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
ifeq ($(CONTAINER),container)
$(info Makefile enabled, proceeding ...)
else
$(error Error: Makefile disabled, exiting ...)
endif

ROOT_MAKEFILE:=$(abspath $(patsubst %/, %, $(dir $(abspath $(lastword $(MAKEFILE_LIST))))))

include $(ROOT_MAKEFILE)/.env
include $(PRES_ENV)

export

BUN_DIR=$(HOME)/.bun
BUN_BIN=$(BUN_DIR)/bin
BUN_DIR=$(HOME)/$(BUN_DIR_R)
BUN_BIN=$(HOME)/$(BUN_BIN_R)
BUN=$(BUN_BIN)/bun

export PATH:=$(PATH):$(BUN_BIN)
Expand Down
734 changes: 379 additions & 355 deletions bun.lock

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "TemplRJS",
"version": "2025.04.0",
"version": "2025.09.0",
"description": "Initial bare-bone full-stack nuxt project.",
"private": true,
"workspaces": [
Expand All @@ -20,17 +20,17 @@
"template"
],
"dependencies": {
"typescript": "^5.8.3"
"typescript": "^5.9.2"
},
"devDependencies": {
"@types/bun": "^1.2.8",
"@types/node": "^22.14.0",
"commitizen": "^4.3.1",
"cz-conventional-changelog": "^3.3.0",
"husky": "^9.1.7",
"lint-staged": "^15.5.0",
"prettier": "^3.5.3",
"shellcheck": "^3.1.0"
"@types/bun": "1.2.22",
"@types/node": "22.14.0",
"commitizen": "4.3.1",
"cz-conventional-changelog": "3.3.0",
"husky": "9.1.7",
"lint-staged": "15.5.2",
"prettier": "3.6.2",
"shellcheck": "3.1.0"
},
"scripts": {
"build:pres": "cd $PRES_PKG && bun run build",
Expand Down
28 changes: 14 additions & 14 deletions packages/presentation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
"lint:eslint": "eslint --fix"
},
"dependencies": {
"@citation-js/core": "^0.7",
"@citation-js/plugin-bibtex": "^0.7",
"@citation-js/plugin-csl": "^0.7",
"@fontsource-variable/rubik": "^5.2",
"@phosphor-icons/web": "^2.1",
"chart.js": "^4.4",
"katex": "^0.16",
"reveal.js": "^5.2",
"zod": "^3.24"
"@citation-js/core": "0.7.18",
"@citation-js/plugin-bibtex": "0.7.18",
"@citation-js/plugin-csl": "0.7.18",
"@fontsource-variable/rubik": "5.2.8",
"@phosphor-icons/web": "2.1.2",
"chart.js": "4.5.0",
"katex": "0.16.22",
"reveal.js": "5.2.1",
"zod": "4.1.11"
},
"devDependencies": {
"@antfu/eslint-config": "^4.11",
"eslint-import-resolver-typescript": "^4.3",
"knip": "^5.46",
"sass": "^1.86",
"vite": "^6.2"
"@antfu/eslint-config": "5.3.0",
"eslint-import-resolver-typescript": "4.4.4",
"knip": "5.63.1",
"sass": "1.93.0",
"vite": "7.1.7"
}
}
Loading