Merge pull request #33 from YunoHost-Apps/upgrade-to-upstream

Upgrade to upstream

README.md

@@ -15,9 +15,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-The Standard Notes Web App. An end-to-end encrypted note-taking app. Web, Mac, Windows, Linux, iOS, and Android.
+End-to-end encrypted note-taking app
 
-**Shipped version:** 3.8.25~ynh2
+**Shipped version:** 10.17.0~ynh1
 
 **Demo:** https://standardnotes.org/demo
 

README_fr.md

@@ -11,9 +11,9 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 ## Vue d'ensemble
 
+Application de prise de notes chiffrées
 
-
+**Version incluse :** 10.17.0~ynh1
-**Version incluse :** 3.8.25~ynh2
 
 **Démo :** https://standardnotes.org/demo
 

conf/env.sample

@@ -2,20 +2,21 @@ RAILS_ENV=production
 PORT=__PORT__
 WEB_CONCURRENCY=0
 RAILS_LOG_TO_STDOUT=true
+
 # Log Level options: "INFO" | "DEBUG" | "INFO" | "WARN" | "ERROR" | "FATAL"
 RAILS_LOG_LEVEL=INFO
+
 RAILS_SERVE_STATIC_FILES=true
 SECRET_KEY_BASE=__SECRET_KEY_BASE__
+
 APP_HOST=http://__DOMAIN____PATH__/
+PURCHASE_URL=https://standardnotes.com/purchase
+PLANS_URL=https://standardnotes.com/plans
+DASHBOARD_URL=http://standardnotes.com/dashboard
+DEFAULT_SYNC_SERVER=https://__SNSERVER_DOMAIN__/
+WEBSOCKET_URL=wss://sockets-dev.standardnotes.com
 
-EXTENSIONS_MANAGER_LOCATION=extensions/extensions-manager/dist/index.html
-SF_DEFAULT_SERVER=https://__SNSERVER_DOMAIN__/
-
-# Development options
-DEV_DEFAULT_SYNC_SERVER=https://api.standardnotes.org
-DEV_EXTENSIONS_MANAGER_LOCATION=public/extensions/extensions-manager/dist/index.html
 ENABLE_UNFINISHED_FEATURES=false
-DEV_WEBSOCKET_URL=wss://sockets-dev.standardnotes.com
 
 # NewRelic (Optional)
 NEW_RELIC_ENABLED=false
@@ -24,5 +25,9 @@ NEW_RELIC_LICENSE_KEY=
 NEW_RELIC_APP_NAME=Web
 NEW_RELIC_BROWSER_MONITORING_AUTO_INSTRUMENT=false
 
+DEV_ACCOUNT_EMAIL=
+DEV_ACCOUNT_PASSWORD=
+DEV_ACCOUNT_SERVER=
+
 # Sub-URI
 RAILS_RELATIVE_URL_ROOT=__PATH__/

manifest.json

@@ -3,9 +3,10 @@
     "id": "snweb",
     "packaging_format": 1,
     "description": {
-        "en": "The Standard Notes Web App. An end-to-end encrypted note-taking app. Web, Mac, Windows, Linux, iOS, and Android."
+        "en": "End-to-end encrypted note-taking app",
+        "fr": "Application de prise de notes chiffrées"
     },
-    "version": "3.8.25~ynh2",
+    "version": "10.17.0~ynh1",
     "url": "https://github.com/standardnotes/web",
     "upstream": {
         "license": "AGPL-3.0-or-later",
@@ -21,7 +22,7 @@
         "email": "46000361+FabianWilkens@users.noreply.github.com"
     },
     "requirements": {
-        "yunohost": ">= 4.3"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
@@ -39,7 +40,7 @@
                 "example": "/notes",
                 "default": "/",
                 "help": {
-                    "en": "You can use extensions only without a path url."
+                    "en": "You can use extensions only without a path URL."
                 }
             },
             {

scripts/_common.sh

@@ -14,10 +14,10 @@ pkg_dependencies="\
         "
 
 RUBY_VERSION="2.7.3"
-NODEJS_VERSION="15.11.0"
+NODEJS_VERSION="16"
 
 SOURCE="https://github.com/standardnotes/web"
-COMMIT="e856ce7bfd3a7b357544e43ca343b1ec861debb3"
+COMMIT="5735ec38f67b42805962c8c7e43b8aea2a65ba4e"
 
 node_max_old_space_size=2048
 

scripts/install

@@ -161,6 +161,7 @@ pushd "$final_path/live"
     ynh_use_nodejs
     ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set --local path 'vendor/bundle'
     ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development'
+    ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path bin/bundle update -j$(getconf _NPROCESSORS_ONLN) --quiet
     ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet
     ynh_exec_warn_less ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn install --pure-lockfile
     ynh_exec_warn_less ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn bundle

scripts/remove

@@ -76,16 +76,6 @@ ynh_script_progression --message="Removing logrotate configuration..." --weight=
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
-#=================================================
-# CLOSE A PORT
-#=================================================
-
-if yunohost firewall list | grep -q "\- $port$"
-then
-	ynh_script_progression --message="Closing port $port..." --weight=1
-	ynh_exec_warn_less yunohost firewall disallow TCP $port
-fi
-
 #=================================================
 # SPECIFIC REMOVE
 #=================================================

scripts/upgrade

@@ -181,6 +181,7 @@ then
 		ynh_use_nodejs
 		ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set --local path 'vendor/bundle'
 		ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development'
+		ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path bin/bundle update -j$(getconf _NPROCESSORS_ONLN) --quiet
 		ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet
 		ynh_exec_warn_less ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn install --pure-lockfile
 		ynh_exec_warn_less ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn bundle