Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@tarsisexistence
tarsisexistence committed Jun 4, 2022
2 parents 3abd9e5 + 1e3d885 commit 00d3831
Show file tree
Hide file tree
Showing 8 changed files with 109 additions and 88 deletions.
12 changes: 6 additions & 6 deletions cli/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@
"@rollup/plugin-image": "2.1.1",
"@rollup/plugin-json": "4.1.0",
"@rollup/plugin-node-resolve": "13.3.0",
"@rollup/plugin-url": "6.1.0",
"@rollup/plugin-url": "7.0.0",
"@typescript-eslint/eslint-plugin": "5.27.0",
"@typescript-eslint/parser": "5.27.0",
"autoprefixer": "10.4.7",
"babel-jest": "27.5.1",
"colorette": "2.0.16",
"cssnano": "5.1.10",
"colorette": "2.0.17",
"cssnano": "5.1.11",
"enquirer": "2.3.6",
"eslint": "8.16.0",
"eslint": "8.17.0",
"eslint-config-prettier": "8.5.0",
"eslint-config-react-app": "6.0.0",
"eslint-import-resolver-typescript": "2.7.1",
Expand Down Expand Up @@ -89,12 +89,12 @@
"shelljs": "0.8.5",
"ts-jest": "27.1.5",
"tslib": "2.4.0",
"typescript": "4.7.2"
"typescript": "4.7.3"
},
"devDependencies": {
"@types/eslint": "8.4.2",
"@types/fs-extra": "9.0.13",
"@types/jest": "27.5.1",
"@types/jest": "27.5.2",
"@types/node": "16.11.38",
"@types/ramda": "0.28.12",
"@types/react": "17.0.45",
Expand Down
2 changes: 1 addition & 1 deletion cli/templates/add/playground/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"@types/react": "17.0.45",
"@types/react-dom": "17.0.17",
"parcel": "2.6.0",
"typescript": "4.7.2"
"typescript": "4.7.3"
}
}
4 changes: 2 additions & 2 deletions example-app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@tarsis/datepicker": "*",
"classnames": "2.3.1",
"dayjs": "1.11.2",
"grommet": "2.23.0",
"grommet": "2.24.0",
"grommet-icons": "4.7.0",
"lodash.times": "4.3.2",
"react": "17.0.2",
Expand Down Expand Up @@ -64,7 +64,7 @@
"stylelint": "14.8.5",
"stylelint-config-recommended": "7.0.0",
"tslib": "2.4.0",
"typescript": "4.7.2",
"typescript": "4.7.3",
"yarn": "1.22.18"
},
"browserslist": {
Expand Down
2 changes: 1 addition & 1 deletion example-app/packages/datepicker/playground/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"@types/react": "17.0.45",
"@types/react-dom": "17.0.17",
"parcel": "2.6.0",
"typescript": "4.7.2"
"typescript": "4.7.3"
}
}
8 changes: 4 additions & 4 deletions example-app/packages/datepicker/playground/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1604,10 +1604,10 @@ type-fest@^0.20.2:
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==

[email protected].2:
version "4.7.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4"
integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==
[email protected].3:
version "4.7.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==

utility-types@^3.10.0:
version "3.10.0"
Expand Down
91 changes: 52 additions & 39 deletions example-app/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2559,12 +2559,12 @@
"@rollup/pluginutils" "^3.1.0"
magic-string "^0.25.7"

"@rollup/plugin-url@6.1.0":
version "6.1.0"
resolved "https://registry.yarnpkg.com/@rollup/plugin-url/-/plugin-url-6.1.0.tgz#1234bba9aa30b5972050bdfcf8fcbb1cb8070465"
integrity sha512-FJNWBnBB7nLzbcaGmu1no+U/LlRR67TtgfRFP+VEKSrWlDTE6n9jMns/N4Q/VL6l4x6kTHQX4HQfwTcldaAfHQ==
"@rollup/plugin-url@7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@rollup/plugin-url/-/plugin-url-7.0.0.tgz#571f6fd51c3d0e00f7404c67efdb93492bfac7f8"
integrity sha512-cIWcEObrmEPAU8q8NluGWlCPlQDuoSKvkyI3eOFO4fx6W02mLNj4ZEiUT0X2mKMIvQzoWL1feEK9d1yr1ICgrw==
dependencies:
"@rollup/pluginutils" "^3.1.0"
"@rollup/pluginutils" "^4.2.1"
make-dir "^3.1.0"
mime "^2.4.6"

Expand All @@ -2585,6 +2585,14 @@
estree-walker "^2.0.1"
picomatch "^2.2.2"

"@rollup/pluginutils@^4.2.1":
version "4.2.1"
resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d"
integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==
dependencies:
estree-walker "^2.0.1"
picomatch "^2.2.2"

"@rushstack/eslint-patch@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.0.tgz#7f698254aadf921e48dda8c0a6b304026b8a9323"
Expand Down Expand Up @@ -2995,10 +3003,10 @@
dependencies:
"@types/istanbul-lib-report" "*"

"@types/[email protected].1":
version "27.5.1"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.5.1.tgz#2c8b6dc6ff85c33bcd07d0b62cb3d19ddfdb3ab9"
integrity sha512-fUy7YRpT+rHXto1YlL+J9rs0uLGyiqVt3ZOTQR+4ROc47yNl8WLdVLgUloBRhOxP1PZvguHl44T3H0wAWxahYQ==
"@types/[email protected].2":
version "27.5.2"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.5.2.tgz#ec49d29d926500ffb9fd22b84262e862049c026c"
integrity sha512-mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA==
dependencies:
jest-matcher-utils "^27.0.0"
pretty-format "^27.0.0"
Expand Down Expand Up @@ -5306,7 +5314,12 @@ colord@^2.9.1, colord@^2.9.2:
resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1"
integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==

[email protected], colorette@^2.0.10, colorette@^2.0.16:
[email protected]:
version "2.0.17"
resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.17.tgz#5dd4c0d15e2984b7433cb4a9f2ead45063b80c47"
integrity sha512-hJo+3Bkn0NCHybn9Tu35fIeoOKGOk5OCC32y4Hz2It+qlCO2Q3DeQ1hRn/tDDMQKRYUEzqsl7jbF6dYKjlE60g==

colorette@^2.0.10, colorette@^2.0.16:
version "2.0.16"
resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
Expand Down Expand Up @@ -5826,10 +5839,10 @@ cssnano-preset-default@^5.1.10:
postcss-svgo "^5.0.3"
postcss-unique-selectors "^5.0.2"

cssnano-preset-default@^5.2.10:
version "5.2.10"
resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.10.tgz#6dfffe6cc3b13f3bb356a42c49a334a98700ef45"
integrity sha512-H8TJRhTjBKVOPltp9vr9El9I+IfYsOMhmXdK0LwdvwJcxYX9oWkY7ctacWusgPWAgQq1vt/WO8v+uqpfLnM7QA==
cssnano-preset-default@^5.2.11:
version "5.2.11"
resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.11.tgz#28350471bc1af9df14052472b61340347f453a53"
integrity sha512-4PadR1NtuaIK8MvLNuY7MznK4WJteldGlzCiMaaTiOUP+apeiIvUDIXykzUOoqgOOUAHrU64ncdD90NfZR3LSQ==
dependencies:
css-declaration-sorter "^6.2.2"
cssnano-utils "^3.1.0"
Expand All @@ -5855,7 +5868,7 @@ cssnano-preset-default@^5.2.10:
postcss-normalize-unicode "^5.1.0"
postcss-normalize-url "^5.1.0"
postcss-normalize-whitespace "^5.1.1"
postcss-ordered-values "^5.1.1"
postcss-ordered-values "^5.1.2"
postcss-reduce-initial "^5.1.0"
postcss-reduce-transforms "^5.1.0"
postcss-svgo "^5.1.0"
Expand All @@ -5871,12 +5884,12 @@ cssnano-utils@^3.1.0:
resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861"
integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==

[email protected].10:
version "5.1.10"
resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.10.tgz#fc6ddd9a4d7d238f320634326ed814cf0abf6e1c"
integrity sha512-ACpnRgDg4m6CZD/+8SgnLcGCgy6DDGdkMbOawwdvVxNietTNLe/MtWcenp6qT0PRt5wzhGl6/cjMWCdhKXC9QA==
[email protected].11:
version "5.1.11"
resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.11.tgz#3bb003380718c7948ce3813493370e8946caf04b"
integrity sha512-2nx+O6LvewPo5EBtYrKc8762mMkZRk9cMGIOP4UlkmxHm7ObxH+zvsJJ+qLwPkUc4/yumL/qJkavYi9NlodWIQ==
dependencies:
cssnano-preset-default "^5.2.10"
cssnano-preset-default "^5.2.11"
lilconfig "^2.0.3"
yaml "^1.10.2"

Expand Down Expand Up @@ -7061,10 +7074,10 @@ eslint-webpack-plugin@^3.1.1:
normalize-path "^3.0.0"
schema-utils "^3.1.1"

eslint@8.16.0:
version "8.16.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.16.0.tgz#6d936e2d524599f2a86c708483b4c372c5d3bbae"
integrity sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==
eslint@8.17.0:
version "8.17.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.17.0.tgz#1cfc4b6b6912f77d24b874ca1506b0fe09328c21"
integrity sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==
dependencies:
"@eslint/eslintrc" "^1.3.0"
"@humanwhocodes/config-array" "^0.9.2"
Expand Down Expand Up @@ -8220,10 +8233,10 @@ grommet-styles@^0.2.0:
resolved "https://registry.yarnpkg.com/grommet-styles/-/grommet-styles-0.2.0.tgz#b2eac2b7e2747cb523434d21728ce5234f8ce4f4"
integrity sha512-0OMSYuGeyifYKpg4Gv2HzL8rUdd0ddnJ5LbCBKgDuloC71XIwr9g/Fxa6rs737MbPV7OZ4pEm4wvrjH4epzf1A==

grommet@2.23.0:
version "2.23.0"
resolved "https://registry.yarnpkg.com/grommet/-/grommet-2.23.0.tgz#f80e1bbd2130bd9fc11bb9765390b59767ff3692"
integrity sha512-1iA7W/u2Q4+B/2I5ri2PV9PPdxkthgK3rVDtw6xIeAkO0DKa9DCr6zTnuXAPNnm8dZJDzO8Du0d04UQYmaK26Q==
grommet@2.24.0:
version "2.24.0"
resolved "https://registry.yarnpkg.com/grommet/-/grommet-2.24.0.tgz#402c198ddf25f1b898cfcb866b690472c3145a5f"
integrity sha512-MsIQyT6TtbO1Bp0BXE48pQytU+6LhDfIUp1/IjPEiqdbxVtvdwL6Ti6mIjAgzssqRt+EGCcDR3eB0uBxSOiqzA==
dependencies:
grommet-icons "^4.7.0"
hoist-non-react-statics "^3.2.0"
Expand Down Expand Up @@ -12662,10 +12675,10 @@ postcss-ordered-values@^5.0.3:
cssnano-utils "^3.0.0"
postcss-value-parser "^4.2.0"

postcss-ordered-values@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz#0b41b610ba02906a3341e92cab01ff8ebc598adb"
integrity sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw==
postcss-ordered-values@^5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.2.tgz#daffacd4abf327d52d5ac570b59dfbcf4b836614"
integrity sha512-wr2avRbW4HS2XE2ZCqpfp4N/tDC6GZKZ+SVP8UBTOVS8QWrc4TD8MYrebJrvVVlGPKszmiSCzue43NDiVtgDmg==
dependencies:
cssnano-utils "^3.1.0"
postcss-value-parser "^4.2.0"
Expand Down Expand Up @@ -14227,9 +14240,9 @@ semver-compare@^1.0.0:
integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=

semver-regex@^3.1.2:
version "3.1.3"
resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz#b2bcc6f97f63269f286994e297e229b6245d0dc3"
integrity sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ==
version "3.1.4"
resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.4.tgz#13053c0d4aa11d070a2f2872b6b1e3ae1e1971b4"
integrity sha512-6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA==

"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
version "5.7.1"
Expand Down Expand Up @@ -15636,10 +15649,10 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

[email protected].2:
version "4.7.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4"
integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==
[email protected].3:
version "4.7.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==

unbox-primitive@^1.0.1:
version "1.0.1"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"devDependencies": {
"@typescript-eslint/eslint-plugin": "5.27.0",
"@typescript-eslint/parser": "5.27.0",
"eslint": "8.16.0",
"eslint": "8.17.0",
"eslint-config-prettier": "8.5.0",
"eslint-config-react-app": "6.0.0",
"eslint-plugin-prettier": "4.0.0",
Expand Down
Loading

0 comments on commit 00d3831

Please sign in to comment.