Merge remote-tracking branch 'origin/master' into course-specific-res…

…earch-form

# Conflicts:
#	services/headless-lms/models/sqlx-data.json

.eslintrc.js

@@ -2,13 +2,17 @@
 
 const DETECT_CSS_REGEX = /\S+:\s+[^\n]+;/
 const DETECT_PX_REGEX = /^\d+px$/
+const DETECT_REM_REGEX = /^\d+rem$/
+const DETECT_EM_REGEX = /^\d+em$/
 module.exports = {
   env: {
     browser: true,
     es2021: true,
     node: true,
   },
   extends: [
+    "plugin:@next/next/recommended",
+    "plugin:@tanstack/eslint-plugin-query/recommended",
     "plugin:i18next/recommended",
     "plugin:jsx-a11y/recommended",
     "plugin:react-hooks/recommended",
@@ -28,13 +32,15 @@ module.exports = {
     ecmaVersion: 12,
     sourceType: "module",
   },
-  plugins: ["react", "@typescript-eslint", "import", "eslint-custom-rules"],
+  plugins: ["react", "@typescript-eslint", "@tanstack/query", "import", "eslint-custom-rules"],
   settings: {
     react: {
       version: "detect",
     },
   },
   rules: {
+    // Should be investigated later
+    "@next/next/no-img-element": "off",
     "react/react-in-jsx-scope": "off",
     "react/prop-types": "off",
     "no-unused-vars": "off",
@@ -216,7 +222,7 @@ module.exports = {
           "labelStyle",
           "data-testid",
         ],
-        ignore: [DETECT_CSS_REGEX, DETECT_PX_REGEX],
+        ignore: [DETECT_CSS_REGEX, DETECT_PX_REGEX, DETECT_REM_REGEX, DETECT_EM_REGEX],
         ignoreCallee: [
           "div",
           "useQuery",

.stylelintrc

@@ -4,6 +4,7 @@
     "font-family-no-missing-generic-family-keyword": null,
     "no-duplicate-selectors": null,
     "function-no-unknown": null,
+    "media-query-no-invalid": null,
     "selector-type-no-unknown": [
       true,
       {
@@ -26,4 +27,4 @@
       "customSyntax": "postcss-styled-syntax"
     }
   ]
-}
+}

bin/.common

@@ -77,7 +77,7 @@ function fail_minikube_version() {
 
 function check_sqlx_cli_version() {
   # just to be sure
-  MINIMUM_ACCEPTABLE_VERSION="0.6.2"
+  MINIMUM_ACCEPTABLE_VERSION="0.7.1"
   ensure_program_in_path cargo
   ensure_program_in_path cargo-sqlx
   SQLX=$(cargo sqlx --version | cut -d ' ' -f 2)

bin/sqlx-prepare

@@ -23,4 +23,4 @@ run_command cd "$RELATIVE_PATH" || exit
 run_command cargo sqlx prepare --database-url postgres://headless-lms@localhost:54328/headless_lms_dev -- "$@" --lib
 
 # Formatting the result file so that diffs are pretty
-run_command npx prettier --write sqlx-data.json
+run_command npx prettier --write .sqlx