Skip to content

Commit

Permalink
⬆️ Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@aileen
aileen committed Aug 27, 2019
1 parent b2a419f commit d2db3cf
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 64 deletions.
22 changes: 11 additions & 11 deletions BaseSiteMapGenerator.js
View file
Expand Up @@ -3,7 +3,7 @@
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");

exports.__esModule = true;
exports["default"] = void 0;
exports.default = void 0;

var _lodash = _interopRequireDefault(require("lodash"));

Expand Down Expand Up @@ -38,7 +38,7 @@ function () {
_proto.generateXmlFromNodes = function generateXmlFromNodes(options) {
var self = this; // Get a mapping of node to timestamp

var timedNodes = _lodash["default"].map(this.nodeLookup, function (node, id) {
var timedNodes = _lodash.default.map(this.nodeLookup, function (node, id) {
return {
id: id,
// Using negative here to sort newest to oldest
Expand All @@ -48,17 +48,17 @@ function () {
}, []); // Sort nodes by timestamp


var sortedNodes = _lodash["default"].sortBy(timedNodes, "ts"); // Grab just the nodes
var sortedNodes = _lodash.default.sortBy(timedNodes, "ts"); // Grab just the nodes


var urlElements = _lodash["default"].map(sortedNodes, "node");
var urlElements = _lodash.default.map(sortedNodes, "node");

var data = {
// Concat the elements to the _attr declaration
urlset: [XMLNS_DECLS].concat(urlElements) // Return the xml

};
return _utils["default"].getDeclarations(options) + (0, _xml["default"])(data);
return _utils.default.getDeclarations(options) + (0, _xml.default)(data);
};

_proto.addUrl = function addUrl(url, datum) {
Expand All @@ -76,15 +76,15 @@ function () {
this.removeFromLookups(datum); // force regeneration of xml

this.siteMapContent = null;
this.lastModified = (0, _moment["default"])(new Date());
this.lastModified = (0, _moment.default)(new Date());
};

_proto.getLastModifiedForDatum = function getLastModifiedForDatum(datum) {
if (datum.updated_at || datum.published_at || datum.created_at) {
var modifiedDate = datum.updated_at || datum.published_at || datum.created_at;
return (0, _moment["default"])(new Date(modifiedDate));
return (0, _moment.default)(new Date(modifiedDate));
} else {
return (0, _moment["default"])(new Date());
return (0, _moment.default)(new Date());
}
};

Expand All @@ -102,7 +102,7 @@ function () {
url: [{
loc: url
}, {
lastmod: (0, _moment["default"])(this.getLastModifiedForDatum(datum), _moment["default"].ISO_8601).toISOString()
lastmod: (0, _moment.default)(this.getLastModifiedForDatum(datum), _moment.default.ISO_8601).toISOString()
}]
};
imgNode = this.createImageNodeFromDatum(datum);
Expand All @@ -127,7 +127,7 @@ function () {
imageEl = [{
'image:loc': image
}, {
'image:caption': _path["default"].basename(image)
'image:caption': _path.default.basename(image)
}]; // Return the node to be added to the url xml node

return {
Expand Down Expand Up @@ -176,4 +176,4 @@ function () {
return BaseSiteMapGenerator;
}();

exports["default"] = BaseSiteMapGenerator;
exports.default = BaseSiteMapGenerator;
14 changes: 7 additions & 7 deletions IndexMapGenerator.js
View file
Expand Up @@ -3,7 +3,7 @@
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");

exports.__esModule = true;
exports["default"] = void 0;
exports.default = void 0;

var _lodash = _interopRequireDefault(require("lodash"));

Expand Down Expand Up @@ -40,7 +40,7 @@ function () {
sitemapindex: [XMLNS_DECLS].concat(urlElements) // Return the xml

};
return _utils["default"].getDeclarations(options) + (0, _xml["default"])(data);
return _utils.default.getDeclarations(options) + (0, _xml.default)(data);
};

_proto.generateSiteMapUrlElements = function generateSiteMapUrlElements(_ref) {
Expand All @@ -50,17 +50,17 @@ function () {
siteUrl = _ref.siteUrl,
pathPrefix = _ref.pathPrefix,
resourcesOutput = _ref.resourcesOutput;
return _lodash["default"].map(sources, function (source) {
return _lodash.default.map(sources, function (source) {
var filePath = resourcesOutput.replace(/:resource/, source.name).replace(/^\//, "");

var siteMapUrl = _url["default"].resolve(siteUrl, _path["default"].join(pathPrefix, filePath));
var siteMapUrl = _url.default.resolve(siteUrl, _path.default.join(pathPrefix, filePath));

var lastModified = _this.types[source.sitemap].lastModified || (0, _moment["default"])(new Date(), _moment["default"].ISO_8601).toISOString();
var lastModified = _this.types[source.sitemap].lastModified || (0, _moment.default)(new Date(), _moment.default.ISO_8601).toISOString();
return {
sitemap: [{
loc: siteMapUrl
}, {
lastmod: (0, _moment["default"])(lastModified).toISOString()
lastmod: (0, _moment.default)(lastModified).toISOString()
}]
};
});
Expand All @@ -69,4 +69,4 @@ function () {
return SiteMapIndexGenerator;
}();

exports["default"] = SiteMapIndexGenerator;
exports.default = SiteMapIndexGenerator;
10 changes: 5 additions & 5 deletions SiteMapGenerator.js
View file
Expand Up @@ -3,7 +3,7 @@
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");

exports.__esModule = true;
exports["default"] = void 0;
exports.default = void 0;

var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));

Expand All @@ -16,20 +16,20 @@ var _BaseSiteMapGenerator2 = _interopRequireDefault(require("./BaseSiteMapGenera
var SiteMapGenerator =
/*#__PURE__*/
function (_BaseSiteMapGenerator) {
(0, _inheritsLoose2["default"])(SiteMapGenerator, _BaseSiteMapGenerator);
(0, _inheritsLoose2.default)(SiteMapGenerator, _BaseSiteMapGenerator);

function SiteMapGenerator(opts, type) {
var _this;

_this = _BaseSiteMapGenerator.call(this) || this;
_this.name = type || "pages";

_lodash["default"].extend((0, _assertThisInitialized2["default"])(_this), opts);
_lodash.default.extend((0, _assertThisInitialized2.default)(_this), opts);

return _this;
}

return SiteMapGenerator;
}(_BaseSiteMapGenerator2["default"]);
}(_BaseSiteMapGenerator2.default);

exports["default"] = SiteMapGenerator;
exports.default = SiteMapGenerator;
10 changes: 5 additions & 5 deletions SiteMapManager.js
View file
Expand Up @@ -3,7 +3,7 @@
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");

exports.__esModule = true;
exports["default"] = void 0;
exports.default = void 0;

var _IndexMapGenerator = _interopRequireDefault(require("./IndexMapGenerator"));

Expand All @@ -27,7 +27,7 @@ function () {
} // ensure, we have a cleaned up array


sitemapTypes = _lodash["default"].uniq(sitemapTypes); // create sitemaps for each type
sitemapTypes = _lodash.default.uniq(sitemapTypes); // create sitemaps for each type

sitemapTypes.forEach(function (type) {
_this[type] = options[type] || _this.createSiteMapGenerator(options, type);
Expand All @@ -46,13 +46,13 @@ function () {
sitemapTypes.forEach(function (type) {
return types[type] = _this2[type];
});
return new _IndexMapGenerator["default"]({
return new _IndexMapGenerator.default({
types: types
});
};

_proto.createSiteMapGenerator = function createSiteMapGenerator(options, type) {
return new _SiteMapGenerator["default"](options, type);
return new _SiteMapGenerator.default(options, type);
};

_proto.getIndexXml = function getIndexXml(options) {
Expand All @@ -74,4 +74,4 @@ function () {
return SiteMapManager;
}();

exports["default"] = SiteMapManager;
exports.default = SiteMapManager;
4 changes: 2 additions & 2 deletions defaults.js
View file
@@ -1,7 +1,7 @@
"use strict";

exports.__esModule = true;
exports["default"] = void 0;
exports.default = void 0;
// These are the default options which can be overwritten
// in gatsby-config.js
var defaultOptions = {
Expand All @@ -15,4 +15,4 @@ var defaultOptions = {
createLinkInHead: true
};
var _default = defaultOptions;
exports["default"] = _default;
exports.default = _default;
48 changes: 24 additions & 24 deletions gatsby-node.js
View file
Expand Up @@ -24,7 +24,7 @@ var PUBLICPATH = "./public";
var INDEXFILE = "/sitemap.xml";
var RESOURCESFILE = "/sitemap-:resource.xml";

var XSLFILE = _path["default"].resolve(__dirname, "./static/sitemap.xsl");
var XSLFILE = _path.default.resolve(__dirname, "./static/sitemap.xsl");

var DEFAULTQUERY = "{\n allSitePage {\n edges {\n node {\n id\n slug: path\n url: path\n }\n }\n }\n site {\n siteMetadata {\n siteUrl\n }\n }\n}";
var DEFAULTMAPPING = {
Expand All @@ -37,28 +37,28 @@ var siteUrl;
var copyStylesheet =
/*#__PURE__*/
function () {
var _ref2 = (0, _asyncToGenerator2["default"])(
var _ref2 = (0, _asyncToGenerator2.default)(
/*#__PURE__*/
_regenerator["default"].mark(function _callee(_ref) {
_regenerator.default.mark(function _callee(_ref) {
var siteUrl, pathPrefix, indexOutput, siteRegex, data, sitemapStylesheet;
return _regenerator["default"].wrap(function _callee$(_context) {
return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
siteUrl = _ref.siteUrl, pathPrefix = _ref.pathPrefix, indexOutput = _ref.indexOutput;
siteRegex = /(\{\{blog-url\}\})/g; // Get our stylesheet template

_context.next = 4;
return _fsExtra["default"].readFile(XSLFILE);
return _fsExtra.default.readFile(XSLFILE);

case 4:
data = _context.sent;
// Replace the `{{blog-url}}` variable with our real site URL
sitemapStylesheet = data.toString().replace(siteRegex, _url["default"].resolve(siteUrl, _path["default"].join(pathPrefix, indexOutput))); // Save the updated stylesheet to the public folder, so it will be
sitemapStylesheet = data.toString().replace(siteRegex, _url.default.resolve(siteUrl, _path.default.join(pathPrefix, indexOutput))); // Save the updated stylesheet to the public folder, so it will be
// available for the xml sitemap files

_context.next = 8;
return _fsExtra["default"].writeFile(_path["default"].join(PUBLICPATH, "sitemap.xsl"), sitemapStylesheet);
return _fsExtra.default.writeFile(_path.default.join(PUBLICPATH, "sitemap.xsl"), sitemapStylesheet);

case 8:
case "end":
Expand Down Expand Up @@ -151,12 +151,12 @@ var addPageNodes = function addPageNodes(parsedNodesArray, allSiteNodes, siteUrl
return foundOne;
});

var remainingNodes = _lodash["default"].difference(allSiteNodes, usedNodes);
var remainingNodes = _lodash.default.difference(allSiteNodes, usedNodes);

remainingNodes.forEach(function (_ref5) {
var node = _ref5.node;
addedPageNodes.pages.push({
url: _url["default"].resolve(siteUrl, node.url),
url: _url.default.resolve(siteUrl, node.url),
node: node
});
});
Expand All @@ -171,7 +171,7 @@ var serializeSources = function serializeSources(mapping) {
sitemaps.push(mapping[resourceType]);
}

sitemaps = _lodash["default"].map(sitemaps, function (source) {
sitemaps = _lodash.default.map(sitemaps, function (source) {
// Ignore the key and only return the name and
// source as we need those to create the index
// and the belonging sources accordingly
Expand All @@ -180,7 +180,7 @@ var serializeSources = function serializeSources(mapping) {
sitemap: source.sitemap || "pages"
};
});
sitemaps = _lodash["default"].uniqBy(sitemaps, "name");
sitemaps = _lodash.default.uniqBy(sitemaps, "name");
return sitemaps;
};

Expand Down Expand Up @@ -233,7 +233,7 @@ var runQuery = function runQuery(handler, _ref6) {

var serialize = function serialize(_temp, _ref8, mapping) {
var _ref9 = _temp === void 0 ? {} : _temp,
sources = (0, _extends2["default"])({}, _ref9);
sources = (0, _extends2.default)({}, _ref9);

var site = _ref8.site,
allSitePage = _ref8.allSitePage;
Expand Down Expand Up @@ -262,15 +262,15 @@ var serialize = function serialize(_temp, _ref8, mapping) {


if (mapping[type].path) {
node.path = _path["default"].resolve(mapping[type].path, node.slug);
node.path = _path.default.resolve(mapping[type].path, node.slug);
} else {
node.path = node.slug;
} // get the real path for the node, which is generated by Gatsby


node = getNodePath(node, allSitePage);
sourceObject[mapping[type].sitemap].push({
url: _url["default"].resolve(siteUrl, node.path),
url: _url.default.resolve(siteUrl, node.path),
node: node
});
});
Expand All @@ -285,29 +285,29 @@ var serialize = function serialize(_temp, _ref8, mapping) {
nodes.push(sourceObject);
var pageNodes = addPageNodes(nodes, allSitePage.edges, siteUrl);

var allNodes = _lodash["default"].merge(nodes, pageNodes);
var allNodes = _lodash.default.merge(nodes, pageNodes);

return allNodes;
};

exports.onPostBuild =
/*#__PURE__*/
function () {
var _ref12 = (0, _asyncToGenerator2["default"])(
var _ref12 = (0, _asyncToGenerator2.default)(
/*#__PURE__*/
_regenerator["default"].mark(function _callee2(_ref11, pluginOptions) {
_regenerator.default.mark(function _callee2(_ref11, pluginOptions) {
var graphql, pathPrefix, queryRecords, options, indexSitemapFile, resourcesSitemapFile, defaultQueryRecords, manager, resourcesSiteMapsArray, indexSiteMap, _i2, _resourcesSiteMapsArr, sitemap, filePath;

return _regenerator["default"].wrap(function _callee2$(_context2) {
return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
graphql = _ref11.graphql, pathPrefix = _ref11.pathPrefix;
// Passing the config option addUncaughtPages will add all pages which are not covered by passed mappings
// to the default `pages` sitemap. Otherwise they will be ignored.
options = pluginOptions.addUncaughtPages ? _lodash["default"].merge(_defaults["default"], pluginOptions) : Object.assign(_defaults["default"], pluginOptions);
indexSitemapFile = _path["default"].join(PUBLICPATH, pathPrefix, INDEXFILE);
resourcesSitemapFile = _path["default"].join(PUBLICPATH, pathPrefix, RESOURCESFILE);
options = pluginOptions.addUncaughtPages ? _lodash.default.merge(_defaults.default, pluginOptions) : Object.assign(_defaults.default, pluginOptions);
indexSitemapFile = _path.default.join(PUBLICPATH, pathPrefix, INDEXFILE);
resourcesSitemapFile = _path.default.join(PUBLICPATH, pathPrefix, RESOURCESFILE);
delete options.plugins;
delete options.createLinkInHead;
options.indexOutput = INDEXFILE;
Expand Down Expand Up @@ -342,7 +342,7 @@ function () {

case 18:
// Instanciate the Ghost Sitemaps Manager
manager = new _SiteMapManager["default"](options);
manager = new _SiteMapManager.default(options);
_context2.next = 21;
return serialize(queryRecords, defaultQueryRecords, options.mapping).forEach(function (source) {
var _loop3 = function _loop3(type) {
Expand Down Expand Up @@ -382,7 +382,7 @@ function () {

_context2.prev = 29;
_context2.next = 32;
return _fsExtra["default"].writeFile(indexSitemapFile, indexSiteMap);
return _fsExtra.default.writeFile(indexSitemapFile, indexSiteMap);

case 32:
_context2.next = 37;
Expand All @@ -407,7 +407,7 @@ function () {

_context2.prev = 41;
_context2.next = 44;
return _fsExtra["default"].writeFile(filePath, sitemap.xml);
return _fsExtra.default.writeFile(filePath, sitemap.xml);

case 44:
_context2.next = 49;
Expand Down

0 comments on commit d2db3cf

Please sign in to comment.