Skip to content

Commit 7374c27

Browse files
authored
Merge pull request #135 from pluginpal/feature/fix-tests-ci
fix: run tests twice in CI, allowing the first try to fail
2 parents c913705 + 645580b commit 7374c27

6 files changed

Lines changed: 48 additions & 126 deletions

File tree

playground/config/plugins.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,7 @@ module.exports = {
33
enabled: true,
44
config: {
55
importOnBootstrap: false,
6-
minify: false,
7-
customTypes: [
8-
{
9-
configName: "home",
10-
queryString: "api::home.home",
11-
uid: ["slug"],
12-
components: [
13-
"Profile",
14-
"Profile.ContactInfo",
15-
],
16-
}
17-
]
6+
minify: true,
187
},
198
},
209
};

playground/src/api/home/content-types/home/schema.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
"title": {
1616
"type": "string"
1717
},
18-
"Profile": {
19-
"type": "component",
20-
"repeatable": false,
21-
"component": "core.profile"
22-
},
2318
"slug": {
2419
"type": "uid",
2520
"targetField": "title"

playground/src/components/core/contact-info.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

playground/src/components/core/profile.json

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,5 @@
11
import type { Schema, Attribute } from '@strapi/strapi';
22

3-
export interface CoreProfile extends Schema.Component {
4-
collectionName: 'components_core_profiles';
5-
info: {
6-
displayName: 'Profile';
7-
description: '';
8-
};
9-
attributes: {
10-
title: Attribute.String;
11-
ContactInfo: Attribute.Component<'core.contact-info', true>;
12-
};
13-
}
14-
15-
export interface CoreContactInfo extends Schema.Component {
16-
collectionName: 'components_core_contact_infos';
17-
info: {
18-
displayName: 'ContactInfo';
19-
};
20-
attributes: {
21-
Phonenumber: Attribute.String;
22-
Email: Attribute.String;
23-
};
24-
}
25-
263
declare module '@strapi/types' {
27-
export module Shared {
28-
export interface Components {
29-
'core.profile': CoreProfile;
30-
'core.contact-info': CoreContactInfo;
31-
}
32-
}
4+
export module Shared {}
335
}

playground/types/generated/contentTypes.d.ts

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,50 @@ export interface AdminTransferTokenPermission extends Schema.CollectionType {
362362
};
363363
}
364364

365+
export interface ApiHomeHome extends Schema.SingleType {
366+
collectionName: 'homes';
367+
info: {
368+
singularName: 'home';
369+
pluralName: 'homes';
370+
displayName: 'Home';
371+
description: '';
372+
};
373+
options: {
374+
draftAndPublish: false;
375+
};
376+
attributes: {
377+
title: Attribute.String;
378+
slug: Attribute.UID<'api::home.home', 'title'>;
379+
createdAt: Attribute.DateTime;
380+
updatedAt: Attribute.DateTime;
381+
createdBy: Attribute.Relation<'api::home.home', 'oneToOne', 'admin::user'> &
382+
Attribute.Private;
383+
updatedBy: Attribute.Relation<'api::home.home', 'oneToOne', 'admin::user'> &
384+
Attribute.Private;
385+
};
386+
}
387+
388+
export interface ApiPagePage extends Schema.CollectionType {
389+
collectionName: 'pages';
390+
info: {
391+
singularName: 'page';
392+
pluralName: 'pages';
393+
displayName: 'Page';
394+
};
395+
options: {
396+
draftAndPublish: false;
397+
};
398+
attributes: {
399+
title: Attribute.String & Attribute.Required;
400+
createdAt: Attribute.DateTime;
401+
updatedAt: Attribute.DateTime;
402+
createdBy: Attribute.Relation<'api::page.page', 'oneToOne', 'admin::user'> &
403+
Attribute.Private;
404+
updatedBy: Attribute.Relation<'api::page.page', 'oneToOne', 'admin::user'> &
405+
Attribute.Private;
406+
};
407+
}
408+
365409
export interface PluginUploadFile extends Schema.CollectionType {
366410
collectionName: 'files';
367411
info: {
@@ -788,51 +832,6 @@ export interface PluginUsersPermissionsUser extends Schema.CollectionType {
788832
};
789833
}
790834

791-
export interface ApiHomeHome extends Schema.SingleType {
792-
collectionName: 'homes';
793-
info: {
794-
singularName: 'home';
795-
pluralName: 'homes';
796-
displayName: 'Home';
797-
description: '';
798-
};
799-
options: {
800-
draftAndPublish: false;
801-
};
802-
attributes: {
803-
title: Attribute.String;
804-
Profile: Attribute.Component<'core.profile'>;
805-
slug: Attribute.UID<'api::home.home', 'title'>;
806-
createdAt: Attribute.DateTime;
807-
updatedAt: Attribute.DateTime;
808-
createdBy: Attribute.Relation<'api::home.home', 'oneToOne', 'admin::user'> &
809-
Attribute.Private;
810-
updatedBy: Attribute.Relation<'api::home.home', 'oneToOne', 'admin::user'> &
811-
Attribute.Private;
812-
};
813-
}
814-
815-
export interface ApiPagePage extends Schema.CollectionType {
816-
collectionName: 'pages';
817-
info: {
818-
singularName: 'page';
819-
pluralName: 'pages';
820-
displayName: 'Page';
821-
};
822-
options: {
823-
draftAndPublish: false;
824-
};
825-
attributes: {
826-
title: Attribute.String & Attribute.Required;
827-
createdAt: Attribute.DateTime;
828-
updatedAt: Attribute.DateTime;
829-
createdBy: Attribute.Relation<'api::page.page', 'oneToOne', 'admin::user'> &
830-
Attribute.Private;
831-
updatedBy: Attribute.Relation<'api::page.page', 'oneToOne', 'admin::user'> &
832-
Attribute.Private;
833-
};
834-
}
835-
836835
declare module '@strapi/types' {
837836
export module Shared {
838837
export interface ContentTypes {
@@ -843,6 +842,8 @@ declare module '@strapi/types' {
843842
'admin::api-token-permission': AdminApiTokenPermission;
844843
'admin::transfer-token': AdminTransferToken;
845844
'admin::transfer-token-permission': AdminTransferTokenPermission;
845+
'api::home.home': ApiHomeHome;
846+
'api::page.page': ApiPagePage;
846847
'plugin::upload.file': PluginUploadFile;
847848
'plugin::upload.folder': PluginUploadFolder;
848849
'plugin::content-releases.release': PluginContentReleasesRelease;
@@ -851,8 +852,6 @@ declare module '@strapi/types' {
851852
'plugin::users-permissions.permission': PluginUsersPermissionsPermission;
852853
'plugin::users-permissions.role': PluginUsersPermissionsRole;
853854
'plugin::users-permissions.user': PluginUsersPermissionsUser;
854-
'api::home.home': ApiHomeHome;
855-
'api::page.page': ApiPagePage;
856855
}
857856
}
858857
}

0 commit comments

Comments
 (0)