enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-11-22 03:32:23 +03:00
Code Issues Projects Releases Wiki Activity

Fix build.json file generation and reading.

Browse Source
This commit is contained in:
Paweł Grabarz 2024-11-20 23:25:29 +01:00
parent 8f91590426
commit 565e2b5e81
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/src/appConfig.js
View File

@ -18,7 +18,9 @@ export async function readEnvironmentFromFile() {
const filePath = path.join(url.fileURLToPath(new URL('../..', import.meta.url)), fileName)
const buildInfo = await (async () => {
try {
return await import('../../../build.json', { with: { type: 'json' } })
const build = await import('../../../build.json', { with: { type: 'json' } })
// Handle importing json file regardless of CommonJS/ESM integation settings.
return 'default' in build ? build.default : build
} catch {
return { commit: '', version: '', engineVersion: '', name: '' }
}

2
build-config.yaml
View File

@ -6,4 +6,4 @@ required-versions:
# NB. The Rust version is pinned in rust-toolchain.toml.
# NB. The Node version is pinned in .node-version.
cargo-watch: ^8.1.1
wasm-pack: ^0.12.1
wasm-pack: ">=0.12.1"

24
build/cli/src/lib.rs
View File

@ -292,7 +292,9 @@ impl Processor {
let context = self.context();
let target = self.target::<Target>();
let job = self.resolve_build_job(job);
let info = self.write_build_info_file();
async move {
info.await?;
let job = job.await?;
target?.build(context, job).await
}
@ -517,6 +519,16 @@ impl Processor {
.boxed()
}
pub fn write_build_info_file(&self) -> BoxFuture<'static, Result> {
let build_info_get = self.js_build_info();
let build_info_path = self.context.inner.repo_root.join(&*enso_build::ide::web::BUILD_INFO);
async move {
let build_info = build_info_get.await?;
build_info_path.write_as_json(&build_info)
}
.boxed()
}
pub fn handle_ide(&self, ide: arg::ide::Target) -> BoxFuture<'static, Result> {
match ide.command {
arg::ide::Command::Build { params } => self.build_ide(params).void_ok().boxed(),
@ -559,19 +571,11 @@ impl Processor {
sign_artifacts,
} = params;
let build_info_get = self.js_build_info();
let build_info_path = self.context.inner.repo_root.join(&*enso_build::ide::web::BUILD_INFO);
let build_info = async move {
let build_info = build_info_get.await?;
build_info_path.write_as_json(&build_info)
};
let info = self.write_build_info_file();
let gui = self.get(gui);
let input = ide::BuildInput {
gui: async move {
build_info.await?;
info.await?;
gui.await
}
.boxed(),