From 026a8d19cb343cbb3161cd27b2be169980fb0b8d Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 27 Aug 2024 13:27:41 -0400 Subject: [PATCH 1/5] Remove unintentional changelog in readme (#3678) --- README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.md b/README.md index 2987dd04a..d232650b6 100644 --- a/README.md +++ b/README.md @@ -373,14 +373,3 @@ yarn wdio run wdio.conf.ts ## KCL For how to contribute to KCL, [see our KCL README](https://github.com/KittyCAD/modeling-app/tree/main/src/wasm-lib/kcl). - - -- Theme removed as a project setting -- Rename kcl Value to Expr, MemoryItem to KclValue -- Remove ProgramReturn -- Macro to make KCL snapshot tests easier -- Add logical not operator using bang ! -- ensure we never execute over ourselves -- Unify KCL expression execution (2 + draw() didn't work) -- Text-CAD-integration - From 5c90f72c9160da92e176e07fa3619d2a46c76d70 Mon Sep 17 00:00:00 2001 From: max Date: Tue, 27 Aug 2024 23:49:46 +0200 Subject: [PATCH 2/5] Bug: Fillet Button - selecting edge without tag caused an Error (#3685) fixed --- src/lang/modifyAst/addFillet.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lang/modifyAst/addFillet.ts b/src/lang/modifyAst/addFillet.ts index e67edca5a..e2fe688ce 100644 --- a/src/lang/modifyAst/addFillet.ts +++ b/src/lang/modifyAst/addFillet.ts @@ -469,6 +469,9 @@ export const hasValidFilletSelection = ({ if (segmentNode.node.type === 'CallExpression') { const segmentName = segmentNode.node.callee.name if (segmentName in sketchLineHelperMap) { + // add check wether tag exists at all: + if (!(segmentNode.node.arguments.length === 3)) return true + // if tag exists, check if it is already filleted const edges = isTagUsedInFillet({ ast, callExp: segmentNode.node, From 5b5355376f7b7c0b203996f5c387c8236867573e Mon Sep 17 00:00:00 2001 From: max Date: Wed, 28 Aug 2024 00:20:50 +0200 Subject: [PATCH 3/5] Revert "Bug: Fillet Button - selecting edge without tag caused an Error" (#3687) Revert "Bug: Fillet Button - selecting edge without tag caused an Error (#3685)" This reverts commit 5c90f72c9160da92e176e07fa3619d2a46c76d70. --- src/lang/modifyAst/addFillet.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/lang/modifyAst/addFillet.ts b/src/lang/modifyAst/addFillet.ts index e2fe688ce..e67edca5a 100644 --- a/src/lang/modifyAst/addFillet.ts +++ b/src/lang/modifyAst/addFillet.ts @@ -469,9 +469,6 @@ export const hasValidFilletSelection = ({ if (segmentNode.node.type === 'CallExpression') { const segmentName = segmentNode.node.callee.name if (segmentName in sketchLineHelperMap) { - // add check wether tag exists at all: - if (!(segmentNode.node.arguments.length === 3)) return true - // if tag exists, check if it is already filleted const edges = isTagUsedInFillet({ ast, callExp: segmentNode.node, From 1d19fc6b7e3b8b3541063bc531f3c298c64e4955 Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 27 Aug 2024 19:02:49 -0400 Subject: [PATCH 4/5] Fix platform detection in Vite (#3689) --- src/lib/utils.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 291302c26..501c5b3f9 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -147,7 +147,7 @@ export function platform(): Platform { case 'sunos': return 'linux' default: - console.error('Unknown platform:', platform) + console.error('Unknown desktop platform:', platform) return '' } } @@ -156,11 +156,14 @@ export function platform(): Platform { // it's more accurate than userAgent and userAgentData in Playwright. if ( navigator.platform?.indexOf('Mac') === 0 || - navigator.platform === 'iPhone' + navigator.platform?.indexOf('iPhone') === 0 || + navigator.platform?.indexOf('iPad') === 0 || + // Vite tests running in HappyDOM. + navigator.platform?.indexOf('Darwin') >= 0 ) { return 'macos' } - if (navigator.platform === 'Win32') { + if (navigator.platform === 'Windows' || navigator.platform === 'Win32') { return 'windows' } @@ -185,7 +188,7 @@ export function platform(): Platform { return 'linux' } console.error( - 'Unknown platform userAgent:', + 'Unknown web platform:', navigator.platform, userAgentDataPlatform, navigator.userAgent From ed339a6b9a154e1b2ebcf1d7e0dcdf380900b0dd Mon Sep 17 00:00:00 2001 From: max Date: Wed, 28 Aug 2024 01:53:33 +0200 Subject: [PATCH 5/5] Bug: Fillet Button - selecting edge without tag caused an Error rev2 (#3690) * typos * typos2 * trigger ci --- src/lang/modifyAst/addFillet.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lang/modifyAst/addFillet.ts b/src/lang/modifyAst/addFillet.ts index e67edca5a..78eede660 100644 --- a/src/lang/modifyAst/addFillet.ts +++ b/src/lang/modifyAst/addFillet.ts @@ -469,6 +469,9 @@ export const hasValidFilletSelection = ({ if (segmentNode.node.type === 'CallExpression') { const segmentName = segmentNode.node.callee.name if (segmentName in sketchLineHelperMap) { + // Add check whether the tag exists at all: + if (!(segmentNode.node.arguments.length === 3)) return true + // If the tag exists, check if it is already filleted const edges = isTagUsedInFillet({ ast, callExp: segmentNode.node,