Skip to content

Conversation

@chromium-52
Copy link
Contributor

@chromium-52 chromium-52 commented Jan 20, 2025

Start to improve linting by migrating to the new flat config for eslint and switching from babel to typescript-eslint as the parser

Epic:

Relevant issues:

Summary by CodeRabbit

  • Chores

    • Updated ESLint configuration to the latest version
    • Updated TypeScript and related development dependencies
    • Simplified linting script
  • Refactor

    • Replaced .eslintrc.cjs with new eslint.config.js configuration
    • Enhanced code quality and linting rules
    • Expanded external dependencies in Rollup configuration

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jan 20, 2025

Walkthrough

The pull request introduces a significant update to the project's ESLint configuration by transitioning from the legacy .eslintrc.cjs to the new eslint.config.js format. This change involves removing the old configuration file, adding a new configuration that uses the latest ESLint flat config system, and updating the package.json with corresponding dependency updates and script modifications. The changes modernize the project's linting setup with the latest ESLint and TypeScript ESLint configurations.

Changes

File Change Summary
.eslintrc.cjs Removed legacy ESLint configuration file
eslint.config.js New ESLint flat configuration added with comprehensive linting rules for JavaScript, TypeScript, and React
package.json - Updated lint script to simplify ESLint command
- Added/updated dependencies: @eslint/js, globals, typescript-eslint
- Updated ESLint and TypeScript dependency versions
rollup.config.cjs Updated external dependencies to exclude react/jsx-runtime in addition to react and react-dom

Possibly related PRs

  • CI Step to run build scripts #561: The changes in this PR involve modifications to the .eslintrc.cjs file, which is directly related to the configuration settings for ESLint, similar to the deletion of the .eslintrc.cjs file in the main PR.
  • Fix: add lin commit hook for css #765: This PR updates the package.json to include a call to stylelint, which is relevant as the main PR also involves changes to linting configurations, indicating a broader context of linting improvements across the project.

Suggested reviewers

  • kotAPI

Poem

🐰 Linting rabbits hop with glee,
Config files dance, now clean and free!
Old rules fade, new standards rise,
ESLint's magic before our eyes 🔍
Code quality hops to new heights!


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 119346b and e68f261.

⛔ Files ignored due to path filters (1)
  • package-lock.json is excluded by !**/package-lock.json
📒 Files selected for processing (1)
  • package.json (5 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • package.json
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: build

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🔭 Outside diff range comments (1)
package.json (1)

Keep Babel presets, remove only eslint parser

The Babel presets are still actively used in your build and test setup:

  • @babel/preset-react and @babel/preset-env are required by your .babelrc.json configuration
  • Your Jest setup uses babel-jest for transforming JavaScript/JSX files

Only @babel/eslint-parser can be safely removed as it's being replaced by typescript-eslint.

🔗 Analysis chain

Line range hint 77-79: Remove unnecessary Babel dependencies.

Since we're migrating to typescript-eslint, the following Babel-related dependencies can be removed unless they're needed for other purposes:

-    "@babel/eslint-parser": "7.23.10",
-    "@babel/preset-env": "7.24.0",
-    "@babel/preset-react": "7.22.15",

Please verify if these are still needed for other build processes before removing.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check for babel usage in the project
echo "Checking for Babel usage..."
rg -l "babel|@babel" --type js --type json --type ts

Length of output: 202


Script:

#!/bin/bash
# Check Babel configuration and Jest setup
echo "=== .babelrc.json content ==="
cat .babelrc.json
echo -e "\n=== jest.config.ts content ==="
cat jest.config.ts

Length of output: 1296

🧹 Nitpick comments (1)
eslint.config.js (1)

8-16: Consider adding strict TypeScript configurations.

While the current setup is good, consider adding tseslint.configs.strict for stricter type checking. This would help catch more TypeScript-specific issues early in development.

 export default tseslint.config(
   eslint.configs.recommended,
   tseslint.configs.recommended,
+  tseslint.configs.strict,
   jsxA11y.flatConfigs.recommended,
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between c137123 and f8763c2.

⛔ Files ignored due to path filters (1)
  • package-lock.json is excluded by !**/package-lock.json
📒 Files selected for processing (3)
  • .eslintrc.cjs (0 hunks)
  • eslint.config.js (1 hunks)
  • package.json (5 hunks)
💤 Files with no reviewable changes (1)
  • .eslintrc.cjs
🔇 Additional comments (3)
eslint.config.js (1)

1-7: LGTM! Imports are well-organized and complete.

All necessary ESLint plugins and parsers are properly imported, including the typescript-eslint parser as required for the migration.

package.json (2)

62-62: Verify TypeScript file handling in lint script.

The simplified lint command relies on ESLint's default file resolution. Verify that TypeScript files are being properly linted.

✅ Verification successful

TypeScript files are properly handled in the lint script

The simplified lint command is safe as the ESLint flat configuration explicitly includes TypeScript files (**/*.{js,jsx,ts,tsx,cjs}), uses the TypeScript parser, and has TypeScript-specific rules configured.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check if TypeScript files are being picked up by the lint command
echo "Testing lint command on TypeScript files..."
touch test.ts
eslint test.ts --print-config .
rm test.ts

Length of output: 256


Script:

#!/bin/bash
# Find ESLint configuration files
echo "Searching for ESLint config files..."
fd -t f -e js -e json -e yaml -e yml -e cjs "eslint" --exec cat {}

Length of output: 1529


81-81: Verify version compatibility between ESLint and TypeScript-related packages.

The typescript-eslint version (^8.20.0) seems unusually high compared to the current stable releases. Please verify the version compatibility.

Also applies to: 101-101, 140-141

Comment on lines +17 to +28
languageOptions: {
globals: {
...globals.browser,
...globals.node,
...globals.jest,
},
parser: typescriptParser,
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
}
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Add React-specific parser options.

The TypeScript parser configuration should include React-specific options for proper JSX handling.

       parserOptions: {
         ecmaVersion: 'latest',
         sourceType: 'module',
+        ecmaFeatures: {
+          jsx: true
+        }
       }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
languageOptions: {
globals: {
...globals.browser,
...globals.node,
...globals.jest,
},
parser: typescriptParser,
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
}
},
languageOptions: {
globals: {
...globals.browser,
...globals.node,
...globals.jest,
},
parser: typescriptParser,
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: {
jsx: true
}
}
},

Comment on lines 29 to 45
rules: {
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/no-explicit-any': 'warn',
'@typescript-eslint/no-non-null-asserted-optional-chain': 'warn',
'@typescript-eslint/ban-ts-comment': 'warn',
'@typescript-eslint/no-require-imports': 'warn',

'no-undef': 'warn',
'prefer-const': 'warn',

'jsx-a11y/alt-text': 'warn',
'jsx-a11y/click-events-have-key-events': 'warn',
'jsx-a11y/no-autofocus': 'warn',
'jsx-a11y/no-static-element-interactions': 'warn',
'jsx-a11y/role-has-required-aria-props': 'warn',
'jsx-a11y/role-supports-aria-props': 'warn',
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Add essential TypeScript rules for better type safety.

Consider adding these important TypeScript rules:

     rules: {
       '@typescript-eslint/no-unused-vars': 'warn',
       '@typescript-eslint/no-explicit-any': 'warn',
       '@typescript-eslint/no-non-null-asserted-optional-chain': 'warn',
       '@typescript-eslint/ban-ts-comment': 'warn',
       '@typescript-eslint/no-require-imports': 'warn',
+      '@typescript-eslint/explicit-function-return-type': 'warn',
+      '@typescript-eslint/no-floating-promises': 'warn',
+      '@typescript-eslint/strict-boolean-expressions': 'warn',

       'no-undef': 'warn',
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
rules: {
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/no-explicit-any': 'warn',
'@typescript-eslint/no-non-null-asserted-optional-chain': 'warn',
'@typescript-eslint/ban-ts-comment': 'warn',
'@typescript-eslint/no-require-imports': 'warn',
'no-undef': 'warn',
'prefer-const': 'warn',
'jsx-a11y/alt-text': 'warn',
'jsx-a11y/click-events-have-key-events': 'warn',
'jsx-a11y/no-autofocus': 'warn',
'jsx-a11y/no-static-element-interactions': 'warn',
'jsx-a11y/role-has-required-aria-props': 'warn',
'jsx-a11y/role-supports-aria-props': 'warn',
}
rules: {
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/no-explicit-any': 'warn',
'@typescript-eslint/no-non-null-asserted-optional-chain': 'warn',
'@typescript-eslint/ban-ts-comment': 'warn',
'@typescript-eslint/no-require-imports': 'warn',
'@typescript-eslint/explicit-function-return-type': 'warn',
'@typescript-eslint/no-floating-promises': 'warn',
'@typescript-eslint/strict-boolean-expressions': 'warn',
'no-undef': 'warn',
'prefer-const': 'warn',
'jsx-a11y/alt-text': 'warn',
'jsx-a11y/click-events-have-key-events': 'warn',
'jsx-a11y/no-autofocus': 'warn',
'jsx-a11y/no-static-element-interactions': 'warn',
'jsx-a11y/role-has-required-aria-props': 'warn',
'jsx-a11y/role-supports-aria-props': 'warn',
}

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
rollup.config.cjs (1)

Line range hint 31-33: Consider streamlining the TypeScript and Babel setup.

Since you're migrating to typescript-eslint, you might want to consider simplifying your build chain. Currently, you're using both TypeScript and Babel with React preset, which might be redundant. TypeScript can handle JSX transformation directly.

Consider:

  1. Using TypeScript's built-in JSX handling by configuring jsx in tsconfig.json
  2. Removing the Babel React preset if TypeScript is handling JSX

This could simplify your build process and potentially improve build times.

Also applies to: 35-38

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between f8763c2 and 3be6346.

⛔ Files ignored due to path filters (1)
  • package-lock.json is excluded by !**/package-lock.json
📒 Files selected for processing (3)
  • eslint.config.js (1 hunks)
  • package.json (5 hunks)
  • rollup.config.cjs (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (2)
  • eslint.config.js
  • package.json
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: build
🔇 Additional comments (1)
rollup.config.cjs (1)

57-57: Good addition of 'react/jsx-runtime' to externals!

This change correctly externalizes the React JSX runtime, which is essential for modern React builds using the new JSX transform. This will help prevent duplicate React runtime code in the bundle.

Let's verify the impact on the bundle output:

✅ Verification successful

Externalization of 'react/jsx-runtime' is correct and future-proof

While there are no direct imports of 'react/jsx-runtime' in the source code, this externalization is beneficial as:

  • It aligns with modern React build patterns
  • Supports both classic and modern JSX transforms as indicated by the TypeScript configurations
  • Prevents potential duplicate React runtime code in the bundle
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check if any existing components are importing jsx-runtime directly
# This helps verify if the externalization is necessary

# Search for jsx-runtime imports in component files
rg -t tsx -t jsx "from\s+['\"]react/jsx-runtime['\"]" src/components/ui/

Length of output: 106


Script:

#!/bin/bash
# Check for jsx-runtime imports in all JS/TS files
fd -e js -e jsx -e ts -e tsx . src/ -x rg -l "from\s+['\"]react/jsx-runtime['\"]" {} \;

# Check for JSX transform configuration in various config files
echo "=== TypeScript Config ==="
fd tsconfig.json -x cat {} \;

echo -e "\n=== Babel Config ==="
fd -e js -e json -e cjs -name "*babel*" -x cat {} \;

Length of output: 1921

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

♻️ Duplicate comments (2)
eslint.config.js (2)

19-30: 🛠️ Refactor suggestion

Add React-specific parser options.

The TypeScript parser configuration should include React-specific options for proper JSX handling.

      parserOptions: {
        ecmaVersion: 'latest',
        sourceType: 'module',
+       ecmaFeatures: {
+         jsx: true
+       }
      }

31-48: 🛠️ Refactor suggestion

Add essential TypeScript rules for better type safety.

Consider adding these important TypeScript rules:

    rules: {
      '@typescript-eslint/no-unused-vars': 'warn',
      '@typescript-eslint/no-explicit-any': 'warn',
      '@typescript-eslint/no-non-null-asserted-optional-chain': 'warn',
      '@typescript-eslint/ban-ts-comment': 'warn',
      '@typescript-eslint/no-require-imports': 'warn',
+     '@typescript-eslint/explicit-function-return-type': 'warn',
+     '@typescript-eslint/no-floating-promises': 'warn',
+     '@typescript-eslint/strict-boolean-expressions': 'warn',

      'no-undef': 'warn',
🧹 Nitpick comments (2)
eslint.config.js (2)

3-8: Consider organizing imports for better maintainability.

Group related imports together for better readability:

import eslint from '@eslint/js';
import globals from 'globals';
+ 
import tseslint from 'typescript-eslint';
import typescriptParser from '@typescript-eslint/parser';
+
import react from 'eslint-plugin-react';
import jsxA11y from 'eslint-plugin-jsx-a11y';

31-48: Consider using 'error' for critical rules.

All rules are currently set to 'warn'. Consider upgrading critical rules to 'error' level for better code quality enforcement:

    rules: {
-     '@typescript-eslint/no-explicit-any': 'warn',
+     '@typescript-eslint/no-explicit-any': 'error',
-     '@typescript-eslint/no-non-null-asserted-optional-chain': 'warn',
+     '@typescript-eslint/no-non-null-asserted-optional-chain': 'error',
-     'no-undef': 'warn',
+     'no-undef': 'error',
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 3be6346 and 5a6c9c0.

📒 Files selected for processing (1)
  • eslint.config.js (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: build

Comment on lines 10 to 18
export default tseslint.config(
eslint.configs.recommended,
tseslint.configs.recommended,
jsxA11y.flatConfigs.recommended,
{
files: [ '**/*.{js,jsx,ts,tsx,cjs}' ],
plugins: {
react,
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Add React recommended configuration.

The React plugin is imported but its recommended configuration is not enabled.

export default tseslint.config(
  eslint.configs.recommended,
  tseslint.configs.recommended,
  jsxA11y.flatConfigs.recommended,
+ react.configs.recommended,
  {
    files: [ '**/*.{js,jsx,ts,tsx,cjs}' ],
    plugins: {
      react,
    },
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
export default tseslint.config(
eslint.configs.recommended,
tseslint.configs.recommended,
jsxA11y.flatConfigs.recommended,
{
files: [ '**/*.{js,jsx,ts,tsx,cjs}' ],
plugins: {
react,
},
export default tseslint.config(
eslint.configs.recommended,
tseslint.configs.recommended,
jsxA11y.flatConfigs.recommended,
react.configs.recommended,
{
files: [ '**/*.{js,jsx,ts,tsx,cjs}' ],
plugins: {
react,
},

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

♻️ Duplicate comments (3)
eslint.config.js (3)

10-14: 🛠️ Refactor suggestion

Add React recommended configuration.

The React plugin is imported but its recommended configuration is not enabled.

export default tseslint.config(
  eslint.configs.recommended,
  tseslint.configs.recommended,
  jsxA11y.flatConfigs.recommended,
+ react.configs.recommended,
  {

20-31: 🛠️ Refactor suggestion

Add React-specific parser options.

The TypeScript parser configuration should include React-specific options for proper JSX handling.

      parserOptions: {
        ecmaVersion: 'latest',
        sourceType: 'module',
+       ecmaFeatures: {
+         jsx: true
+       }
      }

32-38: 🛠️ Refactor suggestion

Add essential TypeScript rules for better type safety.

Consider adding these important TypeScript rules:

    rules: {
      '@typescript-eslint/no-unused-vars': 'warn',
      '@typescript-eslint/no-explicit-any': 'warn',
      '@typescript-eslint/no-non-null-asserted-optional-chain': 'warn',
      '@typescript-eslint/ban-ts-comment': 'warn',
      '@typescript-eslint/no-require-imports': 'warn',
+     '@typescript-eslint/explicit-function-return-type': 'warn',
+     '@typescript-eslint/no-floating-promises': 'warn',
+     '@typescript-eslint/strict-boolean-expressions': 'warn',
🧹 Nitpick comments (1)
eslint.config.js (1)

19-19: Expand the ignores list for better coverage.

Consider adding more common paths to the ignores list:

-    ignores: ['assets/', 'dist/'],
+    ignores: [
+      'assets/',
+      'dist/',
+      'node_modules/',
+      'coverage/',
+      'build/',
+      '**/*.min.js',
+      '**/*.d.ts'
+    ],
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 5a6c9c0 and 119346b.

📒 Files selected for processing (1)
  • eslint.config.js (1 hunks)
🔇 Additional comments (2)
eslint.config.js (2)

1-9: LGTM! Imports and setup are well-structured.

The file includes all necessary imports and the @ts-check directive for TypeScript checking.


15-15: Verify TypeScript files coverage.

Let's ensure all TypeScript files in the project will be properly linted with this configuration.

✅ Verification successful

TypeScript files coverage is complete

The glob pattern **/*.{js,jsx,cjs,ts,tsx} will properly lint all TypeScript files in the project, including components, configurations, and utilities in both /src and /docs directories.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for any TypeScript files that might be missed by the current configuration

# Find all TypeScript files
echo "TypeScript files in the project:"
fd -e ts -e tsx

# Check for any TypeScript files in directories that might be excluded
echo -e "\nTypeScript files in potentially excluded directories:"
fd -e ts -e tsx -p "test/" "src/" "lib/" "packages/"

Length of output: 9195

@kotAPI kotAPI added the automerge A tag that tells kodiak bot to automerge PRs for us when tests and approval conditions are met label Jan 26, 2025
@kodiakhq kodiakhq bot merged commit af41714 into rad-ui:main Jan 26, 2025
4 checks passed
@coderabbitai coderabbitai bot mentioned this pull request Jun 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge A tag that tells kodiak bot to automerge PRs for us when tests and approval conditions are met

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants