bunite-core 0.0.6 → 0.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/shared/paths.ts +8 -5
package/package.json
CHANGED
package/src/shared/paths.ts
CHANGED
|
@@ -35,7 +35,8 @@ export function resolveBunitePackageRoot(): string | null {
|
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
function hasCefRuntime(dir: string): boolean {
|
|
38
|
-
return existsSync(join(dir, "libcef.dll")) || existsSync(join(dir, "libcef.so"))
|
|
38
|
+
return existsSync(join(dir, "libcef.dll")) || existsSync(join(dir, "libcef.so"))
|
|
39
|
+
|| existsSync(join(dir, "Release", "libcef.dll")) || existsSync(join(dir, "Release", "libcef.so"));
|
|
39
40
|
}
|
|
40
41
|
|
|
41
42
|
function parseCefVersion(name: string): number[] | null {
|
|
@@ -126,9 +127,9 @@ export function resolveNativeArtifacts(): ResolvedNativeArtifacts {
|
|
|
126
127
|
|
|
127
128
|
const packageRoot = resolveBunitePackageRoot();
|
|
128
129
|
|
|
129
|
-
// 2. Optional npm packages (
|
|
130
|
-
const nativePackageName =
|
|
131
|
-
const cefPackageName =
|
|
130
|
+
// 2. Optional npm packages (bunite-native-*, bunite-cef-*)
|
|
131
|
+
const nativePackageName = `bunite-native-${PLATFORM_TAG}-${ARCH}`;
|
|
132
|
+
const cefPackageName = `bunite-cef-${PLATFORM_TAG}-${ARCH}`;
|
|
132
133
|
const nativePackageRoot = resolvePackageRoot(nativePackageName);
|
|
133
134
|
const cefPackageRoot = resolvePackageRoot(cefPackageName);
|
|
134
135
|
|
|
@@ -153,7 +154,9 @@ export function resolveNativeArtifacts(): ResolvedNativeArtifacts {
|
|
|
153
154
|
cefPackageName: packagedCefDir && existsSync(packagedCefDir) ? cefPackageName : null,
|
|
154
155
|
nativeLibPath: packagedNativeLibPath,
|
|
155
156
|
processHelperPath: packagedProcessHelperPath,
|
|
156
|
-
cefDir: packagedCefDir && existsSync(packagedCefDir)
|
|
157
|
+
cefDir: (packagedCefDir && existsSync(packagedCefDir))
|
|
158
|
+
? packagedCefDir
|
|
159
|
+
: resolveCefDir(packageRoot ? [packageRoot] : [])
|
|
157
160
|
};
|
|
158
161
|
}
|
|
159
162
|
|