Skip to content

Commit

Permalink
upgrade to 1.9 (#965)
Browse files Browse the repository at this point in the history
* upgrade to 1.9

* feat: use prefetch sw instead

* changeset

* remove duplicate
  • Loading branch information
thejackshelton authored Sep 17, 2024
1 parent a3b55c6 commit 76edce7
Show file tree
Hide file tree
Showing 15 changed files with 91 additions and 67 deletions.
15 changes: 15 additions & 0 deletions .changeset/weak-phones-prove.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
'@qwik-ui/headless': minor
'@qwik-ui/styled': minor
'@qwik-ui/themes': minor
---

feat: carousel reaches beta state

feat: stepper component added as a configuration for the carousel

feat: vertical carousels are now supported

feat: progress bar gets a major refactor and is backwards compatible

docs: fixed theme issues and improved prefetching
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
16 changes: 10 additions & 6 deletions apps/website/src/root.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { component$, useContextProvider, useStore, useStyles$ } from '@builder.io/qwik';
import {
QwikCityProvider,
RouterOutlet,
ServiceWorkerRegister,
} from '@builder.io/qwik-city';
component$,
useContextProvider,
useStore,
useStyles$,
PrefetchGraph,
PrefetchServiceWorker,
} from '@builder.io/qwik';
import { QwikCityProvider, RouterOutlet } from '@builder.io/qwik-city';

import { APP_STATE_CONTEXT_ID } from './_state/app-state-context-id';
import { AppState } from './_state/app-state.type';
Expand Down Expand Up @@ -46,9 +49,10 @@ export default component$(() => {
<meta charset="utf-8" />
<link rel="manifest" href="/manifest.json" />
<RouterHead />
<ServiceWorkerRegister />
</head>
<body lang="en">
<PrefetchGraph />
<PrefetchServiceWorker />
<ThemeProvider
attribute="class"
enableSystem={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default component$(() => {
<ToggleGroup.Root
multiple
value={['left', 'center']}
onChange$={(v) => (valueSelected.value = v)}
onChange$={(v: string[]) => (valueSelected.value = v)}
disabled
>
<ToggleGroup.Item value="left" aria-label="Left aligned" class="toggle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default component$(() => {
<ToggleGroup.Root
multiple
value={['left', 'center']}
onChange$={(v) => (valueSelected.value = v)}
onChange$={(v: string[]) => (valueSelected.value = v)}
>
<ToggleGroup.Item value="left" aria-label="Left aligned" class="toggle">
Left
Expand Down
2 changes: 0 additions & 2 deletions apps/website/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { qwikCity } from '@builder.io/qwik-city/vite';
import { qwikVite } from '@builder.io/qwik/optimizer';
import { qwikNxVite } from 'qwik-nx/plugins';
import { defineConfig } from 'vite';
import tsconfigPaths from 'vite-tsconfig-paths';
import { recmaProvideComponents } from './recma-provide-components';
Expand Down Expand Up @@ -30,7 +29,6 @@ export default defineConfig(async () => {

return {
plugins: [
qwikNxVite(),
qwikCity({
mdxPlugins: {
rehypeSyntaxHighlight: false,
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"packageManager": "[email protected]",
"devDependencies": {
"@axe-core/playwright": "^4.9.1",
"@builder.io/qwik": "1.7.3",
"@builder.io/qwik-city": "1.7.3",
"@builder.io/qwik": "^1.9",
"@builder.io/qwik-city": "^1.9",
"@changesets/cli": "^2.27.3",
"@changesets/get-github-info": "^0.6.0",
"@changesets/types": "^6.0.0",
Expand Down Expand Up @@ -96,7 +96,7 @@
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-playwright": "^1.6.2",
"eslint-plugin-qwik": "1.7.3",
"eslint-plugin-qwik": "^1.9",
"focus-trap": "7.5.4",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/kit-headless/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"private": false,
"peerDependencies": {
"@builder.io/qwik": "1.7.2"
"@builder.io/qwik": "^1.9"
},
"dependencies": {
"@floating-ui/core": "^1.6.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ test.describe('Mobile / Touch Behavior', () => {
await expect(d.getSlideAt(3)).toHaveAttribute('data-active');
await expect(d.getSlideAt(0)).not.toHaveAttribute('data-active');
});

// test(`GIVEN a mobile carousel
// WHEN swiping to the next slide
// THEN the next slide should snap to the left side of the scroller`, async ({
Expand Down
5 changes: 1 addition & 4 deletions packages/kit-headless/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"types": [
"vitest/globals",
"node"
]
"types": ["vitest/globals", "node"]
},
"include": [
"vite.config.ts",
Expand Down
2 changes: 0 additions & 2 deletions packages/kit-headless/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/// <reference types="vitest" />
import { qwikVite } from '@builder.io/qwik/optimizer';
import { dirname, join } from 'path';
import { qwikNxVite } from 'qwik-nx/plugins';
import { fileURLToPath } from 'url';
import { defineConfig } from 'vite';
import dts from 'vite-plugin-dts';
Expand All @@ -15,7 +14,6 @@ const excludeAll = (obj: any) => Object.keys(obj).map(makeRegex);

export default defineConfig({
plugins: [
qwikNxVite(),
qwikVite(),
tsconfigPaths({ root: '../../' }),
dts({
Expand Down
2 changes: 1 addition & 1 deletion packages/kit-styled/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"private": false,
"scripts": {},
"peerDependencies": {
"@builder.io/qwik": "1.7.2"
"@builder.io/qwik": "^1.9"
},
"devDependencies": {
"@qwik-ui/headless": "^0.5.2",
Expand Down
2 changes: 0 additions & 2 deletions packages/kit-styled/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import { qwikVite } from '@builder.io/qwik/optimizer';
import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
import { join } from 'path';
import { qwikNxVite } from 'qwik-nx/plugins';
import { defineConfig } from 'vite';
import dts from 'vite-plugin-dts';
import tsconfigPaths from 'vite-tsconfig-paths';

export default defineConfig({
plugins: [
qwikNxVite(),
qwikVite({
vendorRoots: [join(__dirname, '../kit-headless/src')],
}),
Expand Down
2 changes: 0 additions & 2 deletions packages/themes/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import { qwikVite } from '@builder.io/qwik/optimizer';
import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
import { join } from 'path';
import { qwikNxVite } from 'qwik-nx/plugins';
import { defineConfig } from 'vite';
import dts from 'vite-plugin-dts';
import tsconfigPaths from 'vite-tsconfig-paths';

export default defineConfig({
plugins: [
qwikNxVite(),
qwikVite(),
tsconfigPaths({ root: '../../' }),
dts({
Expand Down
Loading

0 comments on commit 76edce7

Please sign in to comment.