Merge pull request #249 from lilyhuang-github/master

Run-able with more modern version of npm and node (npm 10.2.4, node 20.11.0)
BurkusCat · Sep 26, 2024 · 8296189 · 8296189
2 parents e1f9ea7 + 810e49f
commit 8296189
Show file tree

Hide file tree

Showing 70 changed files with 18,144 additions and 14,258 deletions.
diff --git a/gulpfile.js/gulp/styles.js b/gulpfile.js/gulp/styles.js
@@ -4,7 +4,7 @@
     cssnano = require('gulp-cssnano'),
     gulp = require('gulp'),
     rename = require('gulp-rename'),
-    sass = require('gulp-sass');
+    sass = require('gulp-sass')(require('sass'))
 
 function styles() {
     return gulp.src(conf.paths.src + '/styles/*.scss')

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,12 +36,15 @@
   "dependencies": {
     "file-system": "^2.2.2",
     "gulp-run": "^1.7.1",
-    "gulp-sass": "^4.0.2",
+    "gulp-sass": "^5.1.0",
     "gulp-svg2png": "^2.0.2",
     "gulp-webp": "^4.0.1",
-    "r6operators": "^2.1.0",
-    "sass": "^1.50.1",
-    "workbox-build": "^6.5.3"
+    "phantomjs-prebuilt": "^2.1.16",
+    "r6operators": "^2.10.1",
+    "sass": "^1.79.3",
+    "webp-converter": "^2.3.3",
+    "workbox-build": "^6.5.3",
+    "xmlhttprequest-ssl": "^2.1.1"
   },
   "devDependencies": {
     "angular-mocks": "^1.5.7",
@@ -89,7 +92,6 @@
     "karma-sinon": "^1.0.4",
     "lodash": "^4.17.19",
     "node-notifier": "^8.0.1",
-    "phantomjs": "^2.1.1",
     "proxyquire": "^1.7.9 ",
     "proxyquireify": "^3.2.0",
     "run-sequence": "^1.2.2",

diff --git a/src/main/create-operator-json/core/operatorIdEnum.js b/src/main/create-operator-json/core/operatorIdEnum.js
@@ -67,4 +67,6 @@ export default {
     flores: 60,
     thunderbird: 61,
     osa: 62,
+    thorn:63,
+    azami:64
 };
diff --git a/src/main/create-operator-json/core/operatorList.js b/src/main/create-operator-json/core/operatorList.js
@@ -3,75 +3,79 @@
  * This module to be used only by operatorModule.js
  */
 
-import ace from '../operators/ace';
-import alibi from '../operators/alibi';
-import amaru from '../operators/amaru';
-import aruni from '../operators/aruni';
-import ash from '../operators/ash';
-import bandit from '../operators/bandit';
-import blackbeard from '../operators/blackbeard';
-import blitz from '../operators/blitz';
-import buck from '../operators/buck';
-import capitao from '../operators/capitao';
-import castle from '../operators/castle';
-import caviera from '../operators/caviera';
-import clash from '../operators/clash';
-import doc from '../operators/doc';
-import dokkaebi from '../operators/dokkaebi';
-import echo from '../operators/echo';
-import ela from '../operators/ela';
-import finka from '../operators/finka';
-import flores from '../operators/flores'
-import frost from '../operators/frost';
-import fuze from '../operators/fuze';
-import glaz from '../operators/glaz';
-import goyo from '../operators/goyo';
-import gridlock from '../operators/gridlock';
-import hibana from '../operators/hibana';
-import iana from '../operators/iana';
-import iq from '../operators/iq';
-import jackal from '../operators/jackal';
-import jager from '../operators/jager';
-import kaid from '../operators/kaid';
-import kali from '../operators/kali';
-import kapkan from '../operators/kapkan';
-import lesion from '../operators/lesion';
-import lion from '../operators/lion';
-import maestro from '../operators/maestro';
-import maverick from '../operators/maverick';
-import melusi from '../operators/melusi';
-import mira from '../operators/mira';
-import montagne from '../operators/montagne';
-import mozzie from '../operators/mozzie';
-import mute from '../operators/mute';
-import nokk from '../operators/nokk';
-import nomad from '../operators/nomad';
-import oryx from '../operators/oryx';
-import osa from '../operators/osa';
-import pulse from '../operators/pulse';
-import recruit from '../operators/recruit';
-import rook from '../operators/rook';
-import sledge from '../operators/sledge';
-import smoke from '../operators/smoke';
-import tachanka from '../operators/tachanka';
-import thatcher from '../operators/thatcher';
-import thermite from '../operators/thermite';
-import thunderbird from '../operators/thunderbird';
-import twitch from '../operators/twitch';
-import valkyrie from '../operators/valkyrie';
-import vigil from '../operators/vigil';
-import wamai from '../operators/wamai';
-import warden from '../operators/warden';
-import ying from '../operators/ying';
-import zero from '../operators/zero';
-import zofia from '../operators/zofia';
+import ace from '../operators/ace.js';
+import alibi from '../operators/alibi.js';
+import amaru from '../operators/amaru.js';
+import aruni from '../operators/aruni.js';
+import ash from '../operators/ash.js';
+import azami from '../operators/azami.js';
+import bandit from '../operators/bandit.js';
+import blackbeard from '../operators/blackbeard.js';
+import blitz from '../operators/blitz.js';
+import buck from '../operators/buck.js';
+import capitao from '../operators/capitao.js';
+import castle from '../operators/castle.js';
+import caviera from '../operators/caviera.js';
+import clash from '../operators/clash.js';
+import doc from '../operators/doc.js';
+import dokkaebi from '../operators/dokkaebi.js';
+import echo from '../operators/echo.js';
+import ela from '../operators/ela.js';
+import finka from '../operators/finka.js';
+import flores from '../operators/flores.js';
+import frost from '../operators/frost.js';
+import fuze from '../operators/fuze.js';
+import glaz from '../operators/glaz.js';
+import goyo from '../operators/goyo.js';
+import gridlock from '../operators/gridlock.js';
+import hibana from '../operators/hibana.js';
+import iana from '../operators/iana.js';
+import iq from '../operators/iq.js';
+import jackal from '../operators/jackal.js';
+import jager from '../operators/jager.js';
+import kaid from '../operators/kaid.js';
+import kali from '../operators/kali.js';
+import kapkan from '../operators/kapkan.js';
+import lesion from '../operators/lesion.js';
+import lion from '../operators/lion.js';
+import maestro from '../operators/maestro.js';
+import maverick from '../operators/maverick.js';
+import melusi from '../operators/melusi.js';
+import mira from '../operators/mira.js';
+import montagne from '../operators/montagne.js';
+import mozzie from '../operators/mozzie.js';
+import mute from '../operators/mute.js';
+import nokk from '../operators/nokk.js';
+import nomad from '../operators/nomad.js';
+import oryx from '../operators/oryx.js';
+import osa from '../operators/osa.js';
+import pulse from '../operators/pulse.js';
+import recruit from '../operators/recruit.js';
+import rook from '../operators/rook.js';
+import sledge from '../operators/sledge.js';
+import smoke from '../operators/smoke.js';
+import tachanka from '../operators/tachanka.js';
+import thatcher from '../operators/thatcher.js';
+import thermite from '../operators/thermite.js';
+import thorn from "../operators/thorn.js";
+import thunderbird from '../operators/thunderbird.js';
+import twitch from '../operators/twitch.js';
+import valkyrie from '../operators/valkyrie.js';
+import vigil from '../operators/vigil.js';
+import wamai from '../operators/wamai.js';
+import warden from '../operators/warden.js';
+import ying from '../operators/ying.js';
+import zero from '../operators/zero.js';
+import zofia from '../operators/zofia.js';
+
 
 export default {
   ace,
   alibi,
   amaru,
   aruni,
   ash,
+  azami,
   bandit,
   blackbeard,
   blitz,
@@ -120,6 +124,7 @@ export default {
   tachanka,
   thatcher,
   thermite,
+  thorn,
   thunderbird,
   twitch,
   valkyrie,

diff --git a/src/main/create-operator-json/operators/ace.js b/src/main/create-operator-json/operators/ace.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let ace = new Operator(r6operators.ace, operatorId.ace, "Operation Steel Wave");

diff --git a/src/main/create-operator-json/operators/alibi.js b/src/main/create-operator-json/operators/alibi.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let alibi = new Operator(r6operators.alibi, operatorId.alibi, "Operation Para Bellum");

diff --git a/src/main/create-operator-json/operators/amaru.js b/src/main/create-operator-json/operators/amaru.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let amaru = new Operator(r6operators.amaru, operatorId.amaru, "Operation Ember Rise");

diff --git a/src/main/create-operator-json/operators/aruni.js b/src/main/create-operator-json/operators/aruni.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let aruni = new Operator(r6operators.aruni, operatorId.aruni, "Operation Neon Dawn");

diff --git a/src/main/create-operator-json/operators/ash.js b/src/main/create-operator-json/operators/ash.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let ash = new Operator(r6operators.ash, operatorId.ash, "N/A");

diff --git a/src/main/create-operator-json/operators/azami.js b/src/main/create-operator-json/operators/azami.js
@@ -0,0 +1,10 @@
+'use strict';
+
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
+import r6operators from "r6operators";
+
+let azami = new Operator(r6operators.azami, operatorId.azami, "Operation Demon Veil");
+
+export default azami
diff --git a/src/main/create-operator-json/operators/bandit.js b/src/main/create-operator-json/operators/bandit.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let bandit = new Operator(r6operators.bandit, operatorId.bandit, "N/A");

diff --git a/src/main/create-operator-json/operators/blackbeard.js b/src/main/create-operator-json/operators/blackbeard.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let blackbeard = new Operator(r6operators.blackbeard, operatorId.blackbeard, "Operation Dust Line");

diff --git a/src/main/create-operator-json/operators/blitz.js b/src/main/create-operator-json/operators/blitz.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let blitz = new Operator(r6operators.blitz, operatorId.blitz, "N/A");

diff --git a/src/main/create-operator-json/operators/buck.js b/src/main/create-operator-json/operators/buck.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let buck = new Operator(r6operators.buck, operatorId.buck, "Operation Black Ice");

diff --git a/src/main/create-operator-json/operators/capitao.js b/src/main/create-operator-json/operators/capitao.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let capitao = new Operator(r6operators.capitao, operatorId.capitao, "Operation Skull Rain");

diff --git a/src/main/create-operator-json/operators/castle.js b/src/main/create-operator-json/operators/castle.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let castle = new Operator(r6operators.castle, operatorId.castle, "N/A");

diff --git a/src/main/create-operator-json/operators/caviera.js b/src/main/create-operator-json/operators/caviera.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let caviera = new Operator(r6operators.caveira, operatorId.caviera, "Operation Skull Rain");

diff --git a/src/main/create-operator-json/operators/clash.js b/src/main/create-operator-json/operators/clash.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let clash = new Operator(r6operators.clash, operatorId.clash, "Operation Grim Sky");

diff --git a/src/main/create-operator-json/operators/doc.js b/src/main/create-operator-json/operators/doc.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let doc = new Operator(r6operators.doc, operatorId.doc, "N/A");

diff --git a/src/main/create-operator-json/operators/dokkaebi.js b/src/main/create-operator-json/operators/dokkaebi.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let dokkaebi = new Operator(r6operators.dokkaebi, operatorId.dokkaebi, "Operation White Noise");

diff --git a/src/main/create-operator-json/operators/echo.js b/src/main/create-operator-json/operators/echo.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import counterType from '../core/counterTypeEnums';
-import operatorId from '../core/operatorIdEnum';
-import Operator from '../core/operatorFactory';
+import counterType from '../core/counterTypeEnums.js';
+import operatorId from '../core/operatorIdEnum.js';
+import Operator from '../core/operatorFactory.js';
 import r6operators from "r6operators";
 
 let echo = new Operator(r6operators.echo, operatorId.echo, "Operation Red Crow");