mirrors/dbgate
1
0
Fork 0
mirror of https://github.com/dbgate/dbgate synced 2024-11-07 20:26:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Jan Prochazka 2021-04-17 11:01:42 +02:00
parent 76e51343d0
commit a6207f01af
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/electron.js
View File

@ -205,6 +205,7 @@ function createWindow() {
} else {
const apiProcess = fork(path.join(__dirname, '../packages/api/dist/bundle.js'), [
'--dynport',
'--is-electron-bundle',
'--native-modules',
path.join(__dirname, 'nativeModules'),
// '../../../src/nativeModules'

2
packages/api/src/utility/directories.js
View File

@ -51,7 +51,7 @@ function packagedPluginsDir() {
// node_modules
return global['dbgateApiPackagedPluginsPath'];
}
if (platformInfo.isElectron) {
if (platformInfo.isElectronBundle) {
return path.resolve(__dirname, '../../plugins');
}
return null;

20
packages/api/src/utility/platformInfo.js
View File

@ -11,23 +11,23 @@ const isDocker = fs.existsSync('/home/dbgate-docker/build');
const isDevMode = p.env.DEVMODE == '1';
const isNpmDist = p.argv[2] == 'startNodeWeb';
function moduleAvailable(name) {
try {
require.resolve(name);
return true;
} catch (e) {
return false;
}
}
// function moduleAvailable(name) {
// try {
// require.resolve(name);
// return true;
// } catch (e) {
// return false;
// }
// }
const isElectron = moduleAvailable('electron');
const isElectronBundle = p.argv.indexOf('--is-electron-bundle') >= 0;
const platformInfo = {
isWindows,
isMac,
isLinux,
isDocker,
isElectron,
isElectronBundle,
isDevMode,
isNpmDist,
isSnap: p.env.ELECTRON_SNAP == 'true',

9
packages/web/src/plugins/manifestExtractors.ts
View File

@ -6,15 +6,16 @@ export function extractPluginIcon(packageManifest) {
const homepage = (links && links.homepage) || packageManifest.homepage;
const tested = repository || homepage || packageManifest.homepage;
if (tested == 'https://dbgate.org' || tested == 'https://github.com/dbgate/dbgate') {
// monorepo plugin
return `https://github.com/dbgate/dbgate/raw/master/plugins/${packageManifest.name}/icon.svg`;
}
if (tested) {
const match = tested.match(/https:\/\/github.com\/([^/]*)\/([^/]*)/);
if (match) {
return `https://raw.githubusercontent.com/${match[1]}/${match[2]}/master/icon.svg`;
}
if (tested == 'https://dbgate.org') {
return `https://github.com/dbgate/dbgate/raw/master/plugins/${packageManifest.name}/icon.svg`;
}
}
return 'unknown.svg';
}