From 8aae653abf4a4bcee148fde28285ef0e02cc4fb5 Mon Sep 17 00:00:00 2001 From: Julien Deniau Date: Sat, 27 Jan 2024 16:27:04 +0000 Subject: [PATCH] upgrade next sitemap --- .gitignore | 2 +- package-lock.json | 89 ++++++++++--------- package.json | 2 +- ...next-sitemap.js => next-sitemap.config.js} | 1 + 4 files changed, 48 insertions(+), 46 deletions(-) rename website/{next-sitemap.js => next-sitemap.config.js} (85%) diff --git a/.gitignore b/.gitignore index a916facb3..a7a99033e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ yarn-error.log TODO /website/.next /website/out -/website/public/sitemap.xml +/website/public/sitemap*.xml /website/public/robots.txt /gh-pages /npm diff --git a/package-lock.json b/package-lock.json index fa8ebbac4..91950b5d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "marked": "2.1.2", "microtime": "3.0.0", "next": "^14.1.0", - "next-sitemap": "1.6.124", + "next-sitemap": "4.2.3", "npm-run-all": "4.1.5", "prettier": "2.3.2", "react": "^18.2.0", @@ -773,9 +773,9 @@ "dev": true }, "node_modules/@corex/deepmerge": { - "version": "2.6.20", - "resolved": "https://registry.npmjs.org/@corex/deepmerge/-/deepmerge-2.6.20.tgz", - "integrity": "sha512-oZZxwDtV0bf8VPcSIhZPvdBFUkVIC8zRblUjrrVAsbGRiqUuZJfoXw2M6NDiIXWcUCfOqbkFND6Yf3b9ej9AjA==", + "version": "4.0.43", + "resolved": "https://registry.npmjs.org/@corex/deepmerge/-/deepmerge-4.0.43.tgz", + "integrity": "sha512-N8uEMrMPL0cu/bdboEWpQYb/0i2K5Qn8eCsxzOmxSggJbbQte7ljMRoXm917AbntqTGOzdTu+vP3KOOzoC70HQ==", "dev": true }, "node_modules/@definitelytyped/header-parser": { @@ -8670,21 +8670,6 @@ "node": ">= 10" } }, - "node_modules/matcher": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-4.0.0.tgz", - "integrity": "sha512-S6x5wmcDmsDRRU/c2dkccDwQPXoFczc5+HpQ2lON8pnvHlnvHAHj5WlLVvw6n6vNyHuVugYrFohYxbS+pvFpKQ==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/memorystream": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", @@ -9143,22 +9128,38 @@ } }, "node_modules/next-sitemap": { - "version": "1.6.124", - "resolved": "https://registry.npmjs.org/next-sitemap/-/next-sitemap-1.6.124.tgz", - "integrity": "sha512-Q8hZZcC11zPUZyAPB4npClSrHzZwddzWSVMMqehRKXBblhT/cQPsKf7zxh2UwgVW18EfS6oRhca4lhGjFfyAEw==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/next-sitemap/-/next-sitemap-4.2.3.tgz", + "integrity": "sha512-vjdCxeDuWDzldhCnyFCQipw5bfpl4HmZA7uoo3GAaYGjGgfL4Cxb1CiztPuWGmS+auYs7/8OekRS8C2cjdAsjQ==", "dev": true, + "funding": [ + { + "url": "https://github.com/iamvishnusankar/next-sitemap.git" + } + ], "dependencies": { - "@corex/deepmerge": "^2.6.20", - "matcher": "^4.0.0", - "minimist": "^1.2.5" + "@corex/deepmerge": "^4.0.43", + "@next/env": "^13.4.3", + "fast-glob": "^3.2.12", + "minimist": "^1.2.8" }, "bin": { - "next-sitemap": "bin/next-sitemap" + "next-sitemap": "bin/next-sitemap.mjs", + "next-sitemap-cjs": "bin/next-sitemap.cjs" + }, + "engines": { + "node": ">=14.18" }, "peerDependencies": { "next": "*" } }, + "node_modules/next-sitemap/node_modules/@next/env": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.6.tgz", + "integrity": "sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw==", + "dev": true + }, "node_modules/nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -13514,9 +13515,9 @@ "dev": true }, "@corex/deepmerge": { - "version": "2.6.20", - "resolved": "https://registry.npmjs.org/@corex/deepmerge/-/deepmerge-2.6.20.tgz", - "integrity": "sha512-oZZxwDtV0bf8VPcSIhZPvdBFUkVIC8zRblUjrrVAsbGRiqUuZJfoXw2M6NDiIXWcUCfOqbkFND6Yf3b9ej9AjA==", + "version": "4.0.43", + "resolved": "https://registry.npmjs.org/@corex/deepmerge/-/deepmerge-4.0.43.tgz", + "integrity": "sha512-N8uEMrMPL0cu/bdboEWpQYb/0i2K5Qn8eCsxzOmxSggJbbQte7ljMRoXm917AbntqTGOzdTu+vP3KOOzoC70HQ==", "dev": true }, "@definitelytyped/header-parser": { @@ -19540,15 +19541,6 @@ "integrity": "sha512-ueJhIvklJJw04qxQbGIAu63EXwwOCYc7yKMBjgagTM4rjC5QtWyqSNgW7jCosV1/Km/1TUfs5qEpAqcGG0Mo5g==", "dev": true }, - "matcher": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-4.0.0.tgz", - "integrity": "sha512-S6x5wmcDmsDRRU/c2dkccDwQPXoFczc5+HpQ2lON8pnvHlnvHAHj5WlLVvw6n6vNyHuVugYrFohYxbS+pvFpKQ==", - "dev": true, - "requires": { - "escape-string-regexp": "^4.0.0" - } - }, "memorystream": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", @@ -19880,14 +19872,23 @@ } }, "next-sitemap": { - "version": "1.6.124", - "resolved": "https://registry.npmjs.org/next-sitemap/-/next-sitemap-1.6.124.tgz", - "integrity": "sha512-Q8hZZcC11zPUZyAPB4npClSrHzZwddzWSVMMqehRKXBblhT/cQPsKf7zxh2UwgVW18EfS6oRhca4lhGjFfyAEw==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/next-sitemap/-/next-sitemap-4.2.3.tgz", + "integrity": "sha512-vjdCxeDuWDzldhCnyFCQipw5bfpl4HmZA7uoo3GAaYGjGgfL4Cxb1CiztPuWGmS+auYs7/8OekRS8C2cjdAsjQ==", "dev": true, "requires": { - "@corex/deepmerge": "^2.6.20", - "matcher": "^4.0.0", - "minimist": "^1.2.5" + "@corex/deepmerge": "^4.0.43", + "@next/env": "^13.4.3", + "fast-glob": "^3.2.12", + "minimist": "^1.2.8" + }, + "dependencies": { + "@next/env": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.6.tgz", + "integrity": "sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw==", + "dev": true + } } }, "nice-try": { diff --git a/package.json b/package.json index f7f2efc87..805cb84d9 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "marked": "2.1.2", "microtime": "3.0.0", "next": "^14.1.0", - "next-sitemap": "1.6.124", + "next-sitemap": "4.2.3", "npm-run-all": "4.1.5", "prettier": "2.3.2", "react": "^18.2.0", diff --git a/website/next-sitemap.js b/website/next-sitemap.config.js similarity index 85% rename from website/next-sitemap.js rename to website/next-sitemap.config.js index 9c53c9c9d..7ce2d48d3 100644 --- a/website/next-sitemap.js +++ b/website/next-sitemap.config.js @@ -1,5 +1,6 @@ const { getVersions } = require('./src/static/getVersions'); +/** @type {import('next-sitemap').IConfig} */ module.exports = { siteUrl: 'https://immutable-js.com', generateRobotsTxt: true,