Skip to content

Commit eddc946

Browse files
authored
Merge pull request #352 from pluginpal/feature/update-strapi
Update @strapi to 5.31.2
2 parents 4ddc4b7 + 3bcd2e9 commit eddc946

File tree

7 files changed

+3453
-1167
lines changed

7 files changed

+3453
-1167
lines changed

.changeset/swift-wombats-speak.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"webtools-addon-sitemap": patch
3+
"strapi-plugin-webtools": patch
4+
---
5+
6+
chore: remove -rc version constraint from @strapi design-system & icons peer dependencies

packages/addons/sitemap/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
"eslint:fix": "eslint --fix './**/*.{js,jsx,ts,tsx}'"
4545
},
4646
"peerDependencies": {
47-
"@strapi/design-system": "^2.0.0-rc",
48-
"@strapi/icons": "^2.0.0-rc",
47+
"@strapi/design-system": "^2.0.0",
48+
"@strapi/icons": "^2.0.0",
4949
"@strapi/strapi": "^5.0.0",
5050
"@strapi/utils": "^5.0.0",
5151
"react": "^17.0.0 || ^18.0.0",
@@ -56,8 +56,8 @@
5656
"styled-components": "^6.0.0"
5757
},
5858
"devDependencies": {
59-
"@strapi/design-system": "^2.0.0-rc",
60-
"@strapi/icons": "^2.0.0-rc",
59+
"@strapi/design-system": "^2.0.0",
60+
"@strapi/icons": "^2.0.0",
6161
"@strapi/pack-up": "^5.0.0",
6262
"@strapi/sdk-plugin": "^5.0.0",
6363
"@strapi/strapi": "^5.0.0",

packages/core/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
},
4242
"peerDependencies": {
4343
"@strapi/admin": "^5.0.0",
44-
"@strapi/design-system": "^2.0.0-rc",
45-
"@strapi/icons": "^2.0.0-rc",
44+
"@strapi/design-system": "^2.0.0",
45+
"@strapi/icons": "^2.0.0",
4646
"@strapi/strapi": "^5.0.0",
4747
"@strapi/utils": "^5.0.0",
4848
"react": "^17.0.0 || ^18.0.0",
@@ -52,8 +52,8 @@
5252
},
5353
"devDependencies": {
5454
"@strapi/admin": "^5.0.0",
55-
"@strapi/design-system": "^2.0.0-rc",
56-
"@strapi/icons": "^2.0.0-rc",
55+
"@strapi/design-system": "^2.0.0",
56+
"@strapi/icons": "^2.0.0",
5757
"@strapi/pack-up": "^5.0.0",
5858
"@strapi/sdk-plugin": "^5.0.0",
5959
"@strapi/strapi": "^5.0.0",

playground/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"sitemap": "strapi-sitemap"
1313
},
1414
"dependencies": {
15-
"@strapi/plugin-cloud": "^5.17.0",
16-
"@strapi/plugin-users-permissions": "^5.17.0",
17-
"@strapi/strapi": "^5.17.0",
15+
"@strapi/plugin-cloud": "^5.31.2",
16+
"@strapi/plugin-users-permissions": "^5.31.2",
17+
"@strapi/strapi": "^5.31.2",
1818
"better-sqlite3": "11.3.0",
1919
"react": "^18.0.0",
2020
"react-dom": "^18.0.0",

playground/types/generated/contentTypes.d.ts

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,63 @@ export interface AdminRole extends Struct.CollectionTypeSchema {
203203
};
204204
}
205205

206+
export interface AdminSession extends Struct.CollectionTypeSchema {
207+
collectionName: 'strapi_sessions';
208+
info: {
209+
description: 'Session Manager storage';
210+
displayName: 'Session';
211+
name: 'Session';
212+
pluralName: 'sessions';
213+
singularName: 'session';
214+
};
215+
options: {
216+
draftAndPublish: false;
217+
};
218+
pluginOptions: {
219+
'content-manager': {
220+
visible: false;
221+
};
222+
'content-type-builder': {
223+
visible: false;
224+
};
225+
i18n: {
226+
localized: false;
227+
};
228+
};
229+
attributes: {
230+
absoluteExpiresAt: Schema.Attribute.DateTime & Schema.Attribute.Private;
231+
childId: Schema.Attribute.String & Schema.Attribute.Private;
232+
createdAt: Schema.Attribute.DateTime;
233+
createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
234+
Schema.Attribute.Private;
235+
deviceId: Schema.Attribute.String &
236+
Schema.Attribute.Required &
237+
Schema.Attribute.Private;
238+
expiresAt: Schema.Attribute.DateTime &
239+
Schema.Attribute.Required &
240+
Schema.Attribute.Private;
241+
locale: Schema.Attribute.String & Schema.Attribute.Private;
242+
localizations: Schema.Attribute.Relation<'oneToMany', 'admin::session'> &
243+
Schema.Attribute.Private;
244+
origin: Schema.Attribute.String &
245+
Schema.Attribute.Required &
246+
Schema.Attribute.Private;
247+
publishedAt: Schema.Attribute.DateTime;
248+
sessionId: Schema.Attribute.String &
249+
Schema.Attribute.Required &
250+
Schema.Attribute.Private &
251+
Schema.Attribute.Unique;
252+
status: Schema.Attribute.String & Schema.Attribute.Private;
253+
type: Schema.Attribute.String & Schema.Attribute.Private;
254+
updatedAt: Schema.Attribute.DateTime;
255+
updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
256+
Schema.Attribute.Private;
257+
userId: Schema.Attribute.String &
258+
Schema.Attribute.Required &
259+
Schema.Attribute.Private;
260+
};
261+
}
262+
206263
export interface AdminTransferToken extends Struct.CollectionTypeSchema {
207264
collectionName: 'strapi_transfer_tokens';
208265
info: {
@@ -1197,6 +1254,7 @@ declare module '@strapi/strapi' {
11971254
'admin::api-token-permission': AdminApiTokenPermission;
11981255
'admin::permission': AdminPermission;
11991256
'admin::role': AdminRole;
1257+
'admin::session': AdminSession;
12001258
'admin::transfer-token': AdminTransferToken;
12011259
'admin::transfer-token-permission': AdminTransferTokenPermission;
12021260
'admin::user': AdminUser;

0 commit comments

Comments
 (0)