Skip to content

Commit

Permalink
Merge pull request #277 from nyannyacha/fix-arch-dup
Browse files Browse the repository at this point in the history
fix: use `core.build` variable instead of maintain own `build` constant
  • Loading branch information
nyannyacha authored Feb 20, 2024
2 parents 1dde8c8 + 71128a5 commit 6072a8e
Showing 1 changed file with 1 addition and 25 deletions.
26 changes: 1 addition & 25 deletions crates/sb_core/js/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -235,29 +235,6 @@ const globalScope = {
[webidl.brand]: nonEnumerable(webidl.brand),
};

// set build info
const build = {
target: 'unknown',
arch: 'unknown',
os: 'unknown',
vendor: 'unknown',
env: undefined,
};

function setBuildInfo(target) {
const { 0: arch, 1: vendor, 2: os, 3: env } = StringPrototypeSplit(
target,
'-',
4,
);
build.target = target;
build.arch = arch;
build.vendor = vendor;
build.os = os;
build.env = env;

ObjectFreeze(build);
}

function runtimeStart(runtimeOptions, source) {
core.setMacrotaskCallback(timers.handleTimerMacrotask);
Expand All @@ -266,7 +243,6 @@ function runtimeStart(runtimeOptions, source) {

ops.op_set_format_exception_callback(formatException);

setBuildInfo(runtimeOptions.target);
core.setBuildInfo(runtimeOptions.target);

// deno-lint-ignore prefer-primordials
Expand Down Expand Up @@ -330,7 +306,7 @@ globalThis.bootstrapSBEdge = (

// set these overrides after runtimeStart
ObjectDefineProperties(denoOverrides, {
build: readOnly(build),
build: readOnly(core.build),
env: readOnly(SUPABASE_ENV),
pid: readOnly(globalThis.__pid),
args: readOnly([]), // args are set to be empty
Expand Down

0 comments on commit 6072a8e

Please sign in to comment.