Merge pull request #2 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: TecharyJames

.editorconfig

@@ -3,7 +3,8 @@ charset = utf-8
 end_of_line = lf
 indent_size = 2
 indent_style = space
-insert_final_newline = false
+insert_final_newline = true
+trim_trailing_whitespace = true
 max_line_length = 100
 tab_width = 2
 ij_continuation_indent_size = 2
@@ -15,7 +16,6 @@ ij_visual_guides = 100
 ij_wrap_on_typing = false
 
 [*.css]
-ij_continuation_indent_size = 2
 ij_visual_guides = none
 ij_css_align_closing_brace_with_properties = false
 ij_css_blank_lines_around_nested_selector = 1
@@ -333,7 +333,7 @@ ij_typescript_ternary_operation_wrap = on_every_item
 ij_typescript_union_types_wrap = on_every_item
 ij_typescript_use_chained_calls_group_indents = false
 ij_typescript_use_double_quotes = false
-ij_typescript_use_explicit_js_extension = global
+ij_typescript_use_explicit_js_extension = auto
 ij_typescript_use_path_mapping = always
 ij_typescript_use_public_modifier = false
 ij_typescript_use_semicolon_after_statement = true
@@ -350,9 +350,10 @@ ij_shell_minify_program = false
 ij_shell_redirect_followed_by_space = false
 ij_shell_switch_cases_indented = false
 
-[{*.cjs,*.js,*.mjs}]
+[{*.cjs,*.es6,*.js,*.mjs,*.jsx}]
+indent_size = 2
+tab_width = 2
 ij_continuation_indent_size = 2
-ij_visual_guides = none
 ij_javascript_align_imports = false
 ij_javascript_align_multiline_array_initializer_expression = false
 ij_javascript_align_multiline_binary_operation = false
@@ -368,39 +369,45 @@ ij_javascript_align_var_statements = 0
 ij_javascript_array_initializer_new_line_after_left_brace = true
 ij_javascript_array_initializer_right_brace_on_new_line = true
 ij_javascript_array_initializer_wrap = on_every_item
-ij_javascript_assignment_wrap = on_every_item
-ij_javascript_binary_operation_sign_on_next_line = true
-ij_javascript_binary_operation_wrap = on_every_item
+ij_javascript_assignment_wrap = off
+ij_javascript_binary_operation_sign_on_next_line = false
+ij_javascript_binary_operation_wrap = normal
 ij_javascript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/**
 ij_javascript_blank_lines_after_imports = 1
 ij_javascript_blank_lines_around_class = 1
 ij_javascript_blank_lines_around_field = 0
 ij_javascript_blank_lines_around_function = 1
 ij_javascript_blank_lines_around_method = 1
 ij_javascript_block_brace_style = end_of_line
+ij_javascript_block_comment_add_space = false
+ij_javascript_block_comment_at_first_column = true
 ij_javascript_call_parameters_new_line_after_left_paren = false
 ij_javascript_call_parameters_right_paren_on_new_line = false
-ij_javascript_call_parameters_wrap = on_every_item
+ij_javascript_call_parameters_wrap = normal
 ij_javascript_catch_on_new_line = false
-ij_javascript_chained_call_dot_on_new_line = true
+ij_javascript_chained_call_dot_on_new_line = false
 ij_javascript_class_brace_style = end_of_line
+ij_javascript_class_decorator_wrap = split_into_lines
+ij_javascript_class_field_decorator_wrap = off
+ij_javascript_class_method_decorator_wrap = off
 ij_javascript_comma_on_new_line = false
-ij_javascript_do_while_brace_force = always
+ij_javascript_do_while_brace_force = never
 ij_javascript_else_on_new_line = false
-ij_javascript_enforce_trailing_comma = remove
+ij_javascript_enforce_trailing_comma = whenmultiline
 ij_javascript_extends_keyword_wrap = off
 ij_javascript_extends_list_wrap = off
 ij_javascript_field_prefix = _
 ij_javascript_file_name_style = relaxed
 ij_javascript_finally_on_new_line = false
-ij_javascript_for_brace_force = always
+ij_javascript_for_brace_force = never
 ij_javascript_for_statement_new_line_after_left_paren = false
 ij_javascript_for_statement_right_paren_on_new_line = false
 ij_javascript_for_statement_wrap = off
 ij_javascript_force_quote_style = true
 ij_javascript_force_semicolon_style = true
 ij_javascript_function_expression_brace_style = end_of_line
-ij_javascript_if_brace_force = always
+ij_javascript_function_parameter_decorator_wrap = off
+ij_javascript_if_brace_force = never
 ij_javascript_import_merge_members = global
 ij_javascript_import_prefer_absolute_path = global
 ij_javascript_import_sort_members = true
@@ -421,10 +428,11 @@ ij_javascript_line_comment_add_space = true
 ij_javascript_line_comment_at_first_column = false
 ij_javascript_method_brace_style = end_of_line
 ij_javascript_method_call_chain_wrap = on_every_item
-ij_javascript_method_parameters_new_line_after_left_paren = false
+ij_javascript_method_parameters_new_line_after_left_paren = true
 ij_javascript_method_parameters_right_paren_on_new_line = false
-ij_javascript_method_parameters_wrap = on_every_item
+ij_javascript_method_parameters_wrap = normal
 ij_javascript_object_literal_wrap = on_every_item
+ij_javascript_object_types_wrap = on_every_item
 ij_javascript_parentheses_expression_new_line_after_left_paren = false
 ij_javascript_parentheses_expression_right_paren_on_new_line = false
 ij_javascript_place_assignment_sign_on_next_line = false
@@ -433,7 +441,8 @@ ij_javascript_prefer_explicit_types_function_expression_returns = false
 ij_javascript_prefer_explicit_types_function_returns = false
 ij_javascript_prefer_explicit_types_vars_fields = false
 ij_javascript_prefer_parameters_wrap = false
-ij_javascript_reformat_c_style_comments = true
+ij_javascript_property_prefix =
+ij_javascript_reformat_c_style_comments = false
 ij_javascript_space_after_colon = true
 ij_javascript_space_after_comma = true
 ij_javascript_space_after_dots_in_rest_parameter = false
@@ -459,12 +468,12 @@ ij_javascript_space_before_for_left_brace = true
 ij_javascript_space_before_for_parentheses = true
 ij_javascript_space_before_for_semicolon = false
 ij_javascript_space_before_function_left_parenth = true
-ij_javascript_space_before_generator_mult = false
+ij_javascript_space_before_generator_mult = true
 ij_javascript_space_before_if_left_brace = true
 ij_javascript_space_before_if_parentheses = true
 ij_javascript_space_before_method_call_parentheses = false
 ij_javascript_space_before_method_left_brace = true
-ij_javascript_space_before_method_parentheses = false
+ij_javascript_space_before_method_parentheses = true
 ij_javascript_space_before_property_colon = false
 ij_javascript_space_before_quest = true
 ij_javascript_space_before_switch_left_brace = true
@@ -507,12 +516,13 @@ ij_javascript_ternary_operation_wrap = on_every_item
 ij_javascript_union_types_wrap = on_every_item
 ij_javascript_use_chained_calls_group_indents = false
 ij_javascript_use_double_quotes = false
-ij_javascript_use_explicit_js_extension = global
+ij_javascript_use_explicit_js_extension = auto
+ij_javascript_use_import_type = auto
 ij_javascript_use_path_mapping = always
 ij_javascript_use_public_modifier = false
-ij_javascript_use_semicolon_after_statement = true
-ij_javascript_var_declaration_wrap = on_every_item
-ij_javascript_while_brace_force = always
+ij_javascript_use_semicolon_after_statement = false
+ij_javascript_var_declaration_wrap = normal
+ij_javascript_while_brace_force = never
 ij_javascript_while_on_new_line = false
 ij_javascript_wrap_comments = false
 
@@ -648,8 +658,8 @@ ij_html_keep_line_breaks_in_text = true
 ij_html_keep_whitespaces = false
 ij_html_keep_whitespaces_inside = span,pre,textarea
 ij_html_line_comment_at_first_column = true
-ij_html_new_line_after_last_attribute = when multiline
-ij_html_new_line_before_first_attribute = when multiline
+ij_html_new_line_after_last_attribute = when_multiline
+ij_html_new_line_before_first_attribute = when_multiline
 ij_html_quote_style = double
 ij_html_remove_new_line_before_tags = br
 ij_html_space_after_tag_name = false

.eslintrc.cjs

@@ -33,3 +33,10 @@ app.log
 # AI rules
 .*/rules
 AGENTS.md
+
+# jetbrains
+.idea
+
+# azurite
+__*
+AzuriteConfig

.eslintrc.json

@@ -0,0 +1,2 @@
+build
+out

.gitignore

@@ -0,0 +1,6 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true
+}

.prettierignore

@@ -0,0 +1,37 @@
+import { defineConfig, globalIgnores } from 'eslint/config'
+import eslintConfigNext from 'eslint-config-next'
+import eslintConfigPrettier from 'eslint-config-prettier'
+
+/** @type {import('eslint').Linter.Config[]} */
+const eslintConfig = defineConfig([
+  ...eslintConfigNext,
+  eslintConfigPrettier,
+  {
+    rules: {
+      'no-unused-vars': 'off',
+      // this rule is annoying on strings with quotes in them
+      'react/no-unescaped-entities': 'off',
+      'jsx-a11y/alt-text': 'off',
+      '@next/next/no-img-element': 'off',
+      '@next/next/no-page-custom-font': 'off',
+      'react/display-name': 'off',
+      'react/no-children-prop': 'off',
+      'react/jsx-max-props-per-line': [
+        0,
+        {
+          maximum: 10,
+        },
+      ],
+    },
+  },
+  // Override default ignores of eslint-config-next.
+  globalIgnores([
+    // Default ignores of eslint-config-next:
+    '.next/**',
+    'out/**',
+    'build/**',
+    'next-env.d.ts',
+  ]),
+])
+
+export default eslintConfig

.prettierrc.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "10.2.2",
+  "version": "10.2.6",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -19,8 +19,9 @@
     "build": "next build && rm -rf package.json yarn.lock",
     "start": "next start",
     "export": "next export",
-    "lint": "next lint",
-    "lint-fix": "next lint --fix",
+    "lint": "npx eslint .",
+    "lint-fix": "npx eslint . --fix",
+    "prettier": "prettier --write '**/*.{js,jsx,json}'",
     "start-swa": "swa start --swa-config-location .vscode http://127.0.0.1:3000 --api-location http://127.0.0.1:7071 --verbose=silly"
   },
   "dependencies": {
@@ -40,7 +41,7 @@
     "@nivo/sankey": "^0.99.0",
     "@react-pdf/renderer": "^4.3.2",
     "@reduxjs/toolkit": "^2.11.2",
-    "@tanstack/query-sync-storage-persister": "^5.76.0",
+    "@tanstack/query-sync-storage-persister": "^5.90.25",
     "@tanstack/react-query": "^5.51.11",
     "@tanstack/react-query-devtools": "^5.51.11",
     "@tanstack/react-query-persist-client": "^5.76.0",
@@ -49,14 +50,15 @@
     "@tiptap/extension-heading": "^3.4.1",
     "@tiptap/extension-image": "^3.4.1",
     "@tiptap/extension-table": "^3.19.0",
-    "@tiptap/pm": "^3.4.1",
+    "@tiptap/pm": "^3.20.4",
     "@tiptap/react": "^3.4.1",
-    "@tiptap/starter-kit": "^3.20.1",
+    "@tiptap/starter-kit": "^3.20.5",
     "@uiw/react-json-view": "^2.0.0-alpha.41",
     "@vvo/tzdb": "^6.198.0",
-    "apexcharts": "5.3.5",
+    "apexcharts": "5.10.4",
     "axios": "^1.7.2",
     "date-fns": "4.1.0",
+    "diff": "^8.0.3",
     "eml-parse-js": "^1.2.0-beta.0",
     "export-to-csv": "^1.3.0",
     "formik": "2.4.9",
@@ -71,7 +73,7 @@
     "lodash.isequal": "4.5.0",
     "material-react-table": "^3.0.1",
     "monaco-editor": "^0.55.1",
-    "mui-tiptap": "^1.29.0",
+    "mui-tiptap": "^1.29.1",
     "next": "^16.1.6",
     "nprogress": "0.2.0",
     "numeral": "2.0.6",
@@ -82,13 +84,13 @@
     "react-beautiful-dnd": "13.1.1",
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "19.2.4",
-    "react-dropzone": "14.3.8",
+    "react-dropzone": "15.0.0",
     "react-error-boundary": "^6.1.1",
-    "react-grid-layout": "^2.2.2",
+    "react-grid-layout": "^2.2.3",
     "react-hook-form": "^7.71.2",
     "react-hot-toast": "2.6.0",
     "react-html-parser": "^2.0.2",
-    "react-i18next": "16.2.4",
+    "react-i18next": "16.6.5",
     "react-leaflet": "5.0.0",
     "react-leaflet-markercluster": "^5.0.0-rc.0",
     "react-markdown": "10.1.0",
@@ -99,7 +101,7 @@
     "react-syntax-highlighter": "^16.1.0",
     "react-time-ago": "^7.3.3",
     "react-virtuoso": "^4.18.3",
-    "react-window": "^2.2.5",
+    "react-window": "^2.2.7",
     "recharts": "^3.7.0",
     "redux": "5.0.1",
     "redux-devtools-extension": "2.13.9",
@@ -115,7 +117,12 @@
   },
   "devDependencies": {
     "@svgr/webpack": "8.1.0",
-    "eslint": "9.39.2",
-    "eslint-config-next": "16.1.6"
+    "@types/react": "^19.2.14",
+    "@types/react-dom": "^19.2.3",
+    "eslint": "^9.39.4",
+    "eslint-config-next": "^16.2.1",
+    "eslint-config-prettier": "^10.1.8",
+    "prettier": "^3.8.1",
+    "prettier-eslint": "^16.4.2"
   }
-}
+}

eslint.config.mjs

@@ -1,3 +1,3 @@
 {
-  "version": "10.2.2"
-}
+  "version": "10.2.6"
+}