Skip to content

Dev1 #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bjones1 merged 3 commits into from
Apr 3, 2026
Merged

Dev1 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a13990
Update: JS dependencies.
bjones1 Apr 3, 2026
4ac0855
Fix: specify dist version, to keep CI from failing when a new dist ve…
bjones1 Apr 3, 2026
fc5ab86
Update: Rust dependencies.
bjones1 Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions builder/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 13 additions & 9 deletions builder/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// the CodeChat Editor. If not, see
// [http://www.gnu.org/licenses](http://www.gnu.org/licenses).
/// `main.rs` -- Entrypoint for the CodeChat Editor Builder
/// ============================================================================
/// =======================================================
///
/// This code uses [dist](https://opensource.axo.dev/cargo-dist/book/) as a part
/// of the release process. To update the `./release.yaml` file this tool
Expand All @@ -25,8 +25,11 @@
/// 3. Review changes to `./release.yaml`, reapplying hand edits.
/// 4. Revert the changes to `server/dist-workspace.toml`.
/// 5. Test
///
/// Keep the `DIST_VERSION` consistent with the version of dist in
/// `dist-workspace.toml` on release.
// Imports
// -----------------------------------------------------------------------------
// -------
//
// ### Standard library
use std::{
Expand All @@ -50,7 +53,7 @@ use regex::Regex;
// None
//
// Data structures
// -----------------------------------------------------------------------------
// ---------------
//
// The following defines the command-line interface for the CodeChat Editor.
#[derive(Parser)]
Expand Down Expand Up @@ -117,15 +120,16 @@ struct TypeScriptBuildOptions {
}

// Constants
// -----------------------------------------------------------------------------
// ---------
static VSCODE_PATH: &str = "../extensions/VSCode";
static CLIENT_PATH: &str = "../client";
static BUILDER_PATH: &str = "../builder";
static TEST_UTILS_PATH: &str = "../test_utils";
static NAPI_TARGET: &str = "NAPI_TARGET";
static DIST_VERSION: &str = "0.31.0";

// Code
// -----------------------------------------------------------------------------
// ----
//
// ### Utilities
//
Expand Down Expand Up @@ -288,7 +292,7 @@ fn search_and_replace_file<
}

// Core routines
// -----------------------------------------------------------------------------
// -------------
//
// These functions simplify common build-focused development tasks and support
// CI builds.
Expand Down Expand Up @@ -395,13 +399,13 @@ fn run_install(dev: bool) -> io::Result<()> {
// on MacOS. Try another approach.
#[cfg(target_os = "macos")]
run_cmd!(
curl --proto =https --tlsv1.2 -LsSf "https://github.com/axodotdev/cargo-dist/releases/latest/download/cargo-dist-installer.sh" | sh;
curl --proto =https --tlsv1.2 -LsSf "https://github.com/axodotdev/cargo-dist/releases/download/v${DIST_VERSION}/cargo-dist-installer.sh" | sh;

)?;
#[cfg(not(target_os = "macos"))]
run_cmd!(
info "cargo binstall cargo-dist";
cargo binstall cargo-dist --no-confirm;
cargo binstall cargo-dist@${DIST_VERSION} --no-confirm;
)?;

run_cmd!(
Expand Down Expand Up @@ -766,7 +770,7 @@ fn run_postrelease(target: &str) -> io::Result<()> {
}

// CLI implementation
// -----------------------------------------------------------------------------
// ------------------
//
// The following code implements the command-line interface for the CodeChat
// Editor.
Expand Down
4 changes: 2 additions & 2 deletions client/package.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
'@mathjax/mathjax-newcm-font': '^4.1.1',
codemirror: '^6.0.2',
mathjax: '^4.1.1',
mermaid: '^11.13.0',
mermaid: '^11.14.0',
'pdfjs-dist': '5.4.624',
tinymce: '^8.4.0',
'toastify-js': '^1.12.0',
Expand All @@ -82,7 +82,7 @@
'@typescript-eslint/eslint-plugin': '^8.58.0',
'@typescript-eslint/parser': '^8.58.0',
chai: '^6.2.2',
esbuild: '^0.27.4',
esbuild: '^0.28.0',
eslint: '^10.1.0',
'eslint-config-prettier': '^10.1.8',
'eslint-plugin-import': '^2.32.0',
Expand Down
Loading
Loading