Skip to content

Commit

Permalink
Merge branch 'master' into eslint_config_react_plugin_7.26.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@kodiakhq
kodiakhq[bot] committed Sep 23, 2021
2 parents ec6f58e + bfa6b64 commit dc1b785
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 22 deletions.
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"babel-loader": "^8.2.2",
"eslint": "^7.32.0",
"flow-bin": "^0.160.1",
"glob": "^7.1.7",
"glob": "^7.2.0",
"jest": "^27.2.1",
"jest-runner-eslint": "^0.10.1"
"jest-runner-eslint": "^0.11.1"
},
"jest": {
"testRegex": "/scripts/jest/dontRunJestDirectly\\.js$"
Expand Down
2 changes: 1 addition & 1 deletion src/babel-plugin-transform-sx-tailwind/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@babel/types": "^7.15.6",
"find-cache-dir": "^3.3.2",
"object-hash": "^2.2.0",
"postcss": "^8.3.6",
"postcss": "^8.3.7",
"tailwindcss": "^2.2.15"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/monorepo-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@adeira/js": "^2.1.0",
"@babel/register": "^7.15.3",
"@babel/runtime": "^7.15.4",
"glob": "^7.1.7",
"glob": "^7.2.0",
"is-ci": "^3.0.0"
}
}
2 changes: 1 addition & 1 deletion src/sx-tailwind-website/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"flow-bin": "^0.160.1",
"next-plugin-custom-babel-config": "^1.0.5",
"next-transpile-modules": "^8.0.0",
"postcss": "^8.3.6",
"postcss": "^8.3.7",
"tailwindcss": "^2.2.15"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/sx-tailwind/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@babel/runtime": "^7.15.4",
"change-case": "^4.1.2",
"fast-levenshtein": "^3.0.0",
"postcss": "^8.3.6",
"postcss": "^8.3.7",
"tailwindcss": "^2.2.15"
},
"peerDependencies": {
Expand Down
50 changes: 34 additions & 16 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8040,7 +8040,7 @@ dot-case@^3.0.4:
no-case "^3.0.4"
tslib "^2.0.3"

dot-prop@^5.2.0:
dot-prop@^5.2.0, dot-prop@^5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
Expand Down Expand Up @@ -9772,7 +9772,7 @@ glob-to-regexp@^0.4.1:
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==

glob@7.1.7, glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
glob@7.1.7:
version "7.1.7"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
Expand All @@ -9784,6 +9784,18 @@ glob@7.1.7, glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glo
once "^1.3.0"
path-is-absolute "^1.0.0"

glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
inherits "2"
minimatch "^3.0.4"
once "^1.3.0"
path-is-absolute "^1.0.0"

global-dirs@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686"
Expand Down Expand Up @@ -11759,14 +11771,15 @@ jest-resolve@^27.2.0:
resolve "^1.20.0"
slash "^3.0.0"

jest-runner-eslint@^0.10.1:
version "0.10.1"
resolved "https://registry.yarnpkg.com/jest-runner-eslint/-/jest-runner-eslint-0.10.1.tgz#f76eacb51154736d53d64eb195cc8a82f02caf12"
integrity sha512-3HiDDWwJfXksVUkpDIHphwPkXYtaKFCBjufTz3aR4b6WqSl31WECmTGFqhkfWzQdEACShO6WkKjBj/gSfgLsqQ==
jest-runner-eslint@^0.11.1:
version "0.11.1"
resolved "https://registry.yarnpkg.com/jest-runner-eslint/-/jest-runner-eslint-0.11.1.tgz#390de1e96e700b70d94971ca6ef905160047715d"
integrity sha512-317QEVLQw/NuuNVcR7LN/7pIbA3GbFUPKencJt31BdC/A2pVWBT+8d8PBBrQpsMHENbPV8nkNgLdPYBp2hLVZw==
dependencies:
chalk "^3.0.0"
cosmiconfig "^6.0.0"
create-jest-runner "^0.6.0"
dot-prop "^5.3.0"

jest-runner@^27.2.1:
version "27.2.1"
Expand Down Expand Up @@ -13123,10 +13136,15 @@ nan@^2.12.1:
resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==

nanoid@^3.1.23:
version "3.1.23"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
nanocolors@^0.1.5:
version "0.1.6"
resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.6.tgz#bc2350d3edfdbfadd7ac018c855ae7c13905a6ad"
integrity sha512-2pvTw6vYRaBLGir2xR7MxaJtyWkrn+C53EpW8yPotG+pdAwBvt0Xwk4VJ6VHLY0aLthVZPvDfm9TdZvrvAm5UQ==

nanoid@^3.1.23, nanoid@^3.1.25:
version "3.1.25"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==

nanomatch@^1.2.9:
version "1.2.13"
Expand Down Expand Up @@ -14612,13 +14630,13 @@ postcss@^7.0.14, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.36, postcss@^7.0
source-map "^0.6.1"
supports-color "^6.1.0"

postcss@^8.1.6, postcss@^8.2.1, postcss@^8.2.15, postcss@^8.2.4, postcss@^8.2.6, postcss@^8.2.9, postcss@^8.3.6:
version "8.3.6"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea"
integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==
postcss@^8.1.6, postcss@^8.2.1, postcss@^8.2.15, postcss@^8.2.4, postcss@^8.2.6, postcss@^8.2.9, postcss@^8.3.7:
version "8.3.7"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.7.tgz#ec88563588c8da8e58e7226f7633b51ae221eeda"
integrity sha512-9SaY7nnyQ63/WittqZYAvkkYPyKxchMKH71UDzeTmWuLSvxTRpeEeABZAzlCi55cuGcoFyoV/amX2BdsafQidQ==
dependencies:
colorette "^1.2.2"
nanoid "^3.1.23"
nanocolors "^0.1.5"
nanoid "^3.1.25"
source-map-js "^0.6.2"

prelude-ls@^1.2.1:
Expand Down

0 comments on commit dc1b785

Please sign in to comment.