Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run-able with more modern version of npm and node (npm 10.2.4, node 20.11.0) #249

Merged
merged 4 commits into from
Sep 26, 2024
+18,144 −14,258
Merged

Run-able with more modern version of npm and node (npm 10.2.4, node 20.11.0) #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb46298
update some deprecated dependencies and updated file path from cjs sy…
lilyhuang-github Sep 25, 2024
1de2d5a
updated r6operators for new operator icons and add thron
lilyhuang-github Sep 26, 2024
6efc5b9
thron added officially.
lilyhuang-github Sep 26, 2024
810e49f
add azami
lilyhuang-github Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gulpfile.js/gulp/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
31,853 changes: 17,860 additions & 13,993 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions src/main/create-operator-json/core/operatorIdEnum.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,6 @@ export default {
flores: 60,
thunderbird: 61,
osa: 62,
thorn:63,
azami:64
};
129 changes: 67 additions & 62 deletions src/main/create-operator-json/core/operatorList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -120,6 +124,7 @@ export default {
tachanka,
thatcher,
thermite,
thorn,
thunderbird,
twitch,
valkyrie,
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/ace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/alibi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/amaru.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/aruni.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/ash.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
10 changes: 10 additions & 0 deletions src/main/create-operator-json/operators/azami.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/bandit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/blackbeard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/blitz.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/buck.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/capitao.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/castle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/caviera.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/clash.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/doc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/dokkaebi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/main/create-operator-json/operators/echo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
Loading