Skip to content

Commit

Permalink
Merge pull request #562 from sebgroup/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
mario-subo authored Mar 31, 2021
2 parents fa14d51 + a2f384f commit 79c30ad
Show file tree
Hide file tree
Showing 19 changed files with 24 additions and 22 deletions.
6 changes: 4 additions & 2 deletions lib/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ const defaults = {
external: [...Object.keys(pkg.peerDependencies || {}), ...Object.keys(pkg.dependencies || {}), ...Object.keys(commonPkg.dependencies || {})],
};

const resolveOnly = [new RegExp(`^((?!${defaults.external.map((item) => `(${item})`).join("|")}).)*$`, "g")];

export default [
{
...defaults,
Expand All @@ -32,7 +34,7 @@ export default [
},
],
}),
resolve(),
resolve({ resolveOnly }),
commonjs(),
],
output: {
Expand Down Expand Up @@ -61,7 +63,7 @@ export default [
],
}),
typescript({ compilerOptions: { declarationDir: "dist/esm", outDir: "dist/esm" } }),
resolve(),
resolve({ resolveOnly }),
commonjs(),
],
output: {
Expand Down
2 changes: 1 addition & 1 deletion lib/src/Accordion/Accordion.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";
import classnames from "classnames";
import { AccordionItemProps } from "./AccordionItem";
import "./accordion.scss";
Expand Down
2 changes: 1 addition & 1 deletion lib/src/Accordion/AccordionItem.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { Collapse } from "../Collapse/Collapse";
import classnames from "classnames";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";

export type AccordionItemProps = JSX.IntrinsicElements["div"] & {
/** The header of the accordion item */
Expand Down
2 changes: 1 addition & 1 deletion lib/src/Carousel/Carousel.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import classnames from "classnames";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";
import { CarouselItemProps, AfterSlideEvent } from "./CarouselItem";
import { CarouselIndicators } from "./CarouselIndicators";
import { CarouselNavs } from "./CarouselNavs";
Expand Down
2 changes: 1 addition & 1 deletion lib/src/Carousel/CarouselIndicators.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import { act } from "react-dom/test-utils";
import { unmountComponentAtNode, render } from "react-dom";
import { CarouselIndicators } from "./CarouselIndicators";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";

describe("Component: Carousel", () => {
let container: HTMLDivElement = null;
Expand Down
2 changes: 1 addition & 1 deletion lib/src/Carousel/CarouselNavs.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import { act, Simulate } from "react-dom/test-utils";
import { unmountComponentAtNode, render } from "react-dom";
import { CarouselNavs, CarouselNavsProps } from "./CarouselNavs";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";

describe("Component: Carousel", () => {
let container: HTMLDivElement = null;
Expand Down
2 changes: 1 addition & 1 deletion lib/src/Checkbox/Checkbox.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";
import classnames from "classnames";
import { FeedbackIndicator, Indicator } from "../FeedbackIndicator/FeedbackIndicator";
import "./checkbox.scss";
Expand Down
2 changes: 1 addition & 1 deletion lib/src/Dropdown/CustomDropdownItem.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";
import classnames from "classnames";

export type CustomDropdownItemProps = JSX.IntrinsicElements["input"] & {
Expand Down
4 changes: 2 additions & 2 deletions lib/src/Dropdown/Dropdown.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from "react";
import { createPortal } from "react-dom";
import classnames from "classnames";
import { useCombinedRefs } from "../hooks";
import { useCombinedRefs } from "../hooks/useCombinedRef";
import { CloseButton } from "../CloseButton";
import { CustomDropdownItem } from "./CustomDropdownItem";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";
import "./dropdown.scss";

export interface DropdownText {
Expand Down
2 changes: 1 addition & 1 deletion lib/src/RadioButton/RadioButton.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import classnames from "classnames";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";
import { FeedbackIndicator, Indicator } from "../FeedbackIndicator";
import "./radio-button.scss";

Expand Down
2 changes: 1 addition & 1 deletion lib/src/Stepper/Stepper.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import classnames from "classnames";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";
import { FeedbackIndicator, Indicator } from "../FeedbackIndicator";
import "./stepper.scss";

Expand Down
2 changes: 1 addition & 1 deletion lib/src/Table/parts/TableRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Checkbox } from "../../Checkbox";
import { TableContext } from "../TableContextProvider";
import { TableHeaderCell, TableHeaderCellProps } from "./TableHeaderCell";
import { TableCell, TableCellProps } from "./TableCell";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";

export type TableRowProps<T = any> = JSX.IntrinsicElements["tr"] & {
checked?: boolean;
Expand Down
2 changes: 1 addition & 1 deletion lib/src/Textarea/Textarea.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";
import classnames from "classnames";
import { FeedbackIndicator, Indicator } from "../FeedbackIndicator";
import "./textarea.scss";
Expand Down
2 changes: 1 addition & 1 deletion lib/src/Textbox/Textbox.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";
import classnames from "classnames";
import { FeedbackIndicator, Indicator } from "../FeedbackIndicator";
import "./textbox.scss";
Expand Down
2 changes: 1 addition & 1 deletion lib/src/Toggle/Toggle.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";
import classnames from "classnames";
import "./toggle.scss";

Expand Down
2 changes: 1 addition & 1 deletion lib/src/ToggleSelector/ToggleSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import classnames from "classnames";
import { ToggleSelectorItemProps } from "./ToggleSelectorItem";
import { FeedbackIndicator, Indicator } from "../FeedbackIndicator";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";
import "./toggle-selector.scss";

interface ToggleSelectorSingleProps {
Expand Down
2 changes: 1 addition & 1 deletion lib/src/ToggleSelector/ToggleSelectorItem.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import classnames from "classnames";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";
import "./toggle-selector-item.scss";

export type ToggleSelectorItemProps = JSX.IntrinsicElements["input"] & {
Expand Down
4 changes: 2 additions & 2 deletions lib/src/Tooltip/Tooltip.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Children } from "react";
import React from "react";
import { ElementPosition } from "./placement";
import { randomId } from "@sebgroup/frontend-tools";
import { randomId } from "@sebgroup/frontend-tools/randomId";
import { Overlay } from "./Overlay";
import classnames from "classnames";
import "./tooltip.scss";
Expand Down
2 changes: 1 addition & 1 deletion lib/src/hooks/useDynamicForm.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, ReactNode, useMemo, useCallback } from "react";
import React, { useState, ReactNode, useCallback } from "react";
import classnames from "classnames";

import { Checkbox } from "../Checkbox";
Expand Down

0 comments on commit 79c30ad

Please sign in to comment.