Merge branch 'release-23.x' of https://github.com/WGU-Open-edX/paragon into removing-react-imports-9

Author: jacobo-dominguez-wgu

.github/workflows/ci.yml

@@ -8,6 +8,10 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [20, 24]
+    continue-on-error: ${{ matrix.node == 24 }}
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -16,13 +20,13 @@ jobs:
     - name: Setup Nodejs
       uses: actions/setup-node@v4
       with:
-        node-version-file: '.nvmrc'
+        node-version: ${{ matrix.node }}
     - name: Install dependencies
       run: npm ci
     - name: Check Types
       run: npm run type-check
     - name: Lint
-      run: npm run lint
+      run: make lint
     - name: Test
       run: npm run test
     - name: Verify icon changes
@@ -38,7 +42,7 @@ jobs:
     - name: Build
       run: npm run build
     - name: Build Docs
-      run: npm run build-docs
+      run: make build-docs
     - name: Coverage
       uses: codecov/codecov-action@v4
       with:

Makefile

@@ -32,6 +32,26 @@ test.npm.%: validate-no-uncommitted-package-lock-changes
 requirements:  ## install ci requirements
 	npm ci
 
+# npm swallows errors
+# see https://github.com/openedx/paragon/issues/3329
+# 
+# Instead of having this directly in the build-docs script
+# in the top-level package.json, put it here so we can have
+# a single source of truth and get proper error codes in CI
+.PHONY: build-docs
+build-docs:
+	npm run build --workspace=www
+
+# npm swallows errors
+# see https://github.com/openedx/paragon/issues/3329
+# 
+# Instead of having this directly in the lint script
+# in the top-level package.json, put it here so we can have
+# a single source of truth and get proper error codes in CI
+.PHONY: lint
+lint:
+	npm run stylelint && npm run eslint && npm run lint --workspaces --if-present
+
 i18n.extract:
 	# Pulling display strings from .jsx files into .json files...
 	npm run-script i18n_extract

package-lock.json

@@ -27,11 +27,12 @@
   "sideEffects": false,
   "scripts": {
     "build": "make build",
-    "build-docs": "npm run build --workspace=www",
+    "build-docs": "make build-docs",
     "commit": "commit",
     "debug-test": "node --inspect-brk node_modules/.bin/jest --runInBand --coverage",
     "stylelint": "stylelint \"src/**/*.scss\" \"scss/**/*.scss\" \"www/src/**/*.scss\" --config .stylelintrc.json",
-    "lint": "npm run stylelint && eslint --ext .js --ext .jsx --ext .ts --ext .tsx --ext .json . && npm run lint --workspaces --if-present",
+    "eslint": "eslint --ext .js --ext .jsx --ext .ts --ext .tsx --ext .json .",
+    "lint": "make lint",
     "lint:fix": "npm run stylelint && eslint --fix --ext .js --ext .jsx --ext .ts --ext .tsx --ext .json . && npm run lint --workspaces --if-present",
     "prepublishOnly": "npm run build",
     "semantic-release": "semantic-release",

package.json

@@ -1,13 +1,23 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
+interface ActionRowProps extends React.HTMLAttributes<HTMLElement> {
+  /** Specifies the base element */
+  as?: React.ElementType;
+  /** Specifies the contents of the row */
+  children: React.ReactNode;
+  /** Specifies class name to append to the base element */
+  className?: string;
+  /** Specifies whether row should be displayed horizontally */
+  isStacked?: boolean;
+}
+
 function ActionRow({
-  as,
-  isStacked,
+  as = 'div',
+  isStacked = false,
   children,
   ...props
-}) {
+}: ActionRowProps) {
   return React.createElement(
     as,
     {
@@ -21,24 +31,6 @@ function ActionRow({
   );
 }
 
-ActionRow.propTypes = {
-  /** Specifies the base element */
-  as: PropTypes.elementType,
-  /** Specifies class name to append to the base element */
-  className: PropTypes.string,
-  /** Specifies the contents of the row */
-  children: PropTypes.node,
-  /** Specifies whether row should be displayed horizontally */
-  isStacked: PropTypes.bool,
-};
-
-ActionRow.defaultProps = {
-  as: 'div',
-  className: undefined,
-  children: null,
-  isStacked: false,
-};
-
 function ActionRowSpacer() {
   return <span className="pgn__action-row-spacer" />;
 }

src/ActionRow/index.jsx renamed to src/ActionRow/index.tsx

@@ -1,14 +1,24 @@
-import React from 'react';
-import PropTypes from 'prop-types';
+import React, { ForwardedRef } from 'react';
 import classNames from 'classnames';
 
+interface AnnotationProps extends React.HTMLAttributes<HTMLSpanElement> {
+  /** Specifies contents of the component. */
+  children: React.ReactNode;
+  /** Specifies class name to append to the base element. */
+  className?: string;
+  /** Specifies variant to use. */
+  variant?: 'error' | 'success' | 'warning' | 'light' | 'dark';
+  /** Specifies arrow position. */
+  arrowPlacement?: 'top' | 'right' | 'bottom' | 'left';
+}
+
 const Annotation = React.forwardRef(({
   className,
-  variant,
+  variant = 'success',
   children,
-  arrowPlacement,
+  arrowPlacement = 'bottom',
   ...props
-}, ref) => (
+} : AnnotationProps, ref : ForwardedRef<HTMLSpanElement>) => (
   <span
     className={classNames(
       className,
@@ -22,21 +32,4 @@ const Annotation = React.forwardRef(({
   </span>
 ));
 
-Annotation.defaultProps = {
-  className: undefined,
-  variant: 'success',
-  arrowPlacement: 'bottom',
-};
-
-Annotation.propTypes = {
-  /** Specifies contents of the component. */
-  children: PropTypes.node.isRequired,
-  /** Specifies class name to append to the base element. */
-  className: PropTypes.string,
-  /** Specifies variant to use. */
-  variant: PropTypes.oneOf(['error', 'success', 'warning', 'light', 'dark']),
-  /** Specifies arrow position. */
-  arrowPlacement: PropTypes.oneOf(['top', 'right', 'bottom', 'left']),
-};
-
 export default Annotation;

src/Annotation/index.jsx renamed to src/Annotation/index.tsx

@@ -1,14 +1,23 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
+// @ts-ignore
 import defaultAvatar from './default-avatar.svg';
 
+export interface AvatarProps extends React.ImgHTMLAttributes<HTMLImageElement> {
+  /** Alt text. Usually the user's name */
+  alt?: string;
+  /** Size of the avatar */
+  size?: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl' | 'huge';
+  /** Image src of the avatar image */
+  src?: string;
+}
+
 function Avatar({
-  alt,
-  size,
+  alt = '',
+  size = 'md',
   src,
   ...attrs
-}) {
+}: AvatarProps) {
   return (
     <img
       {...attrs}
@@ -23,19 +32,4 @@ function Avatar({
   );
 }
 
-Avatar.propTypes = {
-  /** Alt text. Usually the user's name */
-  alt: PropTypes.string,
-  /** Size of the avatar */
-  size: PropTypes.oneOf(['xs', 'sm', 'md', 'lg', 'xl', 'xxl', 'huge']),
-  /** Image src of the avatar image */
-  src: PropTypes.string,
-};
-
-Avatar.defaultProps = {
-  alt: '',
-  size: 'md',
-  src: undefined,
-};
-
 export default Avatar;

src/Avatar/index.jsx renamed to src/Avatar/index.tsx

@@ -1,23 +1,38 @@
-import React from 'react';
-import PropTypes from 'prop-types';
+import React, { ForwardedRef } from 'react';
 import classNames from 'classnames';
 import Button from '../Button';
-import Avatar from '../Avatar';
+import Avatar, { AvatarProps } from '../Avatar';
 
 const buttonSizesToAvatarSize = {
   sm: 'xs',
   md: 'sm',
   lg: 'md',
 };
 
+interface AvatarButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+  /** The button text */
+  children?: string;
+  /** A class name to append to the button */
+  className?: string;
+  /** Show the label or only the avatar */
+  showLabel?: boolean;
+  /** The button size */
+  size?: 'sm' | 'md' | 'lg';
+  /** Image src of the avatar image */
+  src?: string;
+  /** The button style variant to use */
+  variant?: string;
+}
+
 const AvatarButton = React.forwardRef(({
   children,
   className,
-  showLabel,
-  size,
+  showLabel = true,
+  size = 'md',
   src,
+  variant = 'tertiary',
   ...attrs
-}, ref) => {
+}: AvatarButtonProps, ref: ForwardedRef<HTMLButtonElement>) => {
   const avatarSize = buttonSizesToAvatarSize[size] || 'sm';
   return (
     <Button
@@ -31,35 +46,12 @@ const AvatarButton = React.forwardRef(({
       )}
       size={size}
       ref={ref}
+      variant={variant}
     >
-      <Avatar src={src} alt={showLabel ? '' : children} size={avatarSize} />
+      <Avatar src={src} alt={showLabel ? '' : children} size={avatarSize as AvatarProps['size']} />
       {showLabel && children}
     </Button>
   );
 });
 
-AvatarButton.propTypes = {
-  /** The button text */
-  children: PropTypes.string,
-  /** A class name to append to the button */
-  className: PropTypes.string,
-  /** Show the label or only the avatar */
-  showLabel: PropTypes.bool,
-  /** The button size */
-  size: PropTypes.oneOf(['sm', 'md', 'lg']),
-  /** Image src of the avatar image */
-  src: PropTypes.string,
-  /** The button style variant to use */
-  variant: PropTypes.string,
-};
-
-AvatarButton.defaultProps = {
-  children: undefined,
-  className: undefined,
-  showLabel: true,
-  size: 'md',
-  src: undefined,
-  variant: 'tertiary',
-};
-
 export default AvatarButton;