Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## 2025-10-16

### 🔧 Changed

- Updated react and react-dom to v19
- Updated React to 19.2.0.

### 🐞 Fixed

- Updated `react` dependencies to use ^ (compatible with) to reduce the impact of `@canva package` updates with react peer dependencies.

## 2025-09-04

### 🔧 Changed
Expand Down
2 changes: 1 addition & 1 deletion demos/common/scripts/app-runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export class AppRunner {
): Promise<WebpackDevServer> => {
const runtimeWebpackConfig = buildConfig();

const compiler = webpack(runtimeWebpackConfig);
const compiler = webpack(runtimeWebpackConfig) as webpack.Compiler;
const server = new WebpackDevServer(
runtimeWebpackConfig.devServer,
compiler,
Expand Down
15 changes: 7 additions & 8 deletions demos/ecommerce_shop/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,20 @@
"@emotion/react": "11.14.0",
"@emotion/styled": "11.14.1",
"@fontsource/roboto": "5.2.6",
"@mui/icons-material": "5.15.15",
"@mui/material": "5.15.15",
"@mui/x-charts": "7.23.6",
"@mui/icons-material": "5.18.0",
"@mui/material": "5.18.0",
"@mui/x-charts": "8.14.0",
"canvas-confetti": "1.9.3",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "^19.2.0",
"react-dom": "^19.2.0",
"react-router-dom": "7.8.2"
},
"devDependencies": {
"@svgr/webpack": "8.1.0",
"@types/canvas-confetti": "1.9.0",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@types/react": "19.2.2",
"@types/react-dom": "19.2.1",
"@types/webpack": "5.28.5",
"@types/webpack-dev-server": "4.7.2",
"css-loader": "7.1.2",
"cssnano": "7.1.1",
"postcss-loader": "8.1.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import type {
ButtonProps as MUIButtonProps,
} from "@mui/material";
import CloseIcon from "@mui/icons-material/Close";
import type { JSX } from "react";

interface DemoAlertProps extends MUIAlertProps {
alertTitle: React.ReactNode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Button as MUIButton, CircularProgress } from "@mui/material";
import type { ButtonProps as MUIButtonProps } from "@mui/material";
import type { JSX } from "react";

type DemoButtonVariant = "primary" | "secondary" | "destructive";

Expand Down
2 changes: 1 addition & 1 deletion demos/ecommerce_shop/frontend/src/context/app-context.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Dispatch, ReactNode, SetStateAction } from "react";
import type { Dispatch, JSX, ReactNode, SetStateAction } from "react";
import { createContext, useContext, useEffect, useState } from "react";
import type { Services } from "src/services";
import { checkForAccessToken, installServices } from "src/services";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { BrandTemplate } from "@canva/connect-api-ts/types.gen";
import type { JSX } from "react";
import { createContext, useContext, useState } from "react";

export interface CampaignContextType {
Expand Down
1 change: 1 addition & 0 deletions demos/ecommerce_shop/frontend/src/pages/error-boundary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline";
import { Box, Stack, Typography } from "@mui/material";
import { DemoButton } from "src/components";
import { Paths } from "src/routes";
import type { JSX } from "react";

const NotFound = (): JSX.Element => {
const navigate = useNavigate();
Expand Down
1 change: 1 addition & 0 deletions demos/ecommerce_shop/frontend/src/pages/return-nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
stepConnectorClasses,
styled,
} from "@mui/material";
import type { JSX } from "react";
import { useEffect, useState } from "react";
import { useNavigate, useSearchParams } from "react-router-dom";
import { NavBar } from "src/components";
Expand Down
2 changes: 2 additions & 0 deletions demos/ecommerce_shop/frontend/webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export function buildConfig({
src: path.resolve(__dirname, "src"),
},
extensions: [".ts", ".tsx", ".js", ".css", ".svg", ".woff", ".woff2"],
// '...' is important here – it keeps the default webpack conditionNames
conditionNames: ["require", "..."],
},
infrastructureLogging: {
level: "none",
Expand Down
2 changes: 1 addition & 1 deletion demos/ecommerce_shop/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"jsx": "react",
"jsx": "react-jsx",
"lib": [
"dom",
"dom.iterable",
Expand Down
13 changes: 6 additions & 7 deletions demos/playground/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,18 @@
"@emotion/react": "11.14.0",
"@emotion/styled": "11.14.1",
"@fontsource/roboto": "5.2.6",
"@mui/icons-material": "5.15.15",
"@mui/material": "5.15.15",
"@mui/x-charts": "7.23.6",
"@mui/icons-material": "5.18.0",
"@mui/material": "5.18.0",
"canvas-confetti": "1.9.3",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "^19.2.0",
"react-dom": "^19.2.0",
"react-router-dom": "7.8.2"
},
"devDependencies": {
"@svgr/webpack": "8.1.0",
"@types/canvas-confetti": "1.9.0",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@types/react": "19.2.2",
"@types/react-dom": "19.2.1",
"css-loader": "7.1.2",
"cssnano": "7.1.1",
"postcss-loader": "8.1.1",
Expand Down
1 change: 1 addition & 0 deletions demos/playground/frontend/src/components/demo-alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import type {
ButtonProps as MUIButtonProps,
} from "@mui/material";
import CloseIcon from "@mui/icons-material/Close";
import type { JSX } from "react";

interface DemoAlertProps extends MUIAlertProps {
alertTitle: React.ReactNode;
Expand Down
1 change: 1 addition & 0 deletions demos/playground/frontend/src/components/demo-button.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Button as MUIButton, CircularProgress } from "@mui/material";
import type { ButtonProps as MUIButtonProps } from "@mui/material";
import type { JSX } from "react";

type DemoButtonVariant = "primary" | "secondary" | "destructive";

Expand Down
2 changes: 1 addition & 1 deletion demos/playground/frontend/src/context/app-context.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Dispatch, ReactNode, SetStateAction } from "react";
import type { Dispatch, JSX, ReactNode, SetStateAction } from "react";
import { createContext, useContext, useEffect, useState } from "react";
import type { Services } from "src/services";
import { checkForAccessToken, installServices } from "src/services";
Expand Down
1 change: 1 addition & 0 deletions demos/playground/frontend/src/pages/error-boundary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline";
import { Box, Stack, Typography } from "@mui/material";
import { DemoButton } from "src/components";
import { Paths } from "src/routes";
import type { JSX } from "react";

const NotFound = (): JSX.Element => {
const navigate = useNavigate();
Expand Down
2 changes: 1 addition & 1 deletion demos/playground/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"jsx": "react",
"jsx": "react-jsx",
"lib": [
"dom",
"dom.iterable",
Expand Down
15 changes: 7 additions & 8 deletions demos/realty/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,19 @@
"@emotion/react": "11.14.0",
"@emotion/styled": "11.14.1",
"@fontsource/roboto": "5.2.6",
"@mui/icons-material": "5.15.15",
"@mui/material": "5.15.15",
"@mui/icons-material": "5.18.0",
"@mui/material": "5.18.0",
"@realty-demo/shared-models": "file:../shared-models/src",
"axios": "1.11.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"axios": "1.12.2",
"react": "^19.2.0",
"react-dom": "^19.2.0",
"react-router-dom": "7.8.2"
},
"devDependencies": {
"@svgr/webpack": "8.1.0",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@types/react": "19.2.2",
"@types/react-dom": "19.2.1",
"@types/webpack": "5.28.5",
"@types/webpack-dev-server": "4.7.2",
"css-loader": "7.1.2",
"cssnano": "7.1.1",
"postcss-loader": "8.1.1",
Expand Down
1 change: 1 addition & 0 deletions demos/realty/frontend/src/components/canva-icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { SvgIconProps } from "@mui/material";
import { SvgIcon } from "@mui/material";
import type { JSX } from "react";

/**
* Props for the CanvaIcon component
Expand Down
1 change: 1 addition & 0 deletions demos/realty/frontend/src/components/demo-alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import type {
ButtonProps as MUIButtonProps,
} from "@mui/material";
import CloseIcon from "@mui/icons-material/Close";
import type { JSX } from "react";

/**
* Props for the DemoAlert component
Expand Down
1 change: 1 addition & 0 deletions demos/realty/frontend/src/components/demo-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Button as MUIButton, CircularProgress } from "@mui/material";
import type { ButtonProps as MUIButtonProps } from "@mui/material";
import { useTheme } from "@mui/material/styles";
import type { SxProps, Theme } from "@mui/material/styles";
import type { JSX } from "react";

/**
* Available button variants for the demo application
Expand Down
1 change: 1 addition & 0 deletions demos/realty/frontend/src/components/developer-note.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { HelpOutline } from "@mui/icons-material";
import { Chip, Tooltip, useTheme } from "@mui/material";
import type { JSX } from "react";

/**
* Props for the DeveloperNote component
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { JSX } from "react";
import { useState, useCallback } from "react";
import { DemoButton } from "src/components";
import { useAppContext } from "src/context";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useNavigate } from "react-router-dom";
import { CanvaIcon } from "src/components/canva-icon";
import { DemoButton } from "src/components/demo-button";
import { Paths } from "src/routes";
import type { JSX } from "react";
import { useCallback } from "react";

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Box, Modal, CircularProgress, Typography, Paper } from "@mui/material";
import type { JSX } from "react";

/**
* Props for the OpeningDesignModal component
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
import CheckCircleOutlineIcon from "@mui/icons-material/CheckCircleOutline";
import { ConnectButton } from "../home/connect-button";
import { useAppContext } from "src/context";
import type { JSX } from "react";

const darkBlue = "#0A2A43";
const darkGreen = "#008009";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
useTheme,
} from "@mui/material";
import SearchIcon from "@mui/icons-material/Search";
import type { JSX } from "react";
import { memo, useCallback } from "react";

/**
Expand Down
1 change: 1 addition & 0 deletions demos/realty/frontend/src/components/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
} from "@mui/material";
import { useNavigate, useLocation } from "react-router-dom";
import { Paths } from "src/routes/routes";
import type { JSX } from "react";
import { useCallback } from "react";
import ListingsIcon from "src/components/icons/listing.svg";
import AssetsIcon from "src/components/icons/asset.svg";
Expand Down
2 changes: 1 addition & 1 deletion demos/realty/frontend/src/context/app-context.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Dispatch, ReactNode, SetStateAction } from "react";
import type { Dispatch, JSX, ReactNode, SetStateAction } from "react";
import { createContext, useContext, useEffect, useState } from "react";
import { checkAuthorizationStatus } from "src/services";
import type { ShopAlertOptions, ShopAlert } from "src/components";
Expand Down
1 change: 1 addition & 0 deletions demos/realty/frontend/src/pages/error-boundary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline";
import { Box, Stack, Typography } from "@mui/material";
import { DemoButton } from "src/components";
import { Paths } from "src/routes";
import type { JSX } from "react";

const NotFound = (): JSX.Element => {
const navigate = useNavigate();
Expand Down
1 change: 1 addition & 0 deletions demos/realty/frontend/src/pages/return-nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
stepConnectorClasses,
styled,
} from "@mui/material";
import type { JSX } from "react";
import { useEffect, useState } from "react";
import { useNavigate, useSearchParams } from "react-router-dom";
import { useAppContext } from "src/context";
Expand Down
Loading