[Upgrade Tool] V2

.github/workflows/tests.yml

@@ -135,7 +135,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [18]
+        node: [20]
     steps:
       - uses: actions/checkout@v4
         with:

e2e/tests/content-manager/editview.spec.js

@@ -0,0 +1,78 @@
+import { test, expect } from '@playwright/test';
+import { login } from '../../utils/login';
+import { resetDatabaseAndImportDataFromPath } from '../../scripts/dts-import';
+
+test.describe('Edit View', () => {
+  test.beforeEach(async ({ page }) => {
+    await resetDatabaseAndImportDataFromPath('./e2e/data/with-admin.tar');
+    await page.goto('/admin');
+    await login({ page });
+  });
+
+  /**
+   * @note There is only one field in this content-type.
+   */
+  test('A user should be able to navigate to the EditView of the content manager to create, save, publish, unpublish & delete a new entry', async ({
+    page,
+  }) => {
+    await page.getByRole('link', { name: 'Content Manager' }).click();
+    await page
+      .getByRole('link', { name: /Create new entry/ })
+      .nth(1)
+      .click();
+
+    /**
+     * Now we're in the edit view.
+     */
+    await page.waitForURL('**/content-manager/collectionType/api::testing.testing/create');
+
+    await page.getByRole('textbox', { name: 'title' }).fill('my content');
+
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    await expect(page.getByText('Saved')).toBeVisible();
+
+    await expect(page.getByRole('button', { name: 'Save' })).toBeDisabled();
+
+    await page.getByRole('button', { name: 'Publish' }).click();
+
+    await expect(page.getByText('Published', { exact: true })).toBeVisible();
+
+    await expect(page.getByRole('button', { name: 'Unpublish' })).not.toBeDisabled();
+
+    await page.getByRole('textbox', { name: 'title' }).fill('my content revised');
+
+    await expect(page.getByRole('button', { name: 'Unpublish' })).toBeDisabled();
+
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    await expect(page.getByRole('button', { name: 'Unpublish' })).not.toBeDisabled();
+
+    await page.getByRole('button', { name: 'Unpublish' }).click();
+
+    await expect(page.getByRole('dialog', { name: 'Confirmation' })).toBeVisible();
+
+    await page.getByRole('button', { name: 'Yes, confirm' }).click();
+
+    await expect(page.getByText('Unpublished')).toBeVisible();
+
+    await expect(page.getByRole('button', { name: 'Publish' })).not.toBeDisabled();
+
+    await page.getByRole('button', { name: 'Delete this entry' }).click();
+
+    await expect(page.getByRole('dialog', { name: 'Confirmation' })).toBeVisible();
+
+    await page.getByRole('button', { name: 'Confirm' }).click();
+
+    await expect(page.getByText('Deleted')).toBeVisible();
+
+    /**
+     * We're back on the list view
+     */
+    await page.waitForURL(
+      '**/content-manager/collectionType/api::testing.testing?page=1&pageSize=10&sort=title:ASC'
+    );
+
+    await expect(page.getByRole('link', { name: /Create new entry/ }).nth(1)).toBeVisible();
+  });
+});

examples/getstarted/config/middlewares.js

@@ -3,11 +3,11 @@
 const responseHandlers = require('./src/response-handlers');
 
 module.exports = [
+  'strapi::logger',
   'strapi::errors',
   'strapi::security',
   'strapi::cors',
   'strapi::poweredBy',
-  'strapi::logger',
   'strapi::query',
   'strapi::body',
   'strapi::session',

examples/kitchensink-ts/config/middlewares.ts

@@ -1,9 +1,9 @@
 export default [
+  'strapi::logger',
   'strapi::errors',
   'strapi::security',
   'strapi::cors',
   'strapi::poweredBy',
-  'strapi::logger',
   'strapi::query',
   'strapi::body',
   'strapi::session',

package.json

@@ -117,9 +117,9 @@
     "eslint-plugin-testing-library": "6.0.2",
     "execa": "5.1.1",
     "find-up": "5.0.0",
-    "fs-extra": "10.0.0",
+    "fs-extra": "10.1.0",
     "get-port": "5.1.1",
-    "glob": "7.2.3",
+    "glob": "10.3.10",
     "husky": "8.0.2",
     "inquirer": "8.2.5",
     "jest": "29.6.0",

packages/cli/create-strapi-starter/package.json

@@ -49,7 +49,7 @@
     "ci-info": "3.8.0",
     "commander": "8.3.0",
     "execa": "5.1.1",
-    "fs-extra": "10.0.0",
+    "fs-extra": "10.1.0",
     "inquirer": "8.2.5",
     "ora": "5.4.1"
   },

packages/core/admin/admin/src/StrapiApp.tsx

@@ -521,12 +521,7 @@ class StrapiApp {
   runHookSeries = (name: string, asynchronous = false) =>
     asynchronous ? this.hooksDict[name].runSeriesAsync() : this.hooksDict[name].runSeries();
 
-  runHookWaterfall = (
-    name: string,
-    initialValue: unknown,
-    asynchronous = false,
-    store?: unknown
-  ) => {
+  runHookWaterfall = <T,>(name: string, initialValue: T, asynchronous = false, store?: Store) => {
     return asynchronous
       ? this.hooksDict[name].runWaterfallAsync(initialValue, store)
       : this.hooksDict[name].runWaterfall(initialValue, store);
@@ -558,6 +553,7 @@ class StrapiApp {
         runHookWaterfall={(name, initialValue, async = false) => {
           return this.runHookWaterfall(name, initialValue, async, store);
         }}
+        // @ts-expect-error – context issue. TODO: fix this.
         runHookSeries={this.runHookSeries}
         themes={this.configurations.themes}
         settings={this.settings}

packages/core/admin/admin/src/content-manager/components/BlocksInput/Blocks/Link.tsx

@@ -18,8 +18,7 @@ import { type Element, Editor, Path, Range, Transforms } from 'slate';
 import { type RenderElementProps, ReactEditor } from 'slate-react';
 import styled from 'styled-components';
 
-// @ts-expect-error TODO migrate this file
-import { composeRefs } from '../../../utils';
+import { composeRefs } from '../../../utils/refs';
 import { type BlocksStore, useBlocksEditorContext } from '../BlocksEditor';
 import { editLink, removeLink } from '../utils/links';
 import { type Block } from '../utils/types';

packages/core/admin/admin/src/content-manager/components/BlocksInput/BlocksInput.tsx

@@ -4,8 +4,7 @@ import { Box, Flex, Typography } from '@strapi/design-system';
 import { type MessageDescriptor, useIntl } from 'react-intl';
 import styled from 'styled-components';
 
-// @ts-expect-error TODO convert to typescript
-import { Hint } from '../Hint';
+import { Hint, HintProps } from '../Hint';
 
 import { BlocksEditor } from './BlocksEditor';
 
@@ -15,18 +14,19 @@ const LabelAction = styled(Box)`
   }
 `;
 
-interface BlocksInputProps extends React.ComponentPropsWithoutRef<typeof BlocksEditor> {
+interface BlocksInputProps
+  extends React.ComponentPropsWithoutRef<typeof BlocksEditor>,
+    Pick<HintProps, 'hint'> {
   intlLabel: MessageDescriptor;
   attribute: { type: string; [key: string]: unknown };
   description?: MessageDescriptor;
   labelAction?: React.ReactNode;
   required?: boolean;
-  hint?: string | string[];
 }
 
 const BlocksInput = React.forwardRef<{ focus: () => void }, BlocksInputProps>(
   (
-    { intlLabel, labelAction, name, required = false, error = '', hint = null, ...editorProps },
+    { intlLabel, labelAction, name, required = false, error = '', hint, ...editorProps },
     forwardedRef
   ) => {
     const { formatMessage } = useIntl();