rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-enable prettier

Browse source
This commit is contained in:
Julian Stirling 2026-02-19 11:11:54 +00:00
parent 7267f4557a
commit 6606754aef
5 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
webapp/eslint.config.mjs
View file

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

4
webapp/package.json
View file

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

2
webapp/src/components/labThingsComponents/actionButton.vue
View file

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

7
webapp/src/components/labThingsComponents/actionStatusModal.vue
View file

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

4
webapp/src/components/labThingsComponents/inputFromSchema.vue
View file

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