From 677ca62637f5d4cf7c4f11faf9eb1c87f72a0108 Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Thu, 5 Mar 2020 16:12:57 +0100
Subject: [PATCH] [enh] Add feed.json to web artifacts
---
app/config.json | 7 +++++++
gulpfile.js | 7 +++++--
scripts/release.sh | 1 -
www/js/config.js | 2 +-
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/app/config.json b/app/config.json
index a64d8caf2..9a1d1269c 100644
--- a/app/config.json
+++ b/app/config.json
@@ -115,6 +115,13 @@
"es-ES": "license/license_g1-es-ES",
"eo-EO": "license/license_g1-eo-EO"
},
+ "feed": {
+ "jsonFeed": {
+ "fr-FR": "feed.json",
+ "en": "feed.json"
+ },
+ "maxContentLength": 650
+ },
"node": {
"host": "g1.duniter.fr",
"port": 443
diff --git a/gulpfile.js b/gulpfile.js
index 6d974a662..ea06f03ab 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -342,8 +342,8 @@ function webCopyFiles() {
gulp.src('./www/img/**/*.*')
.pipe(gulp.dest(tmpPath + '/img')),
- // Copy manifest
- gulp.src('./www/manifest.json')
+ // Copy manifest.json, feed.json
+ gulp.src(['./www/manifest.json', './www/feed*.json'])
.pipe(gulp.dest(tmpPath)),
// Copy lib
@@ -647,6 +647,9 @@ function webExtCopyFiles() {
'!' + wwwPath + '/api/debug.html',
'!' + wwwPath + '/debug.html',
+ // Remove unused files (feed.json) in extension
+ '!' + wwwPath + '/feed*.json',
+
// Add specific resource (and overwrite the default 'manifest.json')
'!' + wwwPath + '/manifest.json',
resourcesPath + '/**/*.*'
diff --git a/scripts/release.sh b/scripts/release.sh
index 005bab6b6..c60ef0c73 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -175,7 +175,6 @@ else
if [[ $? -ne 0 ]]; then
exit 1
fi
-
fi
diff --git a/www/js/config.js b/www/js/config.js
index 7cc4a6838..df8d30880 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -98,7 +98,7 @@ angular.module("cesium.config", [])
}
},
"version": "1.5.3",
- "build": "2020-03-04T18:00:55.476Z",
+ "build": "2020-03-05T15:07:38.518Z",
"newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
})
--
GitLab