+
+
+
About
This is the about page
diff --git a/src/components/pages/index-page/IndexPage.tsx b/src/components/pages/index-page/IndexPage.tsx
index 757d27d..75df19e 100644
--- a/src/components/pages/index-page/IndexPage.tsx
+++ b/src/components/pages/index-page/IndexPage.tsx
@@ -2,12 +2,16 @@ import React from 'react';
import Link from 'next/link';
import { Routes } from '../../../constants/Routes';
import { SimpleBarChartDynamic } from '../../ui/simple-bar-chart/SimpleBarChart.dynamic';
+import Head from 'next/head';
interface IProps {}
export const IndexPage: React.FC = (props) => {
return (
+
+
+
Hello Next.js 👋
diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx
index a07129e..68fd3b8 100644
--- a/src/pages/_document.tsx
+++ b/src/pages/_document.tsx
@@ -15,7 +15,6 @@ class MyDocument extends Document {
-
From 0f28ab709090b5722f917dc991cd4275b6474ff2 Mon Sep 17 00:00:00 2001
From: robertsavian
Date: Fri, 27 Nov 2020 08:47:08 -0600
Subject: [PATCH 04/16] AnyChart component
---
src/components/pages/about-page/AboutPage.tsx | 4 ----
src/components/pages/index-page/IndexPage.tsx | 4 ----
src/components/ui/pie-chart/PieChart.tsx | 4 ++--
.../ui/simple-bar-chart/SimpleBarChart.tsx | 4 ++--
src/modules/any-chart/AnyChart.tsx | 7 +++++++
src/pages/about.tsx | 13 ++++++++++---
src/pages/index.tsx | 13 ++++++++++---
7 files changed, 31 insertions(+), 18 deletions(-)
create mode 100644 src/modules/any-chart/AnyChart.tsx
diff --git a/src/components/pages/about-page/AboutPage.tsx b/src/components/pages/about-page/AboutPage.tsx
index a391f84..b59ba8f 100644
--- a/src/components/pages/about-page/AboutPage.tsx
+++ b/src/components/pages/about-page/AboutPage.tsx
@@ -2,16 +2,12 @@ import React from 'react';
import Link from 'next/link';
import { Routes } from '../../../constants/Routes';
import { PieChartDynamic } from '../../ui/pie-chart/PieChart.dynamic';
-import Head from 'next/head';
interface IProps {}
export const AboutPage: React.FC = (props) => {
return (
-
-
-
About
This is the about page
diff --git a/src/components/pages/index-page/IndexPage.tsx b/src/components/pages/index-page/IndexPage.tsx
index 75df19e..757d27d 100644
--- a/src/components/pages/index-page/IndexPage.tsx
+++ b/src/components/pages/index-page/IndexPage.tsx
@@ -2,16 +2,12 @@ import React from 'react';
import Link from 'next/link';
import { Routes } from '../../../constants/Routes';
import { SimpleBarChartDynamic } from '../../ui/simple-bar-chart/SimpleBarChart.dynamic';
-import Head from 'next/head';
interface IProps {}
export const IndexPage: React.FC = (props) => {
return (
-
-
-
Hello Next.js 👋
diff --git a/src/components/ui/pie-chart/PieChart.tsx b/src/components/ui/pie-chart/PieChart.tsx
index c0100de..2560c46 100644
--- a/src/components/ui/pie-chart/PieChart.tsx
+++ b/src/components/ui/pie-chart/PieChart.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import AnyChart from 'anychart-react';
+import AnyChartReact from 'anychart-react';
interface IProps {
chartId: string;
@@ -11,7 +11,7 @@ interface IProps {
export const PieChart: React.FC = (props) => {
return (
- = (props) => {
const chart = getChart();
return (
- = (props) => {
+ return ;
+};
diff --git a/src/pages/about.tsx b/src/pages/about.tsx
index 2f35b74..6951ace 100644
--- a/src/pages/about.tsx
+++ b/src/pages/about.tsx
@@ -2,14 +2,21 @@ import React from 'react';
import { Layout } from '../components/shared/Layout';
import { NextPage } from 'next';
import { AboutPage } from '../components/pages/about-page/AboutPage';
+import Head from 'next/head';
+import { AnyChart } from '../modules/any-chart/AnyChart';
interface IProps {}
const AboutRoute: NextPage = (props) => {
return (
-
-
-
+ <>
+
+
+
+
+
+
+ >
);
};
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 4f1ce7c..eb0e922 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -2,14 +2,21 @@ import React from 'react';
import { Layout } from '../components/shared/Layout';
import { IndexPage } from '../components/pages/index-page/IndexPage';
import { NextPage } from 'next';
+import Head from 'next/head';
+import { AnyChart } from '../modules/any-chart/AnyChart';
interface IProps {}
const IndexRoute: NextPage = (props) => {
return (
-
-
-
+ <>
+
+
+
+
+
+
+ >
);
};
From d7492da42007b30e49969f5ca057b14fee38a10c Mon Sep 17 00:00:00 2001
From: robertsavian
Date: Sat, 28 Nov 2020 12:45:46 -0600
Subject: [PATCH 05/16] improve charts
---
package.json | 1 +
src/components/pages/about-page/AboutPage.tsx | 42 ++++++++++++++++++-
.../ui/area-chart/AreaChart.dynamic.tsx | 7 ++++
src/components/ui/area-chart/AreaChart.tsx | 32 ++++++++++++++
.../ui/area-chart/AreaChart.utils.ts | 13 ++++++
.../ui/pie-chart/PieChart.dynamic.tsx | 7 ++--
src/components/ui/pie-chart/PieChart.tsx | 2 +-
.../SimpleBarChart.dynamic.tsx | 2 +-
.../ui/simple-bar-chart/SimpleBarChart.tsx | 10 ++---
.../simple-bar-chart/SimpleBarChart.utils.ts | 9 ++--
10 files changed, 110 insertions(+), 15 deletions(-)
create mode 100644 src/components/ui/area-chart/AreaChart.dynamic.tsx
create mode 100644 src/components/ui/area-chart/AreaChart.tsx
create mode 100644 src/components/ui/area-chart/AreaChart.utils.ts
diff --git a/package.json b/package.json
index 1e69b2d..1736293 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
"scripts": {
"dev": "CLIENT_ENV=development next",
"build": "next build",
+ "prestart": "next build",
"start": "next start",
"---------- Linting ----------------------------------------------------": "",
"ts": "tsc --noEmit",
diff --git a/src/components/pages/about-page/AboutPage.tsx b/src/components/pages/about-page/AboutPage.tsx
index b59ba8f..42b5946 100644
--- a/src/components/pages/about-page/AboutPage.tsx
+++ b/src/components/pages/about-page/AboutPage.tsx
@@ -2,6 +2,8 @@ import React from 'react';
import Link from 'next/link';
import { Routes } from '../../../constants/Routes';
import { PieChartDynamic } from '../../ui/pie-chart/PieChart.dynamic';
+import { SimpleBarChartDynamic } from '../../ui/simple-bar-chart/SimpleBarChart.dynamic';
+import { AreaChartDynamic } from '../../ui/area-chart/AreaChart.dynamic';
interface IProps {}
@@ -15,7 +17,45 @@ export const AboutPage: React.FC = (props) => {
Go home
-
+
+
);
};
diff --git a/src/components/ui/area-chart/AreaChart.dynamic.tsx b/src/components/ui/area-chart/AreaChart.dynamic.tsx
new file mode 100644
index 0000000..14578da
--- /dev/null
+++ b/src/components/ui/area-chart/AreaChart.dynamic.tsx
@@ -0,0 +1,7 @@
+import dynamic from 'next/dynamic';
+import { AreaChart } from './AreaChart';
+
+export const AreaChartDynamic = dynamic(
+ () => import('./AreaChart' /* webpackChunkName: "AreaChart" */).then((mod) => mod.AreaChart as any),
+ { ssr: false }
+) as typeof AreaChart;
diff --git a/src/components/ui/area-chart/AreaChart.tsx b/src/components/ui/area-chart/AreaChart.tsx
new file mode 100644
index 0000000..d5c77a1
--- /dev/null
+++ b/src/components/ui/area-chart/AreaChart.tsx
@@ -0,0 +1,32 @@
+import React, { useMemo } from 'react';
+import AnyChartReact from 'anychart-react';
+import { generateAreaChart } from './AreaChart.utils';
+
+interface IProps {}
+
+interface IProps {
+ chartId: string;
+ data: any[];
+ height?: number | string;
+ title: string;
+ width?: number | string;
+}
+
+export const AreaChart: React.FC = (props) => {
+ const chartData = useMemo(() => generateAreaChart(props.data, props.title), [props.data, props.title]);
+
+ return (
+
+ );
+};
+
+AreaChart.defaultProps = {};
diff --git a/src/components/ui/area-chart/AreaChart.utils.ts b/src/components/ui/area-chart/AreaChart.utils.ts
new file mode 100644
index 0000000..c52a620
--- /dev/null
+++ b/src/components/ui/area-chart/AreaChart.utils.ts
@@ -0,0 +1,13 @@
+import anychart from 'anychart';
+
+export const generateAreaChart = (data: any[], title: string) => {
+ const chart = anychart.area();
+
+ data.forEach((chartData) => chart.area(chartData));
+ chart.title(title);
+
+ return {
+ charts: [chart],
+ stage: anychart.graphics.create(),
+ };
+};
diff --git a/src/components/ui/pie-chart/PieChart.dynamic.tsx b/src/components/ui/pie-chart/PieChart.dynamic.tsx
index 5d811a7..4fe8879 100644
--- a/src/components/ui/pie-chart/PieChart.dynamic.tsx
+++ b/src/components/ui/pie-chart/PieChart.dynamic.tsx
@@ -1,6 +1,7 @@
import dynamic from 'next/dynamic';
import { PieChart } from './PieChart';
-export const PieChartDynamic = dynamic(() => import('./PieChart').then((mod) => mod.PieChart as any), {
- ssr: false,
-}) as typeof PieChart;
+export const PieChartDynamic = dynamic(
+ () => import('./PieChart' /* webpackChunkName: "PieChart" */).then((mod) => mod.PieChart as any),
+ { ssr: false }
+) as typeof PieChart;
diff --git a/src/components/ui/pie-chart/PieChart.tsx b/src/components/ui/pie-chart/PieChart.tsx
index 2560c46..f4ab54e 100644
--- a/src/components/ui/pie-chart/PieChart.tsx
+++ b/src/components/ui/pie-chart/PieChart.tsx
@@ -3,7 +3,7 @@ import AnyChartReact from 'anychart-react';
interface IProps {
chartId: string;
- data: number[];
+ data: any[][];
height?: number | string;
title: string;
width?: number | string;
diff --git a/src/components/ui/simple-bar-chart/SimpleBarChart.dynamic.tsx b/src/components/ui/simple-bar-chart/SimpleBarChart.dynamic.tsx
index 85471e8..6aa9a77 100644
--- a/src/components/ui/simple-bar-chart/SimpleBarChart.dynamic.tsx
+++ b/src/components/ui/simple-bar-chart/SimpleBarChart.dynamic.tsx
@@ -2,6 +2,6 @@ import dynamic from 'next/dynamic';
import { SimpleBarChart } from './SimpleBarChart';
export const SimpleBarChartDynamic = dynamic(
- () => import('./SimpleBarChart').then((mod) => mod.SimpleBarChart as any),
+ () => import('./SimpleBarChart' /* webpackChunkName: "SimpleBarChart" */).then((mod) => mod.SimpleBarChart as any),
{ ssr: false }
) as typeof SimpleBarChart;
diff --git a/src/components/ui/simple-bar-chart/SimpleBarChart.tsx b/src/components/ui/simple-bar-chart/SimpleBarChart.tsx
index eacd387..baa94c8 100644
--- a/src/components/ui/simple-bar-chart/SimpleBarChart.tsx
+++ b/src/components/ui/simple-bar-chart/SimpleBarChart.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { getChart } from './SimpleBarChart.utils';
+import React, { useMemo } from 'react';
+import { generateSimpleBarChart } from './SimpleBarChart.utils';
import AnyChartReact from 'anychart-react';
interface IProps {
@@ -11,13 +11,13 @@ interface IProps {
}
export const SimpleBarChart: React.FC = (props) => {
- const chart = getChart();
+ const chartData = useMemo(() => generateSimpleBarChart(), []);
return (
{
- const stage = anychart.graphics.create();
-
+export const generateSimpleBarChart = () => {
const chart1 = anychart.line([1, 2, 3]);
chart1.bounds(0, 0, '100%', '50%');
@@ -11,5 +9,8 @@ export const getChart = () => {
chart2.line([3, 5, 6]);
chart2.bounds(0, '50%', '100%', '50%');
- return { stage, data: [chart1, chart2] };
+ return {
+ charts: [chart1, chart2],
+ stage: anychart.graphics.create(),
+ };
};
From 340230b5fc946229523c4f92220d7359b010b0d8 Mon Sep 17 00:00:00 2001
From: robertsavian
Date: Sat, 28 Nov 2020 12:46:27 -0600
Subject: [PATCH 06/16] improve charts
---
src/components/ui/area-chart/AreaChart.utils.ts | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/components/ui/area-chart/AreaChart.utils.ts b/src/components/ui/area-chart/AreaChart.utils.ts
index c52a620..33af7b7 100644
--- a/src/components/ui/area-chart/AreaChart.utils.ts
+++ b/src/components/ui/area-chart/AreaChart.utils.ts
@@ -1,5 +1,3 @@
-import anychart from 'anychart';
-
export const generateAreaChart = (data: any[], title: string) => {
const chart = anychart.area();
From 065d46c0a2ac306eb0be848d6905ad4fe166f34f Mon Sep 17 00:00:00 2001
From: robertsavian
Date: Sat, 28 Nov 2020 12:48:15 -0600
Subject: [PATCH 07/16] improve charts
---
next.config.js | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/next.config.js b/next.config.js
index 6345b64..02fe11a 100644
--- a/next.config.js
+++ b/next.config.js
@@ -20,12 +20,7 @@ module.exports = withPlugins(
// https://blog.usejournal.com/my-awesome-custom-react-environment-variables-setup-8ebb0797d8ac
config.resolve.alias['environment'] = path.join(__dirname, 'src', 'environments', clientEnv);
- config.externals = [
- ...config.externals,
- {
- anychart: 'anychart',
- },
- ];
+ config.externals = [...config.externals, { anychart: 'anychart' }];
return config;
},
From e26d60562ab2a39a24ca768de5fe940a560f11a5 Mon Sep 17 00:00:00 2001
From: robertsavian
Date: Sat, 28 Nov 2020 17:28:37 -0600
Subject: [PATCH 08/16] anychart
---
src/components/pages/about-page/AboutPage.tsx | 1 -
src/components/ui/area-chart/AreaChart.utils.ts | 2 ++
src/components/ui/simple-bar-chart/SimpleBarChart.utils.ts | 2 ++
src/types/anychart-react.d.ts | 1 +
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/components/pages/about-page/AboutPage.tsx b/src/components/pages/about-page/AboutPage.tsx
index 42b5946..11e04d8 100644
--- a/src/components/pages/about-page/AboutPage.tsx
+++ b/src/components/pages/about-page/AboutPage.tsx
@@ -2,7 +2,6 @@ import React from 'react';
import Link from 'next/link';
import { Routes } from '../../../constants/Routes';
import { PieChartDynamic } from '../../ui/pie-chart/PieChart.dynamic';
-import { SimpleBarChartDynamic } from '../../ui/simple-bar-chart/SimpleBarChart.dynamic';
import { AreaChartDynamic } from '../../ui/area-chart/AreaChart.dynamic';
interface IProps {}
diff --git a/src/components/ui/area-chart/AreaChart.utils.ts b/src/components/ui/area-chart/AreaChart.utils.ts
index 33af7b7..c52a620 100644
--- a/src/components/ui/area-chart/AreaChart.utils.ts
+++ b/src/components/ui/area-chart/AreaChart.utils.ts
@@ -1,3 +1,5 @@
+import anychart from 'anychart';
+
export const generateAreaChart = (data: any[], title: string) => {
const chart = anychart.area();
diff --git a/src/components/ui/simple-bar-chart/SimpleBarChart.utils.ts b/src/components/ui/simple-bar-chart/SimpleBarChart.utils.ts
index 1ed2870..0c9c09b 100644
--- a/src/components/ui/simple-bar-chart/SimpleBarChart.utils.ts
+++ b/src/components/ui/simple-bar-chart/SimpleBarChart.utils.ts
@@ -1,3 +1,5 @@
+import anychart from 'anychart';
+
export const generateSimpleBarChart = () => {
const chart1 = anychart.line([1, 2, 3]);
diff --git a/src/types/anychart-react.d.ts b/src/types/anychart-react.d.ts
index d43961f..d20d944 100644
--- a/src/types/anychart-react.d.ts
+++ b/src/types/anychart-react.d.ts
@@ -1 +1,2 @@
+declare module 'anychart';
declare module 'anychart-react';
From 2b5fccea150b5c8db93403e43d0a7afee73ccc97 Mon Sep 17 00:00:00 2001
From: robertsavian
Date: Sun, 29 Nov 2020 13:50:41 -0600
Subject: [PATCH 09/16] Rename AnyChart to AnyChartScript
---
src/components/ui/area-chart/AreaChart.tsx | 4 ++--
src/components/ui/pie-chart/PieChart.tsx | 4 ++--
src/components/ui/simple-bar-chart/SimpleBarChart.tsx | 4 ++--
src/modules/any-chart/{AnyChart.tsx => AnyChartScript.tsx} | 2 +-
src/pages/about.tsx | 4 ++--
src/pages/index.tsx | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
rename src/modules/any-chart/{AnyChart.tsx => AnyChartScript.tsx} (73%)
diff --git a/src/components/ui/area-chart/AreaChart.tsx b/src/components/ui/area-chart/AreaChart.tsx
index d5c77a1..fa5a659 100644
--- a/src/components/ui/area-chart/AreaChart.tsx
+++ b/src/components/ui/area-chart/AreaChart.tsx
@@ -1,5 +1,5 @@
import React, { useMemo } from 'react';
-import AnyChartReact from 'anychart-react';
+import AnyChart from 'anychart-react';
import { generateAreaChart } from './AreaChart.utils';
interface IProps {}
@@ -16,7 +16,7 @@ export const AreaChart: React.FC = (props) => {
const chartData = useMemo(() => generateAreaChart(props.data, props.title), [props.data, props.title]);
return (
- = (props) => {
return (
- = (props) => {
const chartData = useMemo(() => generateSimpleBarChart(), []);
return (
- = (props) => {
+export const AnyChartScript: React.FC = (props) => {
return ;
};
diff --git a/src/pages/about.tsx b/src/pages/about.tsx
index 6951ace..89545a3 100644
--- a/src/pages/about.tsx
+++ b/src/pages/about.tsx
@@ -3,7 +3,7 @@ import { Layout } from '../components/shared/Layout';
import { NextPage } from 'next';
import { AboutPage } from '../components/pages/about-page/AboutPage';
import Head from 'next/head';
-import { AnyChart } from '../modules/any-chart/AnyChart';
+import { AnyChartScript } from '../modules/any-chart/AnyChartScript';
interface IProps {}
@@ -11,7 +11,7 @@ const AboutRoute: NextPage = (props) => {
return (
<>
-
+
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index eb0e922..296f07b 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -3,7 +3,7 @@ import { Layout } from '../components/shared/Layout';
import { IndexPage } from '../components/pages/index-page/IndexPage';
import { NextPage } from 'next';
import Head from 'next/head';
-import { AnyChart } from '../modules/any-chart/AnyChart';
+import { AnyChartScript } from '../modules/any-chart/AnyChartScript';
interface IProps {}
@@ -11,7 +11,7 @@ const IndexRoute: NextPage = (props) => {
return (
<>
-
+
From 17d478305dfd4584aeed357bd13d32c40059f569 Mon Sep 17 00:00:00 2001
From: robertsavian
Date: Sun, 29 Nov 2020 14:06:27 -0600
Subject: [PATCH 10/16] rename MyDocument to NextDocument
---
src/pages/_document.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx
index 68fd3b8..fda1433 100644
--- a/src/pages/_document.tsx
+++ b/src/pages/_document.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import Document, { Html, Head, Main, NextScript, DocumentContext } from 'next/document';
-class MyDocument extends Document {
+class NextDocument extends Document {
static async getInitialProps(ctx: DocumentContext) {
const initialProps = await Document.getInitialProps(ctx);
@@ -25,4 +25,4 @@ class MyDocument extends Document {
}
}
-export default MyDocument;
+export default NextDocument;
From f71d111a001e7e8b78db51df9dacba96d3ac919d Mon Sep 17 00:00:00 2001
From: robertsavian
Date: Sun, 29 Nov 2020 14:12:41 -0600
Subject: [PATCH 11/16] fix merge conflict
---
src/pages/about/index.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/about/index.tsx b/src/pages/about/index.tsx
index a8476db..8282e43 100644
--- a/src/pages/about/index.tsx
+++ b/src/pages/about/index.tsx
@@ -3,7 +3,7 @@ import { Layout } from '../../components/shared/Layout';
import { NextPage } from 'next';
import { AboutPage } from '../../components/pages/about-page/AboutPage';
import Head from 'next/head';
-import { AnyChartScript } from '../modules/any-chart/AnyChartScript';
+import { AnyChartScript } from '../../modules/any-chart/AnyChartScript';
interface IProps {}
From a39b7baaaaf74257d0771bc3648b67bddb809c05 Mon Sep 17 00:00:00 2001
From: robertsavian
Date: Tue, 1 Dec 2020 13:55:28 -0600
Subject: [PATCH 12/16] import 'anychart';
---
next-env.d.ts | 1 -
src/components/ui/area-chart/AreaChart.utils.ts | 2 +-
src/components/ui/simple-bar-chart/SimpleBarChart.utils.ts | 2 +-
src/types/anychart-react.d.ts | 1 -
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/next-env.d.ts b/next-env.d.ts
index ab21f42..7b7aa2c 100644
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -1,3 +1,2 @@
///
///
-///
diff --git a/src/components/ui/area-chart/AreaChart.utils.ts b/src/components/ui/area-chart/AreaChart.utils.ts
index c52a620..f11f386 100644
--- a/src/components/ui/area-chart/AreaChart.utils.ts
+++ b/src/components/ui/area-chart/AreaChart.utils.ts
@@ -1,4 +1,4 @@
-import anychart from 'anychart';
+import 'anychart';
export const generateAreaChart = (data: any[], title: string) => {
const chart = anychart.area();
diff --git a/src/components/ui/simple-bar-chart/SimpleBarChart.utils.ts b/src/components/ui/simple-bar-chart/SimpleBarChart.utils.ts
index 0c9c09b..8156fbf 100644
--- a/src/components/ui/simple-bar-chart/SimpleBarChart.utils.ts
+++ b/src/components/ui/simple-bar-chart/SimpleBarChart.utils.ts
@@ -1,4 +1,4 @@
-import anychart from 'anychart';
+import 'anychart';
export const generateSimpleBarChart = () => {
const chart1 = anychart.line([1, 2, 3]);
diff --git a/src/types/anychart-react.d.ts b/src/types/anychart-react.d.ts
index d20d944..d43961f 100644
--- a/src/types/anychart-react.d.ts
+++ b/src/types/anychart-react.d.ts
@@ -1,2 +1 @@
-declare module 'anychart';
declare module 'anychart-react';
From c801895b0500952c62f36a0f2866473ca0e9d0a1 Mon Sep 17 00:00:00 2001
From: robertsavian
Date: Wed, 2 Dec 2020 19:59:01 -0600
Subject: [PATCH 13/16] merge conflicts
---
yarn.lock | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 111 insertions(+), 5 deletions(-)
diff --git a/yarn.lock b/yarn.lock
index 57bc53b..cecf490 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -585,6 +585,20 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
dependencies:
color-convert "^2.0.1"
+anychart-react@1.4.1:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/anychart-react/-/anychart-react-1.4.1.tgz#ed3900e7d165d60e370a0c0152bcb24582d39d2a"
+ integrity sha1-7TkA59Fl1g43CgwBUryyRYLTnSo=
+ dependencies:
+ anychart "^8.0.0"
+ react "^15.6.2"
+ react-dom "^15.6.2"
+
+anychart@8.9.0, anychart@^8.0.0:
+ version "8.9.0"
+ resolved "https://registry.yarnpkg.com/anychart/-/anychart-8.9.0.tgz#131681756341d09298744380ca7e894196476bf3"
+ integrity sha512-SE8NUwYY35EBLbZ/g+8nVmF3JYFUB2ZO0hknDb06FO5r9hNwykSAsYKIfNnWSw8YplThlXUNXbKDbfPhTFh1Qw==
+
anymatch@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1430,6 +1444,11 @@ core-js-pure@^3.0.0:
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.0.tgz#4cdd2eca37d49cda206b66e26204818dba77884a"
integrity sha512-fRjhg3NeouotRoIV0L1FdchA6CK7ZD+lyINyMoz19SyV+ROpC4noS1xItWHFtwZdlqfMfVPJEyEGdfri2bD1pA==
+core-js@^1.0.0:
+ version "1.2.7"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+ integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
+
core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -1482,6 +1501,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
+create-react-class@^15.6.0:
+ version "15.7.0"
+ resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.7.0.tgz#7499d7ca2e69bb51d13faf59bd04f0c65a1d6c1e"
+ integrity sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==
+ dependencies:
+ loose-envify "^1.3.1"
+ object-assign "^4.1.1"
+
cross-fetch@3.0.5:
version "3.0.5"
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.5.tgz#2739d2981892e7ab488a7ad03b92df2816e03f4c"
@@ -1954,6 +1981,13 @@ encodeurl@~1.0.2:
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+encoding@^0.1.11:
+ version "0.1.13"
+ resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+ integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+ dependencies:
+ iconv-lite "^0.6.2"
+
end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
version "1.4.4"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -2432,6 +2466,19 @@ fastq@^1.6.0:
dependencies:
reusify "^1.0.4"
+fbjs@^0.8.9:
+ version "0.8.17"
+ resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
+ integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
+ dependencies:
+ core-js "^1.0.0"
+ isomorphic-fetch "^2.1.1"
+ loose-envify "^1.0.0"
+ object-assign "^4.1.0"
+ promise "^7.1.1"
+ setimmediate "^1.0.5"
+ ua-parser-js "^0.7.18"
+
figgy-pudding@^3.5.1:
version "3.5.2"
resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
@@ -2965,6 +3012,13 @@ iconv-lite@0.4.24:
dependencies:
safer-buffer ">= 2.1.2 < 3"
+iconv-lite@^0.6.2:
+ version "0.6.2"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
+ integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+ dependencies:
+ safer-buffer ">= 2.1.2 < 3.0.0"
+
icss-utils@^4.0.0, icss-utils@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467"
@@ -3247,6 +3301,11 @@ is-regex@^1.1.1:
dependencies:
has-symbols "^1.0.1"
+is-stream@^1.0.1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+ integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
is-stream@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
@@ -3296,6 +3355,14 @@ isobject@^3.0.0, isobject@^3.0.1:
resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+isomorphic-fetch@^2.1.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+ integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
+ dependencies:
+ node-fetch "^1.0.1"
+ whatwg-fetch ">=0.10.0"
+
jest-worker@24.9.0:
version "24.9.0"
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
@@ -3493,7 +3560,7 @@ lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
-loose-envify@^1.1.0, loose-envify@^1.4.0:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -3917,6 +3984,14 @@ node-fetch@2.6.1:
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+node-fetch@^1.0.1:
+ version "1.7.3"
+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+ integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
+ dependencies:
+ encoding "^0.1.11"
+ is-stream "^1.0.1"
+
node-html-parser@1.4.9:
version "1.4.9"
resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-1.4.9.tgz#3c8f6cac46479fae5800725edb532e9ae8fd816c"
@@ -4563,14 +4638,14 @@ promise-inflight@^1.0.1:
resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-promise@^7.0.1:
+promise@^7.0.1, promise@^7.1.1:
version "7.3.1"
resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
dependencies:
asap "~2.0.3"
-prop-types@15.7.2, prop-types@^15.7.2:
+prop-types@15.7.2, prop-types@^15.5.10, prop-types@^15.7.2:
version "15.7.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -4723,6 +4798,16 @@ react-dom@17.0.1:
object-assign "^4.1.1"
scheduler "^0.20.1"
+react-dom@^15.6.2:
+ version "15.7.0"
+ resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.7.0.tgz#39106dee996d0742fb0f43d567ef8b8153483ab2"
+ integrity sha512-mpjXqC2t1FuYsILOLCj0kg6pbg460byZkVA/80VtDmKU/pYmoTdHOtaMcTRIDiyXLz4sIur0cQ04nOC6iGndJg==
+ dependencies:
+ fbjs "^0.8.9"
+ loose-envify "^1.1.0"
+ object-assign "^4.1.0"
+ prop-types "^15.5.10"
+
react-is@16.13.1, react-is@^16.8.1:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
@@ -4741,6 +4826,17 @@ react@17.0.1:
loose-envify "^1.1.0"
object-assign "^4.1.1"
+react@^15.6.2:
+ version "15.7.0"
+ resolved "https://registry.yarnpkg.com/react/-/react-15.7.0.tgz#10308fd42ac6912a250bf00380751abc41ac7106"
+ integrity sha512-5/MMRYmpmM0sMTHGLossnJCrmXQIiJilD6y3YN3TzAwGFj6zdnMtFv6xmi65PHKRV+pehIHpT7oy67Sr6s9AHA==
+ dependencies:
+ create-react-class "^15.6.0"
+ fbjs "^0.8.9"
+ loose-envify "^1.1.0"
+ object-assign "^4.1.0"
+ prop-types "^15.5.10"
+
read-pkg@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -4978,7 +5074,7 @@ safe-regex@^1.1.0:
dependencies:
ret "~0.1.10"
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0:
version "2.1.2"
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -5117,7 +5213,7 @@ set-value@^2.0.0, set-value@^2.0.1:
is-plain-object "^2.0.3"
split-string "^3.0.1"
-setimmediate@^1.0.4:
+setimmediate@^1.0.4, setimmediate@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
@@ -5854,6 +5950,11 @@ typescript@4.1.2:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==
+ua-parser-js@^0.7.18:
+ version "0.7.22"
+ resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3"
+ integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==
+
union-value@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -6079,6 +6180,11 @@ webpack@4.44.1:
watchpack "^1.7.4"
webpack-sources "^1.4.1"
+whatwg-fetch@>=0.10.0:
+ version "3.5.0"
+ resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz#605a2cd0a7146e5db141e29d1c62ab84c0c4c868"
+ integrity sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A==
+
whatwg-url@^7.0.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
From f17e60130b19aeb19f3f1c5e3efeb05108de323c Mon Sep 17 00:00:00 2001
From: robertsavian
Date: Thu, 3 Dec 2020 09:04:27 -0600
Subject: [PATCH 14/16] move config.externals
---
next.config.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/next.config.js b/next.config.js
index 27eb87b..a81db74 100644
--- a/next.config.js
+++ b/next.config.js
@@ -16,6 +16,8 @@ module.exports = withPlugins(
distDir: 'build',
webpack(config) {
+ config.externals = [...config.externals, { anychart: 'anychart' }];
+
config.resolve.alias = {
...config.resolve.alias,
// https://blog.usejournal.com/my-awesome-custom-react-environment-variables-setup-8ebb0797d8ac
@@ -28,8 +30,6 @@ module.exports = withPlugins(
process.env.NODE_ENV === 'production' ? new DuplicatePackageCheckerPlugin() : null,
].filter(Boolean);
- config.externals = [...config.externals, { anychart: 'anychart' }];
-
return config;
},
}
From 1284f447db7f58bffddc3a9ce37efc4e380b2fcd Mon Sep 17 00:00:00 2001
From: robertsavian
Date: Thu, 3 Dec 2020 11:21:47 -0600
Subject: [PATCH 15/16] clean up
---
src/components/ui/area-chart/AreaChart.tsx | 2 --
src/components/ui/simple-bar-chart/SimpleBarChart.tsx | 1 -
2 files changed, 3 deletions(-)
diff --git a/src/components/ui/area-chart/AreaChart.tsx b/src/components/ui/area-chart/AreaChart.tsx
index fa5a659..df1df30 100644
--- a/src/components/ui/area-chart/AreaChart.tsx
+++ b/src/components/ui/area-chart/AreaChart.tsx
@@ -2,8 +2,6 @@ import React, { useMemo } from 'react';
import AnyChart from 'anychart-react';
import { generateAreaChart } from './AreaChart.utils';
-interface IProps {}
-
interface IProps {
chartId: string;
data: any[];
diff --git a/src/components/ui/simple-bar-chart/SimpleBarChart.tsx b/src/components/ui/simple-bar-chart/SimpleBarChart.tsx
index 75f86e5..7f74a51 100644
--- a/src/components/ui/simple-bar-chart/SimpleBarChart.tsx
+++ b/src/components/ui/simple-bar-chart/SimpleBarChart.tsx
@@ -4,7 +4,6 @@ import AnyChart from 'anychart-react';
interface IProps {
chartId: string;
- // data: number[];
height?: number | string;
title: string;
width?: number | string;
From 14b70de8b1a0c20b9b43f4110d890b6b5dd4b3fd Mon Sep 17 00:00:00 2001
From: robertsavian
Date: Sat, 9 Apr 2022 13:49:32 -0500
Subject: [PATCH 16/16] update yarn lock
---
yarn.lock | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 114 insertions(+), 5 deletions(-)
diff --git a/yarn.lock b/yarn.lock
index 8679732..168bb0a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -981,6 +981,25 @@ ansi-styles@^5.0.0:
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
+anychart-react@1.4.1:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/anychart-react/-/anychart-react-1.4.1.tgz#ed3900e7d165d60e370a0c0152bcb24582d39d2a"
+ integrity sha1-7TkA59Fl1g43CgwBUryyRYLTnSo=
+ dependencies:
+ anychart "^8.0.0"
+ react "^15.6.2"
+ react-dom "^15.6.2"
+
+anychart@8.9.0:
+ version "8.9.0"
+ resolved "https://registry.yarnpkg.com/anychart/-/anychart-8.9.0.tgz#131681756341d09298744380ca7e894196476bf3"
+ integrity sha512-SE8NUwYY35EBLbZ/g+8nVmF3JYFUB2ZO0hknDb06FO5r9hNwykSAsYKIfNnWSw8YplThlXUNXbKDbfPhTFh1Qw==
+
+anychart@^8.0.0:
+ version "8.11.0"
+ resolved "https://registry.yarnpkg.com/anychart/-/anychart-8.11.0.tgz#1012ab6667e9d487fd0c33b9d62417ed670a2429"
+ integrity sha512-9QhPSG2mVndLJFsJxuZbtaq5M2jN9GOGNQ7MO2kZrg4cBeZJz0z0HG8HQwNvKDzuhClyOURiJg34pTTaDGyXaA==
+
anymatch@^3.0.3:
version "3.1.2"
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
@@ -1390,11 +1409,24 @@ core-js-pure@^3.20.2:
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.21.1.tgz#8c4d1e78839f5f46208de7230cebfb72bc3bdb51"
integrity sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==
+core-js@^1.0.0:
+ version "1.2.7"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+ integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
+
corser@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/corser/-/corser-2.0.1.tgz#8eda252ecaab5840dcd975ceb90d9370c819ff87"
integrity sha1-jtolLsqrWEDc2XXOuQ2TcMgZ/4c=
+create-react-class@^15.6.0:
+ version "15.7.0"
+ resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.7.0.tgz#7499d7ca2e69bb51d13faf59bd04f0c65a1d6c1e"
+ integrity sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==
+ dependencies:
+ loose-envify "^1.3.1"
+ object-assign "^4.1.1"
+
cross-spawn@^6.0.5:
version "6.0.5"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -1619,6 +1651,13 @@ emoji-regex@^9.2.2:
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+encoding@^0.1.11:
+ version "0.1.13"
+ resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+ integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+ dependencies:
+ iconv-lite "^0.6.2"
+
end-of-stream@^1.1.0:
version "1.4.4"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -2025,6 +2064,19 @@ fb-watchman@^2.0.0:
dependencies:
bser "2.1.1"
+fbjs@^0.8.9:
+ version "0.8.18"
+ resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.18.tgz#9835e0addb9aca2eff53295cd79ca1cfc7c9662a"
+ integrity sha512-EQaWFK+fEPSoibjNy8IxUtaFOMXcWsY0JaVrQoZR9zC8N2Ygf9iDITPWjUTVIax95b6I742JFLqASHfsag/vKA==
+ dependencies:
+ core-js "^1.0.0"
+ isomorphic-fetch "^2.1.1"
+ loose-envify "^1.0.0"
+ object-assign "^4.1.0"
+ promise "^7.1.1"
+ setimmediate "^1.0.5"
+ ua-parser-js "^0.7.30"
+
file-entry-cache@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -2374,7 +2426,7 @@ iconv-lite@0.4.24:
dependencies:
safer-buffer ">= 2.1.2 < 3"
-iconv-lite@0.6.3:
+iconv-lite@0.6.3, iconv-lite@^0.6.2:
version "0.6.3"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -2551,6 +2603,11 @@ is-shared-array-buffer@^1.0.1:
dependencies:
call-bind "^1.0.2"
+is-stream@^1.0.1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+ integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
is-stream@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
@@ -2587,6 +2644,14 @@ isexe@^2.0.0:
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+isomorphic-fetch@^2.1.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+ integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
+ dependencies:
+ node-fetch "^1.0.1"
+ whatwg-fetch ">=0.10.0"
+
istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
@@ -3215,7 +3280,7 @@ lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.7.0
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-loose-envify@^1.1.0, loose-envify@^1.4.0:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -3404,6 +3469,14 @@ nice-try@^1.0.4:
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+node-fetch@^1.0.1:
+ version "1.7.3"
+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+ integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
+ dependencies:
+ encoding "^0.1.11"
+ is-stream "^1.0.1"
+
node-int64@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -3456,7 +3529,7 @@ nwsapi@^2.2.0:
resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
-object-assign@^4.0.1, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -3777,7 +3850,7 @@ pretty-quick@3.1.3:
mri "^1.1.5"
multimatch "^4.0.0"
-promise@^7.0.1:
+promise@^7.0.1, promise@^7.1.1:
version "7.3.1"
resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
@@ -3792,7 +3865,7 @@ prompts@^2.0.1:
kleur "^3.0.3"
sisteransi "^1.0.5"
-prop-types@^15.8.1:
+prop-types@^15.5.10, prop-types@^15.8.1:
version "15.8.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -3844,6 +3917,16 @@ react-dom@18.0.0:
loose-envify "^1.1.0"
scheduler "^0.21.0"
+react-dom@^15.6.2:
+ version "15.7.0"
+ resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.7.0.tgz#39106dee996d0742fb0f43d567ef8b8153483ab2"
+ integrity sha512-mpjXqC2t1FuYsILOLCj0kg6pbg460byZkVA/80VtDmKU/pYmoTdHOtaMcTRIDiyXLz4sIur0cQ04nOC6iGndJg==
+ dependencies:
+ fbjs "^0.8.9"
+ loose-envify "^1.1.0"
+ object-assign "^4.1.0"
+ prop-types "^15.5.10"
+
react-is@^16.13.1:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
@@ -3861,6 +3944,17 @@ react@18.0.0:
dependencies:
loose-envify "^1.1.0"
+react@^15.6.2:
+ version "15.7.0"
+ resolved "https://registry.yarnpkg.com/react/-/react-15.7.0.tgz#10308fd42ac6912a250bf00380751abc41ac7106"
+ integrity sha512-5/MMRYmpmM0sMTHGLossnJCrmXQIiJilD6y3YN3TzAwGFj6zdnMtFv6xmi65PHKRV+pehIHpT7oy67Sr6s9AHA==
+ dependencies:
+ create-react-class "^15.6.0"
+ fbjs "^0.8.9"
+ loose-envify "^1.1.0"
+ object-assign "^4.1.0"
+ prop-types "^15.5.10"
+
read-pkg@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -4052,6 +4146,11 @@ semver@^7.3.2, semver@^7.3.5:
dependencies:
lru-cache "^7.4.0"
+setimmediate@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+ integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
shebang-command@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -4469,6 +4568,11 @@ typescript@4.6.3:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
+ua-parser-js@^0.7.30:
+ version "0.7.31"
+ resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
+ integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==
+
unbox-primitive@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
@@ -4590,6 +4694,11 @@ whatwg-encoding@^2.0.0:
dependencies:
iconv-lite "0.6.3"
+whatwg-fetch@>=0.10.0:
+ version "3.6.2"
+ resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
+ integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==
+
whatwg-mimetype@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"