Skip to content

Commit 9335d4a

Browse files
authored
Merge branch 'main' into remove-prop-types
2 parents 9f2c311 + 22c09e7 commit 9335d4a

File tree

194 files changed

+2020
-1689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+2020
-1689
lines changed

.changeset/brave-cycles-matter.md

-34
This file was deleted.

.changeset/fair-bobcats-knock.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
"victory-area": patch
3+
"victory-box-plot": patch
4+
"victory-brush-line": patch
5+
"victory-core": patch
6+
"victory-errorbar": patch
7+
"victory-native": patch
8+
"victory-polar-axis": patch
9+
"victory-scatter": patch
10+
"victory-tooltip": patch
11+
---
12+
13+
Migrate victory-native to TypeScript

.changeset/lucky-bikes-happen.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"victory": patch
3+
---
4+
5+
Update victory package.json source to the correct index file

config/webpack/webpack.config.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,15 @@ module.exports = {
2828
cache: true,
2929
context: SRC,
3030
entry: "./index",
31-
externals: [
32-
{
33-
react: {
34-
root: "React",
35-
commonjs2: "react",
36-
commonjs: "react",
37-
amd: "react",
38-
},
31+
externals: {
32+
react: {
33+
root: "React",
34+
commonjs2: "react",
35+
commonjs: "react",
36+
amd: "react",
3937
},
40-
],
38+
"react-native": "react-native",
39+
},
4140
resolve: {
4241
extensions: [".ts", ".tsx", ".js", ".jsx"],
4342
},

docs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"styled-components": "^5.1.0",
5050
"styled-normalize": "^8.0.6",
5151
"unist-util-visit": "^1.4.0",
52-
"victory": "^36.8.3"
52+
"victory": "^36.8.5"
5353
},
5454
"devDependencies": {
5555
"babel-cli": "^6.26.0",

docs/src/content/introduction/native.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ scope: null
88

99
# Getting Started with Victory Native
1010

11-
> These docs are for the legacy versions of Victory Native. If you're looking for Victory Native XL docs, please [see here]
12-
(https://formidable.com/open-source/victory-native/).
11+
> These docs are for the legacy versions of Victory Native. Victory Native XL is our rewrite of Victory Native designed specifically for React Native. Please [see here for more information]
12+
(https://formidable.com/open-source/victory-native/). If you would like to continue to use this version of Victory with React Native, follow the legacy guide below.
1313

1414
In this guide, we’ll show you how to get started with Victory Native and the React Native SVG dependency running in your React Native app for iOS and Android.
1515

@@ -22,7 +22,7 @@ Victory Native is compatible with React Native 0.50 or higher.
2222
To add Victory Native to your React Native app install `victory-native`.
2323

2424
```bash
25-
$ yarn add victory-native # or npm install --save victory-native
25+
$ yarn add victory-native@legacy # or npm install --save victory-native@legacy
2626
```
2727

2828
#### 2. Add React Native SVG to your app

0 commit comments

Comments
 (0)