Merge pull request #783 from openameba/revert/pr-322

Revert "Merge pull request #322 from openameba/renovate/major-linters"
openameba · Aug 23, 2023 · bb4cd26 · bb4cd26
2 parents fac8ab9 + 55e353c
commit bb4cd26
Show file tree

Hide file tree

Showing 13 changed files with 522 additions and 371 deletions.
diff --git a/package.json b/package.json
@@ -25,15 +25,15 @@
     "@commitlint/config-lerna-scopes": "^17.0.0",
     "@typescript-eslint/eslint-plugin": "6.4.1",
     "@typescript-eslint/parser": "6.4.1",
-    "eslint": "8.47.0",
+    "eslint": "7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-react": "7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.0",
     "is-ci": "^3.0.0",
     "lerna": "^6.0.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "3.0.2",
+    "prettier": "2.7.1",
     "textlint": "^13.0.0",
     "textlint-rule-preset-ameba": "openameba/textlint-rule-preset-ameba#v0.4.0",
     "typescript": "4.8.2",

diff --git a/packages/spindle-syntax-themes/package.json b/packages/spindle-syntax-themes/package.json
@@ -30,6 +30,6 @@
     "firebase-tools": "^12.0.0",
     "puppeteer": "^21.0.0",
     "stylelint": "^15.0.0",
-    "stylelint-config-standard": "^34.0.0"
+    "stylelint-config-standard": "^23.0.0"
   }
 }
diff --git a/packages/spindle-ui/package.json b/packages/spindle-ui/package.json
@@ -90,11 +90,11 @@
     "reg-suit": "^0.12.0",
     "scaffdog": "^3.0.0",
     "stylelint": "^15.0.0",
-    "stylelint-config-prettier": "^9.0.0",
-    "stylelint-config-standard": "^34.0.0",
-    "stylelint-order": "^6.0.0",
-    "stylelint-prettier": "^4.0.0",
-    "stylelint-selector-bem-pattern": "^3.0.0",
+    "stylelint-config-prettier": "^8.0.2",
+    "stylelint-config-standard": "^20.0.0",
+    "stylelint-order": "^4.1.0",
+    "stylelint-prettier": "^1.1.2",
+    "stylelint-selector-bem-pattern": "^2.1.0",
     "ts-jest": "29.1.1",
     "webpack": "^5.73.0"
   }

diff --git a/packages/spindle-ui/src/ButtonGroup/ButtonGroup.css b/packages/spindle-ui/src/ButtonGroup/ButtonGroup.css
@@ -47,10 +47,7 @@
   margin-top: 20px;
 }
 
-:is(
-    .spui-ButtonGroup--medium,
-    .spui-ButtonGroup--small
-  ).spui-ButtonGroup--column
+:is(.spui-ButtonGroup--medium, .spui-ButtonGroup--small).spui-ButtonGroup--column
   > .spui-SubtleButton:not(:first-child) {
   margin-top: 14px;
 }
diff --git a/packages/spindle-ui/src/Dialog/Dialog.css b/packages/spindle-ui/src/Dialog/Dialog.css
@@ -70,16 +70,13 @@ html.spui-Dialog--open {
  * - Safari does not support radius outline
 */
 .spui-Dialog :is(.spui-Button, .spui-LinkButton, .spui-SubtleButton):focus {
-  box-shadow:
-    0 0 0 1px var(--color-surface-primary),
+  box-shadow: 0 0 0 1px var(--color-surface-primary),
     0 0 0 3px var(--color-focus-clarity);
   outline: none;
 }
 
 .spui-Dialog
-  :is(.spui-Button, .spui-LinkButton, .spui-SubtleButton):focus:not(
-    :focus-visible
-  ) {
+  :is(.spui-Button, .spui-LinkButton, .spui-SubtleButton):focus:not(:focus-visible) {
   box-shadow: none;
 }
 

diff --git a/packages/spindle-ui/src/InlineNotification/InlineNotification.tsx b/packages/spindle-ui/src/InlineNotification/InlineNotification.tsx
@@ -85,8 +85,8 @@ const convertInternalChildProps = (
   const hasInternalChildProps = (
     props: OwnProps,
   ): props is InternalChildProps =>
-    ({}).hasOwnProperty.call(props, 'variant') ||
-    {}.hasOwnProperty.call(props, 'emphasis');
+    ({}.hasOwnProperty.call(props, 'variant') ||
+    {}.hasOwnProperty.call(props, 'emphasis'));
 
   if (hasInternalChildProps(props)) {
     const result = {

diff --git a/packages/spindle-ui/src/Modal/AppealModal.css b/packages/spindle-ui/src/Modal/AppealModal.css
@@ -23,9 +23,7 @@
 /* stylelint-disable plugin/selector-bem-pattern */
 /* NOTE: set no animations to the dialog-polyfill browsers for stability */
 .spui-AppealModal[open]:not(.spui-AppealModal--closing),
-.spui-AppealModal[open]:not(
-    .spui-AppealModal--closing
-  ).spui-AppealModal::backdrop {
+.spui-AppealModal[open]:not(.spui-AppealModal--closing).spui-AppealModal::backdrop {
   animation: 0.5s cubic-bezier(0, 0, 0, 1) spui-AppealModal-fade-in;
 }
 
@@ -36,9 +34,7 @@
 
 @media (prefers-reduced-motion: reduce) {
   .spui-AppealModal[open]:not(.spui-AppealModal--closing),
-  .spui-AppealModal[open]:not(
-      .spui-AppealModal--closing
-    ).spui-AppealModal::backdrop,
+  .spui-AppealModal[open]:not(.spui-AppealModal--closing).spui-AppealModal::backdrop,
   .spui-AppealModal--closing,
   .spui-AppealModal--closing.spui-AppealModal::backdrop {
     /* Do not remove this animation to detect animationend in JavaScript */
@@ -82,25 +78,14 @@ html.spui-AppealModal--open {
  * - Safari does not support radius outline
 */
 .spui-AppealModal
-  :is(
-    .spui-Button,
-    .spui-LinkButton,
-    .spui-IconButton,
-    .spui-SubtleButton
-  ):focus {
-  box-shadow:
-    0 0 0 1px var(--color-surface-secondary),
+  :is(.spui-Button, .spui-LinkButton, .spui-IconButton, .spui-SubtleButton):focus {
+  box-shadow: 0 0 0 1px var(--color-surface-secondary),
     0 0 0 3px var(--color-focus-clarity);
   outline: none;
 }
 
 .spui-AppealModal
-  :is(
-    .spui-Button,
-    .spui-LinkButton,
-    .spui-IconButton,
-    .spui-SubtleButton
-  ):focus:not(:focus-visible) {
+  :is(.spui-Button, .spui-LinkButton, .spui-IconButton, .spui-SubtleButton):focus:not(:focus-visible) {
   box-shadow: none;
 }
 

diff --git a/packages/spindle-ui/src/Modal/SemiModal.css b/packages/spindle-ui/src/Modal/SemiModal.css
@@ -32,12 +32,8 @@
 /* stylelint-disable plugin/selector-bem-pattern */
 /* NOTE: set no animations to the dialog-polyfill browsers for stability */
 .spui-SemiModal[data-type='popup'][open]:not(.spui-SemiModal--closing),
-.spui-SemiModal[data-type='popup'][open]:not(
-    .spui-SemiModal--closing
-  ).spui-SemiModal::backdrop,
-.spui-SemiModal[data-type='sheet'][open]:not(
-    .spui-SemiModal--closing
-  ).spui-SemiModal::backdrop {
+.spui-SemiModal[data-type='popup'][open]:not(.spui-SemiModal--closing).spui-SemiModal::backdrop,
+.spui-SemiModal[data-type='sheet'][open]:not(.spui-SemiModal--closing).spui-SemiModal::backdrop {
   animation: 350ms cubic-bezier(0, 0, 0, 1) spui-SemiModal-fade-in;
 }
 
@@ -57,15 +53,11 @@
 
 @media (prefers-reduced-motion: reduce) {
   .spui-SemiModal[data-type='popup'][open]:not(.spui-SemiModal--closing),
-  .spui-SemiModal[data-type='popup'][open]:not(
-      .spui-SemiModal--closing
-    ).spui-SemiModal::backdrop,
+  .spui-SemiModal[data-type='popup'][open]:not(.spui-SemiModal--closing).spui-SemiModal::backdrop,
   .spui-SemiModal[data-type='popup'].spui-SemiModal--closing,
   .spui-SemiModal--closing.spui-SemiModal[data-type='popup']::backdrop,
   .spui-SemiModal[data-type='sheet'][open]:not(.spui-SemiModal--closing),
-  .spui-SemiModal[data-type='sheet'][open]:not(
-      .spui-SemiModal--closing
-    ).spui-SemiModal::backdrop,
+  .spui-SemiModal[data-type='sheet'][open]:not(.spui-SemiModal--closing).spui-SemiModal::backdrop,
   .spui-SemiModal[data-type='sheet'].spui-SemiModal--closing,
   .spui-SemiModal--closing.spui-SemiModal[data-type='sheet']::backdrop {
     /* Do not remove this animation to detect animationend in JavaScript */
@@ -109,25 +101,14 @@ html.spui-SemiModal--open {
  * - Safari does not support radius outline
 */
 .spui-SemiModal
-  :is(
-    .spui-Button,
-    .spui-LinkButton,
-    .spui-IconButton,
-    .spui-SubtleButton
-  ):focus {
-  box-shadow:
-    0 0 0 1px var(--color-surface-secondary),
+  :is(.spui-Button, .spui-LinkButton, .spui-IconButton, .spui-SubtleButton):focus {
+  box-shadow: 0 0 0 1px var(--color-surface-secondary),
     0 0 0 2px var(--color-focus-clarity);
   outline: none;
 }
 
 .spui-SemiModal
-  :is(
-    .spui-Button,
-    .spui-LinkButton,
-    .spui-IconButton,
-    .spui-SubtleButton
-  ):focus:not(:focus-visible) {
+  :is(.spui-Button, .spui-LinkButton, .spui-IconButton, .spui-SubtleButton):focus:not(:focus-visible) {
   box-shadow: none;
 }
 

diff --git a/packages/spindle-ui/src/SegmentedControl/SegmentedControl.css b/packages/spindle-ui/src/SegmentedControl/SegmentedControl.css
@@ -31,9 +31,7 @@
   overflow-wrap: break-word;
   padding: 4px;
   position: relative;
-  transition:
-    font-weight 0.35s ease,
-    color 0.35s ease,
+  transition: font-weight 0.35s ease, color 0.35s ease,
     background-color 0.15s ease;
 }
 

diff --git a/packages/spindle-ui/src/SnackBar/SnackBar.css b/packages/spindle-ui/src/SnackBar/SnackBar.css
@@ -90,9 +90,7 @@
 }
 
 .spui-SnackBar--slide {
-  transition:
-    transform 0.3s ease,
-    opacity 0.3s ease;
+  transition: transform 0.3s ease, opacity 0.3s ease;
 }
 
 .spui-SnackBar--hidden {
@@ -101,9 +99,7 @@
 
 .spui-SnackBar-slide--in {
   opacity: 1;
-  transition:
-    transform 0.5s ease,
-    opacity 0.5s ease;
+  transition: transform 0.5s ease, opacity 0.5s ease;
 }
 
 .spui-SnackBar-slide--in.spui-SnackBar--top {

diff --git a/packages/spindle-ui/src/SnackBar/SnackBar.tsx b/packages/spindle-ui/src/SnackBar/SnackBar.tsx
@@ -136,8 +136,8 @@ const convertInternalChildProps = (
   const hasInternalChildProps = (
     props: OwnProps,
   ): props is InternalChildProps =>
-    ({}).hasOwnProperty.call(props, 'setIsShow') ||
-    {}.hasOwnProperty.call(props, 'variant');
+    ({}.hasOwnProperty.call(props, 'setIsShow') ||
+    {}.hasOwnProperty.call(props, 'variant'));
 
   if (hasInternalChildProps(props)) {
     const result = {

diff --git a/packages/spindle-ui/src/Toast/Toast.css b/packages/spindle-ui/src/Toast/Toast.css
@@ -60,9 +60,7 @@
 }
 
 .spui-Toast--slide {
-  transition:
-    transform 0.3s ease,
-    opacity 0.3s ease;
+  transition: transform 0.3s ease, opacity 0.3s ease;
 }
 
 .spui-Toast--hidden {
@@ -71,9 +69,7 @@
 
 .spui-Toast-slide--in {
   opacity: 1;
-  transition:
-    transform 0.5s ease,
-    opacity 0.5s ease;
+  transition: transform 0.5s ease, opacity 0.5s ease;
 }
 
 .spui-Toast-slide--in.spui-Toast--top {