richie-education 2.25.0-b2.dev164 → 2.25.0-b2.dev168

package/.storybook/main.js

@@ -1,17 +1,16 @@
+import { dirname, join } from "path";
+
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 module.exports = {
-  stories: [
-    '../stories/**/*.stories.mdx',
-    '../stories/**/*.stories.@(js|jsx|ts|tsx)',
-    '../js/**/*.stories.@(js|jsx|ts|tsx)'
-  ],
+  stories: ['../stories/**/*.mdx', '../stories/**/*.stories.@(js|jsx|ts|tsx)', '../js/**/*.stories.@(js|jsx|ts|tsx)'],
   addons: [
-    '@storybook/addon-links',
-    '@storybook/addon-essentials',
-    '@storybook/addon-interactions'
+    getAbsolutePath('@storybook/addon-links'),
+    getAbsolutePath('@storybook/addon-essentials'),
+    getAbsolutePath('@storybook/addon-interactions'),
+    getAbsolutePath('@storybook/addon-webpack5-compiler-babel'),
   ],
   framework: {
-    name: '@storybook/react-webpack5',
+    name: getAbsolutePath('@storybook/react-webpack5'),
     options: {},
   },
   staticDirs: [{
@@ -31,6 +30,10 @@ module.exports = {
     return config;
   },
   docs: {
-    autodocs: true,
+    autodocs: false,
   },
 };
+
+function getAbsolutePath(value) {
+  return dirname(require.resolve(join(value, "package.json")));
+}

package/.storybook/preview.tsx

@@ -1,17 +1,20 @@
 import { useState } from 'react';
 import { IntlProvider } from 'react-intl';
 import { CunninghamProvider } from '@openfun/cunningham-react';
+import { Preview } from '@storybook/react';
 import { useAsyncEffect } from 'hooks/useAsyncEffect';
 import './__mocks__/utils/context';
 
-export const parameters = {
-  actions: { argTypesRegex: '^on[A-Z].*' },
-  controls: {
-    matchers: {
-      color: /(background|color)$/i,
-      date: /Date$/,
+export const preview: Preview = {
+  parameters: {
+    actions: { argTypesRegex: '^on[A-Z].*' },
+    controls: {
+      matchers: {
+        color: /(background|color)$/i,
+        date: /Date$/,
+      },
     },
-  },
+  }
 };
 
 const IconsWrapper = (props) => {

package/js/components/PaymentButton/index.spec.tsx

@@ -159,7 +159,10 @@ describe.each([
     });
 
     afterEach(() => {
-      jest.runOnlyPendingTimers();
+      act(() => {
+        jest.runOnlyPendingTimers();
+      });
+
       jest.useRealTimers();
       cleanup();
     });
@@ -787,9 +790,17 @@ describe.each([
       screen.getByText('Payment in progress');
 
       fetchMock.resetHistory();
+
       // - Wait until order has been polled 29 times.
-      await jest.advanceTimersToNextTimerAsync(PAYMENT_SETTINGS.pollLimit);
-      expect(fetchMock.calls()).toHaveLength(PAYMENT_SETTINGS.pollLimit - 1);
+      await act(async () => {
+        await jest.advanceTimersByTimeAsync(
+          (PAYMENT_SETTINGS.pollLimit - 1) * PAYMENT_SETTINGS.pollInterval,
+        );
+      });
+
+      await waitFor(async () => {
+        expect(fetchMock.calls()).toHaveLength(PAYMENT_SETTINGS.pollLimit - 1);
+      });
 
       // - This round should be the last after which the order should be aborted
       await act(async () => {

package/js/components/SaleTunnel/components/SaleTunnelStepValidation/index.spec.tsx

@@ -1,9 +1,9 @@
 import { fireEvent, render, screen, within } from '@testing-library/react';
 import { IntlProvider } from 'react-intl';
-import { userEvent } from '@storybook/testing-library';
 import { PropsWithChildren, useMemo, useState } from 'react';
 import { QueryClientProvider } from '@tanstack/react-query';
 import { CunninghamProvider } from '@openfun/cunningham-react';
+import userEvent from '@testing-library/user-event';
 import { Priority } from 'types';
 import {
   CourseRun,

package/js/pages/DashboardAddressesManagement/index.spec.tsx

@@ -1,5 +1,6 @@
 import {
   act,
+  findByText,
   fireEvent,
   getByRole,
   queryByRole,
@@ -10,7 +11,6 @@ import {
 import { IntlProvider } from 'react-intl';
 import { QueryClientProvider } from '@tanstack/react-query';
 import fetchMock from 'fetch-mock';
-import { findByText } from '@storybook/testing-library';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
 import { AddressFactory } from 'utils/test/factories/joanie';
 import { SessionProvider } from 'contexts/SessionContext';

package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrder.spec.tsx

@@ -11,7 +11,7 @@ import {
 } from '@testing-library/react';
 import { faker } from '@faker-js/faker';
 import fetchMock from 'fetch-mock';
-import { userEvent } from '@storybook/testing-library';
+import userEvent from '@testing-library/user-event';
 import { DEFAULT_DATE_FORMAT } from 'hooks/useDateFormat';
 import {
   CourseStateFactory,

package/js/widgets/Dashboard/components/DashboardItem/index.spec.tsx

@@ -1,6 +1,6 @@
 import { screen } from '@testing-library/react';
-import { userEvent } from '@storybook/testing-library';
 import { PropsWithChildren } from 'react';
+import userEvent from '@testing-library/user-event';
 import { render } from 'utils/test/render';
 import { IntlWrapper } from 'utils/test/wrappers/IntlWrapper';
 import { DashboardSubItemsList } from './DashboardSubItemsList';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "richie-education",
-  "version": "2.25.0-b2.dev164",
+  "version": "2.25.0-b2.dev168",
   "description": "A CMS to build learning portals for Open Education",
   "main": "sandbox/manage.py",
   "scripts": {
@@ -38,34 +38,34 @@
     "not dead"
   ],
   "dependencies": {
-    "@babel/core": "7.24.0",
+    "@babel/core": "7.24.3",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/plugin-transform-modules-commonjs": "7.23.3",
-    "@babel/preset-env": "7.24.0",
-    "@babel/preset-react": "7.23.3",
-    "@babel/preset-typescript": "7.23.3",
+    "@babel/plugin-transform-modules-commonjs": "7.24.1",
+    "@babel/preset-env": "7.24.3",
+    "@babel/preset-react": "7.24.1",
+    "@babel/preset-typescript": "7.24.1",
     "@faker-js/faker": "8.4.1",
-    "@formatjs/cli": "6.2.7",
+    "@formatjs/cli": "6.2.8",
     "@formatjs/intl-relativetimeformat": "11.2.12",
     "@hookform/resolvers": "3.3.4",
     "@openfun/cunningham-react": "2.6.0",
     "@openfun/cunningham-tokens": "2.1.1",
-    "@sentry/browser": "7.106.0",
-    "@sentry/types": "7.106.0",
-    "@storybook/addon-actions": "7.6.17",
-    "@storybook/addon-essentials": "7.6.17",
-    "@storybook/addon-interactions": "7.6.17",
-    "@storybook/addon-links": "7.6.17",
-    "@storybook/react": "7.6.17",
-    "@storybook/react-webpack5": "7.6.17",
-    "@storybook/testing-library": "0.2.2",
-    "@tanstack/query-core": "5.25.0",
-    "@tanstack/query-sync-storage-persister": "5.25.0",
-    "@tanstack/react-query": "5.25.0",
-    "@tanstack/react-query-persist-client": "5.25.0",
+    "@sentry/browser": "7.108.0",
+    "@sentry/types": "7.108.0",
+    "@storybook/addon-actions": "8.0.4",
+    "@storybook/addon-essentials": "8.0.4",
+    "@storybook/addon-interactions": "8.0.4",
+    "@storybook/addon-links": "8.0.4",
+    "@storybook/react": "8.0.4",
+    "@storybook/react-webpack5": "8.0.4",
+    "@storybook/test": "8.0.4",
+    "@tanstack/query-core": "5.28.8",
+    "@tanstack/query-sync-storage-persister": "5.28.8",
+    "@tanstack/react-query": "5.28.8",
+    "@tanstack/react-query-persist-client": "5.28.8",
     "@testing-library/dom": "9.3.4",
     "@testing-library/jest-dom": "6.4.2",
-    "@testing-library/react": "14.2.1",
+    "@testing-library/react": "14.2.2",
     "@testing-library/user-event": "14.5.2",
     "@types/fetch-mock": "7.3.8",
     "@types/iframe-resizer": "3.5.13",
@@ -74,21 +74,21 @@
     "@types/lodash-es": "4.17.12",
     "@types/node-fetch": "2.6.11",
     "@types/query-string": "6.3.0",
-    "@types/react": "18.2.64",
+    "@types/react": "18.2.70",
     "@types/react-autosuggest": "10.1.11",
-    "@types/react-dom": "18.2.21",
+    "@types/react-dom": "18.2.22",
     "@types/react-modal": "3.16.3",
     "@types/uuid": "9.0.8",
-    "@typescript-eslint/eslint-plugin": "7.1.1",
-    "@typescript-eslint/parser": "7.1.1",
+    "@typescript-eslint/eslint-plugin": "7.3.1",
+    "@typescript-eslint/parser": "7.3.1",
     "babel-jest": "29.7.0",
     "babel-loader": "9.1.3",
     "babel-plugin-react-intl": "8.2.25",
     "bootstrap": ">=4.6.0 <5",
     "classnames": "2.5.1",
     "cljs-merge": "1.1.1",
-    "core-js": "3.36.0",
-    "downshift": "8.4.0",
+    "core-js": "3.36.1",
+    "downshift": "9.0.0",
     "eslint": "8.57.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-config-airbnb-typescript": "18.0.0",
@@ -99,13 +99,13 @@
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jsx-a11y": "6.8.0",
     "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-react": "7.34.0",
+    "eslint-plugin-react": "7.34.1",
     "eslint-plugin-react-hooks": "4.6.0",
     "eslint-plugin-storybook": "0.8.0",
     "fetch-mock": "9.11.0",
     "file-loader": "6.2.0",
     "glob": "10.3.10",
-    "i18n-iso-countries": "7.10.1",
+    "i18n-iso-countries": "7.11.0",
     "iframe-resizer": "4.3.9",
     "intl-pluralrules": "2.0.1",
     "jest": "29.7.0",
@@ -113,7 +113,7 @@
     "js-cookie": "3.0.5",
     "lodash-es": "4.17.21",
     "mdn-polyfills": "5.20.0",
-    "msw": "2.2.3",
+    "msw": "2.2.10",
     "node-fetch": ">2.6.6 <3",
     "nodemon": "3.1.0",
     "prettier": "3.2.5",
@@ -121,17 +121,17 @@
     "react": "18.2.0",
     "react-autosuggest": "10.1.0",
     "react-dom": "18.2.0",
-    "react-hook-form": "7.51.0",
-    "react-intl": "6.6.2",
+    "react-hook-form": "7.51.1",
+    "react-intl": "6.6.3",
     "react-modal": "3.16.1",
     "react-router-dom": "6.22.3",
-    "sass": "1.71.1",
+    "sass": "1.72.0",
     "source-map-loader": "5.0.0",
-    "storybook": "7.6.17",
+    "storybook": "8.0.4",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "typescript": "5.4.2",
+    "typescript": "5.4.3",
     "uuid": "9.0.1",
-    "webpack": "5.90.3",
+    "webpack": "5.91.0",
     "webpack-cli": "5.1.4",
     "whatwg-fetch": "3.6.20",
     "xhr-mock": "2.5.1",
@@ -140,13 +140,17 @@
   },
   "resolutions": {
     "@testing-library/dom": "9.3.4",
-    "@types/react": "18.2.64",
-    "@types/react-dom": "18.2.21"
+    "@types/react": "18.2.70",
+    "@types/react-dom": "18.2.22"
   },
   "msw": {
     "workerDirectory": "../richie/static/richie/js"
   },
   "volta": {
     "node": "20.11.0"
+  },
+  "devDependencies": {
+    "@storybook/addon-mdx-gfm": "8.0.4",
+    "@storybook/addon-webpack5-compiler-babel": "3.0.3"
   }
 }