From 81b62a508efad638c261876fa10f02fd433c213c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20de=20Juvigny?= Date: Wed, 4 Dec 2024 09:36:19 +0100 Subject: [PATCH] feat: add content preview (remove future flag) --- examples/getstarted/config/features.js | 6 +----- .../content-manager/admin/src/preview/constants.ts | 1 - .../core/content-manager/admin/src/preview/index.ts | 6 ------ .../content-manager/server/src/preview/constants.ts | 1 - .../core/content-manager/server/src/preview/index.ts | 10 ---------- packages/core/types/src/modules/features.ts | 4 +--- 6 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 packages/core/content-manager/admin/src/preview/constants.ts delete mode 100644 packages/core/content-manager/server/src/preview/constants.ts diff --git a/examples/getstarted/config/features.js b/examples/getstarted/config/features.js index 817d6e26de..c381b7503a 100644 --- a/examples/getstarted/config/features.js +++ b/examples/getstarted/config/features.js @@ -1,5 +1 @@ -module.exports = ({ env }) => ({ - future: { - preview: env.bool('STRAPI_FUTURE_PREVIEW', false), - }, -}); +module.exports = ({ env }) => ({}); diff --git a/packages/core/content-manager/admin/src/preview/constants.ts b/packages/core/content-manager/admin/src/preview/constants.ts deleted file mode 100644 index 4d7e03781c..0000000000 --- a/packages/core/content-manager/admin/src/preview/constants.ts +++ /dev/null @@ -1 +0,0 @@ -export const FEATURE_ID = 'preview'; diff --git a/packages/core/content-manager/admin/src/preview/index.ts b/packages/core/content-manager/admin/src/preview/index.ts index 5562d7ee9d..c389f1184a 100644 --- a/packages/core/content-manager/admin/src/preview/index.ts +++ b/packages/core/content-manager/admin/src/preview/index.ts @@ -1,18 +1,12 @@ /* eslint-disable check-file/no-index */ import { PreviewSidePanel } from './components/PreviewSidePanel'; -import { FEATURE_ID } from './constants'; import type { ContentManagerPlugin } from '../content-manager'; import type { PluginDefinition } from '@strapi/admin/strapi-admin'; const previewAdmin = { bootstrap(app) { - // TODO: Add license registry check when it's available - if (!window.strapi.future.isEnabled(FEATURE_ID)) { - return; - } - const contentManagerPluginApis = app.getPlugin('content-manager') .apis as ContentManagerPlugin['config']['apis']; diff --git a/packages/core/content-manager/server/src/preview/constants.ts b/packages/core/content-manager/server/src/preview/constants.ts deleted file mode 100644 index 4d7e03781c..0000000000 --- a/packages/core/content-manager/server/src/preview/constants.ts +++ /dev/null @@ -1 +0,0 @@ -export const FEATURE_ID = 'preview'; diff --git a/packages/core/content-manager/server/src/preview/index.ts b/packages/core/content-manager/server/src/preview/index.ts index 612e8e68e6..8e64bd12ea 100644 --- a/packages/core/content-manager/server/src/preview/index.ts +++ b/packages/core/content-manager/server/src/preview/index.ts @@ -1,6 +1,5 @@ import type { Plugin } from '@strapi/types'; -import { FEATURE_ID } from './constants'; import { routes } from './routes'; import { controllers } from './controllers'; import { services } from './services'; @@ -11,15 +10,6 @@ import { getService } from './utils'; * so that we can assume it is enabled in the other files. */ const getFeature = (): Partial => { - if (!strapi.features.future.isEnabled(FEATURE_ID)) { - return {}; - } - - // TODO: Add license registry check when it's available - // if (!strapi.ee.features.isEnabled('cms-content-preview')) { - // return {}; - // } - return { register() { const config = getService(strapi, 'preview-config'); diff --git a/packages/core/types/src/modules/features.ts b/packages/core/types/src/modules/features.ts index 4fae21d01b..c2e1a20b2b 100644 --- a/packages/core/types/src/modules/features.ts +++ b/packages/core/types/src/modules/features.ts @@ -1,7 +1,5 @@ export interface FeaturesConfig { - future?: { - preview?: boolean; - }; + future?: object; } export interface FeaturesService {