Merge remote-tracking branch 'origin/wj' into wilm

scripts/check-naming-and-style.sh

@@ -195,11 +195,19 @@ while IFS= read -r hit; do
     [ -z "$hit" ] && continue
     file=${hit%%:*}
     line=${hit#*:}; line=${line%%:*}
-    if ! sed -n "${line},$((line + 8))p" "$file" | grep -q "'levelid'"; then
+    # Python writes 'levelid', Vue writes levelid: - accept either, so the
+    # check covers the payloads a browser sends as well as the ones the server
+    # emits. It was Python-only, which is how three asset forms shipped a
+    # position with no level.
+    if ! sed -n "${line},$((line + 8))p" "$file" | grep -qE "'levelid'|levelid:"; then
         MISSING_LEVEL="$MISSING_LEVEL$file:$line"$'\n'
     fi
 done <<EOF
 $(grep -rn "'mapx':" --include='*.py' shopdb/ plugins/ scripts/ 2>/dev/null | grep -v '/tests\?/' || true)
+$(grep -rn "mapx: " --include='*.vue' --include='*.js' \
+    frontend/src plugins/*/frontend 2>/dev/null \
+    | grep -v '.plugins-staged' | grep -v '\.spec\.js' \
+    | grep -vE "mapx: (null|0)," || true)
 EOF
 if [ -n "$MISSING_LEVEL" ]; then
     echo "FAIL: these emit 'mapx' with no 'levelid' beside it - a position with no"