From 577b8cd665c0a6afcbb994342eac94c5fe93b665 Mon Sep 17 00:00:00 2001 From: Leo Rocha Date: Tue, 13 Oct 2020 14:58:29 +0200 Subject: [PATCH 1/4] [logs][s] Added better error logs for when a theme does not load as the previous was only a warning without any extra text --- utils/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/index.js b/utils/index.js index f698d066..59db94db 100644 --- a/utils/index.js +++ b/utils/index.js @@ -381,11 +381,15 @@ module.exports.loadTheme = function (app) { try { const theme = config.get('THEME') + logger.info('Theme: ' + theme) const themePath = config.get('THEME_DIR') + logger.info('Theme Path: ' + themePath) if (!theme) return loadExtension(theme, themePath, 'theme')(app) } catch (e) { const theme = config.get('THEME') + logger.warn('Theme: ' + theme) + logger.error(e) logger.warn('WARNING: Failed to load theme', theme, e) } } From 448d5337aa4104960b655af93ff828316c0e3db6 Mon Sep 17 00:00:00 2001 From: Leo Rocha Date: Wed, 14 Oct 2020 09:24:37 +0200 Subject: [PATCH 2/4] [formatting][xs]Added prettier as dependency with configuration files --- .prettierignore | 23 +++++++++++++++++++++++ .prettierrc.json | 4 ++++ package.json | 2 ++ yarn.lock | 17 +++++++++++++++++ 4 files changed, 46 insertions(+) create mode 100644 .prettierignore create mode 100644 .prettierrc.json diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..af4c27ff --- /dev/null +++ b/.prettierignore @@ -0,0 +1,23 @@ +node_modules/ + +# yarn +yarn-error.log + +# sass +.sass-cache + +# misc +sandbox/* +*.env +.nyc_output/* + +# VIM swap files +.*.sw* + +# ctags +tags + +# themes +themes/frontend-eds/* + +.github diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 00000000..b2095be8 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,4 @@ +{ + "semi": false, + "singleQuote": true +} diff --git a/package.json b/package.json index b1977794..45fe5ff6 100644 --- a/package.json +++ b/package.json @@ -63,9 +63,11 @@ "md5": "^2.2.1", "moment": "^2.24.0", "nconf": "^0.10.0", + "node-cache": "^5.1.2", "node-fetch": "^2.6.1", "nodemailer": "^6.3.0", "nunjucks": "^3.2.0", + "prettier": "^2.1.2", "slugify": "^1.3.6", "url-join": "^4.0.1", "winston": "^3.3.3", diff --git a/yarn.lock b/yarn.lock index 3e233c37..47baccd4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1366,6 +1366,11 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +clone@2.x: + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= + clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" @@ -4074,6 +4079,13 @@ nock@^10.0.6: qs "^6.5.1" semver "^5.5.0" +node-cache@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-5.1.2.tgz#f264dc2ccad0a780e76253a694e9fd0ed19c398d" + integrity sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg== + dependencies: + clone "2.x" + node-fetch@^2.3.0, node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" @@ -4610,6 +4622,11 @@ prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" +prettier@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5" + integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg== + pretty-ms@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-5.0.0.tgz#6133a8f55804b208e4728f6aa7bf01085e951e24" From 3b27a2ccb7cd1293877295bdee9885a26ce7a26f Mon Sep 17 00:00:00 2001 From: Leo <3646521+leomrocha@users.noreply.github.com> Date: Tue, 13 Oct 2020 15:29:53 +0200 Subject: [PATCH 3/4] Update index.js --- utils/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/index.js b/utils/index.js index 59db94db..f529facf 100644 --- a/utils/index.js +++ b/utils/index.js @@ -388,9 +388,10 @@ module.exports.loadTheme = function (app) { loadExtension(theme, themePath, 'theme')(app) } catch (e) { const theme = config.get('THEME') + logger.warn('WARNING: Failed to load theme') logger.warn('Theme: ' + theme) logger.error(e) - logger.warn('WARNING: Failed to load theme', theme, e) + } } From 04d5a39ee723a78e442e86d585656ba2a71eb9fe Mon Sep 17 00:00:00 2001 From: Leo Rocha Date: Fri, 27 Nov 2020 14:54:44 +0100 Subject: [PATCH 4/4] [package.json][xs] taking out prettier from dependencies to avoid breaking translations --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index 45fe5ff6..b1977794 100644 --- a/package.json +++ b/package.json @@ -63,11 +63,9 @@ "md5": "^2.2.1", "moment": "^2.24.0", "nconf": "^0.10.0", - "node-cache": "^5.1.2", "node-fetch": "^2.6.1", "nodemailer": "^6.3.0", "nunjucks": "^3.2.0", - "prettier": "^2.1.2", "slugify": "^1.3.6", "url-join": "^4.0.1", "winston": "^3.3.3",