From 54c1fbb70d9d2f8d62421bf3d959a1a04d6334c9 Mon Sep 17 00:00:00 2001 From: Alex Bea Date: Wed, 30 May 2018 17:59:36 -0400 Subject: [PATCH 1/5] Specifies undeclared variable --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 25cbff882..8a82080fd 100644 --- a/index.js +++ b/index.js @@ -68,7 +68,7 @@ module.exports = { var argv = self.apos.argv; if (argv['exclude-types']) { - self.excludeTypes = excludeTypes.concat(argv['exclude-types'].split(',')); + self.excludeTypes = self.excludeTypes.concat(argv['exclude-types'].split(',')); } if (self.caching) { From cd374e0d1e845c4bd476d778833772f57e11d75f Mon Sep 17 00:00:00 2001 From: Alex Bea Date: Thu, 3 Jan 2019 16:44:46 -0500 Subject: [PATCH 2/5] Moved argv exclude types block after initialization --- index.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index 34767d2b5..5f7bf52a8 100644 --- a/index.js +++ b/index.js @@ -69,10 +69,6 @@ module.exports = { var argv = self.apos.argv; - if (argv['exclude-types']) { - self.excludeTypes = self.excludeTypes.concat(argv['exclude-types'].split(',')); - } - if (self.caching) { self.cacheOutput = []; } @@ -93,7 +89,13 @@ module.exports = { self.format = argv.format || options.format || 'xml'; self.indent = (typeof(argv.indent) !== 'undefined') ? argv.indent : options.indent; + self.excludeTypes = options.excludeTypes || []; + + if (argv['exclude-types']) { + self.excludeTypes = self.excludeTypes.concat(argv['exclude-types'].split(',')); + } + self.perLocale = options.perLocale || argv['per-locale']; // Exception: plaintext sitemaps and sitemap indexes don't go // together, so we can presume that if they explicitly ask From 692281a8e69db84e632ce4d7c9de18558eb182fe Mon Sep 17 00:00:00 2001 From: Alex Bea Date: Thu, 14 Feb 2019 10:59:05 -0500 Subject: [PATCH 3/5] Bumps version and fixes repo URLs. --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 537cc67ce..efe903822 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "apostrophe-site-map", - "version": "2.4.6", + "version": "2.4.7", "description": "Generate site maps for sites powered by the Apostrophe CMS.", "main": "index.js", "dependencies": { @@ -18,7 +18,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/punkave/apostrophe-site-map" + "url": "https://github.com/apostrophecms/apostrophe-site-map" }, "keywords": [ "sitemap", @@ -32,7 +32,7 @@ "author": "P'unk Avenue LLC", "license": "MIT", "bugs": { - "url": "https://github.com/punkave/apostrophe-site-map/issues" + "url": "https://github.com/apostrophecms/apostrophe-site-map/issues" }, - "homepage": "https://github.com/punkave/apostrophe-site-map" + "homepage": "https://github.com/apostrophecms/apostrophe-site-map" } From 21102367054760bc431c80baac3663e0369c117c Mon Sep 17 00:00:00 2001 From: Alex Bea Date: Thu, 14 Feb 2019 11:07:18 -0500 Subject: [PATCH 4/5] Adds readme doc --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c246fcc36..1f3385048 100644 --- a/README.md +++ b/README.md @@ -235,6 +235,8 @@ modules: { ## Changelog +2.4.7: Fixes a bug in the `exclude-types` argument usage. + 2.4.6: never generate a priority below 0.1. 2.4.5: clone the priority field before adding it so we do not get into issues with `arrangeFields`. From 352088e852fbe494bd00f5aa8a044e4a719e5b3c Mon Sep 17 00:00:00 2001 From: Alex Bea Date: Mon, 20 May 2019 13:19:31 -0400 Subject: [PATCH 5/5] Updates changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e99004687..84e1d9bcc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 2.5.1 + +Fixes a bug in the `exclude-types` argument usage. + ## 2.5.0 Added a configuration option to remove `siteMapPriority` field globally