From 62a876cf72fc96e7e9a0807647627cf08fe620a5 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Thu, 26 Jan 2023 17:27:44 +0100 Subject: [PATCH] Update v13.2.2 + NodeJS 18.13.0 + Remove Yarn + Add pnpm --- conf/app.src | 4 ++-- scripts/_common.sh | 2 +- scripts/install | 8 ++++---- scripts/upgrade | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/conf/app.src b/conf/app.src index c16f9db..94e519c 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/misskey-dev/misskey/archive/refs/tags/12.119.2.tar.gz -SOURCE_SUM=0620c8d4ee82f3bfa5749197b719cff606628413875589918df58f71cae9df57 +SOURCE_URL=https://github.com/misskey-dev/misskey/archive/refs/tags/13.2.2.tar.gz +SOURCE_SUM=C7E936CE928FFB83CD2EC8FAB95173658915833BE65AB450E4BBEEB3CAC7BD13 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/scripts/_common.sh b/scripts/_common.sh index c05657a..dae5c7b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -NODEJS_VERSION="16.15.0" +NODEJS_VERSION="18.13.0" # dependencies used by the app pkg_dependencies="ffmpeg postgresql" diff --git a/scripts/install b/scripts/install index 48b0e52..b50a0c6 100755 --- a/scripts/install +++ b/scripts/install @@ -72,7 +72,6 @@ ynh_script_progression --message="Installing dependencies..." --weight=3 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" #================================================= # CREATE DEDICATED USER @@ -132,9 +131,10 @@ ynh_script_progression --message="Building app..." --weight=15 pushd "$final_path" ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn add ts-node webpack - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production yarn build - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run init + corepack enable + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --frozen-lockfile + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run init popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index dce88f2..bc8ee8e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -137,10 +137,10 @@ ynh_script_progression --message="Building app..." pushd "$final_path" ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cleanall - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production yarn build - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn migrate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run clean-all + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm install --frozen-lockfile + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run migrate popd #=================================================