Skip to content

Commit c9df748

Browse files
csandmancsandman
authored
Merge pull request #195 from csandman/package-upgrades
Package Upgrades
2 parents ce0ded5 + 34a9cf4 commit c9df748

File tree

12 files changed

+2261
-1907
lines changed

12 files changed

+2261
-1907
lines changed

‎.eslintrc‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
"browser": true,
66
"node": true
77
},
8-
"globals": {
9-
"cy": true,
10-
"Cypress": true
11-
},
128
"extends": [
139
"eslint:recommended",
1410
"plugin:react/recommended",
@@ -28,8 +24,9 @@
2824
},
2925
"project": "tsconfig.eslint.json"
3026
},
31-
"plugins": ["@typescript-eslint"],
27+
"plugins": ["deprecation", "@typescript-eslint"],
3228
"rules": {
29+
"deprecation/deprecation": "warn",
3330
"no-console": "error",
3431
"curly": ["error", "all"],
3532
"no-underscore-dangle": "off",
@@ -57,11 +54,5 @@
5754
"disallowTypeAnnotations": true
5855
}
5956
]
60-
},
61-
"overrides": [
62-
{
63-
"files": ["./cypress/**/*.ts"],
64-
"parserOptions": { "project": "./cypress/tsconfig.json" }
65-
}
66-
]
57+
}
6758
}

‎package-lock.json‎

Lines changed: 2167 additions & 1778 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
"bugs": {
1313
"url": "https://github.com/csandman/chakra-react-select/issues"
1414
},
15+
"exports": {
16+
".": {
17+
"import": "./dist/esm/index.js",
18+
"require": "./dist/cjs/index.js",
19+
"types": "./dist/types/index.d.ts",
20+
"default": "./dist/esm/index.js"
21+
}
22+
},
1523
"main": "dist/cjs/index.js",
1624
"module": "dist/esm/index.js",
1725
"files": [
@@ -52,47 +60,45 @@
5260
"react-dom": "^18.0.0"
5361
},
5462
"devDependencies": {
55-
"@babel/cli": "^7.18.9",
56-
"@babel/core": "^7.18.9",
63+
"@babel/cli": "^7.19.3",
64+
"@babel/core": "^7.19.3",
5765
"@babel/plugin-proposal-class-properties": "^7.18.6",
58-
"@babel/preset-env": "^7.18.9",
66+
"@babel/preset-env": "^7.19.3",
5967
"@babel/preset-react": "^7.18.6",
6068
"@babel/preset-typescript": "^7.18.6",
61-
"@chakra-ui/babel-plugin": "^1.0.4",
62-
"@chakra-ui/form-control": "^2.0.4",
63-
"@chakra-ui/icon": "^3.0.4",
64-
"@chakra-ui/layout": "^2.1.1",
65-
"@chakra-ui/menu": "^2.0.6",
66-
"@chakra-ui/spinner": "^2.0.4",
67-
"@chakra-ui/system": "^2.2.2",
68-
"@emotion/react": "^11.9.3",
69-
"@emotion/styled": "^11.9.3",
69+
"@chakra-ui/babel-plugin": "^1.0.8",
70+
"@chakra-ui/form-control": "^2.0.11",
71+
"@chakra-ui/icon": "^3.0.11",
72+
"@chakra-ui/layout": "^2.1.8",
73+
"@chakra-ui/menu": "^2.1.1",
74+
"@chakra-ui/spinner": "^2.0.10",
75+
"@chakra-ui/system": "^2.2.12",
76+
"@emotion/react": "^11.10.4",
77+
"@emotion/styled": "^11.10.4",
7078
"@trivago/prettier-plugin-sort-imports": "^3.3.0",
71-
"@types/react": "^18.0.15",
72-
"@types/react-codesandboxer": "^3.1.1",
73-
"@typescript-eslint/eslint-plugin": "^5.30.7",
74-
"@typescript-eslint/parser": "^5.30.7",
75-
"codesandboxer": "^1.0.3",
76-
"concurrently": "^7.3.0",
79+
"@types/react": "^18.0.21",
80+
"@typescript-eslint/eslint-plugin": "^5.39.0",
81+
"@typescript-eslint/parser": "^5.39.0",
82+
"concurrently": "^7.4.0",
7783
"cross-env": "^7.0.3",
78-
"eslint": "^8.20.0",
84+
"eslint": "^8.24.0",
7985
"eslint-config-airbnb": "^19.0.4",
8086
"eslint-config-airbnb-typescript": "^17.0.0",
8187
"eslint-config-prettier": "^8.5.0",
88+
"eslint-plugin-deprecation": "^1.3.2",
8289
"eslint-plugin-import": "^2.26.0",
83-
"eslint-plugin-jsx-a11y": "^6.6.0",
84-
"eslint-plugin-react": "^7.30.1",
90+
"eslint-plugin-jsx-a11y": "^6.6.1",
91+
"eslint-plugin-react": "^7.31.8",
8592
"eslint-plugin-react-hooks": "^4.6.0",
8693
"husky": "^8.0.1",
8794
"lint-staged": "^13.0.3",
88-
"nodemon": "^2.0.19",
95+
"nodemon": "^2.0.20",
8996
"prettier": "^2.7.1",
90-
"prettier-package-json": "^2.6.4",
97+
"prettier-package-json": "^2.7.0",
9198
"react": "^18.2.0",
92-
"react-codesandboxer": "^3.1.5",
9399
"react-dom": "^18.2.0",
94100
"rimraf": "^3.0.2",
95-
"typescript": "^4.7.4"
101+
"typescript": "^4.8.4"
96102
},
97103
"keywords": [
98104
"accessibility",
@@ -112,14 +118,6 @@
112118
"access": "public",
113119
"registry": "https://registry.npmjs.org/"
114120
},
115-
"exports": {
116-
".": {
117-
"import": "./dist/esm/index.js",
118-
"require": "./dist/cjs/index.js",
119-
"types": "./dist/types/index.d.ts",
120-
"default": "./dist/esm/index.js"
121-
}
122-
},
123121
"lint-staged": {
124122
"*.{js,jsx,ts,tsx}": "eslint --cache --fix",
125123
"*": "prettier --ignore-unknown --write",

‎src/chakra-components/containers.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import { Box } from "@chakra-ui/layout";
3-
import type { CSSObject } from "@chakra-ui/system";
3+
import type { SystemStyleObject } from "@chakra-ui/system";
44
import { useMultiStyleConfig } from "@chakra-ui/system";
55
import type {
66
ContainerProps,
@@ -27,7 +27,7 @@ export const SelectContainer = <
2727
selectProps: { chakraStyles },
2828
} = props;
2929

30-
const initialSx: CSSObject = {
30+
const initialSx: SystemStyleObject = {
3131
position: "relative",
3232
direction: isRtl ? "rtl" : undefined,
3333
...(isDisabled ? { cursor: "not-allowed" } : {}),
@@ -79,7 +79,7 @@ export const ValueContainer = <
7979
variant,
8080
});
8181

82-
const initialSx: CSSObject = {
82+
const initialSx: SystemStyleObject = {
8383
display: "flex",
8484
alignItems: "center",
8585
flex: 1,
@@ -128,7 +128,7 @@ export const IndicatorsContainer = <
128128
selectProps: { chakraStyles },
129129
} = props;
130130

131-
const initialSx: CSSObject = {
131+
const initialSx: SystemStyleObject = {
132132
display: "flex",
133133
alignItems: "center",
134134
alignSelf: "stretch",

‎src/chakra-components/control.tsx‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Icon } from "@chakra-ui/icon";
44
import { Box, Divider } from "@chakra-ui/layout";
55
import { Spinner } from "@chakra-ui/spinner";
66
import { useMultiStyleConfig, useStyleConfig } from "@chakra-ui/system";
7-
import type { CSSObject } from "@chakra-ui/system";
7+
import type { SystemStyleObject } from "@chakra-ui/system";
88
import type {
99
ClearIndicatorProps,
1010
ControlProps,
@@ -49,19 +49,13 @@ const Control = <
4949
variant,
5050
});
5151

52-
const heights: SizeProps = {
53-
sm: 8,
54-
md: 10,
55-
lg: 12,
56-
};
57-
58-
const initialSx: CSSObject = {
52+
const initialSx: SystemStyleObject = {
5953
...inputStyles.field,
6054
display: "flex",
6155
padding: 0,
6256
overflow: "hidden",
6357
height: "auto",
64-
minHeight: heights[size || "md"],
58+
minH: inputStyles.field.h,
6559
...(isDisabled ? { pointerEvents: "none" } : {}),
6660
};
6761

@@ -107,7 +101,7 @@ export const IndicatorSeparator = <
107101
selectProps: { chakraStyles, useBasicStyles, variant },
108102
} = props;
109103

110-
const initialSx: CSSObject = {
104+
const initialSx: SystemStyleObject = {
111105
opacity: 1,
112106
...(useBasicStyles || variant !== "outline" ? { display: "none" } : {}),
113107
};
@@ -173,7 +167,7 @@ export const DropdownIndicator = <
173167
};
174168
const iconSize = iconSizes[size || "md"];
175169

176-
const initialSx: CSSObject = {
170+
const initialSx: SystemStyleObject = {
177171
...inputStyles.addon,
178172
display: "flex",
179173
alignItems: "center",
@@ -199,7 +193,7 @@ export const DropdownIndicator = <
199193
height: "1em",
200194
width: "1em",
201195
};
202-
const iconSx: CSSObject = chakraStyles?.downChevron
196+
const iconSx: SystemStyleObject = chakraStyles?.downChevron
203197
? chakraStyles.downChevron(initialIconStyles, props)
204198
: initialIconStyles;
205199

@@ -253,7 +247,7 @@ export const ClearIndicator = <
253247
size,
254248
});
255249

256-
const initialSx: CSSObject = {
250+
const initialSx: SystemStyleObject = {
257251
...closeButtonStyles,
258252
marginX: 1,
259253
display: "flex",
@@ -266,11 +260,11 @@ export const ClearIndicator = <
266260
? chakraStyles.clearIndicator(initialSx, props)
267261
: initialSx;
268262

269-
const initialIconStyles: CSSObject = {
263+
const initialIconStyles: SystemStyleObject = {
270264
width: "1em",
271265
height: "1em",
272266
};
273-
const iconSx: CSSObject = chakraStyles?.crossIcon
267+
const iconSx: SystemStyleObject = chakraStyles?.crossIcon
274268
? chakraStyles.crossIcon(initialIconStyles, props)
275269
: initialIconStyles;
276270

@@ -320,7 +314,7 @@ export const LoadingIndicator = <
320314

321315
const spinnerSize = spinnerSizes[size || "md"];
322316

323-
const initialSx: CSSObject = { marginRight: 3 };
317+
const initialSx: SystemStyleObject = { marginRight: 3 };
324318

325319
const sx = chakraStyles?.loadingIndicator
326320
? chakraStyles.loadingIndicator(initialSx, props)

‎src/chakra-components/input.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import { Box } from "@chakra-ui/layout";
3-
import type { CSSObject } from "@chakra-ui/system";
3+
import type { SystemStyleObject } from "@chakra-ui/system";
44
import { chakra } from "@chakra-ui/system";
55
import type { GroupBase, InputProps } from "react-select";
66
import { cleanCommonProps } from "../utils";
@@ -21,7 +21,7 @@ const Input = <
2121
const { innerRef, isDisabled, isHidden, inputClassName, ...innerProps } =
2222
cleanCommonProps(props);
2323

24-
const spacingSx: CSSObject = {
24+
const spacingSx: SystemStyleObject = {
2525
gridArea: "1 / 2",
2626
font: "inherit",
2727
minW: "2px",
@@ -30,7 +30,7 @@ const Input = <
3030
outline: 0,
3131
};
3232

33-
const initialContainerSx: CSSObject = {
33+
const initialContainerSx: SystemStyleObject = {
3434
flex: "1 1 auto",
3535
display: "inline-grid",
3636
gridArea: "1 / 1 / 2 / 3",
@@ -50,7 +50,7 @@ const Input = <
5050
? chakraStyles.inputContainer(initialContainerSx, props)
5151
: initialContainerSx;
5252

53-
const initialInputSx: CSSObject = {
53+
const initialInputSx: SystemStyleObject = {
5454
label: "input",
5555
color: "inherit",
5656
background: 0,

0 commit comments

Comments
 (0)