diff --git a/app/client/.gitignore b/app/client/.gitignore
index 2e84c1908d..3c972dd653 100755
--- a/app/client/.gitignore
+++ b/app/client/.gitignore
@@ -23,4 +23,6 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*
-/out
\ No newline at end of file
+/out
+/public/fonts
+/src/assets/icon/fonts
diff --git a/app/client/.lintstagedrc b/app/client/.lintstagedrc
index c316ce5182..f72b289722 100644
--- a/app/client/.lintstagedrc
+++ b/app/client/.lintstagedrc
@@ -1,3 +1,3 @@
{
- "src/**/*.tsx": ["./node_modules/eslint/bin/eslint.js --fix", "./node_modules/prettier/bin-prettier.js --write", "git add"]
+ "src/**/*.tsx": ["npx eslint --fix", "npx prettier --write", "git add"]
}
diff --git a/app/client/package.json b/app/client/package.json
index 1f5123649a..31a148f4db 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -26,6 +26,7 @@
"@types/react-router-dom": "^4.3.5",
"@types/styled-components": "^4.1.8",
"axios": "^0.18.0",
+ "eslint": "^6.4.0",
"flow-bin": "^0.91.0",
"fontfaceobserver": "^2.1.0",
"husky": "^3.0.5",
@@ -57,7 +58,8 @@
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
- "flow": "flow"
+ "flow": "flow",
+ "postinstall": "./src/assets/icons/build.sh"
},
"resolutions": {
"jest": "24.8.0"
@@ -80,6 +82,7 @@
"eslint-config-react": "^1.1.7",
"eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-react": "^7.14.3",
+ "icon-font-generator": "^2.1.10",
"redux-devtools": "^3.5.0"
},
"husky": {
diff --git a/app/client/public/appsmith-widget-font/fonts/appsmith-widget-font.eot b/app/client/public/appsmith-widget-font/fonts/appsmith-widget-font.eot
deleted file mode 100644
index 88ed660d1e..0000000000
Binary files a/app/client/public/appsmith-widget-font/fonts/appsmith-widget-font.eot and /dev/null differ
diff --git a/app/client/public/appsmith-widget-font/fonts/appsmith-widget-font.svg b/app/client/public/appsmith-widget-font/fonts/appsmith-widget-font.svg
deleted file mode 100644
index c946036eff..0000000000
--- a/app/client/public/appsmith-widget-font/fonts/appsmith-widget-font.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
diff --git a/app/client/public/appsmith-widget-font/fonts/appsmith-widget-font.ttf b/app/client/public/appsmith-widget-font/fonts/appsmith-widget-font.ttf
deleted file mode 100644
index 14f9ce9efb..0000000000
Binary files a/app/client/public/appsmith-widget-font/fonts/appsmith-widget-font.ttf and /dev/null differ
diff --git a/app/client/public/appsmith-widget-font/fonts/appsmith-widget-font.woff b/app/client/public/appsmith-widget-font/fonts/appsmith-widget-font.woff
deleted file mode 100644
index 96865fd148..0000000000
Binary files a/app/client/public/appsmith-widget-font/fonts/appsmith-widget-font.woff and /dev/null differ
diff --git a/app/client/public/appsmith-widget-font/icons-reference.html b/app/client/public/appsmith-widget-font/icons-reference.html
deleted file mode 100644
index e7c6122796..0000000000
--- a/app/client/public/appsmith-widget-font/icons-reference.html
+++ /dev/null
@@ -1,176 +0,0 @@
-
-
-
-
-
-
- Font Reference - appsmith-widget-font
-
-
-
-
-
-
-
appsmith-widget-font
-
This font was created withFontastic
-
CSS mapping
-
-
Character mapping
-
-
Widget-Icons
-
-
-
-
-
-
-
- alert
-
-
-
-
-
-
-
-
- button
-
-
-
-
-
-
-
-
- checkbox
-
-
-
-
-
-
-
-
- collapse
-
-
-
-
-
-
-
-
- datepicker
-
-
-
-
-
-
-
-
- dropdown
-
-
-
-
-
-
-
-
- file upload
-
-
-
-
-
-
-
-
- image
-
-
-
-
-
-
-
-
- input
-
-
-
-
-
-
-
-
- location picker
-
-
-
-
-
-
-
-
- modal
-
-
-
-
-
-
-
-
- radio
-
-
-
-
-
-
-
-
- rich text
-
-
-
-
-
-
-
-
- switch
-
-
-
-
-
-
-
-
- table
-
-
-
-
-
-
-
-
- tabs
-
-
-
-
-
-
-
-
- text
-
-
-
-
-
\ No newline at end of file
diff --git a/app/client/public/fonts/widgets/Widget-Icons.json b/app/client/public/fonts/widgets/Widget-Icons.json
deleted file mode 100644
index dade769980..0000000000
--- a/app/client/public/fonts/widgets/Widget-Icons.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "alert": "\\f101",
- "button": "\\f102",
- "checkbox": "\\f103",
- "collapse": "\\f104",
- "datepicker": "\\f105",
- "dropdown": "\\f106",
- "file upload": "\\f107",
- "image": "\\f108",
- "input": "\\f109",
- "location picker": "\\f10a",
- "modal": "\\f10b",
- "radio": "\\f10c",
- "rich text": "\\f10d",
- "switch": "\\f10e",
- "table": "\\f10f",
- "tabs": "\\f110",
- "text": "\\f111"
-}
\ No newline at end of file
diff --git a/app/client/public/fonts/widgets/Widget-Icons.svg b/app/client/public/fonts/widgets/Widget-Icons.svg
deleted file mode 100644
index 187bf9baba..0000000000
--- a/app/client/public/fonts/widgets/Widget-Icons.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
diff --git a/app/client/public/fonts/widgets/Widget-Icons.ttf b/app/client/public/fonts/widgets/Widget-Icons.ttf
deleted file mode 100644
index 4fac804718..0000000000
Binary files a/app/client/public/fonts/widgets/Widget-Icons.ttf and /dev/null differ
diff --git a/app/client/public/fonts/widgets/Widget-Icons.woff b/app/client/public/fonts/widgets/Widget-Icons.woff
deleted file mode 100644
index c435a73a8a..0000000000
Binary files a/app/client/public/fonts/widgets/Widget-Icons.woff and /dev/null differ
diff --git a/app/client/public/fonts/widgets/Widget-Icons.woff2 b/app/client/public/fonts/widgets/Widget-Icons.woff2
deleted file mode 100644
index d6b88fa2f3..0000000000
Binary files a/app/client/public/fonts/widgets/Widget-Icons.woff2 and /dev/null differ
diff --git a/app/client/public/index.html b/app/client/public/index.html
index 7c8d34dcfa..c674d12044 100755
--- a/app/client/public/index.html
+++ b/app/client/public/index.html
@@ -15,7 +15,7 @@
rel="stylesheet"
/>
-
+
diff --git a/app/client/src/assets/icons/build.sh b/app/client/src/assets/icons/build.sh
new file mode 100755
index 0000000000..dbbdf7cda1
--- /dev/null
+++ b/app/client/src/assets/icons/build.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+# assumes yarn is installed globally
+
+cd "$(dirname "$0")"
+mkdir fonts;
+find ./ -maxdepth 1 -mindepth 1 -type d \! -name fonts | sed -e "s/^\.\/\///g" | while read d;
+do
+ mkdir fonts/${d};
+ npx icon-font-generator ${d}/*.svg -o fonts/${d} -n "${d}-icons";
+done;
+
+# using relative path for now
+mv fonts ../../../public/
diff --git a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.css b/app/client/src/assets/icons/fonts/widgets/Widget-Icons.css
deleted file mode 100644
index a7f6f3f996..0000000000
--- a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.css
+++ /dev/null
@@ -1,71 +0,0 @@
-@font-face {
- font-family: "Widget-Icons";
- src: url("./Widget-Icons.eot?8c5fb10027fde9f328ea41c7f2f3873d?#iefix") format("embedded-opentype"),
-url("./Widget-Icons.woff2?8c5fb10027fde9f328ea41c7f2f3873d") format("woff2"),
-url("./Widget-Icons.woff?8c5fb10027fde9f328ea41c7f2f3873d") format("woff"),
-url("./Widget-Icons.ttf?8c5fb10027fde9f328ea41c7f2f3873d") format("truetype"),
-url("./Widget-Icons.svg?8c5fb10027fde9f328ea41c7f2f3873d#Widget-Icons") format("svg");
-}
-
-i[class^="icon-"]:before, i[class*=" icon-"]:before {
- font-family: Widget-Icons !important;
- font-style: normal;
- font-weight: normal !important;
- font-variant: normal;
- text-transform: none;
- line-height: 1;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-alert:before {
- content: "\f101";
-}
-.icon-button:before {
- content: "\f102";
-}
-.icon-checkbox:before {
- content: "\f103";
-}
-.icon-collapse:before {
- content: "\f104";
-}
-.icon-datepicker:before {
- content: "\f105";
-}
-.icon-dropdown:before {
- content: "\f106";
-}
-.icon-file upload:before {
- content: "\f107";
-}
-.icon-image:before {
- content: "\f108";
-}
-.icon-input:before {
- content: "\f109";
-}
-.icon-location picker:before {
- content: "\f10a";
-}
-.icon-modal:before {
- content: "\f10b";
-}
-.icon-radio:before {
- content: "\f10c";
-}
-.icon-rich text:before {
- content: "\f10d";
-}
-.icon-switch:before {
- content: "\f10e";
-}
-.icon-table:before {
- content: "\f10f";
-}
-.icon-tabs:before {
- content: "\f110";
-}
-.icon-text:before {
- content: "\f111";
-}
diff --git a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.eot b/app/client/src/assets/icons/fonts/widgets/Widget-Icons.eot
deleted file mode 100644
index e47cf532db..0000000000
Binary files a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.eot and /dev/null differ
diff --git a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.html b/app/client/src/assets/icons/fonts/widgets/Widget-Icons.html
deleted file mode 100644
index 7100b7dd57..0000000000
--- a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.html
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-
-
- Widget-Icons
-
-
-
-
-
-
-
- Widget-Icons
-
-
-
-
-
-
-
- alert
-
-
-
-
-
-
-
-
- button
-
-
-
-
-
-
-
-
- checkbox
-
-
-
-
-
-
-
-
- collapse
-
-
-
-
-
-
-
-
- datepicker
-
-
-
-
-
-
-
-
- dropdown
-
-
-
-
-
-
-
-
- file upload
-
-
-
-
-
-
-
-
- image
-
-
-
-
-
-
-
-
- input
-
-
-
-
-
-
-
-
- location picker
-
-
-
-
-
-
-
-
- modal
-
-
-
-
-
-
-
-
- radio
-
-
-
-
-
-
-
-
- rich text
-
-
-
-
-
-
-
-
- switch
-
-
-
-
-
-
-
-
- table
-
-
-
-
-
-
-
-
- tabs
-
-
-
-
-
-
-
-
- text
-
-
-
-
-
\ No newline at end of file
diff --git a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.json b/app/client/src/assets/icons/fonts/widgets/Widget-Icons.json
deleted file mode 100644
index dade769980..0000000000
--- a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "alert": "\\f101",
- "button": "\\f102",
- "checkbox": "\\f103",
- "collapse": "\\f104",
- "datepicker": "\\f105",
- "dropdown": "\\f106",
- "file upload": "\\f107",
- "image": "\\f108",
- "input": "\\f109",
- "location picker": "\\f10a",
- "modal": "\\f10b",
- "radio": "\\f10c",
- "rich text": "\\f10d",
- "switch": "\\f10e",
- "table": "\\f10f",
- "tabs": "\\f110",
- "text": "\\f111"
-}
\ No newline at end of file
diff --git a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.svg b/app/client/src/assets/icons/fonts/widgets/Widget-Icons.svg
deleted file mode 100644
index 187bf9baba..0000000000
--- a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
diff --git a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.ttf b/app/client/src/assets/icons/fonts/widgets/Widget-Icons.ttf
deleted file mode 100644
index 4fac804718..0000000000
Binary files a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.ttf and /dev/null differ
diff --git a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.woff b/app/client/src/assets/icons/fonts/widgets/Widget-Icons.woff
deleted file mode 100644
index c435a73a8a..0000000000
Binary files a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.woff and /dev/null differ
diff --git a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.woff2 b/app/client/src/assets/icons/fonts/widgets/Widget-Icons.woff2
deleted file mode 100644
index d6b88fa2f3..0000000000
Binary files a/app/client/src/assets/icons/fonts/widgets/Widget-Icons.woff2 and /dev/null differ
diff --git a/app/client/src/assets/icons/widgets/alert.svg b/app/client/src/assets/icons/widget/alert.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/alert.svg
rename to app/client/src/assets/icons/widget/alert.svg
diff --git a/app/client/src/assets/icons/widgets/button.svg b/app/client/src/assets/icons/widget/button.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/button.svg
rename to app/client/src/assets/icons/widget/button.svg
diff --git a/app/client/src/assets/icons/widgets/checkbox.svg b/app/client/src/assets/icons/widget/checkbox.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/checkbox.svg
rename to app/client/src/assets/icons/widget/checkbox.svg
diff --git a/app/client/src/assets/icons/widgets/collapse.svg b/app/client/src/assets/icons/widget/collapse.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/collapse.svg
rename to app/client/src/assets/icons/widget/collapse.svg
diff --git a/app/client/src/assets/icons/widget/container.svg b/app/client/src/assets/icons/widget/container.svg
new file mode 100644
index 0000000000..ed7bd00a1f
--- /dev/null
+++ b/app/client/src/assets/icons/widget/container.svg
@@ -0,0 +1,3 @@
+
diff --git a/app/client/src/assets/icons/widgets/datepicker.svg b/app/client/src/assets/icons/widget/datepicker.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/datepicker.svg
rename to app/client/src/assets/icons/widget/datepicker.svg
diff --git a/app/client/src/assets/icons/widgets/dropdown.svg b/app/client/src/assets/icons/widget/dropdown.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/dropdown.svg
rename to app/client/src/assets/icons/widget/dropdown.svg
diff --git a/app/client/src/assets/icons/widgets/file upload.svg b/app/client/src/assets/icons/widget/file upload.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/file upload.svg
rename to app/client/src/assets/icons/widget/file upload.svg
diff --git a/app/client/src/assets/icons/widget/file-upload.svg b/app/client/src/assets/icons/widget/file-upload.svg
new file mode 100644
index 0000000000..3339c43747
--- /dev/null
+++ b/app/client/src/assets/icons/widget/file-upload.svg
@@ -0,0 +1,3 @@
+
diff --git a/app/client/src/assets/icons/widgets/image.svg b/app/client/src/assets/icons/widget/image.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/image.svg
rename to app/client/src/assets/icons/widget/image.svg
diff --git a/app/client/src/assets/icons/widgets/input.svg b/app/client/src/assets/icons/widget/input.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/input.svg
rename to app/client/src/assets/icons/widget/input.svg
diff --git a/app/client/src/assets/icons/widgets/location picker.svg b/app/client/src/assets/icons/widget/location picker.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/location picker.svg
rename to app/client/src/assets/icons/widget/location picker.svg
diff --git a/app/client/src/assets/icons/widget/location-picker.svg b/app/client/src/assets/icons/widget/location-picker.svg
new file mode 100644
index 0000000000..254038ecd5
--- /dev/null
+++ b/app/client/src/assets/icons/widget/location-picker.svg
@@ -0,0 +1,3 @@
+
diff --git a/app/client/src/assets/icons/widgets/modal.svg b/app/client/src/assets/icons/widget/modal.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/modal.svg
rename to app/client/src/assets/icons/widget/modal.svg
diff --git a/app/client/src/assets/icons/widget/plus.svg b/app/client/src/assets/icons/widget/plus.svg
new file mode 100644
index 0000000000..fc1aa5b1f1
--- /dev/null
+++ b/app/client/src/assets/icons/widget/plus.svg
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/app/client/src/assets/icons/widgets/radio.svg b/app/client/src/assets/icons/widget/radio.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/radio.svg
rename to app/client/src/assets/icons/widget/radio.svg
diff --git a/app/client/src/assets/icons/widgets/rich text.svg b/app/client/src/assets/icons/widget/rich text.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/rich text.svg
rename to app/client/src/assets/icons/widget/rich text.svg
diff --git a/app/client/src/assets/icons/widget/rich-text.svg b/app/client/src/assets/icons/widget/rich-text.svg
new file mode 100644
index 0000000000..99149884a5
--- /dev/null
+++ b/app/client/src/assets/icons/widget/rich-text.svg
@@ -0,0 +1,8 @@
+
diff --git a/app/client/src/assets/icons/widgets/switch.svg b/app/client/src/assets/icons/widget/switch.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/switch.svg
rename to app/client/src/assets/icons/widget/switch.svg
diff --git a/app/client/src/assets/icons/widgets/table.svg b/app/client/src/assets/icons/widget/table.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/table.svg
rename to app/client/src/assets/icons/widget/table.svg
diff --git a/app/client/src/assets/icons/widgets/tabs.svg b/app/client/src/assets/icons/widget/tabs.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/tabs.svg
rename to app/client/src/assets/icons/widget/tabs.svg
diff --git a/app/client/src/assets/icons/widgets/text.svg b/app/client/src/assets/icons/widget/text.svg
similarity index 100%
rename from app/client/src/assets/icons/widgets/text.svg
rename to app/client/src/assets/icons/widget/text.svg
diff --git a/app/client/src/editorComponents/ContainerComponent.tsx b/app/client/src/editorComponents/ContainerComponent.tsx
index e07fe36629..7c2d901b27 100644
--- a/app/client/src/editorComponents/ContainerComponent.tsx
+++ b/app/client/src/editorComponents/ContainerComponent.tsx
@@ -1,9 +1,6 @@
import { ComponentProps } from "./BaseComponent";
import { ContainerOrientation } from "../constants/WidgetConstants";
import styled from "../constants/DefaultTheme";
-import { useDrop } from "react-dnd";
-import { WidgetTypes } from "../constants/WidgetConstants";
-import { DraggableWidget } from "../widgets/BaseWidget";
import React from "react";
export const Container = styled("div")`
@@ -28,21 +25,7 @@ export const Container = styled("div")`
}};
`;
const ContainerComponent = (props: ContainerProps) => {
- const addWidgetFn = props.addWidget;
- const [, drop] = useDrop({
- accept: Object.values(WidgetTypes),
- drop(item: DraggableWidget, monitor) {
- if (addWidgetFn && monitor.isOver({ shallow: true })) {
- addWidgetFn(item.type);
- }
- return undefined;
- },
- });
- return (
-
- {props.children}
-
- );
+ return {props.children};
};
export interface ContainerProps extends ComponentProps {
diff --git a/app/client/src/editorComponents/InputGroupComponent.tsx b/app/client/src/editorComponents/InputGroupComponent.tsx
deleted file mode 100644
index 3e366ff7c8..0000000000
--- a/app/client/src/editorComponents/InputGroupComponent.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import * as React from "react";
-import { ComponentProps } from "./BaseComponent";
-import { IconName, InputGroup, Intent } from "@blueprintjs/core";
-import { Container } from "./ContainerComponent";
-class InputGroupComponent extends React.Component {
- render() {
- return (
-
-
-
- );
- }
-}
-
-export interface InputGroupComponentProps extends ComponentProps {
- className?: string;
- disabled?: boolean;
- large?: boolean;
- intent?: Intent;
- defaultValue?: string;
- leftIcon?: IconName;
- rightElement?: JSX.Element;
- round?: boolean;
- small?: boolean;
- type?: string;
- value?: string;
- placeholder?: string;
-}
-
-export default InputGroupComponent;
diff --git a/app/client/src/index.tsx b/app/client/src/index.tsx
index d0833ce93c..75ab6ae070 100755
--- a/app/client/src/index.tsx
+++ b/app/client/src/index.tsx
@@ -17,6 +17,7 @@ import { rootSaga } from "./sagas";
import { DndProvider } from "react-dnd";
import HTML5Backend from "react-dnd-html5-backend";
import { appInitializer } from "./utils/AppsmithUtils";
+import ProtectedRoute from "./pages/common/ProtectedRoute";
appInitializer();
WidgetBuilderRegistry.registerWidgetBuilders();
@@ -30,7 +31,7 @@ ReactDOM.render(
-
+
diff --git a/app/client/src/mockResponses/WidgetCardsPaneResponse.tsx b/app/client/src/mockResponses/WidgetCardsPaneResponse.tsx
index 1c49a36f12..4433ab11f7 100644
--- a/app/client/src/mockResponses/WidgetCardsPaneResponse.tsx
+++ b/app/client/src/mockResponses/WidgetCardsPaneResponse.tsx
@@ -1,51 +1,108 @@
import { WidgetCardsPaneReduxState } from "../reducers/uiReducers/widgetCardsPaneReducer";
+import { generateReactKey } from "../utils/generators";
const WidgetCardsPaneResponse: WidgetCardsPaneReduxState = {
cards: {
common: [
{
widgetType: "TEXT_WIDGET",
- icon: "icon-text",
- label: "Container",
+ icon: "icon-plus",
+ label: "Text",
+ key: generateReactKey(),
},
{
- widgetType: "CHECKBOX_WIDGET",
- icon: "icon-checkbox",
- label: "Container",
- },
- {
- widgetType: "RADIO_GROUP_WIDGET",
- icon: "icon-radio",
- label: "Container",
+ widgetType: "IMAGE_WIDGET",
+ icon: "icon-image",
+ label: "Image",
+ key: generateReactKey(),
},
{
widgetType: "BUTTON_WIDGET",
icon: "icon-button",
label: "Button",
+ key: generateReactKey(),
},
{
widgetType: "SPINNER_WIDGET",
icon: "icon-switch",
label: "Spinner",
+ key: generateReactKey(),
},
{
widgetType: "CONTAINER_WIDGET",
- icon: "icon-modal",
+ icon: "icon-container",
label: "Container",
+ key: generateReactKey(),
},
],
form: [
{
widgetType: "BUTTON_WIDGET",
- icon: "appsmith-widget-button",
+ icon: "icon-button",
label: "Button",
+ key: generateReactKey(),
+ },
+ {
+ widgetType: "BUTTON_WIDGET",
+ icon: "icon-button",
+ label: "Button",
+ key: generateReactKey(),
+ },
+ {
+ widgetType: "DROP_DOWN_WIDGET",
+ icon: "icon-dropdown",
+ label: "Dropdown",
+ key: generateReactKey(),
+ },
+ {
+ widgetType: "DATE_PICKER_WIDGET",
+ icon: "icon-datepicker",
+ label: "DatePicker",
+ key: generateReactKey(),
+ },
+ {
+ widgetType: "RADIO_GROUP_WIDGET",
+ icon: "icon-radio",
+ label: "Radio Button",
+ key: generateReactKey(),
+ },
+ {
+ widgetType: "SWITCH_WIDGET",
+ icon: "icon-switch",
+ label: "Toggle",
+ key: generateReactKey(),
},
],
view: [
{
- widgetType: "BUTTON_WIDGET",
- icon: "appsmith-widget-button",
- label: "Button",
+ widgetType: "TEXT_WIDGET",
+ icon: "icon-text",
+ label: "Text",
+ key: generateReactKey(),
+ },
+ {
+ widgetType: "IMAGE_WIDGET",
+ icon: "icon-image",
+ label: "Image",
+ key: generateReactKey(),
+ },
+ {
+ widgetType: "CONTAINER_WIDGET",
+ icon: "icon-container",
+ label: "Container",
+ key: generateReactKey(),
+ },
+ {
+ widgetType: "SPINNER_WIDGET",
+ icon: "icon-spinner",
+ label: "Spinner",
+ key: generateReactKey(),
+ },
+ {
+ widgetType: "TABLE_WIDGET",
+ icon: "icon-table",
+ label: "Table",
+ key: generateReactKey(),
},
],
},
diff --git a/app/client/src/pages/Editor/Canvas.tsx b/app/client/src/pages/Editor/Canvas.tsx
index 94844bdc4d..679a2e4375 100644
--- a/app/client/src/pages/Editor/Canvas.tsx
+++ b/app/client/src/pages/Editor/Canvas.tsx
@@ -1,46 +1,16 @@
-import React, { MutableRefObject, useLayoutEffect } from "react";
+import React from "react";
import styled from "styled-components";
import WidgetFactory from "../../utils/WidgetFactory";
import { WidgetTypes, RenderModes } from "../../constants/WidgetConstants";
-import { DraggableWidget, WidgetFunctions } from "../../widgets/BaseWidget";
+import { WidgetFunctions } from "../../widgets/BaseWidget";
import { useDrop } from "react-dnd";
import { ContainerWidgetProps } from "../../widgets/ContainerWidget";
-import EditorDragLayer from "./EditorDragLayer";
-const ArtBoardBackgroundMask = styled.div`
- position: absolute;
- left: 0;
- right: 0;
- bottom: 0;
- top: 0;
- z-index: -10;
-`;
-
-const ArtBoard = styled.div`
+const ArtBoard = styled.div`
width: 100%;
height: 100%;
position: relative;
overflow: auto;
- background: linear-gradient(
- 90deg,
- transparent,
- transparent 1px,
- #ffffff 1px,
- #ffffff 63px,
- transparent 63px,
- transparent 100%
- ),
- linear-gradient(
- transparent,
- transparent 1px,
- #ffffff 1px,
- #ffffff 63px,
- transparent 63px,
- transparent 100%
- ),
- black;
- background-size: 64px 64px;
- background-position: 0 0;
`;
interface CanvasProps {
@@ -49,36 +19,14 @@ interface CanvasProps {
widgetFunctions: WidgetFunctions;
}
-interface ArtBoardProps {
- cellSize: string;
-}
-
const Canvas = (props: CanvasProps) => {
- const [width, setWidth] = React.useState(1);
- const artBoardMask: MutableRefObject = React.useRef(
- null,
- );
const [, drop] = useDrop({
accept: Object.values(WidgetTypes),
- drop(item: DraggableWidget) {
- props.addWidget(item.type, item.key);
- return undefined;
- },
});
- useLayoutEffect(() => {
- const el = artBoardMask.current;
- if (el) {
- const rect = el.getBoundingClientRect();
- setWidth(rect.width);
- }
- }, [setWidth]);
-
return (
-
-
-
+
{props.pageWidget &&
WidgetFactory.createWidget(
props.pageWidget,
diff --git a/app/client/src/pages/Editor/WidgetCardsPane.tsx b/app/client/src/pages/Editor/WidgetCardsPane.tsx
index cb1849a273..6e7652af77 100644
--- a/app/client/src/pages/Editor/WidgetCardsPane.tsx
+++ b/app/client/src/pages/Editor/WidgetCardsPane.tsx
@@ -35,7 +35,7 @@ const WidgetCardsPane: React.SFC = (
{group}
{props.cards[group].map((card: WidgetCardProps) => (
-
+
))}
diff --git a/app/client/src/pages/Editor/index.tsx b/app/client/src/pages/Editor/index.tsx
index 603f4ccd58..e901451e90 100644
--- a/app/client/src/pages/Editor/index.tsx
+++ b/app/client/src/pages/Editor/index.tsx
@@ -7,14 +7,12 @@ import { AppState } from "../../reducers";
import { EditorReduxState } from "../../reducers/uiReducers/editorReducer";
import WidgetCardsPane from "./WidgetCardsPane";
import EditorHeader from "./EditorHeader";
-import { WidgetType } from "../../constants/WidgetConstants";
import CanvasWidgetsNormalizer from "../../normalizers/CanvasWidgetsNormalizer";
import { ContainerWidgetProps } from "../../widgets/ContainerWidget";
import { fetchPage, addWidget } from "../../actions/pageActions";
import { executeAction } from "../../actions/widgetActions";
import { RenderModes } from "../../constants/WidgetConstants";
import { ActionPayload } from "../../constants/ActionConstants";
-// import EditorDragLayer from "./EditorDragLayer"
const CanvasContainer = styled.section`
height: 100%;
@@ -59,23 +57,7 @@ class Editor extends Component {
this.props.fetchCanvasWidgets("1");
}
- addWidgetToCanvas = (widgetType: WidgetType, key: string): void => {
- this.props.addPageWidget("1", {
- key: key,
- bottomRow: 9,
- leftColumn: 1,
- parentColumnSpace: 90,
- parentRowSpace: 50,
- renderMode: RenderModes.CANVAS,
- rightColumn: 3,
- snapColumns: 20,
- snapRows: 20,
- children: [],
- topRow: 1,
- widgetId: key,
- widgetType: widgetType,
- });
- };
+ addWidgetToCanvas = (): void => {};
public render() {
return (
diff --git a/app/client/src/pages/common/ProtectedRoute.tsx b/app/client/src/pages/common/ProtectedRoute.tsx
index bae9ea0f8d..f35dcfcc1f 100644
--- a/app/client/src/pages/common/ProtectedRoute.tsx
+++ b/app/client/src/pages/common/ProtectedRoute.tsx
@@ -11,7 +11,6 @@ const ProtectedRoute = ({
path: string;
component: React.ReactType;
}) => {
- // let windowDoc: any = window
return (
=3.5 <5", lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@^4.2.0, lodash@~4.17.10:
+"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@^4.2.0, lodash@~4.17.10:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -7151,9 +7279,9 @@ log-update@^2.3.0:
wrap-ansi "^3.0.1"
loglevel@^1.4.1:
- version "1.6.3"
- resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.3.tgz#77f2eb64be55a404c9fd04ad16d57c1d6d6b1280"
- integrity sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==
+ version "1.6.4"
+ resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.4.tgz#f408f4f006db8354d0577dcf6d33485b3cb90d56"
+ integrity sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==
loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
version "1.4.0"
@@ -7335,9 +7463,9 @@ merge-stream@^2.0.0:
integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
merge2@^1.2.3:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.4.tgz#c9269589e6885a60cf80605d9522d4b67ca646e3"
- integrity sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
+ integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
methods@~1.1.2:
version "1.1.2"
@@ -7349,6 +7477,11 @@ micro-api-client@^3.2.1:
resolved "https://registry.yarnpkg.com/micro-api-client/-/micro-api-client-3.3.0.tgz#52dd567d322f10faffe63d19d4feeac4e4ffd215"
integrity sha512-y0y6CUB9RLVsy3kfgayU28746QrNMpSm9O/AYGNsBgOkJr/X/Jk0VLGoO8Ude7Bpa8adywzF+MzXNZRFRsNPhg==
+microbuffer@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/microbuffer/-/microbuffer-1.0.0.tgz#8b3832ed40c87d51f47bb234913a698a756d19d2"
+ integrity sha1-izgy7UDIfVH0e7I0kTppinVtGdI=
+
microevent.ts@~0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0"
@@ -7411,7 +7544,7 @@ mime@1.6.0:
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-mime@^2.4.2, mime@^2.4.4:
+mime@^2.4.4:
version "2.4.4"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
@@ -7477,17 +7610,17 @@ minimist@~0.0.1:
integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
minipass@^2.2.1, minipass@^2.3.5:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.5.0.tgz#dddb1d001976978158a05badfcbef4a771612857"
- integrity sha512-9FwMVYhn6ERvMR8XFdOavRz4QK/VJV8elU1x50vYexf9lslDcWe/f4HBRxCPd185ekRSjU6CfYyJCECa/CQy7Q==
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.6.0.tgz#80a68c8a43257b7f744ce09733f6a9c6eef9f731"
+ integrity sha512-OuNZ0OHrrI+jswzmgivYBZ+fAAGHZA4293d5q0z631/I9QSw3yumKB92njxHIHiB1eAdGRsE+3CcOPkoEyV5FQ==
dependencies:
safe-buffer "^5.1.2"
yallist "^3.0.0"
minizlib@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
- integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.2.tgz#6f0ccc82fa53e1bf2ff145f220d2da9fa6e3a166"
+ integrity sha512-hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ==
dependencies:
minipass "^2.2.1"
@@ -7585,15 +7718,15 @@ mute-stream@0.0.7:
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
-nan@^2.12.1, nan@^2.13.2:
+nan@^2.1.0, nan@^2.12.1, nan@^2.13.2:
version "2.14.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
nanoid@^2.0.4:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.0.4.tgz#4889355c9ce8e24efad7c65945a4a2875ac3e8f4"
- integrity sha512-sOJnBmY3TJQBVIBqKHoifuwygrocXg3NjS9rZSMnVl05XWSHK7Qxb177AIZQyMDjP86bz+yneozj/h9qsPLcCA==
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.1.tgz#524fd4acd45c126e0c87cd43ab5ee8346e695df9"
+ integrity sha512-0YbJdaL4JFoejIOoawgLcYValFGJ2iyUuVDIWL3g8Es87SSOWFbWdRUMV3VMSiyPs3SQ3QxCIxFX00q5DLkMCw==
nanomatch@^1.2.9:
version "1.2.13"
@@ -7617,6 +7750,13 @@ natural-compare@^1.4.0:
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+neatequal@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/neatequal/-/neatequal-1.0.0.tgz#2ee1211bc9fa6e4c55715fd210bb05602eb1ae3b"
+ integrity sha1-LuEhG8n6bkxVcV/SELsFYC6xrjs=
+ dependencies:
+ varstream "^0.3.2"
+
needle@^2.2.1:
version "2.4.0"
resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
@@ -7658,12 +7798,12 @@ no-case@^2.2.0:
dependencies:
lower-case "^1.1.1"
-node-forge@0.7.5:
- version "0.7.5"
- resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
- integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
+node-forge@0.8.2:
+ version "0.8.2"
+ resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.8.2.tgz#b4bcc59fb12ce77a8825fc6a783dfe3182499c5a"
+ integrity sha512-mXQ9GBq1N3uDCyV1pdSzgIguwgtVpM7f5/5J4ipz12PKWElmPpVWLDuWl8iXmhysr21+WmX/OJ5UKx82wjomgg==
-node-gyp@^3.8.0:
+node-gyp@^3.0.3, node-gyp@^3.8.0:
version "3.8.0"
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
@@ -7748,9 +7888,9 @@ node-pre-gyp@^0.12.0:
tar "^4"
node-releases@^1.1.25, node-releases@^1.1.29:
- version "1.1.29"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.29.tgz#86a57c6587a30ecd6726449e5d293466b0a0bb86"
- integrity sha512-R5bDhzh6I+tpi/9i2hrrvGJ3yKPYzlVOORDkXhnZuwi5D3q1I5w4vYy24PJXTcLk9Q0kws9TO77T75bcK8/ysQ==
+ version "1.1.30"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.30.tgz#35eebf129c63baeb6d8ddeda3c35b05abfd37f7f"
+ integrity sha512-BHcr1g6NeUH12IL+X3Flvs4IOnl1TL0JczUhEZjDE+FXXPQcVCNr8NEPb01zqGxzhTpdyJL5GXemaCW7aw6Khw==
dependencies:
semver "^5.3.0"
@@ -7917,6 +8057,11 @@ object-hash@^1.1.4:
resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
+object-inspect@^1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
+ integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
+
object-is@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
@@ -8231,17 +8376,17 @@ p-try@^2.0.0:
resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-pako@~1.0.5:
+pako@^1.0.0, pako@~1.0.5:
version "1.0.10"
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
parallel-transform@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
- integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+ integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
dependencies:
- cyclist "~0.2.2"
+ cyclist "^1.0.1"
inherits "^2.0.3"
readable-stream "^2.1.5"
@@ -8523,9 +8668,9 @@ popper.js@^1.14.4, popper.js@^1.15.0:
integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==
portfinder@^1.0.9:
- version "1.0.23"
- resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.23.tgz#894db4bcc5daf02b6614517ce89cd21a38226b82"
- integrity sha512-B729mL/uLklxtxuiJKfQ84WPxNw5a7Yhx3geQZdcA4GjNjZSTSSMMWyoennMVnTWSmAR0lMdzWYN0JLnHrg1KQ==
+ version "1.0.24"
+ resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.24.tgz#11efbc6865f12f37624b6531ead1d809ed965cfa"
+ integrity sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==
dependencies:
async "^1.5.2"
debug "^2.2.0"
@@ -9188,9 +9333,9 @@ postcss@7.0.14:
supports-color "^6.1.0"
postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.5, postcss@^7.0.6:
- version "7.0.17"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
- integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
+ version "7.0.18"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"
+ integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==
dependencies:
chalk "^2.4.2"
source-map "^0.6.1"
@@ -9249,6 +9394,11 @@ private@^0.1.6:
resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
+process-nextick-args@~1.0.6:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+ integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
+
process-nextick-args@~2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -9322,9 +9472,9 @@ pseudomap@^1.0.2:
integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
psl@^1.1.24, psl@^1.1.28:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/psl/-/psl-1.3.0.tgz#e1ebf6a3b5564fa8376f3da2275da76d875ca1bd"
- integrity sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/psl/-/psl-1.4.0.tgz#5dd26156cdb69fa1fdb8ab1991667d3f80ced7c2"
+ integrity sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==
public-encrypt@^4.0.0:
version "4.0.3"
@@ -9467,7 +9617,7 @@ react-app-polyfill@^1.0.2:
regenerator-runtime "0.13.3"
whatwg-fetch "3.0.0"
-react-day-picker@^7.3.0:
+react-day-picker@^7.3.2:
version "7.3.2"
resolved "https://registry.yarnpkg.com/react-day-picker/-/react-day-picker-7.3.2.tgz#b9b9b0000ba53b2c9df9bccb79664862aba6b60a"
integrity sha512-mij2j2Un/v2V2ow+hf/hFBMdl6Eis/C/YhBtlI6Xpbvh3Q6WMix78zEkCdw6i9GldafOrpnupWKofv/h5oSI4g==
@@ -9750,7 +9900,7 @@ read-pkg@^5.1.1:
parse-json "^5.0.0"
type-fest "^0.6.0"
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
version "2.3.6"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -9763,6 +9913,16 @@ read-pkg@^5.1.1:
string_decoder "~1.1.1"
util-deprecate "~1.0.1"
+readable-stream@^1.0.33:
+ version "1.1.14"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+ integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+ dependencies:
+ core-util-is "~1.0.0"
+ inherits "~2.0.1"
+ isarray "0.0.1"
+ string_decoder "~0.10.x"
+
readable-stream@^3.0.6, readable-stream@^3.1.1:
version "3.4.0"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
@@ -9772,6 +9932,18 @@ readable-stream@^3.0.6, readable-stream@^3.1.1:
string_decoder "^1.1.1"
util-deprecate "^1.0.1"
+readable-stream@~2.0.4:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
+ integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
+ dependencies:
+ core-util-is "~1.0.0"
+ inherits "~2.0.1"
+ isarray "~1.0.0"
+ process-nextick-args "~1.0.6"
+ string_decoder "~0.10.x"
+ util-deprecate "~1.0.1"
+
readdirp@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -9877,7 +10049,7 @@ regex-parser@2.2.10:
resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.10.tgz#9e66a8f73d89a107616e63b39d4deddfee912b37"
integrity sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==
-regexp-tree@^0.1.6:
+regexp-tree@^0.1.13:
version "0.1.13"
resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.13.tgz#5b19ab9377edc68bc3679256840bb29afc158d7f"
integrity sha512-hwdV/GQY5F8ReLZWO+W1SRoN5YfpOKY6852+tBFcma72DKBIcHjPRIlIvQN35bCOljuAfP2G2iB0FC/w236mUw==
@@ -9895,9 +10067,9 @@ regexpp@^2.0.1:
integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
regexpu-core@^4.5.4:
- version "4.5.5"
- resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.5.tgz#aaffe61c2af58269b3e516b61a73790376326411"
- integrity sha512-FpI67+ky9J+cDizQUJlIlNZFKual/lUkFr1AG6zOCpwZ9cLrg8UUVakyUQJD7fCDIe9Z2nwTQJNPyonatNmDFQ==
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
+ integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
dependencies:
regenerate "^1.4.0"
regenerate-unicode-properties "^8.1.0"
@@ -10040,10 +10212,10 @@ resolve-from@^4.0.0:
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-resolve-pathname@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
- integrity sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==
+resolve-pathname@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
+ integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
resolve-url-loader@3.1.0:
version "3.1.0"
@@ -10252,19 +10424,19 @@ rollup-pluginutils@2.6.0:
micromatch "^3.1.10"
rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1:
- version "2.8.1"
- resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz#8fa6dd0697344938ef26c2c09d2488ce9e33ce97"
- integrity sha512-J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg==
+ version "2.8.2"
+ resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
+ integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
dependencies:
estree-walker "^0.6.1"
rollup@^1.12.0:
- version "1.20.3"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.20.3.tgz#6243f6c118ca05f56b2d9433112400cd834a1eb8"
- integrity sha512-/OMCkY0c6E8tleeVm4vQVDz24CkVgvueK3r8zTYu2AQNpjrcaPwO9hE+pWj5LTFrvvkaxt4MYIp2zha4y0lRvg==
+ version "1.21.4"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.21.4.tgz#00a41a30f90095db890301b226cbe2918e4cf54d"
+ integrity sha512-Pl512XVCmVzgcBz5h/3Li4oTaoDcmpuFZ+kdhS/wLreALz//WuDAMfomD3QEYl84NkDu6Z6wV9twlcREb4qQsw==
dependencies:
"@types/estree" "0.0.39"
- "@types/node" "^12.7.2"
+ "@types/node" "^12.7.5"
acorn "^7.0.0"
rsvp@^4.8.4:
@@ -10297,9 +10469,9 @@ run-queue@^1.0.0, run-queue@^1.0.3:
aproba "^1.1.1"
rxjs@^6.3.3, rxjs@^6.4.0:
- version "6.5.2"
- resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
- integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+ version "6.5.3"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
+ integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
dependencies:
tslib "^1.9.0"
@@ -10368,7 +10540,7 @@ sass-loader@7.2.0:
pify "^4.0.1"
semver "^5.5.0"
-sax@^1.2.4, sax@~1.2.4:
+sax@^1.1.5, sax@^1.2.4, sax@~1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -10398,12 +10570,12 @@ schema-utils@^1.0.0:
ajv-keywords "^3.1.0"
schema-utils@^2.0.0, schema-utils@^2.0.1:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.1.0.tgz#940363b6b1ec407800a22951bdcc23363c039393"
- integrity sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.2.0.tgz#48a065ce219e0cacf4631473159037b2c1ae82da"
+ integrity sha512-5EwsCNhfFTZvUreQhx/4vVQpJ/lnCAkgoIHLhSpp4ZirE+4hzFvdJi0FMub6hxbFVBJYSpeVVmon+2e7uEGRrA==
dependencies:
- ajv "^6.1.0"
- ajv-keywords "^3.1.0"
+ ajv "^6.10.2"
+ ajv-keywords "^3.4.1"
scss-tokenizer@^0.2.3:
version "0.2.3"
@@ -10419,11 +10591,11 @@ select-hose@^2.0.0:
integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
selfsigned@^1.9.1:
- version "1.10.4"
- resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
- integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
+ version "1.10.6"
+ resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.6.tgz#7b3cd37ed9c2034261a173af1a1aae27d8169b67"
+ integrity sha512-i3+CeqxL7DpAazgVpAGdKMwHuL63B5nhJMh9NQ7xmChGkA3jNFflq6Jyo1LLJYcr3idWiNOPWHCrm4zMayLG4w==
dependencies:
- node-forge "0.7.5"
+ node-forge "0.8.2"
semver-compare@^1.0.0:
version "1.0.0"
@@ -10470,9 +10642,9 @@ send@0.17.1:
statuses "~1.5.0"
serialize-javascript@^1.6.1, serialize-javascript@^1.7.0:
- version "1.9.0"
- resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.0.tgz#5b77019d7c3b85fe91b33ae424c53dcbfb6618bd"
- integrity sha512-UkGlcYMtw4d9w7YfCtJFgdRTps8N4L0A48R+SmcGL57ki1+yHwJXnalk5bjgrw+ljv6SfzjzPjhohod2qllg/Q==
+ version "1.9.1"
+ resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
+ integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==
serve-index@^1.7.2:
version "1.9.1"
@@ -10920,6 +11092,32 @@ string-width@^3.0.0, string-width@^3.1.0:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^5.1.0"
+string.fromcodepoint@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz#8d978333c0bc92538f50f383e4888f3e5619d653"
+ integrity sha1-jZeDM8C8klOPUPOD5IiPPlYZ1lM=
+
+string.prototype.codepointat@^0.2.0:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc"
+ integrity sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==
+
+string.prototype.trimleft@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
+ integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==
+ dependencies:
+ define-properties "^1.1.3"
+ function-bind "^1.1.1"
+
+string.prototype.trimright@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
+ integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==
+ dependencies:
+ define-properties "^1.1.3"
+ function-bind "^1.1.1"
+
string_decoder@^1.0.0, string_decoder@^1.1.1:
version "1.3.0"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -10927,6 +11125,11 @@ string_decoder@^1.0.0, string_decoder@^1.1.1:
dependencies:
safe-buffer "~5.2.0"
+string_decoder@~0.10.x:
+ version "0.10.31"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+ integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
string_decoder@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -11081,6 +11284,38 @@ svg-parser@^2.0.0:
resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.2.tgz#d134cc396fa2681dc64f518330784e98bd801ec8"
integrity sha512-1gtApepKFweigFZj3sGO8KT8LvVZK8io146EzXrpVuWCDAbISz/yMucco3hWTkpZNoPabM+dnMOpy6Swue68Zg==
+svg-pathdata@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-1.0.4.tgz#7a681342aac7effd8d52afba7999910c9da3b959"
+ integrity sha1-emgTQqrH7/2NUq+6eZmRDJ2juVk=
+ dependencies:
+ readable-stream "~2.0.4"
+
+svg2ttf@^4.0.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/svg2ttf/-/svg2ttf-4.3.0.tgz#433440c7e9062f8fdcec3cad721cd08a2c7e51e3"
+ integrity sha512-LZ0B7zzHWLWbzLzwaKGHQvPOuxCXLReIb3LSxFSGUy1gMw2Utk6KGNbTmbmRL6Rk1qDSmTixnDrQgnXaL9n0CA==
+ dependencies:
+ argparse "^1.0.6"
+ cubic2quad "^1.0.0"
+ lodash "^4.17.10"
+ microbuffer "^1.0.0"
+ svgpath "^2.1.5"
+ xmldom "~0.1.22"
+
+svgicons2svgfont@^5.0.0:
+ version "5.0.2"
+ resolved "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-5.0.2.tgz#0511823c6491be1a7d543292e29a8ae627ad0406"
+ integrity sha1-BRGCPGSRvhp9VDKS4pqK5ietBAY=
+ dependencies:
+ commander "^2.9.0"
+ neatequal "^1.0.0"
+ readable-stream "^2.0.4"
+ sax "^1.1.5"
+ string.fromcodepoint "^0.2.1"
+ string.prototype.codepointat "^0.2.0"
+ svg-pathdata "^1.0.4"
+
svgo@^1.0.0, svgo@^1.2.2:
version "1.3.0"
resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.0.tgz#bae51ba95ded9a33a36b7c46ce9c359ae9154313"
@@ -11100,6 +11335,11 @@ svgo@^1.0.0, svgo@^1.2.2:
unquote "~1.1.1"
util.promisify "~1.0.0"
+svgpath@^2.1.5:
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/svgpath/-/svgpath-2.2.2.tgz#1c70d44e27f7b6bd42a74ed3c960be93e411def3"
+ integrity sha512-7cXFbkZvPkZpKLC+3QIfyUd3/Un/CvJONjTD3Gz5qLuEa73StPOt8kZjTi9apxO6zwCaza0bPNnmzTyrQ4qQlw==
+
symbol-observable@^1.0.2, symbol-observable@^1.1.0, symbol-observable@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
@@ -11172,9 +11412,9 @@ terser@^3.14.1:
source-map-support "~0.5.10"
terser@^4.1.2:
- version "4.2.1"
- resolved "https://registry.yarnpkg.com/terser/-/terser-4.2.1.tgz#1052cfe17576c66e7bc70fcc7119f22b155bdac1"
- integrity sha512-cGbc5utAcX4a9+2GGVX4DsenG6v0x3glnDi5hx8816X1McEAwPlPgRtXPJzSBsbpILxZ8MQMT0KvArLuE0HP5A==
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.1.tgz#09820bcb3398299c4b48d9a86aefc65127d0ed65"
+ integrity sha512-pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg==
dependencies:
commander "^2.20.0"
source-map "~0.6.1"
@@ -11348,14 +11588,15 @@ trim-right@^1.0.1:
glob "^7.1.2"
ts-jest@^24.0.2:
- version "24.0.2"
- resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.2.tgz#8dde6cece97c31c03e80e474c749753ffd27194d"
- integrity sha512-h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw==
+ version "24.1.0"
+ resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.1.0.tgz#2eaa813271a2987b7e6c3fefbda196301c131734"
+ integrity sha512-HEGfrIEAZKfu1pkaxB9au17b1d9b56YZSqz5eCVE8mX68+5reOvlM93xGOzzCREIov9mdH7JBG+s0UyNAqr0tQ==
dependencies:
bs-logger "0.x"
buffer-from "1.x"
fast-json-stable-stringify "2.x"
json5 "2.x"
+ lodash.memoize "4.x"
make-error "1.x"
mkdirp "0.x"
resolve "1.x"
@@ -11363,9 +11604,9 @@ ts-jest@^24.0.2:
yargs-parser "10.x"
ts-loader@^6.0.4:
- version "6.0.4"
- resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.0.4.tgz#bc331ad91a887a60632d94c9f79448666f2c4b63"
- integrity sha512-p2zJYe7OtwR+49kv4gs7v4dMrfYD1IPpOtqiSPCbe8oR+4zEBtdHwzM7A7M91F+suReqgzZrlClk4LRSSp882g==
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.1.0.tgz#999cb0a7644f9c7c6c0901802dce50ceb0a76e5b"
+ integrity sha512-7JedeOu2rsYHQDEr2fwmMozABwbQTZXEaEMZPSIWG7gpzRefOLJCqwdazcegHtyaxp04PeEgs/b0m08WMpnIzQ==
dependencies:
chalk "^2.3.0"
enhanced-resolve "^4.0.0"
@@ -11436,13 +11677,40 @@ tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
-tsutils@^3.14.0, tsutils@^3.7.0:
+tsutils@^3.17.1, tsutils@^3.7.0:
version "3.17.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==
dependencies:
tslib "^1.8.1"
+ttf2eot@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-2.0.0.tgz#8e6337a585abd1608a0c84958ab483ce69f6654b"
+ integrity sha1-jmM3pYWr0WCKDISVirSDzmn2ZUs=
+ dependencies:
+ argparse "^1.0.6"
+ microbuffer "^1.0.0"
+
+ttf2woff2@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/ttf2woff2/-/ttf2woff2-2.0.3.tgz#5e020afe6e643287f3ad7687abed20fe654eb329"
+ integrity sha1-XgIK/m5kMofzrXaHq+0g/mVOsyk=
+ dependencies:
+ bindings "^1.2.1"
+ bufferstreams "^1.1.0"
+ nan "^2.1.0"
+ node-gyp "^3.0.3"
+
+ttf2woff@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/ttf2woff/-/ttf2woff-2.0.1.tgz#871832240024b09db9570904c7c1928b8057c969"
+ integrity sha1-hxgyJAAksJ25VwkEx8GSi4BXyWk=
+ dependencies:
+ argparse "^1.0.6"
+ microbuffer "^1.0.0"
+ pako "^1.0.0"
+
tty-browserify@0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -11515,9 +11783,9 @@ typescript-tuple@^2.1.0:
typescript-compare "^0.0.2"
typescript@^3.2.4, typescript@^3.4.5:
- version "3.6.2"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.2.tgz#105b0f1934119dde543ac8eb71af3a91009efe54"
- integrity sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==
+ version "3.6.3"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da"
+ integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==
uglify-js@3.4.x:
version "3.4.10"
@@ -11535,6 +11803,11 @@ uglify-js@^3.1.4:
commander "~2.20.0"
source-map "~0.6.1"
+underscore@^1.7.0:
+ version "1.9.1"
+ resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
+ integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
+
unicode-canonical-property-names-ecmascript@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -11616,9 +11889,9 @@ unset-value@^1.0.0:
isobject "^3.0.0"
upath@^1.1.1:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
- integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+ integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
upper-case@^1.1.1:
version "1.1.3"
@@ -11637,6 +11910,11 @@ urix@^0.1.0:
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+url-join@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/url-join/-/url-join-1.1.0.tgz#741c6c2f4596c4830d6718460920d0c92202dc78"
+ integrity sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg=
+
url-loader@2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz#bcc1ecabbd197e913eca23f5e0378e24b4412961"
@@ -11722,10 +12000,17 @@ validate-npm-package-license@^3.0.1:
spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0"
-value-equal@^0.4.0:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"
- integrity sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==
+value-equal@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
+ integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
+
+varstream@^0.3.2:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/varstream/-/varstream-0.3.2.tgz#18ac6494765f3ff1a35ad9a4be053bec188a5de1"
+ integrity sha1-GKxklHZfP/GjWtmkvgU77BiKXeE=
+ dependencies:
+ readable-stream "^1.0.33"
vary@~1.1.2:
version "1.1.2"
@@ -11804,18 +12089,35 @@ wcwidth@^1.0.1:
dependencies:
defaults "^1.0.3"
+webfonts-generator@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/webfonts-generator/-/webfonts-generator-0.4.0.tgz#5f89fc81c7160e6e0cbbc9b7387e42a5851fda46"
+ integrity sha1-X4n8gccWDm4Mu8m3OH5CpYUf2kY=
+ dependencies:
+ handlebars "^4.0.5"
+ mkdirp "^0.5.0"
+ q "^1.1.2"
+ svg2ttf "^4.0.0"
+ svgicons2svgfont "^5.0.0"
+ ttf2eot "^2.0.0"
+ ttf2woff "^2.0.1"
+ ttf2woff2 "^2.0.3"
+ underscore "^1.7.0"
+ url-join "^1.1.0"
+
webidl-conversions@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
webpack-dev-middleware@^3.5.1:
- version "3.7.0"
- resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"
- integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==
+ version "3.7.1"
+ resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.1.tgz#1167aea02afa034489869b8368fe9fed1aea7d09"
+ integrity sha512-5MWu9SH1z3hY7oHOV6Kbkz5x7hXbxK56mGHNqHTe6d+ewxOwKUxoUJBs7QIaJb33lPjl9bJZ3X0vCoooUzC36A==
dependencies:
memory-fs "^0.4.1"
- mime "^2.4.2"
+ mime "^2.4.4"
+ mkdirp "^0.5.1"
range-parser "^1.2.1"
webpack-log "^2.0.0"
@@ -11910,9 +12212,9 @@ webpack@4.39.1:
webpack-sources "^1.4.1"
webpack@^4.28.4:
- version "4.39.3"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.39.3.tgz#a02179d1032156b713b6ec2da7e0df9d037def50"
- integrity sha512-BXSI9M211JyCVc3JxHWDpze85CvjC842EvpRsVTc/d15YJGlox7GIDd38kJgWrb3ZluyvIjgenbLDMBQPDcxYQ==
+ version "4.40.2"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.40.2.tgz#d21433d250f900bf0facbabe8f50d585b2dc30a7"
+ integrity sha512-5nIvteTDCUws2DVvP9Qe+JPla7kWPPIDFZv55To7IycHWZ+Z5qBdaBYPyuXWdhggTufZkQwfIK+5rKQTVovm2A==
dependencies:
"@webassemblyjs/ast" "1.8.5"
"@webassemblyjs/helper-module-context" "1.8.5"
@@ -12236,9 +12538,14 @@ xml-name-validator@^3.0.0:
integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
xmlchars@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.1.1.tgz#ef1a81c05bff629c2280007f12daca21bd6f6c93"
- integrity sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w==
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+ integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+
+xmldom@~0.1.22:
+ version "0.1.27"
+ resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
+ integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
xregexp@4.0.0:
version "4.0.0"