diff --git a/.changeset/bright-lights-slide.md b/.changeset/bright-lights-slide.md new file mode 100644 index 00000000..65128aa4 --- /dev/null +++ b/.changeset/bright-lights-slide.md @@ -0,0 +1,5 @@ +--- +"webtools-addon-sitemap": patch +--- + +chore: allow both v1 and v2 as peer dependency of the sitemap addon diff --git a/.changeset/hungry-planes-return.md b/.changeset/hungry-planes-return.md new file mode 100644 index 00000000..5ecd4edc --- /dev/null +++ b/.changeset/hungry-planes-return.md @@ -0,0 +1,5 @@ +--- +"strapi-plugin-webtools": major +--- + +refactor: rename the router controller to 'findOne' for fetching with a read-only API token diff --git a/packages/addons/sitemap/package.json b/packages/addons/sitemap/package.json index 88a7a889..4b7caf61 100644 --- a/packages/addons/sitemap/package.json +++ b/packages/addons/sitemap/package.json @@ -52,7 +52,7 @@ "react-dom": "^17.0.0 || ^18.0.0", "react-router-dom": "^6.0.0", "redux": "*", - "strapi-plugin-webtools": "^1.4.0", + "strapi-plugin-webtools": "^1.4.0 || ^2.0.0", "styled-components": "^6.0.0" }, "devDependencies": { diff --git a/packages/core/server/controllers/index.ts b/packages/core/server/controllers/index.ts index 70702ca1..a05f4086 100644 --- a/packages/core/server/controllers/index.ts +++ b/packages/core/server/controllers/index.ts @@ -1,13 +1,13 @@ import urlAliasController from './url-alias'; import urlPatternController from './url-pattern'; import infoController from './info'; -import coreController from './core'; +import routerController from './router'; import searchController from './search'; export default { 'url-alias': urlAliasController, 'url-pattern': urlPatternController, info: infoController, - core: coreController, + router: routerController, search: searchController, }; diff --git a/packages/core/server/controllers/core.ts b/packages/core/server/controllers/router.ts similarity index 97% rename from packages/core/server/controllers/core.ts rename to packages/core/server/controllers/router.ts index 306baff6..66696278 100644 --- a/packages/core/server/controllers/core.ts +++ b/packages/core/server/controllers/router.ts @@ -10,7 +10,7 @@ import { sanitizeOutput } from '../util/sanitizeOutput'; */ export default { - router: async (ctx: Context) => { + findOne: async (ctx: Context) => { const { path, ...searchQuery } = ctx.query; const { auth } = ctx.state; diff --git a/packages/core/server/routes/index.ts b/packages/core/server/routes/index.ts index 92273652..80b78609 100644 --- a/packages/core/server/routes/index.ts +++ b/packages/core/server/routes/index.ts @@ -45,7 +45,7 @@ export default { { method: 'GET', path: '/router', - handler: 'core.router', + handler: 'router.findOne', config: { policies: [], }, diff --git a/playground/src/index.ts b/playground/src/index.ts index 9e4b13f1..3564c442 100644 --- a/playground/src/index.ts +++ b/playground/src/index.ts @@ -36,8 +36,8 @@ export default { publicRole.permissions['plugin::webtools'] = { controllers: { - core: { - router: { enabled: true }, + router: { + findOne: { enabled: true }, }, 'url-alias': { find: { enabled: true },