chore: rename core packages (#20243)

* chore: remove plugin from cm package name

* chore: remove plugin from upload package name

* chore: remove plugin from email package name

* chore: remove plugin from ctb package name

* chore: remove plugin from i18n package name

* fix: plugin ids

* fix: v5 migratino

* fix: import order lint error

packages/core/content-manager/package.json

@@ -1,5 +1,5 @@
 {
- "name": "@strapi/plugin-content-manager",
+ "name": "@strapi/content-manager",
  "version": "5.0.0-beta.5",
  "description": "A powerful UI to easily manage your data.",
  "repository": {

packages/core/content-releases/admin/src/components/CMReleasesContainer.tsx

@@ -7,6 +7,7 @@ import {
  useQueryParams,
  useRBAC,
 } from '@strapi/admin/strapi-admin';
+import { unstable_useDocument } from '@strapi/content-manager/strapi-admin';
 import {
  Box,
  Button,
@@ -24,7 +25,6 @@ import {
 } from '@strapi/design-system';
 import { Plus } from '@strapi/icons';
 import { EmptyDocuments } from '@strapi/icons/symbols';
-import { unstable_useDocument } from '@strapi/plugin-content-manager/strapi-admin';
 import { isAxiosError } from 'axios';
 import { Formik, Form } from 'formik';
 import { useIntl } from 'react-intl';

packages/core/content-releases/admin/src/components/ReleaseAction.tsx

@@ -29,7 +29,7 @@ import { type FormValues, INITIAL_VALUES, RELEASE_ACTION_FORM_SCHEMA } from './C
 import { NoReleases } from './CMReleasesContainer';
 import { ReleaseActionOptions } from './ReleaseActionOptions';
 
-import type { BulkActionComponent } from '@strapi/plugin-content-manager/strapi-admin';
+import type { BulkActionComponent } from '@strapi/content-manager/strapi-admin';
 
 const getContentPermissions = (subject: string) => {
  const permissions = {

packages/core/content-releases/admin/src/components/tests/CMReleasesContainer.test.tsx

@@ -7,8 +7,8 @@ import { Route, Routes } from 'react-router-dom';
 
 import { CMReleasesContainer } from '../CMReleasesContainer';
 
-jest.mock('@strapi/plugin-content-manager/strapi-admin', () => ({
- ...jest.requireActual('@strapi/plugin-content-manager/strapi-admin'),
+jest.mock('@strapi/content-manager/strapi-admin', () => ({
+ ...jest.requireActual('@strapi/content-manager/strapi-admin'),
  unstable_useDocument: jest.fn().mockReturnValue({
  schema: {
  options: {

packages/core/content-releases/admin/src/index.ts

@@ -9,7 +9,7 @@ import { releaseApi } from './services/release';
 import { prefixPluginTranslations } from './utils/prefixPluginTranslations';
 
 import type { StrapiApp } from '@strapi/admin/strapi-admin';
-import type { BulkActionComponent } from '@strapi/plugin-content-manager/strapi-admin';
+import type { BulkActionComponent } from '@strapi/content-manager/strapi-admin';
 import type { Plugin } from '@strapi/types';
 
 // eslint-disable-next-line import/no-default-export

packages/core/content-releases/admin/src/pages/ReleaseDetailsPage.tsx

@@ -13,6 +13,7 @@ import {
  useRBAC,
  useStrapiApp,
 } from '@strapi/admin/strapi-admin';
+import { unstable_useDocument } from '@strapi/content-manager/strapi-admin';
 import {
  Button,
  ContentLayout,
@@ -33,7 +34,6 @@ import {
 } from '@strapi/design-system';
 import { CheckCircle, More, Pencil, Trash, CrossCircle } from '@strapi/icons';
 import { EmptyDocuments } from '@strapi/icons/symbols';
-import { unstable_useDocument } from '@strapi/plugin-content-manager/strapi-admin';
 import format from 'date-fns/format';
 import { utcToZonedTime } from 'date-fns-tz';
 import { useIntl } from 'react-intl';

packages/core/content-releases/admin/src/pages/tests/ReleaseDetailsPage.test.tsx

@@ -19,8 +19,8 @@ jest.mock('@strapi/admin/strapi-admin', () => ({
  })),
 }));
 
-jest.mock('@strapi/plugin-content-manager/strapi-admin', () => ({
- ...jest.requireActual('@strapi/plugin-content-manager/strapi-admin'),
+jest.mock('@strapi/content-manager/strapi-admin', () => ({
+ ...jest.requireActual('@strapi/content-manager/strapi-admin'),
  unstable_useDocument: jest.fn().mockReturnValue({ validate: jest.fn().mockReturnValue({}) }),
 }));
 

packages/core/content-releases/package.json

@@ -72,8 +72,8 @@
  "devDependencies": {
  "@strapi/admin": "5.0.0-beta.5",
  "@strapi/admin-test-utils": "5.0.0-beta.5",
+ "@strapi/content-manager": "5.0.0-beta.5",
  "@strapi/pack-up": "5.0.0",
- "@strapi/plugin-content-manager": "5.0.0-beta.5",
  "@testing-library/react": "14.0.0",
  "@testing-library/user-event": "14.4.3",
  "@types/koa": "2.13.4",
@@ -89,7 +89,7 @@
  },
  "peerDependencies": {
  "@strapi/admin": "^5.0.0 || ^5.0.0-beta || ^5.0.0-alpha || ^5.0.0-rc",
- "@strapi/plugin-content-manager": "^5.0.0 || ^5.0.0-beta || ^5.0.0-alpha || ^5.0.0-rc",
+ "@strapi/content-manager": "^5.0.0 || ^5.0.0-beta || ^5.0.0-alpha || ^5.0.0-rc",
  "react": "^17.0.0 || ^18.0.0",
  "react-dom": "^17.0.0 || ^18.0.0",
  "react-router-dom": "^6.0.0",

packages/core/content-type-builder/admin/src/pluginId.ts

@@ -1,3 +1,3 @@
 import pluginPkg from '../../package.json';
 
-export const pluginId = pluginPkg.name.replace(/^@strapi\/plugin-/i, '');
+export const pluginId = pluginPkg.name.replace(/^@strapi\//i, '');

packages/core/content-type-builder/package.json

@@ -1,7 +1,7 @@
 {
- "name": "@strapi/plugin-content-type-builder",
+ "name": "@strapi/content-type-builder",
  "version": "5.0.0-beta.5",
- "description": "Strapi plugin to create content type",
+ "description": "Create and manage content types",
  "repository": {
  "type": "git",
  "url": "git://github.com/strapi/strapi.git"

packages/core/core/src/loaders/plugins/get-enabled-plugins.ts

@@ -30,11 +30,11 @@ interface PluginDeclaration {
  * otherwise known as "core features"
  */
 const INTERNAL_PLUGINS = [
- '@strapi/plugin-content-manager',
- '@strapi/plugin-content-type-builder',
- '@strapi/plugin-email',
- '@strapi/plugin-upload',
- '@strapi/plugin-i18n',
+ '@strapi/content-manager',
+ '@strapi/content-type-builder',
+ '@strapi/email',
+ '@strapi/upload',
+ '@strapi/i18n',
  '@strapi/content-releases',
  '@strapi/review-workflows',
 ];

packages/core/email/package.json

@@ -1,5 +1,5 @@
 {
- "name": "@strapi/plugin-email",
+ "name": "@strapi/email",
  "version": "5.0.0-beta.5",
  "description": "Easily configure your Strapi application to send emails.",
  "repository": {

packages/core/review-workflows/admin/src/routes/content-manager/[model]/[id]/components/AssigneeSelect.tsx

@@ -7,8 +7,8 @@ import {
  useAdminUsers,
  useQueryParams,
 } from '@strapi/admin/strapi-admin';
+import { unstable_useDocument } from '@strapi/content-manager/strapi-admin';
 import { Combobox, ComboboxOption, Field, Flex } from '@strapi/design-system';
-import { unstable_useDocument } from '@strapi/plugin-content-manager/strapi-admin';
 import { useIntl } from 'react-intl';
 import { useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';

packages/core/review-workflows/admin/src/routes/content-manager/[model]/[id]/components/Panel.tsx

@@ -1,12 +1,12 @@
+import { unstable_useDocumentLayout as useDocumentLayout } from '@strapi/content-manager/strapi-admin';
 import { Flex } from '@strapi/design-system';
-import { unstable_useDocumentLayout as useDocumentLayout } from '@strapi/plugin-content-manager/strapi-admin';
 import { useIntl } from 'react-intl';
 import { useParams } from 'react-router-dom';
 
 import { AssigneeSelect } from './AssigneeSelect';
 import { StageSelect } from './StageSelect';
 
-import type { PanelComponent } from '@strapi/plugin-content-manager/strapi-admin';
+import type { PanelComponent } from '@strapi/content-manager/strapi-admin';
 
 const Panel: PanelComponent = () => {
  const { slug = '', id } = useParams<{

packages/core/review-workflows/admin/src/routes/content-manager/[model]/[id]/components/StageSelect.tsx

@@ -2,6 +2,7 @@ import * as React from 'react';
 
 import { useNotification, useAPIErrorHandler, useQueryParams } from '@strapi/admin/strapi-admin';
 import { useLicenseLimits } from '@strapi/admin/strapi-admin/ee';
+import { unstable_useDocument } from '@strapi/content-manager/strapi-admin';
 import {
  SingleSelect,
  SingleSelectOption,
@@ -12,7 +13,6 @@ import {
  Loader,
  Typography,
 } from '@strapi/design-system';
-import { unstable_useDocument } from '@strapi/plugin-content-manager/strapi-admin';
 import { useIntl } from 'react-intl';
 import { useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';

packages/core/review-workflows/admin/src/routes/content-manager/[model]/[id]/components/tests/AssigneeSelect.test.tsx

@@ -1,11 +1,11 @@
-import { unstable_useDocument } from '@strapi/plugin-content-manager/strapi-admin';
+import { unstable_useDocument } from '@strapi/content-manager/strapi-admin';
 import { render as renderRTL, waitFor, server } from '@tests/utils';
 import { rest } from 'msw';
 import { Route, Routes } from 'react-router-dom';
 
 import { AssigneeSelect } from '../AssigneeSelect';
 
-jest.mock('@strapi/plugin-content-manager/strapi-admin', () => ({
+jest.mock('@strapi/content-manager/strapi-admin', () => ({
  unstable_useDocument: jest.fn().mockReturnValue({
  document: {
  documentId: '12345',

packages/core/review-workflows/admin/src/routes/content-manager/[model]/[id]/components/tests/StageSelect.test.tsx

@@ -5,7 +5,7 @@ import { Route, Routes } from 'react-router-dom';
 
 import { StageSelect } from '../StageSelect';
 
-jest.mock('@strapi/plugin-content-manager/strapi-admin', () => ({
+jest.mock('@strapi/content-manager/strapi-admin', () => ({
  unstable_useDocument: jest.fn().mockReturnValue({
  document: {
  documentId: '12345',

packages/core/review-workflows/admin/src/routes/content-manager/[model]/constants.tsx

@@ -4,7 +4,7 @@ import { StageFilter } from './components/StageFilter';
 import { AssigneeColumn, StageColumn } from './components/TableColumns';
 
 import type { Filters } from '@strapi/admin/strapi-admin';
-import type { ListFieldLayout } from '@strapi/plugin-content-manager/strapi-admin';
+import type { ListFieldLayout } from '@strapi/content-manager/strapi-admin';
 import type { MessageDescriptor } from 'react-intl';
 
 export const REVIEW_WORKFLOW_COLUMNS = [

packages/core/review-workflows/admin/src/services/content-manager.ts

@@ -6,7 +6,7 @@ import type {
  UpdateStage,
  UpdateAssignee,
 } from '../../../shared/contracts/review-workflows';
-import type { Contracts } from '@strapi/plugin-content-manager/_internal/shared';
+import type { Contracts } from '@strapi/content-manager/_internal/shared';
 
 type ContentType = Contracts.ContentTypes.ContentType;
 interface ContentTypes {

packages/core/review-workflows/admin/src/utils/cm-hooks.ts

@@ -2,7 +2,7 @@
 
 import { REVIEW_WORKFLOW_COLUMNS } from '../routes/content-manager/[model]/constants';
 
-import type { ListFieldLayout, ListLayout } from '@strapi/plugin-content-manager/strapi-admin';
+import type { ListFieldLayout, ListLayout } from '@strapi/content-manager/strapi-admin';
 
 /* -------------------------------------------------------------------------------------------------
  * addColumnToTableHook

packages/core/review-workflows/package.json

@@ -67,8 +67,8 @@
  },
  "devDependencies": {
  "@strapi/admin": "5.0.0-beta.5",
+ "@strapi/content-manager": "5.0.0-beta.5",
  "@strapi/pack-up": "5.0.0",
- "@strapi/plugin-content-manager": "5.0.0-beta.5",
  "@strapi/types": "5.0.0-beta.5",
  "@strapi/utils": "5.0.0-beta.5",
  "@testing-library/react": "14.0.0",
@@ -80,7 +80,7 @@
  },
  "peerDependencies": {
  "@strapi/admin": "^5.0.0 || ^5.0.0-beta || ^5.0.0-alpha || ^5.0.0-rc",
- "@strapi/plugin-content-manager": "^5.0.0 || ^5.0.0-beta || ^5.0.0-alpha || ^5.0.0-rc",
+ "@strapi/content-manager": "^5.0.0 || ^5.0.0-beta || ^5.0.0-alpha || ^5.0.0-rc",
  "react": "^17.0.0 || ^18.0.0",
  "react-dom": "^17.0.0 || ^18.0.0",
  "react-router-dom": "^6.0.0",

packages/core/strapi/package.json

@@ -110,23 +110,23 @@
  "dependencies": {
  "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
  "@strapi/admin": "5.0.0-beta.5",
+ "@strapi/content-manager": "5.0.0-beta.5",
  "@strapi/content-releases": "5.0.0-beta.5",
+ "@strapi/content-type-builder": "5.0.0-beta.5",
  "@strapi/core": "5.0.0-beta.5",
  "@strapi/data-transfer": "5.0.0-beta.5",
  "@strapi/database": "5.0.0-beta.5",
+ "@strapi/email": "5.0.0-beta.5",
  "@strapi/generate-new": "5.0.0-beta.5",
  "@strapi/generators": "5.0.0-beta.5",
+ "@strapi/i18n": "5.0.0-beta.5",
  "@strapi/logger": "5.0.0-beta.5",
  "@strapi/pack-up": "5.0.0",
  "@strapi/permissions": "5.0.0-beta.5",
- "@strapi/plugin-content-manager": "5.0.0-beta.5",
- "@strapi/plugin-content-type-builder": "5.0.0-beta.5",
- "@strapi/plugin-email": "5.0.0-beta.5",
- "@strapi/plugin-i18n": "5.0.0-beta.5",
- "@strapi/plugin-upload": "5.0.0-beta.5",
  "@strapi/review-workflows": "5.0.0-beta.5",
  "@strapi/types": "5.0.0-beta.5",
  "@strapi/typescript-utils": "5.0.0-beta.5",
+ "@strapi/upload": "5.0.0-beta.5",
  "@strapi/utils": "5.0.0-beta.5",
  "@types/nodemon": "1.19.6",
  "@vitejs/plugin-react-swc": "3.6.0",

packages/core/strapi/src/admin.ts

@@ -1,10 +1,10 @@
 import { RenderAdminArgs, renderAdmin } from '@strapi/admin/strapi-admin';
-import contentTypeBuilder from '@strapi/plugin-content-type-builder/strapi-admin';
-import contentManager from '@strapi/plugin-content-manager/strapi-admin';
-import email from '@strapi/plugin-email/strapi-admin';
+import contentTypeBuilder from '@strapi/content-type-builder/strapi-admin';
+import contentManager from '@strapi/content-manager/strapi-admin';
+import email from '@strapi/email/strapi-admin';
 // @ts-expect-error – No types, yet.
-import upload from '@strapi/plugin-upload/strapi-admin';
-import i18n from '@strapi/plugin-i18n/strapi-admin';
+import upload from '@strapi/upload/strapi-admin';
+import i18n from '@strapi/i18n/strapi-admin';
 import contentReleases from '@strapi/content-releases/strapi-admin';
 import reviewWorkflows from '@strapi/review-workflows/strapi-admin';
 

packages/core/strapi/src/node/core/aliases.ts

@@ -12,15 +12,14 @@ import { StrapiMonorepo } from './monorepo';
 const devAliases: Record<string, string> = {
  '@strapi/admin/strapi-admin': './packages/core/admin/admin/src',
  '@strapi/content-releases/strapi-admin': './packages/core/content-releases/admin/src',
- '@strapi/plugin-content-manager/strapi-admin': './packages/core/content-manager/admin/src',
- '@strapi/plugin-content-type-builder/strapi-admin':
- './packages/core/content-type-builder/admin/src',
- '@strapi/plugin-email/strapi-admin': './packages/core/email/admin/src',
- '@strapi/plugin-upload/strapi-admin': './packages/core/upload/admin/src',
+ '@strapi/content-manager/strapi-admin': './packages/core/content-manager/admin/src',
+ '@strapi/content-type-builder/strapi-admin': './packages/core/content-type-builder/admin/src',
+ '@strapi/email/strapi-admin': './packages/core/email/admin/src',
+ '@strapi/upload/strapi-admin': './packages/core/upload/admin/src',
  '@strapi/plugin-color-picker/strapi-admin': './packages/plugins/color-picker/admin/src',
  '@strapi/plugin-documentation/strapi-admin': './packages/plugins/documentation/admin/src',
  '@strapi/plugin-graphql/strapi-admin': './packages/plugins/graphql/admin/src',
- '@strapi/plugin-i18n/strapi-admin': './packages/plugins/i18n/admin/src',
+ '@strapi/i18n/strapi-admin': './packages/plugins/i18n/admin/src',
  '@strapi/plugin-sentry/strapi-admin': './packages/plugins/sentry/admin/src',
  '@strapi/plugin-users-permissions/strapi-admin': './packages/plugins/users-permissions/admin/src',
  '@strapi/review-workflows/strapi-admin': './packages/core/review-workflows/admin/src',

packages/core/upload/admin/src/pluginId.js

@@ -1,5 +1,5 @@
 import pluginPkg from '../../package.json';
 
-const pluginId = pluginPkg.name.replace(/^@strapi\/plugin-/i, '');
+export const pluginId = pluginPkg.name.replace(/^@strapi\//i, '');
 
 export default pluginId;

packages/core/upload/package.json

@@ -1,5 +1,5 @@
 {
- "name": "@strapi/plugin-upload",
+ "name": "@strapi/upload",
  "version": "5.0.0-beta.5",
  "description": "Makes it easy to upload images and files to your Strapi Application.",
  "license": "SEE LICENSE IN LICENSE",

packages/plugins/i18n/admin/src/components/CMHeaderActions.tsx

@@ -1,14 +1,14 @@
 import * as React from 'react';
 
 import { useNotification, useQueryParams } from '@strapi/admin/strapi-admin';
-import { Flex, Status, Typography } from '@strapi/design-system';
-import { Trash, WarningCircle } from '@strapi/icons';
 import {
  type HeaderActionComponent,
  unstable_useDocument as useDocument,
  unstable_useDocumentActions as useDocumentActions,
  type DocumentActionComponent,
-} from '@strapi/plugin-content-manager/strapi-admin';
+} from '@strapi/content-manager/strapi-admin';
+import { Flex, Status, Typography } from '@strapi/design-system';
+import { Trash, WarningCircle } from '@strapi/icons';
 import { useIntl } from 'react-intl';
 import { useNavigate } from 'react-router-dom';
 import styled from 'styled-components';

packages/plugins/i18n/admin/src/components/LocaleListCell.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 
+import { unstable_useDocument as useDocument } from '@strapi/content-manager/strapi-admin';
 import { Box, Flex, Popover, Typography, useCollator } from '@strapi/design-system';
 import { CaretDown } from '@strapi/icons';
-import { unstable_useDocument as useDocument } from '@strapi/plugin-content-manager/strapi-admin';
 import { useIntl } from 'react-intl';
 import styled from 'styled-components';
 

packages/plugins/i18n/admin/src/components/tests/LocaleListCell.test.tsx

@@ -6,8 +6,8 @@ import { LocaleListCell } from '../LocaleListCell';
  * @note Because the `useDocument` hook access the contentManagerApi, we need to unfortunately mock it.
  * It'd be good to export an FE rendering wrapper that would work for plugins...
  */
-jest.mock('@strapi/plugin-content-manager/strapi-admin', () => ({
- ...jest.requireActual('@strapi/plugin-content-manager/strapi-admin'),
+jest.mock('@strapi/content-manager/strapi-admin', () => ({
+ ...jest.requireActual('@strapi/content-manager/strapi-admin'),
  unstable_useDocument: jest.fn(() => ({
  meta: {
  availableLocales: [

packages/plugins/i18n/admin/src/contentManagerHooks/editView.tsx

@@ -8,7 +8,7 @@ import styled from 'styled-components';
 
 import { getTranslation } from '../utils/getTranslation';
 
-import type { EditFieldLayout, EditLayout } from '@strapi/plugin-content-manager/strapi-admin';
+import type { EditFieldLayout, EditLayout } from '@strapi/content-manager/strapi-admin';
 
 interface MutateEditViewArgs {
  layout: EditLayout;

packages/plugins/i18n/admin/src/contentManagerHooks/listView.tsx

@@ -3,7 +3,7 @@ import { LocaleListCell } from '../components/LocaleListCell';
 import { doesPluginOptionsHaveI18nLocalized } from '../utils/fields';
 import { getTranslation } from '../utils/getTranslation';
 
-import type { ListFieldLayout, ListLayout } from '@strapi/plugin-content-manager/strapi-admin';
+import type { ListFieldLayout, ListLayout } from '@strapi/content-manager/strapi-admin';
 
 /* -------------------------------------------------------------------------------------------------
  * addColumnToTableHook

packages/plugins/i18n/admin/src/contentManagerHooks/tests/listView.test.ts

@@ -1,6 +1,6 @@
 import { addColumnToTableHook } from '../listView';
 
-import type { ListFieldLayout, ListLayout } from '@strapi/plugin-content-manager/strapi-admin';
+import type { ListFieldLayout, ListLayout } from '@strapi/content-manager/strapi-admin';
 
 describe('addColumnToTableHook', () => {
  const DEFAULT_FIELD: ListFieldLayout = {