Merge branch 'enable-prettier' into 'v3'

Re-enable prettier

See merge request openflexure/openflexure-microscope-server!497

webapp/eslint.config.mjs

@@ -2,7 +2,8 @@ import js from "@eslint/js";
 import vue from "eslint-plugin-vue";
 import vueParser from "vue-eslint-parser";
 import babelParser from "@babel/eslint-parser";
-import prettier from "eslint-config-prettier";
+import prettierPlugin from "eslint-plugin-prettier";
+import prettierConfig from "eslint-config-prettier";
 import globals from "globals";
 
 const isProd = process.env.NODE_ENV === "production";
@@ -19,10 +20,10 @@ export default [
 
   ...vue.configs["flat/recommended"],
 
-  prettier,
+  prettierConfig,
 
   {
-    files: ["**/*.vue", "**/*.js"],
+    files: ["**/*.vue", "**/*.js", "**/*.jsx", "**/*.cjs", "**/*.mjs"],
     languageOptions: {
       parser: vueParser,
       parserOptions: {
@@ -40,9 +41,11 @@ export default [
 
     plugins: {
       vue,
+      prettier: prettierPlugin,
     },
 
     rules: {
+      "prettier/prettier": "warn",
       // Environment-based rules
       "no-console": isProd ? "warn" : "off",
       "no-debugger": isProd ? "warn" : "off",

webapp/package.json

@@ -8,8 +8,8 @@
     "gv": "genversion src/version.js",
     "serve": "vite serve --mode development",
     "build": "vite build --mode production",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --ignore-pattern .gitignore --max-warnings=0",
-    "lint:fix": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-pattern .gitignore"
+    "lint": "eslint . --ignore-pattern .gitignore --max-warnings=0",
+    "lint:fix": "eslint . --fix --ignore-pattern .gitignore"
   },
   "dependencies": {
     "@vueuse/core": "^14.1.0",

webapp/src/components/labThingsComponents/actionButton.vue

@@ -104,7 +104,7 @@ export default {
       type: Boolean,
       required: false,
       default: false,
-    }
+    },
   },
 
   emits: [

webapp/src/components/labThingsComponents/actionStatusModal.vue

@@ -2,10 +2,7 @@
   <div ref="modal" class="" uk-modal="bg-close: false; esc-close: false; stack: true;">
     <div id="status-modal" class="uk-modal-dialog uk-modal-body uk-margin-auto-vertical">
       <h2>{{ title }}</h2>
-      <mini-stream-display
-        v-if="displayStream"
-        class="uk-margin-small-bottom"
-      />
+      <mini-stream-display v-if="displayStream" class="uk-margin-small-bottom" />
       <action-log-display :log="log" :task-status="taskStatus" />
       <div id="progress-and-cancel-row">
         <div class="stretchy">
@@ -116,7 +113,7 @@ export default {
   margin-right: 5px;
 }
 #status-modal {
-  max-height: 90vh;   // never exceed 90% of viewport height
+  max-height: 90vh; // never exceed 90% of viewport height
   display: flex;
   flex-direction: column;
 }

webapp/src/components/labThingsComponents/inputFromSchema.vue

@@ -193,9 +193,7 @@ export default {
       }
     },
     isDisabled() {
-      return !this.dataSchema?.forms?.some(form =>
-        form.op?.includes('writeproperty')
-      );
+      return !this.dataSchema?.forms?.some((form) => form.op?.includes("writeproperty"));
     },
     useDropdown: function () {
       if (this.options === null) return false;