examples: trunk-workspace: update for future compat

CHANGELOG.md

@@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed
 * `buildTrunkPackage` will pass in `--release=true` (instead of just
   `--release`) for trunk versions 0.21 or higher to avoid argument ambiguities
+* `buildTrunkPackage` will now correctly honor `buildPhaseCargoCommand` if
+  specified (previously the value of `buildPhaseCommand` was incorrectly being
+  used)
 * `removeReferencesToVendoredSourcesHook` avoids referencing `/dev/fd`
   directly since it may not be present on certain platforms
 

checks/trunk.nix

@@ -39,22 +39,10 @@ let
   trunkSimpleNoArtifacts = myLibWasm.buildTrunkPackage (defaultArgs // {
     pname = "trunk-simple-no-artifacts";
   });
-
-  trunkOutdatedBindgen = myLibWasm.buildTrunkPackage {
-    pname = "trunk-outdated-bindgen";
-    src = ./trunk-outdated-bindgen;
-    doCheck = false;
-    wasm-bindgen-cli = pkgs.wasm-bindgen-cli.override {
-      version = "0.2.85";
-      hash = "sha256-0pTIzpu7dJM34CXmi83e8UV0E3N2bKJiOMw5WJQ2s/Y=";
-      cargoHash = "sha256-ZwmoFKmGaf5VvTTXjLyb2714Pu536E/8UxUzxI40ID8=";
-    };
-  };
 in
 runCommand "trunkTests" { } ''
   test -f ${trunkSimple}/*.wasm
   test -f ${trunkSimple}/*.css
   test -f ${trunkSimpleNoArtifacts}/*.wasm
-  test -f ${trunkOutdatedBindgen}/*.wasm
   mkdir -p $out
 ''

examples/trunk-workspace/flake.nix

@@ -4,10 +4,6 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    # The version of wasm-bindgen-cli needs to match the version in Cargo.lock
-    # Update this to include the version you need
-    nixpkgs-for-wasm-bindgen.url = "github:NixOS/nixpkgs/4e6868b1aa3766ab1de169922bb3826143941973";
-
     crane.url = "github:ipetkov/crane";
 
     flake-utils.url = "github:numtide/flake-utils";
@@ -18,7 +14,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, crane, flake-utils, rust-overlay, nixpkgs-for-wasm-bindgen, ... }:
+  outputs = { self, nixpkgs, crane, flake-utils, rust-overlay, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {
@@ -33,11 +29,7 @@
           # wasm32-unknown-unknown is required for trunk.
           targets = [ "wasm32-unknown-unknown" ];
         };
-        craneLib = ((crane.mkLib pkgs).overrideToolchain rustToolchainFor).overrideScope (_final: _prev: {
-          # The version of wasm-bindgen-cli needs to match the version in Cargo.lock. You
-          # can unpin this if your nixpkgs commit contains the appropriate wasm-bindgen-cli version
-          inherit (import nixpkgs-for-wasm-bindgen { inherit system; }) wasm-bindgen-cli;
-        });
+        craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchainFor;
 
         # When filtering sources, we want to allow assets other than .rs files
         unfilteredRoot = ./.; # The original, unfiltered source
@@ -107,12 +99,26 @@
         myClient = craneLib.buildTrunkPackage (wasmArgs // {
           pname = "trunk-workspace-client";
           cargoArtifacts = cargoArtifactsWasm;
-          trunkIndexPath = "client/index.html";
+          # Trunk expects the current directory to be the crate to compile
+          preBuild = ''
+            cd ./client
+          '';
+          # After building, move the `dist` artifacts and restore the working directory
+          postBuild = ''
+            mv ./dist ..
+            cd ..
+          '';
           # The version of wasm-bindgen-cli here must match the one from Cargo.lock.
           wasm-bindgen-cli = pkgs.wasm-bindgen-cli.override {
             version = "0.2.93";
             hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=";
             cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=";
+            # When updating to a new version comment out the above two lines and
+            # uncomment the bottom two lines. Then try to do a build, which will fail
+            # but will print out the correct value for `hash`. Replace the value and then
+            # repeat the process but this time the printed value will be for `cargoHash`
+            # hash = lib.fakeHash;
+            # cargoHash = lib.fakeHash;
           };
         });
       in

examples/trunk/flake.nix

@@ -4,10 +4,6 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    # The version of wasm-bindgen-cli needs to match the version in Cargo.lock
-    # Update this to include the version you need
-    nixpkgs-for-wasm-bindgen.url = "github:NixOS/nixpkgs/4e6868b1aa3766ab1de169922bb3826143941973";
-
     crane.url = "github:ipetkov/crane";
 
     flake-utils.url = "github:numtide/flake-utils";
@@ -18,7 +14,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, crane, flake-utils, rust-overlay, nixpkgs-for-wasm-bindgen, ... }:
+  outputs = { self, nixpkgs, crane, flake-utils, rust-overlay, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {
@@ -33,11 +29,7 @@
           # wasm32-unknown-unknown is required for trunk
           targets = [ "wasm32-unknown-unknown" ];
         };
-        craneLib = ((crane.mkLib pkgs).overrideToolchain rustToolchainFor).overrideScope (_final: _prev: {
-          # The version of wasm-bindgen-cli needs to match the version in Cargo.lock. You
-          # can unpin this if your nixpkgs commit contains the appropriate wasm-bindgen-cli version
-          inherit (import nixpkgs-for-wasm-bindgen { inherit system; }) wasm-bindgen-cli;
-        });
+        craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchainFor;
 
         # When filtering sources, we want to allow assets other than .rs files
         unfilteredRoot = ./.; # The original, unfiltered source
@@ -87,6 +79,12 @@
             version = "0.2.93";
             hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=";
             cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=";
+            # When updating to a new version comment out the above two lines and
+            # uncomment the bottom two lines. Then try to do a build, which will fail
+            # but will print out the correct value for `hash`. Replace the value and then
+            # repeat the process but this time the printed value will be for `cargoHash`
+            # hash = lib.fakeHash;
+            # cargoHash = lib.fakeHash;
           };
         });
 

lib/buildTrunkPackage.nix

@@ -20,9 +20,9 @@ let
 
     buildTrunkPackage {
       wasm-bindgen-cli = pkgs.wasm-bindgen-cli.override {
-        version = "0.2.84";
-        hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk=";
-        cargoHash = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50=";
+        version = "${default-wasm-bindgen-cli.version}";
+        hash = "${default-wasm-bindgen-cli.hash or "lib.fakeHash"}";
+        cargoHash = "${default-wasm-bindgen-cli.cargoHash or "lib.fakeHash"}";
       };
       ...
     }
@@ -81,7 +81,7 @@ mkCargoDerivation (args // {
     echo "TRUNK_TOOLS_WASM_OPT=''${TRUNK_TOOLS_WASM_OPT}"
   '';
 
-  buildPhaseCargoCommand = args.buildPhaseCommand or ''
+  buildPhaseCargoCommand = args.buildPhaseCargoCommand or ''
     local profileArgs=""
     if [[ "$CARGO_PROFILE" == "release" ]]; then
       profileArgs="--release${lib.optionalString (lib.versionAtLeast trunk.version "0.21") "=true"}"

test/flake.nix

@@ -4,10 +4,6 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     nixpkgs-latest-release.url = "github:NixOS/nixpkgs/release-24.05";
 
-    # The version of wasm-bindgen-cli needs to match the version in Cargo.lock
-    # Update this to include the version you need
-    nixpkgs-for-wasm-bindgen.url = "github:NixOS/nixpkgs/4e6868b1aa3766ab1de169922bb3826143941973";
-
     advisory-db = {
       url = "github:rustsec/advisory-db";
       flake = false;