Skip to content

Commit

Permalink
Merge branch 'main' into pr/JerryWu1234/832-1
Browse files Browse the repository at this point in the history
  • Loading branch information
maiieul committed Oct 10, 2024
2 parents 3677ca9 + 6d48d34 commit 376246c
Show file tree
Hide file tree
Showing 276 changed files with 18,889 additions and 15,572 deletions.
5 changes: 5 additions & 0 deletions .changeset/two-jeans-share.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@qwik-ui/headless': minor
---

We are removing the existing popover animations shimming and instead wil now only support native popover animations. This is considered a breaking change but will be more reliable overall.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ node_modules
dist
coverage
.eslintrc.*
vite.config.ts
vite.config.ts
packages/kit-headless/browsers/**
5 changes: 0 additions & 5 deletions .github/actions/test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ runs:
env:
NODE_OPTIONS: --experimental-vm-modules

- name: Test Headless
uses: cypress-io/github-action@v5
with:
command: 'pnpm test.headless.ci'

# - name: Build
# shell: bash
# run: npx nx affected:build --base=last-release --exclude=website
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
jobs:
test:
runs-on: ubuntu-latest
name: Test NodeJS ${{ matrix.node_version }}

strategy:
matrix:
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
],
"editor.codeActionsOnSave": {
"source.removeUnusedImports": "explicit"
}
},
"vitest.disableWorkspaceWarning": true
}
35 changes: 28 additions & 7 deletions apps/component-tests/src/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -1240,11 +1240,19 @@

*::-webkit-scrollbar-thumb {
/* Thumb color */
background-color: var(--qwikui-slate-500);
background-color: hsla(var(--foreground) / 0.25);
border-radius: 0.5rem;
background-clip: padding-box;
border-left: 0.3rem solid transparent;
border-right: 0.3rem solid transparent;
border-left: 0.15rem solid transparent;
border-right: 0.15rem solid transparent;
}

.navigation-docs::-webkit-scrollbar-thumb {
background-color: hsla(var(--foreground) / 0.1);
}

.dark .navigation-docs::-webkit-scrollbar-thumb {
background-color: hsla(var(--foreground) / 0.2);
}

*::-webkit-scrollbar-corner {
Expand All @@ -1256,8 +1264,17 @@
border-left: 1px solid var(--qwikui-slate-300);
}

.dark *::-webkit-scrollbar-thumb {
background-color: var(--qwikui-slate-500);
.toc-scrollbar::-webkit-scrollbar-track,
.dark .toc-scrollbar::-webkit-scrollbar-track {
border-color: transparent;
}

.toc-scrollbar::-webkit-scrollbar-thumb {
background-color: transparent;
}

.toc-scrollbar:hover.toc-scrollbar::-webkit-scrollbar-thumb {
background-color: hsla(var(--foreground) / 0.15);
}

.dark *::-webkit-scrollbar-track {
Expand All @@ -1272,7 +1289,7 @@
}

.code-example *::-webkit-scrollbar-thumb {
background: var(--qwikui-slate-500);
background-color: var(--qwikui-slate-600);
border-radius: 0.5rem;
background-clip: padding-box;
}
Expand All @@ -1290,6 +1307,10 @@
.dark .note-link a {
border-bottom: 1px solid white !important;
}

.gif-container {
border-radius: var(--border-radius);
}
}

:root {
Expand Down Expand Up @@ -1342,7 +1363,7 @@ body {
min-height: 100%;
}

/* Utilities layer for animations. The current arbitrary & docs tailwind animation guidelines are not maintainable long term.
/* Utilities layer for animations. The current arbitrary & docs tailwind animation guidelines are not maintainable long term.
It would make more sense to supply the user with the animation declaration in the docs.
*/
@layer utilities {
Expand Down
45 changes: 36 additions & 9 deletions apps/component-tests/src/root.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
import { component$, useStyles$ } from '@builder.io/qwik';
import {
QwikCityProvider,
RouterOutlet,
ServiceWorkerRegister,
} from '@builder.io/qwik-city';
import { RouterHead } from './components/router-head/router-head';
component$, useStyles$,
PrefetchGraph,
PrefetchServiceWorker
} from '@builder.io/qwik';
import { QwikCityProvider, RouterOutlet } from '@builder.io/qwik-city';

import { RouterHead } from './components/router-head/router-head';
import globalStyles from './global.css?inline';

import { ThemeProvider } from '@qwik-ui/themes';

import '@fontsource-variable/inter';
import {
ThemeBaseColors,
ThemeBorderRadiuses,
ThemeFonts,
ThemeModes,
ThemePrimaryColors,
ThemeStyles,
} from '@qwik-ui/utils';

export default component$(() => {
/**
* The root of a QwikCity site always start with the <QwikCityProvider> component,
Expand All @@ -17,16 +29,31 @@ export default component$(() => {
*/
useStyles$(globalStyles);


return (
<QwikCityProvider>
<head>
<meta charSet="utf-8" />
<meta charset="utf-8" />
<link rel="manifest" href="/manifest.json" />
<RouterHead />
</head>
<body lang="en">
<RouterOutlet />
<ServiceWorkerRegister />
<PrefetchGraph />
<PrefetchServiceWorker />
<ThemeProvider
attribute="class"
enableSystem={false}
themes={[
...Object.values(ThemeFonts),
...Object.values(ThemeModes),
...Object.values(ThemeStyles),
...Object.values(ThemeBaseColors),
...Object.values(ThemePrimaryColors),
...Object.values(ThemeBorderRadiuses),
]}
>
<RouterOutlet />
</ThemeProvider>
</body>
</QwikCityProvider>
);
Expand Down
2 changes: 0 additions & 2 deletions apps/component-tests/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ import { qwikVite } from '@builder.io/qwik/optimizer';
import { qwikCity } from '@builder.io/qwik-city/vite';
import { defineConfig } from 'vite';
import tsconfigPaths from 'vite-tsconfig-paths';
import { qwikNxVite } from 'qwik-nx/plugins';

export default defineConfig({
cacheDir: '../../node_modules/.vite/apps/component-tests',
plugins: [
qwikNxVite(),
qwikCity(),
qwikVite({
client: {
Expand Down
10 changes: 0 additions & 10 deletions apps/website-e2e/.eslintrc.json

This file was deleted.

8 changes: 0 additions & 8 deletions apps/website-e2e/cypress.config.ts

This file was deleted.

30 changes: 0 additions & 30 deletions apps/website-e2e/project.json

This file was deleted.

13 changes: 0 additions & 13 deletions apps/website-e2e/src/e2e/app.cy.ts

This file was deleted.

4 changes: 0 additions & 4 deletions apps/website-e2e/src/fixtures/example.json

This file was deleted.

1 change: 0 additions & 1 deletion apps/website-e2e/src/support/app.po.ts

This file was deleted.

33 changes: 0 additions & 33 deletions apps/website-e2e/src/support/commands.ts

This file was deleted.

17 changes: 0 additions & 17 deletions apps/website-e2e/src/support/e2e.ts

This file was deleted.

10 changes: 0 additions & 10 deletions apps/website-e2e/tsconfig.json

This file was deleted.

Loading

0 comments on commit 376246c

Please sign in to comment.