diff --git a/ynh-dev b/ynh-dev index f10d635..290f332 100755 --- a/ynh-dev +++ b/ynh-dev @@ -308,13 +308,13 @@ function use_git() ;; yunohost-admin) - mkdir -p /var/cache/ynh-dev/yunohost-admin/ - create_sym_link "/ynh-dev/yunohost-admin/app/.env" "/var/cache/ynh-dev/yunohost-admin/.env" - create_sym_link "/var/cache/ynh-dev/yunohost-admin/node_modules" "/ynh-dev/yunohost-admin/app/node_modules" - create_sym_link "/ynh-dev/yunohost-admin/app/package.json" "/var/cache/ynh-dev/yunohost-admin/package.json" - create_sym_link "/ynh-dev/yunohost-admin/app/package-lock.json" "/var/cache/ynh-dev/yunohost-admin/package-lock.json" + local DEV_PATH="/ynh-dev/yunohost-admin/app" + local CACHE_PATH="/var/cache/ynh-dev/yunohost-admin" - cd /var/cache/ynh-dev/yunohost-admin/ + create_sym_link "/ynh-dev/yunohost-admin/app/.env" "/var/cache/ynh-dev/yunohost-admin/.env" + prepare_cache_and_deps "$DEV_PATH" "$CACHE_PATH" + + cd "$CACHE_PATH" # Inject container ip in .env file # Used by vite to expose itself on network and proxy api requests. @@ -337,18 +337,9 @@ with open(setting_file) as f: EOF fi - # Install dependencies with npm install (or rather npm ci) - if [[ -e "/var/cache/ynh-dev/yunohost-admin/node_modules/vue" ]]; - then - info "NB: skipping npm ci because vue is already installed. If you want to upgrade/refresh npm dependencies, you should run 'npm ci' manually, or delete /var/cache/ynh-dev/yunohot-admin/node_modules." - else - info "Installing npm dependencies ... (this may take a while)" - npm ci --no-bin-links - fi - - cd /ynh-dev/yunohost-admin/app/ - info "Now running 'npm run dev'" - npm run dev + cd "$DEV_PATH" + info "Now running dev server" + yarn dev --host ;; yunohost-admin-build) if [[ ! -e "/usr/share/yunohost/admin-bkp" ]] @@ -358,7 +349,7 @@ EOF fi cd /ynh-dev/yunohost-admin/app - npm run build + yarn build create_sym_link "/ynh-dev/yunohost-admin/app/dist" "/usr/share/yunohost/admin"