mirror of
https://github.com/dscalzi/HeliosLauncher.git
synced 2024-12-22 11:42:14 -08:00
Compare commits
5 Commits
0dcabb8a35
...
7be365442a
Author | SHA1 | Date | |
---|---|---|---|
|
7be365442a | ||
|
e401608c33 | ||
|
6aaeeff9a4 | ||
|
9cca37ca8a | ||
|
03dac9ed6d |
@ -839,9 +839,7 @@ class ProcessBuilder {
|
|||||||
libs[mdl.getVersionlessMavenIdentifier()] = mdl.getPath()
|
libs[mdl.getVersionlessMavenIdentifier()] = mdl.getPath()
|
||||||
if(mdl.subModules.length > 0){
|
if(mdl.subModules.length > 0){
|
||||||
const res = this._resolveModuleLibraries(mdl)
|
const res = this._resolveModuleLibraries(mdl)
|
||||||
if(res.length > 0){
|
libs = {...libs, ...res}
|
||||||
libs = {...libs, ...res}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -850,9 +848,7 @@ class ProcessBuilder {
|
|||||||
for(let i=0; i<mods.length; i++){
|
for(let i=0; i<mods.length; i++){
|
||||||
if(mods.sub_modules != null){
|
if(mods.sub_modules != null){
|
||||||
const res = this._resolveModuleLibraries(mods[i])
|
const res = this._resolveModuleLibraries(mods[i])
|
||||||
if(res.length > 0){
|
libs = {...libs, ...res}
|
||||||
libs = {...libs, ...res}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -863,27 +859,25 @@ class ProcessBuilder {
|
|||||||
* Recursively resolve the path of each library required by this module.
|
* Recursively resolve the path of each library required by this module.
|
||||||
*
|
*
|
||||||
* @param {Object} mdl A module object from the server distro index.
|
* @param {Object} mdl A module object from the server distro index.
|
||||||
* @returns {Array.<string>} An array containing the paths of each library this module requires.
|
* @returns {{[id: string]: string}} An object containing the paths of each library this module requires.
|
||||||
*/
|
*/
|
||||||
_resolveModuleLibraries(mdl){
|
_resolveModuleLibraries(mdl){
|
||||||
if(!mdl.subModules.length > 0){
|
if(!mdl.subModules.length > 0){
|
||||||
return []
|
return {}
|
||||||
}
|
}
|
||||||
let libs = []
|
let libs = {}
|
||||||
for(let sm of mdl.subModules){
|
for(let sm of mdl.subModules){
|
||||||
if(sm.rawModule.type === Type.Library){
|
if(sm.rawModule.type === Type.Library){
|
||||||
|
|
||||||
if(sm.rawModule.classpath ?? true) {
|
if(sm.rawModule.classpath ?? true) {
|
||||||
libs.push(sm.getPath())
|
libs[sm.getVersionlessMavenIdentifier()] = sm.getPath()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// If this module has submodules, we need to resolve the libraries for those.
|
// If this module has submodules, we need to resolve the libraries for those.
|
||||||
// To avoid unnecessary recursive calls, base case is checked here.
|
// To avoid unnecessary recursive calls, base case is checked here.
|
||||||
if(mdl.subModules.length > 0){
|
if(mdl.subModules.length > 0){
|
||||||
const res = this._resolveModuleLibraries(sm)
|
const res = this._resolveModuleLibraries(sm)
|
||||||
if(res.length > 0){
|
libs = {...libs, ...res}
|
||||||
libs = libs.concat(res)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return libs
|
return libs
|
||||||
|
1882
package-lock.json
generated
1882
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
14
package.json
14
package.json
@ -24,25 +24,25 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@electron/remote": "^2.1.2",
|
"@electron/remote": "^2.1.2",
|
||||||
"adm-zip": "^0.5.12",
|
"adm-zip": "^0.5.16",
|
||||||
"discord-rpc-patch": "^4.0.1",
|
"discord-rpc-patch": "^4.0.1",
|
||||||
"ejs": "^3.1.10",
|
"ejs": "^3.1.10",
|
||||||
"ejs-electron": "^3.0.0",
|
"ejs-electron": "^3.0.0",
|
||||||
"electron-updater": "^6.1.8",
|
"electron-updater": "^6.3.9",
|
||||||
"fs-extra": "^11.1.1",
|
"fs-extra": "^11.1.1",
|
||||||
"github-syntax-dark": "^0.5.0",
|
"github-syntax-dark": "^0.5.0",
|
||||||
"got": "^11.8.5",
|
"got": "^11.8.5",
|
||||||
"helios-core": "~2.2.1",
|
"helios-core": "~2.2.3",
|
||||||
"helios-distribution-types": "^1.3.0",
|
"helios-distribution-types": "^1.3.0",
|
||||||
"jquery": "^3.7.1",
|
"jquery": "^3.7.1",
|
||||||
"lodash.merge": "^4.6.2",
|
"lodash.merge": "^4.6.2",
|
||||||
"semver": "^7.6.0",
|
"semver": "^7.6.3",
|
||||||
"toml": "^3.0.0"
|
"toml": "^3.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"electron": "^30.0.1",
|
"electron": "^33.2.1",
|
||||||
"electron-builder": "^24.13.3",
|
"electron-builder": "^25.1.8",
|
||||||
"eslint": "^8.57.0"
|
"eslint": "^8.57.1"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
Loading…
Reference in New Issue
Block a user