fix: package.json & package-lock.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-MARKED-2342073
- https://snyk.io/vuln/SNYK-JS-MARKED-2342082

.gitignore

@@ -76,4 +76,3 @@ error_log
 /config.php
 /config.bak.php
 /VERSION
-sync.sh

.shift

@@ -1,4 +0,0 @@
-This file was added by Shift #54503 in order to open a
-Pull Request since no other commits were made.
-
-You should remove this file.

app/Database/seeds/dev/in_progress.yml

@@ -36,8 +36,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb1
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -55,8 +54,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb2
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -74,8 +72,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb3
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -93,8 +90,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb34
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -112,8 +108,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb35
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -131,8 +126,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb36
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -150,8 +144,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb37
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -169,8 +162,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb38
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -188,8 +180,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb39
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'

app/Database/seeds/dev/sample.yml

@@ -34,17 +34,6 @@ airports:
     lon: -97.6698889
     hub: 1
     ground_handling_cost: 100
-  - id: KPHN
-    iata: HPN
-    icao: KPHN
-    name: Westchester County Airport
-    location: White Plains
-    country: United States
-    timezone: America/New_York
-    lat: 41.067
-    lon: -73.7076
-    hub: 1
-    ground_handling_cost: 100
   - id: KJFK
     iata: JFK
     icao: KJFK
@@ -459,21 +448,6 @@ flights:
   - id: flightid_1
     airline_id: 1
     flight_number: 100
-    dpt_airport_id: KHPN
-    arr_airport_id: KJFK
-    route: DCT CMK V374 DENNA V44 BELTT/N0346F140 V44 DPK DCT
-    distance: 113
-    level: 110
-    dpt_time: 6PM CST
-    arr_time: 11PM EST
-    flight_time: 240
-    flight_type: J
-    load_factor: 100
-    created_at: NOW
-    updated_at: NOW
-  - id: flightid_2
-    airline_id: 1
-    flight_number: 101
     dpt_airport_id: KAUS
     arr_airport_id: KJFK
     route: KAUS SID TNV J87 IAH J2 LCH J22 MEI J239 ATL J52 AJFEB J14 BYJAC Q60 JAXSN J14 COLIN J61 HUBBS J55 SIE STAR KJFK

app/Support/Database.php

@@ -134,11 +134,6 @@ class Database
                     ->where($id_col, $row[$id_col])
                     ->update($row);
             } else {
-                // Remove ID column if it exists and its empty, let the DB set it
-                /*if (array_key_exists($id_col, $row) && empty($row[$id_col])) {
-                    unset($row[$id_col]);
-                }*/
-
                 DB::table($table)->insert($row);
             }
         } catch (QueryException $e) {

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "phpvms",
+  "name": "npm-proj-1642362664591-0.49461278836317146QUut7C",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
@@ -29,7 +29,7 @@
         "leaflet-rotatedmarker": "^0.2.0",
         "leaflet.geodesic": "^2.5.2",
         "lodash": ">=4.17.19",
-        "marked": "^2.1.3",
+        "marked": "^4.0.10",
         "minimist": "^1.2.2",
         "moment": "^2.29.1",
         "paper-dashboard": "^1.1.0",
@@ -8552,14 +8552,14 @@
       }
     },
     "node_modules/marked": {
-      "version": "2.1.3",
+      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz",
-      "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==",
+      "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==",
       "bin": {
-        "marked": "bin/marked"
+        "marked": "bin/marked.js"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 12"
       }
     },
     "node_modules/math-random": {
@@ -20627,9 +20627,9 @@
       }
     },
     "marked": {
-      "version": "2.1.3",
+      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz",
-      "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA=="
+      "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw=="
     },
     "math-random": {
       "version": "1.0.4",

package.json

@@ -34,7 +34,7 @@
     "leaflet-rotatedmarker": "^0.2.0",
     "leaflet.geodesic": "^2.5.2",
     "lodash": ">=4.17.19",
-    "marked": "^2.1.3",
+    "marked": "^4.0.10",
     "minimist": "^1.2.2",
     "moment": "^2.29.1",
     "paper-dashboard": "^1.1.0",