Merge pull request #90 from BC-SECURITY/release/2.6.1

v2.6.1 into main

.editorconfig

@@ -4,4 +4,4 @@ indent_size = 2
 end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
-max_line_length = 100
+max_line_length = 80

.eslintrc.js

@@ -1,56 +1,60 @@
-require('@rushstack/eslint-patch/modern-module-resolution');
+require("@rushstack/eslint-patch/modern-module-resolution");
 
-const path = require('node:path');
-const createAliasSetting = require('@vue/eslint-config-airbnb/createAliasSetting');
+const path = require("node:path");
+const createAliasSetting = require("@vue/eslint-config-airbnb/createAliasSetting");
 
 module.exports = {
   root: true,
   env: {
     es2021: true,
   },
-  extends: [
-    'plugin:vue/recommended',
-    '@vue/eslint-config-airbnb',
-  ],
+  extends: ["plugin:vue/recommended", "@vue/eslint-config-airbnb", "prettier"],
   rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'no-plusplus': 'off',
-    'import/no-cycle': 'off',
-    'vue/valid-v-slot': ['error', {
-      allowModifiers: true,
-    }],
-    'no-param-reassign': 'off',
-    'import/no-unresolved': 'error',
+    "no-console": process.env.NODE_ENV === "production" ? "error" : "off",
+    "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off",
+    "no-plusplus": "off",
+    "import/no-cycle": "off",
+    "vue/valid-v-slot": [
+      "error",
+      {
+        allowModifiers: true,
+      },
+    ],
+    "no-param-reassign": "off",
+    "import/no-unresolved": "error",
     // This is probably a good idea, but I don't want to diverge all the file names right now
     // while maintaining 4.x and 5.x.
-    'vue/multi-word-component-names': 'off',
-    'vue/max-len': ['error', {
-      code: 120,
-      ignoreComments: true,
-      ignoreStrings: true,
-      ignoreTemplateLiterals: true,
-      ignoreRegExpLiterals: true,
-      ignoreUrls: true,
-    }],
-    'no-unused-vars': ['error', {
-      argsIgnorePattern: '^_',
-      varsIgnorePattern: '^_',
-      caughtErrorsIgnorePattern: '^_',
-    }],
+    "vue/multi-word-component-names": "off",
+    "vue/max-len": [
+      "error",
+      {
+        code: 120,
+        ignoreComments: true,
+        ignoreStrings: true,
+        ignoreTemplateLiterals: true,
+        ignoreRegExpLiterals: true,
+        ignoreUrls: true,
+      },
+    ],
+    "no-unused-vars": [
+      "error",
+      {
+        argsIgnorePattern: "^_",
+        varsIgnorePattern: "^_",
+        caughtErrorsIgnorePattern: "^_",
+      },
+    ],
+    "prefer-destructuring": ["error", { object: true, array: false }],
   },
   settings: {
     ...createAliasSetting({
-      '@': `${path.resolve(__dirname, './src')}`,
+      "@": `${path.resolve(__dirname, "./src")}`,
     }),
   },
-  parserOptions: {
-  },
+  parserOptions: {},
   overrides: [
     {
-      files: [
-        '**/__tests__/*.{j,t}s?(x)',
-      ],
+      files: ["**/__tests__/*.{j,t}s?(x)"],
       env: {
         mocha: true,
       },

.github/.dependabot.yml

@@ -6,4 +6,3 @@ updates:
       interval: "weekly"
       day: "sunday"
     target-branch: "dev"
-

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -3,60 +3,60 @@ description: File a bug/issue
 title: "[BUG] <title>"
 labels: ["bug"]
 body:
-- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the bug you encountered.
-    options:
-    - label: I have searched the existing issues
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: input
+    attributes:
+      label: Empire Version
+      description: What version of Empire are you using?
+    validations:
       required: true
-- type: input
-  attributes:
-    label: Empire Version
-    description: What version of Empire are you using?
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Starkiller Version
-    description: What version of Starkiller are you using?
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Browser
-    description: What browser are you using?
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Current Behavior
-    description: A concise description of what you're experiencing.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Expected Behavior
-    description: A concise description of what you expected to happen.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Steps To Reproduce
-    description: Steps to reproduce the behavior.
-    placeholder: |
-      1. In this environment...
-      1. With this config...
-      1. Run '...'
-      1. See error...
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Anything else?
-    description: |
-      Links? References? Anything that will give us more context about the issue you are encountering!
+  - type: input
+    attributes:
+      label: Starkiller Version
+      description: What version of Starkiller are you using?
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Browser
+      description: What browser are you using?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: A concise description of what you're experiencing.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: A concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        1. With this config...
+        1. Run '...'
+        1. See error...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Anything that will give us more context about the issue you are encountering!
 
-      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-  validations:
-    required: false
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -3,27 +3,27 @@ description: File a bug/issue
 title: "[FEATURE REQUEST] <title>"
 labels: ["enhancement"]
 body:
-- type: textarea
-  attributes:
-    label: Description
-    description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Solution
-    description: A clear and concise description of what you want to happen.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Alternatives
-    description: A clear and concise description of any alternative solutions or features you've considered.
-  validations:
-    required: false
-- type: textarea
-  attributes:
-    label: Additional Context
-    description: Add any other context or screenshots about the feature request here.
-  validations:
-    required: false
+  - type: textarea
+    attributes:
+      label: Description
+      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Solution
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Alternatives
+      description: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional Context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false

.github/actions/clean-merge/action.yml

@@ -1,14 +1,14 @@
-name: 'Clean Merge'
-description: 'Merge a branch into another branch without creating a merge commit. Fail if the merge would create merge conflicts.'
+name: "Clean Merge"
+description: "Merge a branch into another branch without creating a merge commit. Fail if the merge would create merge conflicts."
 inputs:
   from-branch:
-    description: 'The branch to merge from'
+    description: "The branch to merge from"
     required: true
   to-branch:
-    description: 'The branch to merge to'
+    description: "The branch to merge to"
     required: true
   push-repo:
-    description: 'The remote to push to'
+    description: "The remote to push to"
     required: true
 runs:
   using: "composite"
@@ -25,7 +25,7 @@ runs:
         git submodule foreach --recursive git reset --hard
         git submodule update --init --recursive
     - name: Merge ${{ inputs.from-branch }} branch to ${{ inputs.to-branch }}
-      shell: '/bin/bash {0}'
+      shell: "/bin/bash {0}"
       run: |
         git merge --no-edit ${{ inputs.from-branch }}
         if [ $? -ne 0 ]; then
@@ -47,4 +47,4 @@ runs:
       shell: bash
       run: |
         git push ${{ inputs.push-repo }} ${{ inputs.to-branch }}
-        echo "MERGE_STATUS=NO_CHANGES" >> $GITHUB_ENV
+        echo "MERGE_STATUS=NO_CHANGES" >> $GITHUB_ENV