sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 05:08:19 +08:00
Code Activity

merge alas

Browse Source
This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
webapp/scripts/update-electron-vendors.js
View File

@@ -12,21 +12,13 @@ const path = require('path');
*/
function getVendors() {
const output = execSync(`${electron} -p "JSON.stringify(process.versions)"`, {
<<<<<<< HEAD
env: {ELECTRON_RUN_AS_NODE: '1'},
=======
env: {'ELECTRON_RUN_AS_NODE': '1'},
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
encoding: 'utf-8',
});
return JSON.parse(output);
}
<<<<<<< HEAD
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
function formattedJSON(obj) {
return JSON.stringify(obj, null, 2) + '\n';
}
@@ -40,19 +32,14 @@ function updateVendors() {
const packageJSONPath = path.resolve(process.cwd(), 'package.json');
return Promise.all([
<<<<<<< HEAD
writeFile(
'./electron-vendors.config.json',
=======
writeFile('./electron-vendors.config.json',
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
formattedJSON({
chrome: chromeMajorVersion,
node: nodeMajorVersion,
}),
),
<<<<<<< HEAD
readFile(packageJSONPath)
.then(JSON.parse)
.then(packageJSON => {
@@ -64,17 +51,6 @@ function updateVendors() {
return writeFile(packageJSONPath, formattedJSON(packageJSON));
}),
=======
readFile(packageJSONPath).then(JSON.parse).then((packageJSON) => {
if (!packageJSON || !Array.isArray(packageJSON.browserslist)) {
throw new Error(`Can't find browserslist in ${packageJSONPath}`);
}
packageJSON.browserslist = [`Chrome ${chromeMajorVersion}`];
return writeFile(packageJSONPath, formattedJSON(packageJSON));
}),
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
]);
}