chore: update prettier and prettier config (#827)

qlik-oss · Jan 30, 2024 · 897e555 · 897e555
1 parent 8bd754c
commit 897e555
Show file tree

Hide file tree

Showing 13 changed files with 108 additions and 107 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
@@ -23,8 +23,8 @@ about: Something isn't working as expected. 😕
 
 ### Versions
 
-* picasso.js: (x.y.z)
-* Browser: ?
+- picasso.js: (x.y.z)
+- Browser: ?
 
 ### Additional context
 

diff --git a/examples/hammer/index.html b/examples/hammer/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

diff --git a/examples/q-scatterplot/index.html b/examples/q-scatterplot/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

diff --git a/examples/scatterplot/index.html b/examples/scatterplot/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jsx-a11y": "6.8.0",
-    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-prettier": "5.1.3",
     "extend": "3.0.2",
     "globby": "14.0.0",
     "husky": "8.0.3",
@@ -58,8 +58,8 @@
     "jest-puppeteer": "9.0.2",
     "jsdom": "23.2.0",
     "lerna": "6.6.2",
-    "prettier": "2.8.8",
-    "pretty-quick": "3.1.3",
+    "prettier": "3.2.4",
+    "pretty-quick": "4.0.0",
     "puppeteer": "21.6.1",
     "rollup": "2.79.1",
     "rollup-plugin-babel": "4.4.0",

diff --git a/packages/picasso.js/src/core/component/interpolate-object.js b/packages/picasso.js/src/core/component/interpolate-object.js
@@ -51,20 +51,20 @@ export function value(a, b, k) {
     : (t === 'number'
         ? number
         : t === 'string'
-        ? (c = color(b)) && colorKeys.includes(k)
-          ? ((b = c), rgb)
-          : string
-        : b instanceof color
-        ? rgb
-        : b instanceof Date
-        ? date
-        : isNumberArray(b)
-        ? numberArray
-        : Array.isArray(b)
-        ? genericArray
-        : (typeof b.valueOf !== 'function' && typeof b.toString !== 'function') || isNaN(b)
-        ? object
-        : number)(a, b);
+          ? (c = color(b)) && colorKeys.includes(k)
+            ? ((b = c), rgb)
+            : string
+          : b instanceof color
+            ? rgb
+            : b instanceof Date
+              ? date
+              : isNumberArray(b)
+                ? numberArray
+                : Array.isArray(b)
+                  ? genericArray
+                  : (typeof b.valueOf !== 'function' && typeof b.toString !== 'function') || isNaN(b)
+                    ? object
+                    : number)(a, b);
 }
 
 export default function object(a, b) {

diff --git a/packages/picasso.js/src/core/data/extractor-matrix.js b/packages/picasso.js/src/core/data/extractor-matrix.js
@@ -6,16 +6,16 @@ function datumExtract(propCfg, cell, { key }) {
       typeof propCfg.value === 'function' // eslint-disable-line no-nested-ternary
         ? propCfg.value(cell)
         : typeof propCfg.value !== 'undefined'
-        ? propCfg.value
-        : cell,
+          ? propCfg.value
+          : cell,
   };
 
   datum.label =
     typeof propCfg.label === 'function' // eslint-disable-line no-nested-ternary
       ? propCfg.label(cell)
       : typeof propCfg.label !== 'undefined'
-      ? String(propCfg.label)
-      : String(datum.value);
+        ? String(propCfg.label)
+        : String(datum.value);
 
   if (propCfg.field) {
     datum.source = {

diff --git a/plugins/q/src/data/extractor-s.js b/plugins/q/src/data/extractor-s.js
@@ -65,16 +65,16 @@ function datumExtract(propCfg, cell, { key }) {
       typeof propCfg.value === 'function'
         ? propCfg.value(cell)
         : typeof propCfg.value !== 'undefined'
-        ? propCfg.value
-        : cell, // eslint-disable-line no-nested-ternary
+          ? propCfg.value
+          : cell, // eslint-disable-line no-nested-ternary
   };
 
   datum.label =
     typeof propCfg.label === 'function'
       ? propCfg.label(cell)
       : typeof propCfg.label !== 'undefined'
-      ? String(propCfg.label)
-      : String(datum.value); // eslint-disable-line no-nested-ternary
+        ? String(propCfg.label)
+        : String(datum.value); // eslint-disable-line no-nested-ternary
 
   if (propCfg.field) {
     datum.source = {
@@ -165,14 +165,14 @@ export default function extract(config, dataset, cache, util) {
                   typeof p.value === 'function'
                     ? p.value(fieldValues)
                     : typeof p.value !== 'undefined'
-                    ? p.value
-                    : fieldValues,
+                      ? p.value
+                      : fieldValues,
                 label:
                   typeof p.label === 'function'
                     ? p.label(fieldLabels)
                     : typeof p.label !== 'undefined'
-                    ? String(p.label)
-                    : String(ret[propsArr[l]].value),
+                      ? String(p.label)
+                      : String(ret[propsArr[l]].value),
               };
             }
           }

diff --git a/plugins/q/src/data/extractor-t.js b/plugins/q/src/data/extractor-t.js
@@ -126,16 +126,16 @@ function datumExtract(propCfg, cell, { key }) {
       typeof propCfg.value === 'function'
         ? propCfg.value(cell)
         : typeof propCfg.value !== 'undefined'
-        ? propCfg.value
-        : cell, // eslint-disable-line no-nested-ternary
+          ? propCfg.value
+          : cell, // eslint-disable-line no-nested-ternary
   };
 
   datum.label =
     typeof propCfg.label === 'function'
       ? propCfg.label(cell)
       : typeof propCfg.label !== 'undefined'
-      ? String(propCfg.label)
-      : String(datum.value); // eslint-disable-line no-nested-ternary
+        ? String(propCfg.label)
+        : String(datum.value); // eslint-disable-line no-nested-ternary
 
   if (propCfg.field) {
     datum.source = {

diff --git a/studio/src/components/RenderingArea/RenderingArea.jsx b/studio/src/components/RenderingArea/RenderingArea.jsx
@@ -118,12 +118,12 @@ const RenderingArea = ({ title, code, data, api, settings, dataSource }) => {
                 generator,
               })
             : [
-              {
-                type: 'q',
-                key: 'qHyperCube',
-                data: data.box ? data.generated.box.qHyperCube : data.qHyperCube,
-              },
-            ]) || {};
+                {
+                  type: 'q',
+                  key: 'qHyperCube',
+                  data: data.box ? data.generated.box.qHyperCube : data.qHyperCube,
+                },
+              ]) || {};
         prevDataScript.current = dataHashId;
         prevData.current = theData;
       }

diff --git a/test/integration/brushing/tap.fix.html b/test/integration/brushing/tap.fix.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <title>Basic bar chart</title>

diff --git a/tsconfig.json b/tsconfig.json
@@ -98,7 +98,7 @@
 
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true /* Skip type checking all .d.ts files. */
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */,
   },
-  "files": ["packages/picasso.js/types/index.d.ts"]
+  "files": ["packages/picasso.js/types/index.d.ts"],
 }