Skip to content

Commit a29e53a

Browse files
committed
Merge branch 'unified-desktop-gui' into tgriesser/unify/ui-data-push
* unified-desktop-gui: chore(unify): optimize deps automatically, clean up unused files (#18429) fixing stub types and tests (#18428) feat: expose project config to project nodes (#18424) feat(launchpad): Adding generic error screen (#18405)
2 parents 0c5eee1 + f7a7683 commit a29e53a

File tree

28 files changed

+725
-301
lines changed

28 files changed

+725
-301
lines changed

packages/app/package.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,16 @@
6969
"dist",
7070
"lib",
7171
"src"
72-
]
72+
],
73+
"vite": {
74+
"optimizeDeps": {
75+
"include": [
76+
"@urql/vue",
77+
"@vueuse/core",
78+
"lodash",
79+
"vue",
80+
"vue-toast-notification"
81+
]
82+
}
83+
}
7384
}

packages/app/src/Foo.spec.tsx

Lines changed: 0 additions & 17 deletions
This file was deleted.

packages/app/src/Foo.vue

Lines changed: 0 additions & 18 deletions
This file was deleted.

packages/app/src/components/button/Button.vue

Lines changed: 0 additions & 90 deletions
This file was deleted.

packages/app/src/components/input/Input.vue

Lines changed: 0 additions & 106 deletions
This file was deleted.

packages/app/src/composables/index.ts

Lines changed: 0 additions & 24 deletions
This file was deleted.

packages/app/src/layouts/default.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
2-
<div class="h-screen overflow-hidden flex flex-row bg-red">
3-
<main class="min-w-0 flex-1 border-t bg-green border-gray-200 lg:flex">
2+
<div class="h-screen overflow-hidden flex flex-row">
3+
<main class="min-w-0 flex-1 border-t border-gray-200 lg:flex">
44
<section
55
aria-labelledby="primary-heading"
66
class="min-w-0 flex-1 h-full flex flex-col overflow-hidden lg:order-last"

packages/app/src/locales/en-US.json

Lines changed: 0 additions & 30 deletions
This file was deleted.

packages/app/src/specs/SpecsList.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { defaultMessages } from '@cy/i18n'
44

55
const rowSelector = '[data-testid=specs-list-row]'
66
const inputSelector = 'input'
7-
const fullFile = (s) => `${s.node.fileName}${s.node.specFileExtension}${s.node.fileExtension}`
7+
const fullFile = (s) => `${s.node.fileName}${s.node.specFileExtension}`
88
const hasSpecText = (_node: JQuery<HTMLElement>, spec: SpecListRowFragment) => {
99
const $node = _node as JQuery<HTMLDivElement>
1010

packages/app/src/specs/SpecsListHeader.spec.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ describe('<SpecsListHeader />', { keystrokeDelay: 0 }, () => {
3030
const onNewSpec = cy.spy().as('new-spec')
3131
const search = ref('')
3232

33-
cy.mount(<SpecsListHeader
33+
cy.mount(<div class="max-w-800px p-12 resize overflow-auto"><SpecsListHeader
3434
modelValue={search.value}
3535
onNewSpec={onNewSpec}
36-
/>)
36+
/></div>)
3737
.get(buttonSelector)
3838
.click()
3939
.get('@new-spec')

0 commit comments

Comments
 (0)