diff --git a/.env.development b/.env.development index ba9d3917f..47ce20bfc 100644 --- a/.env.development +++ b/.env.development @@ -9,6 +9,7 @@ VITE_KC_SITE_BASE_URL=https://dev.zoo.dev VITE_KC_SITE_APP_URL=https://app.dev.zoo.dev VITE_KC_SKIP_AUTH=false VITE_KC_CONNECTION_TIMEOUT_MS=5000 +#VITE_WASM_URL="optional way of overriding the wasm url, particular for unit tests which need this if you running not on the default 3000 port" #VITE_KC_DEV_TOKEN="optional token to skip auth in the app" #token="required token for playwright. TODO: clean up env vars in #3973" diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md index 69ea908a3..fbc43581c 100644 --- a/.github/ISSUE_TEMPLATE/release.md +++ b/.github/ISSUE_TEMPLATE/release.md @@ -2,7 +2,7 @@ name: Release about: Create a new release for the Zoo Design Studio title: "Cut release v1.?.?" -labels: [release] +labels: [meta/release] --- > Instructions: https://github.com/KittyCAD/modeling-app/blob/main/CONTRIBUTING.md#shipping-releases @@ -19,7 +19,8 @@ Release builds URL: ??? * [ ] Confirm the application opens (dismiss the updater) * [ ] Create a project with a basic Text-to-CAD prompt * [ ] Confirm the result is viewable in an engine stream -* [ ] Open the application again and confirm the updater can downgrade +* [ ] Use 'Check for updates' to bring back the updater toast +* [ ] Confirm the app can update to the previous release ## macOS via ??? @@ -27,7 +28,8 @@ Release builds URL: ??? * [ ] Confirm the application opens (dismiss the updater) * [ ] Create a project with a basic Text-to-CAD prompt * [ ] Confirm the result is viewable in an engine stream -* [ ] Open the application again and confirm the updater can downgrade +* [ ] Use 'Check for updates' to bring back the updater toast +* [ ] Confirm the app can update to the previous release ## Linux via ??? @@ -35,4 +37,5 @@ Release builds URL: ??? * [ ] Confirm the application opens (dismiss the updater) * [ ] Create a project with a basic Text-to-CAD prompt * [ ] Confirm the result is viewable in an engine stream -* [ ] Open the application again and confirm the updater can downgrade +* [ ] Use 'Check for updates' to bring back the updater toast +* [ ] Confirm the app can update to the previous release diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 21c7812db..63aaa6dd7 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1814,7 +1814,7 @@ dependencies = [ [[package]] name = "kcl-bumper" -version = "0.1.81" +version = "0.1.82" dependencies = [ "anyhow", "clap", @@ -1825,7 +1825,7 @@ dependencies = [ [[package]] name = "kcl-derive-docs" -version = "0.1.81" +version = "0.1.82" dependencies = [ "proc-macro2", "quote", @@ -1834,7 +1834,7 @@ dependencies = [ [[package]] name = "kcl-directory-test-macro" -version = "0.1.81" +version = "0.1.82" dependencies = [ "convert_case", "proc-macro2", @@ -1844,7 +1844,7 @@ dependencies = [ [[package]] name = "kcl-language-server" -version = "0.2.81" +version = "0.2.82" dependencies = [ "anyhow", "clap", @@ -1865,7 +1865,7 @@ dependencies = [ [[package]] name = "kcl-language-server-release" -version = "0.1.81" +version = "0.1.82" dependencies = [ "anyhow", "clap", @@ -1885,7 +1885,7 @@ dependencies = [ [[package]] name = "kcl-lib" -version = "0.2.81" +version = "0.2.82" dependencies = [ "anyhow", "approx 0.5.1", @@ -1962,7 +1962,7 @@ dependencies = [ [[package]] name = "kcl-python-bindings" -version = "0.3.81" +version = "0.3.82" dependencies = [ "anyhow", "kcl-lib", @@ -1977,7 +1977,7 @@ dependencies = [ [[package]] name = "kcl-test-server" -version = "0.1.81" +version = "0.1.82" dependencies = [ "anyhow", "hyper 0.14.32", @@ -1990,7 +1990,7 @@ dependencies = [ [[package]] name = "kcl-to-core" -version = "0.1.81" +version = "0.1.82" dependencies = [ "anyhow", "async-trait", @@ -2004,7 +2004,7 @@ dependencies = [ [[package]] name = "kcl-wasm-lib" -version = "0.1.81" +version = "0.1.82" dependencies = [ "anyhow", "bson", diff --git a/rust/kcl-bumper/Cargo.toml b/rust/kcl-bumper/Cargo.toml index 1bad868b6..c4fcef73d 100644 --- a/rust/kcl-bumper/Cargo.toml +++ b/rust/kcl-bumper/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "kcl-bumper" -version = "0.1.81" +version = "0.1.82" edition = "2021" repository = "https://github.com/KittyCAD/modeling-api" rust-version = "1.76" diff --git a/rust/kcl-derive-docs/Cargo.toml b/rust/kcl-derive-docs/Cargo.toml index 0e00fa5ff..e357f366e 100644 --- a/rust/kcl-derive-docs/Cargo.toml +++ b/rust/kcl-derive-docs/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "kcl-derive-docs" description = "A tool for generating documentation from Rust derive macros" -version = "0.1.81" +version = "0.1.82" edition = "2021" license = "MIT" repository = "https://github.com/KittyCAD/modeling-app" diff --git a/rust/kcl-directory-test-macro/Cargo.toml b/rust/kcl-directory-test-macro/Cargo.toml index d545fa9fb..28012b624 100644 --- a/rust/kcl-directory-test-macro/Cargo.toml +++ b/rust/kcl-directory-test-macro/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "kcl-directory-test-macro" description = "A tool for generating tests from a directory of kcl files" -version = "0.1.81" +version = "0.1.82" edition = "2021" license = "MIT" repository = "https://github.com/KittyCAD/modeling-app" diff --git a/rust/kcl-language-server-release/Cargo.toml b/rust/kcl-language-server-release/Cargo.toml index 806f43178..ee0e3cbd1 100644 --- a/rust/kcl-language-server-release/Cargo.toml +++ b/rust/kcl-language-server-release/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kcl-language-server-release" -version = "0.1.81" +version = "0.1.82" edition = "2021" authors = ["KittyCAD Inc "] publish = false diff --git a/rust/kcl-language-server/Cargo.toml b/rust/kcl-language-server/Cargo.toml index 3e005d841..1024176a3 100644 --- a/rust/kcl-language-server/Cargo.toml +++ b/rust/kcl-language-server/Cargo.toml @@ -2,7 +2,7 @@ name = "kcl-language-server" description = "A language server for KCL." authors = ["KittyCAD Inc "] -version = "0.2.81" +version = "0.2.82" edition = "2021" license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/rust/kcl-lib/Cargo.toml b/rust/kcl-lib/Cargo.toml index e6f401de8..2e21a496a 100644 --- a/rust/kcl-lib/Cargo.toml +++ b/rust/kcl-lib/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "kcl-lib" description = "KittyCAD Language implementation and tools" -version = "0.2.81" +version = "0.2.82" edition = "2021" license = "MIT" repository = "https://github.com/KittyCAD/modeling-app" diff --git a/rust/kcl-python-bindings/Cargo.toml b/rust/kcl-python-bindings/Cargo.toml index f9999faea..ad36c1b99 100644 --- a/rust/kcl-python-bindings/Cargo.toml +++ b/rust/kcl-python-bindings/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kcl-python-bindings" -version = "0.3.81" +version = "0.3.82" edition = "2021" repository = "https://github.com/kittycad/modeling-app" exclude = ["tests/*", "files/*", "venv/*"] diff --git a/rust/kcl-test-server/Cargo.toml b/rust/kcl-test-server/Cargo.toml index 551c59271..0f054b84a 100644 --- a/rust/kcl-test-server/Cargo.toml +++ b/rust/kcl-test-server/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "kcl-test-server" description = "A test server for KCL" -version = "0.1.81" +version = "0.1.82" edition = "2021" license = "MIT" diff --git a/rust/kcl-to-core/Cargo.toml b/rust/kcl-to-core/Cargo.toml index 959dbca55..eec3c8aae 100644 --- a/rust/kcl-to-core/Cargo.toml +++ b/rust/kcl-to-core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "kcl-to-core" description = "Utility methods to convert kcl to engine core executable tests" -version = "0.1.81" +version = "0.1.82" edition = "2021" license = "MIT" repository = "https://github.com/KittyCAD/modeling-app" diff --git a/rust/kcl-wasm-lib/Cargo.toml b/rust/kcl-wasm-lib/Cargo.toml index c2766be63..7b1e95a75 100644 --- a/rust/kcl-wasm-lib/Cargo.toml +++ b/rust/kcl-wasm-lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kcl-wasm-lib" -version = "0.1.81" +version = "0.1.82" edition = "2021" repository = "https://github.com/KittyCAD/modeling-app" rust-version = "1.83" diff --git a/src/lang/wasmUtils.ts b/src/lang/wasmUtils.ts index 373b66e14..443ec4e34 100644 --- a/src/lang/wasmUtils.ts +++ b/src/lang/wasmUtils.ts @@ -6,6 +6,12 @@ import { webSafeJoin, webSafePathSplit } from '@src/lib/paths' import { init, reloadModule } from '@src/lib/wasm_lib_wrapper' export const wasmUrl = () => { + const wasmFile = '/kcl_wasm_lib_bg.wasm' + // Check for test environment override + if (typeof process !== 'undefined' && process.env?.VITE_WASM_URL) { + return process.env.VITE_WASM_URL + wasmFile + } + // For when we're in electron (file based) or web server (network based) // For some reason relative paths don't work as expected. Otherwise we would // just do /wasm_lib_bg.wasm. In particular, the issue arises when the path @@ -14,8 +20,7 @@ export const wasmUrl = () => { ? document.location.origin + '/kcl_wasm_lib_bg.wasm' : document.location.protocol + webSafeJoin(webSafePathSplit(document.location.pathname).slice(0, -1)) + - '/kcl_wasm_lib_bg.wasm' - + wasmFile return fullUrl }