diff --git a/packages/core/typescript/create-itk-wasm/package.json b/packages/core/typescript/create-itk-wasm/package.json index 33a3b073a..fa51286e0 100644 --- a/packages/core/typescript/create-itk-wasm/package.json +++ b/packages/core/typescript/create-itk-wasm/package.json @@ -1,6 +1,6 @@ { "name": "create-itk-wasm", - "version": "2.1.1", + "version": "2.1.3", "description": "CLI to create a new ITK-Wasm project or add a pipeline to an existing project.", "type": "module", "exports": { diff --git a/packages/core/typescript/create-itk-wasm/src/generate/itk-wasm-env-bash.ts b/packages/core/typescript/create-itk-wasm/src/generate/itk-wasm-env-bash.ts index 173a73189..cb555f96e 100644 --- a/packages/core/typescript/create-itk-wasm/src/generate/itk-wasm-env-bash.ts +++ b/packages/core/typescript/create-itk-wasm/src/generate/itk-wasm-env-bash.ts @@ -20,7 +20,7 @@ export ITK_WASM_TEST_DATA_HASH=\${ITK_WASM_TEST_DATA_HASH:-$(cat package.json | export ITK_WASM_TEST_DATA_URLS=\${ITK_WASM_TEST_DATA_URLS:-$(cat package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')} export ITK_WASM_ITK_REPOSITORY=\${ITK_WASM_ITK_REPOSITORY:-"https://github.com/thewtex/ITK"} -export ITK_WASM_ITK_BRANCH=\${ITK_WASM_ITK_BRANCH:-"itkwasm-2024-05-20-5db055d7ad3b-4"} +export ITK_WASM_ITK_BRANCH=\${ITK_WASM_ITK_BRANCH:-"itkwasm-2025-03-19-25d3162371"} export ITK_WASM_NATIVE_WORKSPACE=\${ITK_WASM_NATIVE_WORKSPACE:-$(pwd)/native} diff --git a/packages/core/typescript/create-itk-wasm/src/generate/package-json.ts b/packages/core/typescript/create-itk-wasm/src/generate/package-json.ts index 8a1fd5349..4ea00d047 100644 --- a/packages/core/typescript/create-itk-wasm/src/generate/package-json.ts +++ b/packages/core/typescript/create-itk-wasm/src/generate/package-json.ts @@ -53,7 +53,7 @@ function generatePackageJson(project: ProjectSpec) { }, devDependencies: { '@itk-wasm/dam': '^1.1.1', - 'itk-wasm': '1.0.0-b.188' + 'itk-wasm': '1.0.0-b.196' } } if (project.author) { diff --git a/packages/core/typescript/create-itk-wasm/src/generate/pixi-toml.ts b/packages/core/typescript/create-itk-wasm/src/generate/pixi-toml.ts index 708d9e032..59407730c 100644 --- a/packages/core/typescript/create-itk-wasm/src/generate/pixi-toml.ts +++ b/packages/core/typescript/create-itk-wasm/src/generate/pixi-toml.ts @@ -23,7 +23,7 @@ python = ["python"] [dependencies] python = "3.12.*" -pnpm = ">=10.12.1,<11" +pnpm = ">=10.14.0,<11" hatch = ">=1.13.0,<2" pip = ">=24.2,<25" diff --git a/packages/core/typescript/itk-wasm/package.json b/packages/core/typescript/itk-wasm/package.json index 248dfcb7c..627d04939 100644 --- a/packages/core/typescript/itk-wasm/package.json +++ b/packages/core/typescript/itk-wasm/package.json @@ -1,6 +1,6 @@ { "name": "itk-wasm", - "version": "1.0.0-b.195", + "version": "1.0.0-b.196", "description": "High-performance spatial analysis in a web browser, Node.js, and reproducible execution across programming languages and hardware architectures.", "type": "module", "module": "./dist/index.js", diff --git a/packages/core/typescript/itk-wasm/src/bindgen/typescript/resources/template.package.json b/packages/core/typescript/itk-wasm/src/bindgen/typescript/resources/template.package.json index 2fccf3c01..272559834 100644 --- a/packages/core/typescript/itk-wasm/src/bindgen/typescript/resources/template.package.json +++ b/packages/core/typescript/itk-wasm/src/bindgen/typescript/resources/template.package.json @@ -33,7 +33,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "itk-wasm": "1.0.0-b.195" + "itk-wasm": "1.0.0-b.196" }, "devDependencies": { "@itk-wasm/demo-app": "^0.2.0", diff --git a/packages/core/typescript/itk-wasm/src/cli/default-image-tag.js b/packages/core/typescript/itk-wasm/src/cli/default-image-tag.js index 3ac0a022f..c4bc08afa 100644 --- a/packages/core/typescript/itk-wasm/src/cli/default-image-tag.js +++ b/packages/core/typescript/itk-wasm/src/cli/default-image-tag.js @@ -1,2 +1,2 @@ -const defaultImageTag = '20250619-3165ade4' +const defaultImageTag = '20250813-cd217d20' export default defaultImageTag diff --git a/packages/core/typescript/itk-wasm/src/version.ts b/packages/core/typescript/itk-wasm/src/version.ts index fd2475956..541273a29 100644 --- a/packages/core/typescript/itk-wasm/src/version.ts +++ b/packages/core/typescript/itk-wasm/src/version.ts @@ -1,3 +1,3 @@ -const version = '1.0.0-b.195' +const version = '1.0.0-b.196' export default version diff --git a/src/docker/RELEASE.md b/src/docker/RELEASE.md index ffdc6879d..7bc242f8d 100644 --- a/src/docker/RELEASE.md +++ b/src/docker/RELEASE.md @@ -4,12 +4,12 @@ Verify the source tree. ``` -# on an amd64 system +# on an arm64 system # DockerHub, quay.io login required pixi run build-docker-images --with-debug ./src/docker/push.sh -# on a linux arm64 system +# on a linux amd64 system export OCI_EXE=docker pixi run build-docker-images --with-debug # requires manifest-tool, see https://github.com/estesp/manifest-tool/releases/ diff --git a/src/docker/itk-wasm-base/Dockerfile b/src/docker/itk-wasm-base/Dockerfile index 663cc002f..c212c7592 100644 --- a/src/docker/itk-wasm-base/Dockerfile +++ b/src/docker/itk-wasm-base/Dockerfile @@ -98,10 +98,11 @@ RUN mkdir ITK-build && \ find . -name '*.o' -delete && \ cd .. && chmod -R 777 ITK-build -ENV ITKMeshToPolyData_GIT_TAG=1e594b7437a43be348b0ccea827c66fb5aa13e1f +ENV ITKMeshToPolyData_GIT_TAG=45454052790b9f01bc1e1baf0e9400f68a3f1363 RUN git clone https://github.com/InsightSoftwareConsortium/ITKMeshToPolyData.git && \ cd ITKMeshToPolyData && \ git checkout ${ITKMeshToPolyData_GIT_TAG} && \ + echo "" > wasm/CMakeLists.txt && \ cd / && \ mkdir ITKMeshToPolyData-build && \ cd ITKMeshToPolyData-build && \