feat: use pnpm instead of yarn

This commit is contained in:
Settel 2023-06-18 11:16:49 +02:00
parent 0f805962a4
commit b359d30d8c
5 changed files with 5204 additions and 4521 deletions

View File

@ -1,13 +1,13 @@
pipeline: pipeline:
frontend: frontend:
image: node:16-alpine image: node:18-alpine
commands: commands:
- ( cd client && yarn install ) - ( cd client && pnpm run install )
- ( cd client/ && yarn generate ) - ( cd client/ && pnpm run generate )
- mkdir -p client/.output/public/ - mkdir -p client/.output/public/
backend: backend:
image: golang:1.18-alpine image: golang:1.20-alpine
commands: commands:
- apk add go-bindata - apk add go-bindata
- apk add make - apk add make

View File

@ -9,7 +9,7 @@ info:
setup: setup:
@echo "I checking for tools" @echo "I checking for tools"
@for binary in go go-bindata tmux node yarn npx \ @for binary in go go-bindata tmux node pnpm npx \
pexec inotifyloop inotifywait \ pexec inotifyloop inotifywait \
podman newuidmap slirp4netns; do \ podman newuidmap slirp4netns; do \
echo -n " $$binary: " ; \ echo -n " $$binary: " ; \
@ -19,7 +19,7 @@ setup:
fi ;\ fi ;\
done done
@echo "I installing client dependencies" @echo "I installing client dependencies"
( cd client && yarn install ) ( cd client && pnpm run setup )
@echo "I create client output directory" @echo "I create client output directory"
mkdir -p client/.output/public/ mkdir -p client/.output/public/
@echo "I installing server dependencies" @echo "I installing server dependencies"
@ -41,14 +41,14 @@ run-tmux:
tmux attach-session -t "$(TMUX_SESSION)" tmux attach-session -t "$(TMUX_SESSION)"
run-client: run-client:
(cd client/ && yarn dev) (cd client/ && pnpm dev)
run-server: run-server:
$(MAKE) -C server run-loop $(MAKE) -C server run-loop
build: build:
echo $(VERSION) echo $(VERSION)
(cd client/ && yarn generate) (cd client/ && pnpm run generate)
$(MAKE) -C server build $(MAKE) -C server build
$(MAKE) podman-build $(MAKE) podman-build
$(MAKE) podman-save $(MAKE) podman-save

View File

@ -7,20 +7,28 @@
"build": "nuxt build", "build": "nuxt build",
"dev": "nuxt dev", "dev": "nuxt dev",
"generate": "nuxt generate", "generate": "nuxt generate",
"preview": "nuxt preview" "setup": "pnpm install"
}, },
"devDependencies": { "devDependencies": {
"nuxt": "^3.0.0", "@types/node": "18",
"sass": "^1.56.1", "nuxt": "^3.5.3",
"sass-loader": "^13.2.0", "sass": "^1.63.4",
"typescript-strict-plugin": "^2.1.0" "sass-loader": "^13.3.2",
"typescript-strict-plugin": "^2.1.0",
"webpack": "^5.87.0"
}, },
"dependencies": { "dependencies": {
"@pinia/nuxt": "^0.4.4", "@pinia/nuxt": "^0.4.11",
"@vue/reactivity": "^3.3.4",
"@vue/runtime-core": "^3.3.4",
"@vue/runtime-dom": "^3.3.4",
"@vue/shared": "^3.3.4",
"build-url": "^6.0.1", "build-url": "^6.0.1",
"nuxt-icons": "^3.0.0", "nuxt-icons": "^3.2.1",
"ohmyfetch": "^0.4.21", "ohmyfetch": "^0.4.21",
"typescript": "^4.9.3", "typescript": "^5.1.3",
"vue-contenteditable": "^4.1.0" "vue": "^3.3.4",
"vue-contenteditable": "^4.1.0",
"vue-router": "^4.2.2"
} }
} }

5179
client/pnpm-lock.yaml Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff