Merge pull request #2629 from sanger/develop

[release] Merge Develop into Master for 12.6.0

Author: BenTopping

.nvmrc

@@ -1 +1 @@
-v24.13.0
+v24.14.0

.prettierignore

@@ -27,3 +27,4 @@ generate-docs.sh
 *.txt
 docs/*
 tests/e2e/reports/*
+.idea

.release-version

@@ -1,2 +1,2 @@
-12.5.0
+12.6.0
 

CONTRIBUTING.md

@@ -1 +1,32 @@
 
+
+# Contributing
+
+All contributions to this project are subject to the **[MIT Licence](https://foss-haas.mit-license.org/)**. By submitting a contribution, you agree to license your work under these terms.
+
+## Contribution Process
+
+### 1. Issue First
+
+All contributions from outside the core team require an **Issue First** approach. Before submitting a pull request (PR), you must:
+
+1. **Open an issue** in the repository.
+2. Ensure the issue includes:
+	- **Clear problem statement:** Describe the issue or feature request.
+	- **Reproduction steps:** If reporting a bug, provide steps to reproduce it.
+	- **Proposed approach:** Outline your suggested solution or implementation.
+	- **Why this change matters:** Explain the impact or necessity of the change.
+	- **Tag** `@sanger/psd-developers` in the issue to bring it to the attention of a maintainer.
+	- **Wait** for the issue to be assigned or approved by a maintainer.
+
+### 2. Pull Request
+
+Once your issue is approved:
+
+1. **Fork** the repository and create a branch for your changes.
+2. **Submit a PR** referencing the approved issue.
+3. Ensure your code adheres to the project's coding standards and passes all CI checks.
+
+### 3. Review
+
+Maintainers will review your PR. Address any feedback before merging.

README.md

@@ -2,6 +2,10 @@
 
 A Vue front-end app to interact with the [Traction API](https://github.com/sanger/traction-service).
 
+## License
+
+This project is licensed under the [MIT License](LICENSE).
+
 ## Requirements for Development
 
 The following tools are required for development:

eslint.config.js

@@ -1,6 +1,7 @@
 // This is the main configuration file for ESLint. It is a JavaScript file that exports an ESLint configuration object.
 // https://eslint.org/docs/user-guide/configuring
 import pluginVue from 'eslint-plugin-vue'
+import pluginCypress from 'eslint-plugin-cypress'
 import js from '@eslint/js'
 import globals from 'globals'
 import eslintConfigPrettier from 'eslint-config-prettier'
@@ -11,9 +12,15 @@ export default defineConfig([
   js.configs.recommended,
   eslintConfigPrettier,
   {
-    files: ['**/*.js,**/*.vue,**/*.cjs'],
-    // removed rules that seem to have no effect
-    rules: {},
+    files: ['tests/e2e/**/*.js'],
+    extends: [pluginCypress.configs.recommended],
+    rules: {
+      'cypress/no-unnecessary-waiting': 'off',
+    },
+  },
+  {
+    files: ['tests/e2e/**/*.js'],
+    extends: [pluginCypress.configs.globals],
   },
   {
     ignores: ['dist/**/*.js', 'docs/**/*.js', 'documentation/**/*.js'],
@@ -24,14 +31,10 @@ export default defineConfig([
       sourceType: 'module',
       globals: {
         ...globals.node,
-        // TODO: we are using vitest and there is a plugin e.g. it, expect, describe
-        ...globals.jest,
+        // e.g. it, expect, describe
+        ...globals.vitest,
         // e.g. document, alert, window
         ...globals.browser,
-        // Global vitest and Cypress variables so they don't violate no-undef
-        vi: 'readonly',
-        cy: 'readonly',
-        Cypress: 'readonly',
       },
     },
   },