@dbx-tools/projen 0.6.191 → 0.6.192

package/index.ts

@@ -3,7 +3,7 @@
 // Hand edits are overwritten on the next watch; this file is read-only.
 
 export const PACKAGE_IDENTIFIER = "@dbx-tools/projen";
-export const PACKAGE_VERSION = "0.6.190";
+export const PACKAGE_VERSION = "0.6.191";
 export * as barrels from "./src/barrels.ts";
 export * as bunApp from "./src/bun-app.ts";
 export * as bunWorkflow from "./src/bun-workflow.ts";

package/package.json

@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.7.0",
-    "@dbx-tools/core": "0.6.191",
-    "@dbx-tools/path": "0.6.191",
-    "@dbx-tools/shared-core": "0.6.191",
+    "@dbx-tools/core": "0.6.192",
+    "@dbx-tools/path": "0.6.192",
+    "@dbx-tools/shared-core": "0.6.192",
     "commander": "^15.0.0",
     "concurrently": "^10.0.3",
     "constructs": "^10.6.0",
@@ -47,7 +47,7 @@
   },
   "main": "index.ts",
   "license": "Apache-2.0",
-  "version": "0.6.191",
+  "version": "0.6.192",
   "types": "index.ts",
   "type": "module",
   "exports": {

package/src/project-rs.ts

@@ -693,6 +693,7 @@ export class DBXToolsRustWorkspace {
       dbxToolsProject.dbxToolsConfig.rust = this.workspaceMapping;
     }
     project.gitignore.addPatterns(
+      "!/Cargo.lock",
       "target/",
       ...this.bindingMappings.flatMap((binding) => [
         ...(binding.node ? [`${binding.node}/src/*${binding.crate.replaceAll("-", "_")}.*`] : []),
@@ -816,6 +817,18 @@ export class DBXToolsRustWorkspace {
     new TextFile(project, "Cargo.toml", {
       lines: renderToml(generatedWorkspaceManifest).trimEnd().split("\n"),
     });
+    new TextFile(project, ".cargo/config.toml", {
+      lines: renderToml({
+        "target.x86_64-pc-windows-msvc": {
+          rustflags: ["-C", "target-feature=+crt-static"],
+        },
+        "target.aarch64-pc-windows-msvc": {
+          rustflags: ["-C", "target-feature=+crt-static"],
+        },
+      })
+        .trimEnd()
+        .split("\n"),
+    });
     project.addTask("rs:format", { exec: "cargo fmt --all" });
     project.addTask("rs:lint", { exec: "cargo clippy --workspace --all-targets --all-features" });
     project.addTask("rs:test", { exec: "cargo test --workspace" });
@@ -879,6 +892,7 @@ export class DBXToolsRustWorkspace {
       return { ...target, ...(hasReleaseExclusions ? { cargoExcludes } : {}) };
     });
     const hasPythonBindings = bindings.some((binding) => binding.python);
+    const usesCargoLock = existsSync(join(project.outdir, "Cargo.lock"));
     const usePreinstalledWindowsRust = releaseRustVersion === "stable";
     const hasTargetOutputs =
       bindings.length > 0 || releaseBinaries.length > 0 || publicCrates.length > 0;
@@ -1056,7 +1070,7 @@ export class DBXToolsRustWorkspace {
           },
           run: timedBash(
             "rust_workspace",
-            `cargo build --release --workspace --target "\${{ matrix.cargo }}"${
+            `cargo build --release --workspace${usesCargoLock ? " --locked" : ""} --target "\${{ matrix.cargo }}"${
               hasReleaseExclusions ? " ${{ matrix.cargoExcludes }}" : ""
             }`,
           ),

package/tasks/bump.ts

@@ -315,6 +315,16 @@ program
           stdin: "ignore",
           check: true,
         });
+        if (existsSync(join(root, "Cargo.toml"))) {
+          logger.info("refreshing Cargo.lock workspace versions");
+          exec.spawnSync("cargo", ["metadata", "--format-version", "1", "--no-deps"], {
+            cwd: process.cwd(),
+            stdout: "ignore",
+            stderr: "inherit",
+            stdin: "ignore",
+            check: true,
+          });
+        }
       }
 
       if (opts.commit) {

package/tasks/uniffi-release.mjs

@@ -494,7 +494,15 @@ const build = () => {
   rmSync(output, { recursive: true, force: true });
   mkdirSync(output, { recursive: true });
   if (!parsed.values["skip-build"]) {
-    run("cargo", ["build", "--release", "--package", crate, "--target", cargoTarget]);
+    run("cargo", [
+      "build",
+      "--release",
+      ...(existsSync(resolve(root, "Cargo.lock")) ? ["--locked"] : []),
+      "--package",
+      crate,
+      "--target",
+      cargoTarget,
+    ]);
   }
   if (!existsSync(library)) throw new Error(`Missing native library ${library}`);
 

package/tasks/uniffi.ts

@@ -130,6 +130,7 @@ if (!values["skip-build"]) {
   run("cargo", [
     "build",
     "--release",
+    ...(existsSync(join(root, "Cargo.lock")) ? ["--locked"] : []),
     "--package",
     crate,
     ...(values["cargo-target"] ? ["--target", values["cargo-target"]] : []),