chore: bump weekly (holochain#359)

* chore: bump weekly * chore: bump tryorama , holochain client and hc-spin versions * nix flake update * fix dprint_plugin_typescript breaking change
c12i · Sep 6, 2024 · d415a38 · d415a38
1 parent cbba922
commit d415a38
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 46 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "holochain_scaffolding_cli"
-version = "0.4000.0-dev.16"
+version = "0.4000.0-dev.17"
 description = "CLI to easily generate and modify holochain apps"
 license = "CAL-1.0"
 homepage = "https://developer.holochain.org"
@@ -18,10 +18,10 @@ name = "holochain_scaffolding_cli"
 path = "src/lib.rs"
 
 [dependencies]
-holochain = { features = ["test_utils"], version = "0.4.0-dev.18" }
-holochain_types = "0.4.0-dev.18"
-holochain_util = { features = ["backtrace"], version = "0.4.0-dev.2" }
-mr_bundle = "0.4.0-dev.5"
+holochain = { features = ["test_utils"], version = "0.4.0-dev.22" }
+holochain_types = "0.4.0-dev.22"
+holochain_util = { features = ["backtrace"], version = "0.4.0-dev.4" }
+mr_bundle = "0.4.0-dev.7"
 
 dirs = "5.0.1"
 ignore = "0.4"

diff --git a/flake.lock b/flake.lock
diff --git a/src/utils.rs b/src/utils.rs
@@ -239,6 +239,7 @@ pub fn format_code<P: Into<PathBuf>>(code: &str, file_name: P) -> ScaffoldResult
             "ts" | "js" | "tsx" | "jsx" => {
                 let formatted_code = dprint_plugin_typescript::format_text(
                     &file_path,
+                    None,
                     code.to_owned(),
                     &ts_format_config,
                 )
@@ -287,18 +288,26 @@ fn format_nested<'a>(
     if let Some(nested_extension) = path.extension().and_then(|ext| ext.to_str()) {
         match (root_extension, nested_extension) {
             ("vue", "ts" | "js") => {
-                let formatted_code =
-                    dprint_plugin_typescript::format_text(path, raw.to_owned(), ts_format_config)
-                        .map_err(|e| anyhow::anyhow!("Failed to format source code: {e:?}"))?;
+                let formatted_code = dprint_plugin_typescript::format_text(
+                    path,
+                    None,
+                    raw.to_owned(),
+                    ts_format_config,
+                )
+                .map_err(|e| anyhow::anyhow!("Failed to format source code: {e:?}"))?;
 
                 if let Some(value) = formatted_code {
                     return Ok(Cow::Owned(value));
                 }
             }
             ("svelte", "ts" | "js" | "tsx" | "jsx") => {
-                let formatted_code =
-                    dprint_plugin_typescript::format_text(path, raw.to_owned(), ts_format_config)
-                        .map_err(|e| anyhow::anyhow!("Failed to format source code: {e:?}"))?;
+                let formatted_code = dprint_plugin_typescript::format_text(
+                    path,
+                    None,
+                    raw.to_owned(),
+                    ts_format_config,
+                )
+                .map_err(|e| anyhow::anyhow!("Failed to format source code: {e:?}"))?;
 
                 if let Some(value) = formatted_code {
                     return Ok(Cow::Owned(value));

diff --git a/src/versions.rs b/src/versions.rs
@@ -1,11 +1,11 @@
 /// npm: <https://www.npmjs.com/package/@holochain/tryorama>
-pub const TRYORAMA_VERSION: &str = "^0.17.0-dev.4";
+pub const TRYORAMA_VERSION: &str = "^0.17.0-dev.5";
 
 /// npm: <https://www.npmjs.com/package/@holochain/client>
-pub const HOLOCHAIN_CLIENT_VERSION: &str = "^0.18.0-dev.8";
+pub const HOLOCHAIN_CLIENT_VERSION: &str = "^0.18.0-dev.10";
 
 /// npm: <https://www.npmjs.com/package/@holochain/hc-spin>
-pub const HC_SPIN_VERSION: &str = "^0.400.0-dev.2";
+pub const HC_SPIN_VERSION: &str = "^0.400.0-dev.3";
 
 /// npm: <https://www.npmjs.com/package/@holo-host/web-sdk>
 pub const WEB_SDK_VERSION: &str = "^0.6.20-prerelease";

diff --git a/templates/generic/web-app/package.json.hbs b/templates/generic/web-app/package.json.hbs
@@ -23,7 +23,7 @@
   {{/if}}
     "package": "{{(package_manager_command package_manager "build:happ" null)}} && {{(package_manager_command package_manager "package" "ui")}} && hc web-app pack workdir --recursive",
     "build:happ": "{{(package_manager_command package_manager "build:zomes" null)}} && hc app pack workdir --recursive",
-    "build:zomes": "RUSTFLAGS='' CARGO_TARGET_DIR=target cargo build --release --target wasm32-unknown-unknown"
+    "build:zomes": "cargo build --release --target wasm32-unknown-unknown"
   },
   "devDependencies": {
     "@holochain-playground/cli": "{{holochain_playground_cli_version}}",