Code Style and remove deprecated packager commands

3 files changed, 16 insertions, 14 deletions

diff --git a/gulp/gulpfile.addon.js b/gulp/gulpfile.addon.js
index 7756a73a..07e83398 100644
--- a/gulp/gulpfile.addon.js
+++ b/gulp/gulpfile.addon.js
@@ -37,7 +37,7 @@ async function setRdfVersion(version, file) {
 
   console.log(`Updating ${file} to ${version}`);
 
-  let regexp = new RegExp("<em:version>(\\d)*\\.(\\d)*\\.(\\d)*<\\/em:version>", "g");
+  const regexp = new RegExp("<em:version>(\\d)*\\.(\\d)*\\.(\\d)*<\\/em:version>", "g");
 
   let data = await fs.promises.readFile(file, 'utf8');
   data = data.replace(
@@ -146,7 +146,7 @@ async function packageXpi() {
 
   console.log(`Packaging sieve-${version}.xpi`);
 
-  await src([`${BUILD_DIR_ADDON}/**`], {buffer:false})
+  await src([`./${BUILD_DIR_ADDON}/**`], {buffer:false})
     .pipe(zip(`sieve-${version}.xpi`))
     .pipe(dest('./release/thunderbird'));
   // place code for your default task here
@@ -167,7 +167,7 @@ async function packageXpi() {
 async function deploy() {
   "use strict";
 
-  let { SieveThunderbirdImport } = require("../src/app/utils/SieveThunderbirdImport.js");
+  const { SieveThunderbirdImport } = require("../src/app/utils/SieveThunderbirdImport.js");
 
   let target = (new SieveThunderbirdImport()).getDefaultUserProfile();
 
@@ -178,7 +178,7 @@ async function deploy() {
 
   target = path.join(target, "sieve@mozdev.org");
 
-  let source = path.join(
+  const source = path.join(
     path.resolve(BUILD_DIR_ADDON),
     path.sep);
 
@@ -225,6 +225,7 @@ function watchSrc() {
       './src/**/*.css',
       './src/**/*.xul',
       './src/**/*.dtd',
+      './src/**/*.tpl',
       './src/**/*.properties'],
     parallel(
       packageSrc,
@@ -250,7 +251,7 @@ exports['package'] = parallel(
   packageBootstrap,
   packageLicense,
   packageCodeMirror,
-  packageMaterialIcons,
+  packageMaterialIcons
 );
 
 exports['updateVersion'] = updateVersion;
diff --git a/gulp/gulpfile.app.js b/gulp/gulpfile.app.js
index 679f87ab..9e803fad 100644
--- a/gulp/gulpfile.app.js
+++ b/gulp/gulpfile.app.js
@@ -133,14 +133,15 @@ async function packageWin32() {
     arch: "ia32",
     platform: "win32",
     download: {
-      cache: path.join(common.BASE_DIR_BUILD, "/electron/cache")
+      // cache: path.join(common.BASE_DIR_BUILD, "/electron/cache"),
+      cacheRoot: path.join(common.BASE_DIR_BUILD, "/electron/cache")
     },
     out: path.join(common.BASE_DIR_BUILD, "/electron/out"),
     overwrite: true,
-    packageManager: "yarn",
+    // packageManager: "yarn",
     // packageManager : false,
-    prune: true,
-    icon: "./../test.ico"
+    // icon: "./../test.ico",
+    prune: true
   };
 
   const packager = require('electron-packager');
@@ -154,7 +155,7 @@ async function packageWin32() {
 async function packageLinux() {
   "use strict";
 
-  let options = {
+  const options = {
     dir: BUILD_DIR_APP,
     arch: "x64",
     platform: "linux",
diff --git a/gulp/gulpfile.common.js b/gulp/gulpfile.common.js
index 4fa0216a..3b4dad8f 100644
--- a/gulp/gulpfile.common.js
+++ b/gulp/gulpfile.common.js
@@ -176,7 +176,7 @@ async function setPackageVersion(version, file) {
 
   console.log(`Updating ${file} to ${version}`);
 
-  let data = JSON.parse(await fs.promises.readFile(file, 'utf8'));
+  const data = JSON.parse(await fs.promises.readFile(file, 'utf8'));
   data.version = version;
 
   await fs.promises.writeFile(file, JSON.stringify(data, null, 2), 'utf-8');
@@ -194,7 +194,7 @@ async function setPackageVersion(version, file) {
 async function bumpMajorVersion() {
   "use strict";
 
-  let pkgVersion = await getPackageVersion('./package.json');
+  const pkgVersion = await getPackageVersion('./package.json');
 
   console.log("Major bump from " + pkgVersion.join(".") + " ...");
 
@@ -216,7 +216,7 @@ async function bumpMajorVersion() {
 async function bumpMinorVersion() {
   "use strict";
 
-  let pkgVersion = await getPackageVersion('./package.json');
+  const pkgVersion = await getPackageVersion('./package.json');
 
   console.log("Minor bump from " + pkgVersion.join("."));
 
@@ -237,7 +237,7 @@ async function bumpMinorVersion() {
 async function bumpPatchVersion() {
   "use strict";
 
-  let pkgVersion = await getPackageVersion('./package.json');
+  const pkgVersion = await getPackageVersion('./package.json');
 
   console.log("Patch bump from " + pkgVersion.join("."));