fix conflict

.babelrc.js

@@ -1,21 +1,24 @@
 module.exports = {
-  presets: ["@babel/preset-react", "@babel/preset-typescript"],
-  plugins: [
-    "lodash",
-    ["@babel/proposal-class-properties", { loose: true }],
-    "@babel/transform-arrow-functions",
-    "@babel/transform-block-scoping",
-    "@babel/transform-classes",
-    "@babel/transform-computed-properties",
-    "@babel/transform-destructuring",
-    "@babel/transform-parameters",
-    "@babel/transform-shorthand-properties",
-    "@babel/transform-spread",
-    "@babel/transform-template-literals",
-    "@babel/proposal-object-rest-spread",
-    "@babel/proposal-optional-chaining",
-    "@babel/plugin-proposal-export-namespace-from",
+  presets: [
+    [
+      "@babel/preset-env",
+      {
+        loose: true,
+        exclude: [
+          // only enabled in commonjs targets
+          // see the section on `env` below
+          "@babel/plugin-transform-modules-commonjs",
+
+          // do not use this plugin with webpack
+          // ref: https://babeljs.io/docs/babel-plugin-proposal-dynamic-import
+          "@babel/plugin-proposal-dynamic-import",
+        ],
+      },
+    ],
+    "@babel/preset-react",
+    "@babel/preset-typescript",
   ],
+  plugins: ["lodash"],
   ignore: ["**/*.d.ts"],
   env: {
     commonjs: {

.babelrc.native.js

@@ -1,7 +1,7 @@
 module.exports = {
   presets: ["module:metro-react-native-babel-preset"],
   plugins: [
-    "@babel/plugin-proposal-export-namespace-from",
+    "@babel/plugin-transform-export-namespace-from",
     "@babel/plugin-transform-flow-strip-types",
   ],
 };

.eslintrc.js

@@ -103,6 +103,7 @@ module.exports = {
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/no-invalid-this": ["error"],
         "@typescript-eslint/no-non-null-assertion": "off",
+        "@typescript-eslint/no-unnecessary-type-assertion": "off",
         "@typescript-eslint/no-unsafe-argument": "off",
         "@typescript-eslint/no-unsafe-assignment": "off",
         "@typescript-eslint/no-unsafe-return": "off",

.github/actions/setup/action.yml

@@ -2,18 +2,19 @@ name: Setup
 description: Setup Build Step
 inputs:
   node-version:
+    default: "18.x"
+    description: "The version of nodejs to use."
     required: true
-    default: '18.x'
 
 runs:
   using: "composite"
   steps:
-    - uses: pnpm/action-setup@v2
+    - uses: pnpm/action-setup@v3
       with:
         version: 7
 
     - name: Use Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ inputs.node-version }}
         cache: 'pnpm'

.github/workflows/issue-stale.yml

@@ -2,7 +2,7 @@ name: Close inactive issues
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 * * * *'
+    - cron: "0 0 * * *"
 
 jobs:
   close-issues:
@@ -13,7 +13,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/stale@v4
+      - uses: actions/stale@v9
         with:
           ascending: false
           operations-per-run: 100

.github/workflows/issue-triage.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-22.04
     if: "${{ contains(github.event.label.name, 'Status: Needs More Info :hand:') }}"
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.CHANGESETS_GITHUB_TOKEN }}
           script: |

CONTRIBUTING.md

@@ -19,7 +19,7 @@ Victory is a monorepo built with [Wireit](https://github.com/google/wireit) and
 
 ### Requirements
 
-- [Node.js](https://nodejs.org/) 14 or higher.
+- [Node.js](https://nodejs.org/) 18 or higher.
 - [pnpm](https://pnpm.io/) 7 or higher.
 
 ### Setup
@@ -41,7 +41,7 @@ $ pnpm install
 
 ## Development
 
-### Dev servers
+### Dev demo app
 
 We have some dev servers available for a sample development environment.
 
@@ -52,6 +52,14 @@ $ pnpm start
 
 These run appropriate file watchers, so you can just start developing source files and wait for the webpack dev server to pick up the new changes.
 
+### Running Docs locally
+
+You can run the documentation website locally with the following command. It is linked to the Victory package via PNPM and will reflect changes in packages when they are rebuilt.
+
+```sh
+$ pnpm start:docs
+```
+
 ### Build and checks
 
 Our task system mostly takes care of all task dependencies and things you need. When you first clone this repo or a new branch, run:

README.md

@@ -1,6 +1,6 @@
 <div align="center">
   <a href="https://commerce.nearform.com/open-source/" target="_blank">
-    <img alt="Victory — Formidable, We build the modern web" src="https://raw.githubusercontent.com/FormidableLabs/victory/main//Victory-Hero.png" />
+    <img alt="Victory — Formidable, We build the modern web" src="https://oss.nearform.com/api/banner.svg?badge=victory&bg=9c2f1e" />
   </a>
 
   <strong>
@@ -20,8 +20,6 @@
     <img alt="build status" src="https://github.com/FormidableLabs/victory/actions/workflows/ci.yml/badge.svg">
   </a>
 
-  <img alt="Gzip size" src="http://img.badgesize.io/https://unpkg.com/victory/dist/victory.min.js?compression=gzip&label=gzip%20size">
-
   <a href="https://github.com/FormidableLabs/victory#maintenance-status">
     <img alt="Maintenance Status" src="https://img.shields.io/badge/maintenance-active-green.svg" />
   </a>
@@ -36,11 +34,11 @@
 
 - [Getting Started](#getting-started)
 - [Victory Native](#victory-native)
-- [API Documentation](http://formidable.com/open-source/victory/docs)
-- [Guides](http://formidable.com/open-source/victory/guides)
+- [API Documentation](http://commerce.nearform.com/open-source/victory/docs)
+- [Guides](http://commerce.nearform.com/open-source/victory/guides)
 - [Contributing](#contributing)
 
-* See the **docs and examples** on the website: https://commerce.nearform.com/open-source/victory.
+* See the **docs and examples** on the website: https://commerce.nearform.com/open-source/victory
 * **Experiment** with all Victory components in this [code sandbox](https://codesandbox.io/s/dj4f7t)
 
 ## Getting started

demo/ts/components/group-demo.tsx

@@ -9,6 +9,7 @@ import { VictoryScatter } from "victory-scatter";
 import { VictoryErrorBar } from "victory-errorbar";
 import { VictoryTooltip } from "victory-tooltip";
 import { VictoryVoronoi } from "victory-voronoi";
+import { VictoryBoxPlot } from "victory-box-plot";
 import { range, random } from "lodash";
 
 class App extends React.Component {
@@ -160,6 +161,27 @@ class App extends React.Component {
               />
             </VictoryGroup>
           </VictoryChart>
+          <VictoryGroup style={chartStyle}>
+              <VictoryBoxPlot
+                minLabels
+                maxLabels
+                data={[
+                  { x: 1, y: [1, 2, 3, 5] },
+                  { x: 2, y: [3, 2, 8, 10] },
+                  { x: 3, y: [2, 8, 6, 5] },
+                  { x: 4, y: [1, 3, 2, 9] },
+                ]}
+                style={{
+                  min: { stroke: "tomato" },
+                  max: { stroke: "orange" },
+                  q1: { fill: "tomato" },
+                  q3: { fill: "orange" },
+                  median: { stroke: "white", strokeWidth: 2 },
+                  minLabels: { fill: "tomato" },
+                  maxLabels: { fill: "orange" },
+                }}
+              />
+            </VictoryGroup>
         </div>
       </div>
     );

docs/.eslintrc.json

@@ -0,0 +1,11 @@
+{
+  "extends": "next/core-web-vitals",
+  "rules": {
+    "no-magic-numbers": 0,
+    "react/no-multi-comp": 0,
+    "new-cap": 0,
+    "max-params": 0,
+    "@typescript-eslint/ban-ts-comment": 0,
+    "@typescript-eslint/no-unnecessary-type-assertion": 0
+  }
+}

docs/.gitignore

@@ -0,0 +1,36 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+.yarn/install-state.gz
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts