Compare commits
	
		
			14 Commits
		
	
	
		
			achalmers/
			...
			kurt-speed
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 182865014e | |||
| 2452eede0b | |||
| 98442b9ec2 | |||
| fb1c8036f6 | |||
| 2918612d4b | |||
| abbd065c2c | |||
| 23e29b024f | |||
| 807adac371 | |||
| 03eb8dca32 | |||
| e3358f8251 | |||
| 49ea3991b2 | |||
| f32f0e2717 | |||
| 0363e4f4e0 | |||
| 5e60dbd5e8 | 
| @ -1,5 +1,6 @@ | ||||
| VITE_KC_API_WS_MODELING_URL=wss://api.dev.zoo.dev/ws/modeling/commands | ||||
| VITE_KC_API_BASE_URL=https://api.dev.zoo.dev | ||||
| VITE_KC_SITE_BASE_URL=https://dev.zoo.dev | ||||
| VITE_KC_WASM_OVERRIDE_URL="" | ||||
| VITE_KC_SKIP_AUTH=false | ||||
| VITE_KC_CONNECTION_TIMEOUT_MS=5000 | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| VITE_KC_API_WS_MODELING_URL=wss://api.zoo.dev/ws/modeling/commands | ||||
| VITE_KC_API_BASE_URL=https://api.zoo.dev | ||||
| VITE_KC_SITE_BASE_URL=https://zoo.dev | ||||
| VITE_KC_WASM_OVERRIDE_URL="" | ||||
| VITE_KC_SKIP_AUTH=false | ||||
| VITE_KC_CONNECTION_TIMEOUT_MS=15000 | ||||
|  | ||||
							
								
								
									
										35
									
								
								.github/workflows/playwright.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										35
									
								
								.github/workflows/playwright.yml
									
									
									
									
										vendored
									
									
								
							| @ -14,9 +14,31 @@ permissions: | ||||
|   pull-requests: write | ||||
|  | ||||
| jobs: | ||||
|   check-wasm-lib-changes: | ||||
|     runs-on: ubuntu-latest | ||||
|     outputs: | ||||
|       url: ${{ steps.set-output.outputs.url }} | ||||
|     steps: | ||||
|       - uses: actions/checkout@v2 | ||||
|         with: | ||||
|           fetch-depth: 0 # Fetches all history for all branches and tags | ||||
|  | ||||
|       - name: Check for changes in src/wasm-lib | ||||
|         id: set-output | ||||
|         run: | | ||||
|           if git diff --quiet origin/main...HEAD -- src/wasm-lib; then | ||||
|             echo "url=https://app.zoo.dev" >> $GITHUB_OUTPUT | ||||
|             echo "No changes detected in src/wasm-lib" | ||||
|           else | ||||
|             echo "Changes detected in src/wasm-lib" | ||||
|             echo "url=" >> $GITHUB_OUTPUT | ||||
|           fi | ||||
|  | ||||
|  | ||||
|   playwright-ubuntu: | ||||
|     timeout-minutes: 60 | ||||
|     runs-on: ubuntu-latest-8-cores | ||||
|     needs: check-wasm-lib-changes | ||||
|     steps: | ||||
|     - uses: actions/checkout@v4 | ||||
|     - uses: actions/setup-node@v4 | ||||
| @ -28,13 +50,19 @@ jobs: | ||||
|       run: yarn | ||||
|     - name: Install Playwright Browsers | ||||
|       run: yarn playwright install --with-deps | ||||
|     - name: Print WASM Lib Changes URL | ||||
|       run: | | ||||
|         echo "WASM Lib Changes URL: ${{ needs.check-wasm-lib-changes.outputs.url }}" | ||||
|     - name: Setup Rust | ||||
|       if: ${{ needs.check-wasm-lib-changes.outputs.url }} == '' | ||||
|       uses: dtolnay/rust-toolchain@stable | ||||
|     - name: Cache wasm | ||||
|       if: ${{ needs.check-wasm-lib-changes.outputs.url }} == '' | ||||
|       uses: Swatinem/rust-cache@v2 | ||||
|       with: | ||||
|         workspaces: './src/wasm-lib' | ||||
|     - name: build wasm | ||||
|       if: ${{ needs.check-wasm-lib-changes.outputs.url }} == '' | ||||
|       run: yarn build:wasm | ||||
|     - name: build web | ||||
|       run: yarn build:local | ||||
| @ -44,6 +72,7 @@ jobs: | ||||
|         CI: true | ||||
|         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }} | ||||
|         snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }} | ||||
|         WASM_OVERRIDE: ${{ steps.check-wasm-lib-changes.outputs.url }} | ||||
|     - uses: actions/upload-artifact@v3 | ||||
|       if: always() | ||||
|       with: | ||||
| @ -79,6 +108,7 @@ jobs: | ||||
|       env: | ||||
|         CI: true | ||||
|         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }} | ||||
|         WASM_OVERRIDE: ${{ steps.check-wasm-lib-changes.outputs.url }} | ||||
|     - uses: actions/upload-artifact@v3 | ||||
|       if: always() | ||||
|       with: | ||||
| @ -89,6 +119,7 @@ jobs: | ||||
|   playwright-macos: | ||||
|     timeout-minutes: 60 | ||||
|     runs-on: macos-14 | ||||
|     needs: check-wasm-lib-changes | ||||
|     steps: | ||||
|     - uses: actions/checkout@v4 | ||||
|     - uses: actions/setup-node@v4 | ||||
| @ -100,12 +131,15 @@ jobs: | ||||
|     - name: Install Playwright Browsers | ||||
|       run: yarn playwright install --with-deps | ||||
|     - name: Setup Rust | ||||
|       if: needs.check-wasm-lib-changes.outputs.url == '' | ||||
|       uses: dtolnay/rust-toolchain@stable | ||||
|     - name: Cache wasm | ||||
|       if: needs.check-wasm-lib-changes.outputs.url == '' | ||||
|       uses: Swatinem/rust-cache@v2 | ||||
|       with: | ||||
|         workspaces: './src/wasm-lib' | ||||
|     - name: build wasm | ||||
|       if: needs.check-wasm-lib-changes.outputs.url == '' | ||||
|       run: yarn build:wasm | ||||
|     - name: build web | ||||
|       run: yarn build:local | ||||
| @ -116,6 +150,7 @@ jobs: | ||||
|       env: | ||||
|         CI: true | ||||
|         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }} | ||||
|         WASM_OVERRIDE: ${{ steps.check-wasm-lib-changes.outputs.url }} | ||||
|     - uses: actions/upload-artifact@v3 | ||||
|       if: always() | ||||
|       with: | ||||
|  | ||||
| @ -72,7 +72,7 @@ export default defineConfig({ | ||||
|  | ||||
|   /* Run your local dev server before starting the tests */ | ||||
|   webServer: { | ||||
|     command: 'yarn serve', | ||||
|     command: 'VITE_KC_WASM_OVERRIDE_URL=$WASM_OVERRIDE yarn serve', | ||||
|     // url: 'http://127.0.0.1:3000', | ||||
|     reuseExistingServer: !process.env.CI, | ||||
|   }, | ||||
|  | ||||
| @ -7,5 +7,7 @@ export const VITE_KC_API_BASE_URL = import.meta.env.VITE_KC_API_BASE_URL | ||||
| export const VITE_KC_SITE_BASE_URL = import.meta.env.VITE_KC_SITE_BASE_URL | ||||
| export const VITE_KC_CONNECTION_TIMEOUT_MS = import.meta.env | ||||
|   .VITE_KC_CONNECTION_TIMEOUT_MS | ||||
| export const VITE_KC_WASM_OVERRIDE_URL = import.meta.env | ||||
|   .VITE_KC_WASM_OVERRIDE_URL | ||||
| export const TEST = import.meta.env.TEST | ||||
| export const DEV = import.meta.env.DEV | ||||
|  | ||||
| @ -25,7 +25,7 @@ import { AppInfo } from 'wasm-lib/kcl/bindings/AppInfo' | ||||
| import { CoreDumpManager } from 'lib/coredump' | ||||
| import openWindow from 'lib/openWindow' | ||||
| import { DefaultPlanes } from 'wasm-lib/kcl/bindings/DefaultPlanes' | ||||
| import { TEST } from 'env' | ||||
| import { TEST, VITE_KC_WASM_OVERRIDE_URL } from 'env' | ||||
|  | ||||
| export type { Program } from '../wasm-lib/kcl/bindings/Program' | ||||
| export type { Value } from '../wasm-lib/kcl/bindings/Value' | ||||
| @ -76,8 +76,9 @@ export type { MemoryItem } from '../wasm-lib/kcl/bindings/MemoryItem' | ||||
| export type { ExtrudeSurface } from '../wasm-lib/kcl/bindings/ExtrudeSurface' | ||||
|  | ||||
| export const wasmUrl = () => { | ||||
|   const baseUrl = | ||||
|     typeof window === 'undefined' | ||||
|   const baseUrl = VITE_KC_WASM_OVERRIDE_URL | ||||
|     ? VITE_KC_WASM_OVERRIDE_URL | ||||
|     : typeof window === 'undefined' | ||||
|     ? 'http://127.0.0.1:3000' | ||||
|     : window.location.origin.includes('tauri://localhost') | ||||
|     ? 'tauri://localhost' // custom protocol for macOS | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	