From 225f46bc0dba263cfb964b4d7149619db00640c5 Mon Sep 17 00:00:00 2001 From: axolotle Date: Sat, 2 Mar 2024 03:46:02 +0100 Subject: [PATCH] chore: replace npm with yarn --- app/package.json | 4 ++-- debian/rules | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index 9c044232..4d7fcb69 100644 --- a/app/package.json +++ b/app/package.json @@ -9,8 +9,8 @@ "build": "vite build", "lint:js": "eslint --ext \".ts,.vue,.cjs,.js\" --ignore-path ../.gitignore .", "lint:prettier": "prettier --check .", - "lint": "npm run lint:js && npm run lint:prettier", - "lintfix": "prettier --write --list-different . && npm run lint:js --fix" + "lint": "yarn lint:js && yarn lint:prettier", + "lintfix": "prettier --write --list-different . && yarn lint:js --fix" }, "dependencies": { "@fontsource/fira-code": "^4.5.13", diff --git a/debian/rules b/debian/rules index dce28a59..02aeba18 100755 --- a/debian/rules +++ b/debian/rules @@ -16,11 +16,13 @@ TMPDIR = $$(pwd)/debian/yunohost-admin override_dh_auto_build: /usr/bin/curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor | tee /usr/share/keyrings/nodesource.gpg >/dev/null + /usr/bin/curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/yarn.gpg >/dev/null echo 'deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_14.x bullseye main' > /etc/apt/sources.list.d/nodesource.list + echo "deb [signed-by=/etc/apt/trusted.gpg.d/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list /usr/bin/apt update - /usr/bin/apt install nodejs -y - cd app ; /usr/bin/npm --progress false ci - cd app ; /usr/bin/npm run build + /usr/bin/apt install nodejs yarn -y + cd app ; /usr/bin/yarn install --frozen-lockfile --non-interactive + cd app ; /usr/bin/yarn build override_dh_clean: