Merge pull request #441 from WatWowMap/develop

Sync Develop

Author: TurtIeSocks

.gitignore

@@ -59,3 +59,8 @@ Desktop.ini
 # Linux
 .directory
 *~
+
+# Custom Files
+src/**/*.custom.jsx
+src/**/*.custom.js
+src/**/*.custom.css

esbuild.config.mjs

@@ -1,11 +1,14 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-continue */
+/* eslint-disable no-restricted-syntax */
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable no-console */
 import path from 'path'
 import fs from 'fs'
 import { fileURLToPath } from 'url'
 import dotenv from 'dotenv'
 
-import { build } from 'esbuild'
+import { build as compile } from 'esbuild'
 import { htmlPlugin } from '@craftamap/esbuild-plugin-html'
 import esbuildMxnCopy from 'esbuild-plugin-mxn-copy'
 import aliasPlugin from 'esbuild-plugin-path-alias'
@@ -17,9 +20,19 @@ const { version } = JSON.parse(fs.readFileSync(path.resolve(__dirname, 'package.
 const isDevelopment = Boolean(process.argv.includes('--dev'))
 const isRelease = Boolean(process.argv.includes('--release'))
 
-if (fs.existsSync(path.resolve(__dirname, 'dist'))) {
+const hasCustom = await (async function checkFolders(folder, isCustom = false) {
+  for (const file of await fs.promises.readdir(folder)) {
+    if (isCustom) return true
+    if (file.startsWith('.')) continue
+    if (!file.includes('.')) isCustom = await checkFolders(`${folder}/${file}`, isCustom)
+    if (/\.custom.(jsx?|css)$/.test(file)) return true
+  }
+  return isCustom
+}(path.resolve(__dirname, 'src')))
+
+if (await fs.existsSync(path.resolve(__dirname, 'dist'))) {
   console.log('Cleaning up old build')
-  fs.rm(path.resolve(__dirname, 'dist'), { recursive: true }, (err) => {
+  await fs.rm(path.resolve(__dirname, 'dist'), { recursive: true }, (err) => {
     if (err) console.log(err)
   })
 }
@@ -30,7 +43,7 @@ const plugins = [
       {
         entryPoints: ['src/index.jsx'],
         filename: 'index.html',
-        htmlTemplate: fs.readFileSync('./public/index.template.html'),
+        htmlTemplate: await fs.readFileSync('./public/index.template.html'),
         scriptLoading: 'defer',
         favicon: './public/favicon/favicon.ico',
       },
@@ -55,11 +68,50 @@ if (isDevelopment) {
     eslintPlugin(),
   )
 } else {
+  if (hasCustom) {
+    plugins.push(
+      {
+        name: 'Custom Loader',
+        setup(build) {
+          const customPaths = []
+          build.onLoad({ filter: /\.(jsx?|css)$/ }, async (args) => {
+            const isNodeModule = /node_modules/.test(args.path)
+            if (!isNodeModule) {
+              const [base, suffix] = args.path.split('.')
+              const newPath = `${base}.custom.${suffix}`
+              if (await fs.existsSync(newPath)) {
+                customPaths.push(newPath)
+                return {
+                  contents: await fs.readFileSync(newPath, 'utf8'),
+                  loader: suffix,
+                  watchFiles: isDevelopment ? [newPath] : undefined,
+                }
+              }
+            }
+          })
+          build.onEnd(() => {
+            if (customPaths.length && !isDevelopment) {
+              console.log(`
+======================================================
+                       WARNING:
+       Custom files aren't officially supported
+        Be sure to watch for breaking changes!
+    
+${customPaths.map((x, i) => ` ${i + 1}. src/${x.split('src/')[1]}`).join('\n')}
+    
+======================================================
+`)
+            }
+          })
+        },
+      },
+    )
+  }
   console.log(`Building production version: ${version}`)
 }
 
 try {
-  await build({
+  await compile({
     entryPoints: ['src/index.jsx'],
     legalComments: 'none',
     bundle: true,
@@ -89,6 +141,8 @@ try {
         ...env.parsed,
         VERSION: version,
         DEVELOPMENT: isDevelopment,
+        CUSTOM: hasCustom,
+        LOCALES: await fs.promises.readdir(`${__dirname}/public/locales`),
       }),
     },
     plugins,

package.json

@@ -32,7 +32,7 @@
     "@sentry/cli": "^1.73.0",
     "dotenv": "^10.0.0",
     "esbuild": "^0.14.22",
-    "esbuild-plugin-eslinter": "^0.1.1",
+    "esbuild-plugin-eslinter": "^0.1.2",
     "esbuild-plugin-mxn-copy": "^1.0.1",
     "esbuild-plugin-path-alias": "^1.0.3",
     "eslint": "^8.9.0",
@@ -50,9 +50,12 @@
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.60",
     "@material-ui/styles": "^4.11.4",
-    "@sentry/react": "^6.16.1",
-    "@sentry/tracing": "^6.16.1",
+    "@sentry/react": "^6.18.2",
+    "@sentry/tracing": "^6.18.2",
+    "@turf/boolean-point-in-polygon": "^6.5.0",
     "@turf/center": "^6.3.0",
+    "@turf/destination": "^6.5.0",
+    "@turf/helpers": "^6.5.0",
     "apollo-link-timeout": "^4.0.0",
     "apollo-server-core": "^3.5.0",
     "apollo-server-express": "^3.5.0",

public/base-locales/de.json

@@ -489,5 +489,31 @@
   "loading": "laden von {{category}}",
   "loading_icons": "Icons abrufen",
   "loading_invasions": "Rocket-Lineup abrufen",
-  "pvp_ranking_cap": "Level"
+  "pvp_ranking_cap": "Level",
+  "scan_next": "Standort scannen",
+  "scan_next_choose": "Ziehen Sie die Markierung per Drag & Drop um die Scanposition festzulegen",
+  "scan_zone": "Scanne ein Gebiet",
+  "scan_zone_choose": "Ziehen Sie die Markierung per Drag & Drop um die Scanposition festzulegen und die Größe zu wählen",
+  "scan_zone_size": "Größe",
+  "scan_zone_range": "Reichweite",
+  "scan_zone_spacing": "Abstand",
+  "scan_zone_radius": "Radius",
+  "scan_requests": "Scan Anfrage",
+  "scan_queue": "Aktuelle Warteschlange",
+  "click_to_scan": "Hier scannen",
+  "scan_confirmed_title": "Scan-Anfrage bestätigt",
+  "scan_confirmed": "Gerät wurde an den Standort geschickt, das Ergebnis wird bald auf der Karte erscheinen!",
+  "scan_loading_title": "Sende Scan-Anfrage",
+  "scan_loading": "Deine Scan-Anfrage wird bearbeitet und wurde erfolgreich abgeschickt!",
+  "scan_error_title": "Fehler",
+  "scan_error": "Es ist ein Fehler bei der Verarbeitung der Scan-Anfrage aufgetreten...",
+  "scan_outside_area": "Dieser Standort liegt außerhalb der Grenzen der zugelassenen Gebiete",
+  "device_icons": "Gerätesymbole",
+  "spawnpoint_icons": "Spawnpunkt-Symbole",
+  "disabled": "Deaktiviert",
+  "lc_title": "folge deinem Standort",
+  "lc_metersUnit": "Meter",
+  "lc_feetUnit": "Fuss",
+  "lc_popup": "Dein Standort befindet sich innerhalb von {distance} {unit} Abstand zu diesem Punkt.",
+  "lc_outsideMapBoundsMsg": "Dein Standort scheint sich außerhalb der Grenzen der Karte zu befinden."
 }

public/base-locales/en.json

@@ -21,6 +21,11 @@
   "search_nests": "Search Nests",
   "search_gyms": "Search Gyms",
   "search_pokestops": "Search PokéStops",
+  "search_raids": "Search Raids",
+  "search_eggs": "Search Eggs",
+  "search_quests": "Search Quests",
+  "search_lures": "Search Lures",
+  "search_invasions": "Search Invasions",
   "sm": "sm",
   "md": "md",
   "lg": "lg",
@@ -493,5 +498,29 @@
   "loading": "Loading {{category}}",
   "loading_icons": "Fetching Icons",
   "loading_invasions": "Fetching Invasions",
-  "pvp_ranking_cap": "Level"
+  "scan_next": "Scan Location",
+  "scan_next_choose": "Drag and Drop the Marker to Set the Scan Location",
+  "scan_zone": "Scan an Area",
+  "scan_zone_choose": "Drag and Drop the Marker to Set the Scan Location and Choose the Size",
+  "scan_zone_size": "Size",
+  "scan_zone_range": "Range",
+  "scan_zone_spacing": "Spacing",
+  "scan_zone_radius": "Radius",
+  "scan_requests": "Scan Requests",
+  "scan_queue": "Current Queue",
+  "click_to_scan": "Scan Here",
+  "scan_confirmed_title": "Scan demand confirmed",
+  "scan_confirmed": "Worker has been sent to location, result will soon appear on the map!",
+  "scan_loading_title": "Sending scan request",
+  "scan_loading": "Your scan request is being processed and sent to the system!",
+  "scan_error_title": "Error",
+  "scan_error": "There has been an error while processing the scan request...",
+  "scan_outside_area": "This location is outside the boundaries of authorized areas",
+  "pvp_ranking_cap": "Level",
+  "lc_title": "Follow Your Location",
+  "lc_metersUnit": "meters",
+  "lc_feetUnit": "feet",
+  "lc_popup": "You are within {distance} {unit} from this point",
+  "lc_outsideMapBoundsMsg": "You seem located outside the boundaries of the map",
+  "no_alerts": "No Alerts Found"
 }

public/base-locales/es.json

@@ -469,5 +469,20 @@
   "loading_icons": "Obtener iconos",
   "loading_invasions": "Ir a buscar invasiones",
   "loading": "Cargando {{category}}",
-  "pvp_ranking_cap": "Nivel"
+  "pvp_ranking_cap": "Nivel",
+  "badge_0": "Ninguna",
+  "device_icons": "Iconos de dispositivos",
+  "spawnpoint_icons": "Iconos de puntos de aparición",
+  "badge_1": "Bronce",
+  "badge_2": "Plata",
+  "badge_3": "Oro",
+  "gym_badge_menu": "Editar insignia de gimnasio",
+  "gym_badges": "insignias de gimnasio",
+  "gym_badge_diamonds": "Mostrar insignias de gimnasio",
+  "gym_badges_subtitle": "Muestra insignias de gimnasio en el mapa y una lista en la página de perfil.",
+  "confirm_filters_reset": "Restablecer filtros",
+  "filters_reset_text": "¿Está seguro de que desea restablecer la configuración a los valores predeterminados? \n¡Esto no se puede deshacer!",
+  "filters_reset_title": "Restablecer filtros",
+  "raid_quick_select": "Selección rápida",
+  "disabled": "Discapacitado"
 }

public/base-locales/fr.json

@@ -484,5 +484,30 @@
   "loading_invasions": "Récupération des Invasions",
   "login_button": 12,
   "join_button": 12,
-  "pvp_ranking_cap": "Niveau"
-}
+  "scan_next": "Scanner un emplacement",
+  "scan_next_choose": "Glisser et déposer le marqueur pour définir l'emplacement de scan",
+  "scan_zone": "Scanner une zone",
+  "scan_zone_choose": "Glisser et déposer le marqueur pour définir l'emplacement et choisissez la taille du scan",
+  "scan_zone_size": "Taille",
+  "scan_zone_range": "Portée",
+  "scan_zone_spacing": "Espacement",
+  "scan_zone_radius": "Rayon",
+  "scan_requests": "Demandes de Scan ",
+  "scan_queue": "File d'attente ",
+  "click_to_scan": "Scanner ici",
+  "scan_confirmed_title": "Demande de scan confirmée",
+  "scan_confirmed": "L'appareil a été envoyé à la position de scan, le résultat sera bientôt visible sur la map !",
+  "scan_loading_title": "Envoi de la demande de scan",
+  "scan_loading": "Votre demande de scan est analysée et transmise au système !",
+  "scan_error_title": "Erreur",
+  "scan_error": "Il y a eu une erreur lors du traitement de la demande de scan...",
+  "scan_outside_area": "Cet emplacement est en dehors des zones autorisées",
+  "pvp_ranking_cap": "Niveau",
+  "device_icons": "Icônes d'appareils",
+  "spawnpoint_icons": "Icônes de points d'apparition",
+  "confirm_filters_reset": "Réinitialiser les filtres",
+  "filters_reset_text": "Voulez-vous vraiment réinitialiser les paramètres aux valeurs par défaut ? \nCelà ne peut pas être annulé!",
+  "filters_reset_title": "Réinitialiser les filtres",
+  "raid_quick_select": "Sélection rapide",
+  "disabled": "Désactivé"
+}

public/base-locales/it.json

@@ -438,5 +438,20 @@
   "loading_icons": "Recupero delle icone",
   "loading_invasions": "Recupero delle invasioni",
   "loading": "Caricamento {{category}}",
-  "pvp_ranking_cap": "Livello"
+  "pvp_ranking_cap": "Livello",
+  "badge_0": "Nessuno",
+  "device_icons": "Icone del dispositivo",
+  "spawnpoint_icons": "Icone del punto di spawn",
+  "badge_1": "Bronzo",
+  "badge_2": "Argento",
+  "badge_3": "Oro",
+  "gym_badge_menu": "Modifica badge palestra",
+  "gym_badges": "Distintivi da palestra",
+  "gym_badge_diamonds": "Mostra badge palestra",
+  "gym_badges_subtitle": "Visualizza i badge della palestra sulla mappa e un elenco nella pagina del profilo.",
+  "confirm_filters_reset": "Ripristina i filtri",
+  "filters_reset_text": "Sei sicuro di voler ripristinare le impostazioni ai valori predefiniti? \nQuesto non può essere annullato!",
+  "filters_reset_title": "Ripristina i filtri",
+  "raid_quick_select": "Selezione rapida",
+  "disabled": "Disabilitato"
 }

public/base-locales/ja.json

@@ -439,5 +439,20 @@
   "loading_icons": "アイコンの取得",
   "loading_invasions": "侵略をフェッチする",
   "loading": "{{category}}を読み込んでいます",
-  "pvp_ranking_cap": "レベル"
+  "pvp_ranking_cap": "レベル",
+  "badge_0": "なし",
+  "device_icons": "デバイスアイコン",
+  "spawnpoint_icons": "スポーンポイントアイコン",
+  "badge_1": "ブロンズ",
+  "badge_2": "銀",
+  "badge_3": "ゴールド",
+  "gym_badge_menu": "ジムバッジを編集する",
+  "gym_badges": "ジムバッジ",
+  "gym_badge_diamonds": "ジムバッジを表示する",
+  "gym_badges_subtitle": "マップ上にジムバッジを表示し、プロファイルページにリストを表示します。",
+  "confirm_filters_reset": "フィルタをリセット",
+  "filters_reset_text": "設定をデフォルト値にリセットしてもよろしいですか？\nこれは、元に戻すことはできません！",
+  "filters_reset_title": "フィルタをリセット",
+  "raid_quick_select": "クイックセレクト",
+  "disabled": "無効"
 }

public/base-locales/ko.json

@@ -438,5 +438,20 @@
   "loading_icons": "아이콘 가져오기",
   "loading_invasions": "침략 가져오기",
   "loading": "{{category}} 로드 중",
-  "pvp_ranking_cap": "수준"
+  "pvp_ranking_cap": "수준",
+  "badge_0": "없음",
+  "device_icons": "장치 아이콘",
+  "spawnpoint_icons": "생성 지점 아이콘",
+  "badge_1": "청동",
+  "badge_2": "은",
+  "badge_3": "금",
+  "gym_badge_menu": "체육관 배지 수정",
+  "gym_badges": "체육관 배지",
+  "gym_badge_diamonds": "체육관 배지 표시",
+  "gym_badges_subtitle": "지도에 체육관 배지를 표시하고 프로필 페이지에 목록을 표시합니다.",
+  "confirm_filters_reset": "필터 재설정",
+  "filters_reset_text": "설정을 기본값으로 재설정하시겠습니까? \n이 취소 할 수 없습니다!",
+  "filters_reset_title": "필터 재설정",
+  "raid_quick_select": "빠른 선택",
+  "disabled": "장애가있는"
 }