diff --git a/.vscode/launch.json b/.vscode/launch.json index 8f30e65aa..e606416f4 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,6 +10,22 @@ "name": "Launch Chrome against localhost", "url": "http://localhost:8080", "webRoot": "${workspaceFolder}" + }, + { + "type": "node", + "name": "Debug website SSR (preview)", + "request": "launch", + "program": "${workspaceFolder}/node_modules/vite/bin/vite.js", + "args": ["preview", "--config", "apps/website/vite.config.ts", "--open"], + "cwd": "${workspaceFolder}", + "console": "integratedTerminal", + "stopOnEntry": true, + "sourceMaps": true, + "resolveSourceMapLocations": [ + "${workspaceFolder}/**", + "!**/node_modules/**" + ], + "skipFiles": ["/**"] } ] } diff --git a/apps/component-tests/package.json b/apps/component-tests/package.json index 9278b1ea1..468a683df 100644 --- a/apps/component-tests/package.json +++ b/apps/component-tests/package.json @@ -1,3 +1,4 @@ { - "name": "componentTests" -} + "name": "componentTests", + "type": "module" +} \ No newline at end of file diff --git a/apps/component-tests/project.json b/apps/component-tests/project.json index e586f5f08..3dd6692f3 100644 --- a/apps/component-tests/project.json +++ b/apps/component-tests/project.json @@ -8,7 +8,7 @@ "executor": "qwik-nx:build", "options": { "runSequence": ["component-tests:build.client", "component-tests:build.ssr"], - "outputPath": "dist/apps/component-tests" + "outputPath": "dist/apps/component-tests/client" }, "configurations": { "preview": {} @@ -17,7 +17,7 @@ "build.client": { "executor": "@nx/vite:build", "options": { - "outputPath": "dist/apps/component-tests", + "outputPath": "dist/apps/component-tests/client", "configFile": "apps/component-tests/vite.config.ts" } }, @@ -25,7 +25,7 @@ "executor": "@nx/vite:build", "defaultConfiguration": "preview", "options": { - "outputPath": "dist/apps/component-tests" + "outputPath": "dist/apps/component-tests/server" }, "configurations": { "preview": { diff --git a/apps/component-tests/src/components/router-head/router-head.tsx b/apps/component-tests/src/components/router-head/router-head.tsx index f1a292b87..59e2f4f24 100644 --- a/apps/component-tests/src/components/router-head/router-head.tsx +++ b/apps/component-tests/src/components/router-head/router-head.tsx @@ -1,5 +1,5 @@ -import { component$ } from '@builder.io/qwik'; -import { useDocumentHead, useLocation } from '@builder.io/qwik-city'; +import { component$ } from '@qwik.dev/core'; +import { useDocumentHead, useLocation } from '@qwik.dev/router'; /** * The RouterHead component is placed inside of the document `` element. diff --git a/apps/component-tests/src/components/showcase-test/showcase-test.tsx b/apps/component-tests/src/components/showcase-test/showcase-test.tsx index 0d9a2a8df..cb4ddf3f9 100644 --- a/apps/component-tests/src/components/showcase-test/showcase-test.tsx +++ b/apps/component-tests/src/components/showcase-test/showcase-test.tsx @@ -1,5 +1,5 @@ -import { Component, component$, useSignal, useTask$ } from '@builder.io/qwik'; -import { useLocation } from '@builder.io/qwik-city'; +import { Component, component$, useSignal, useTask$ } from '@qwik.dev/core'; +import { useLocation } from '@qwik.dev/router'; import { metaGlobComponents } from './component-imports'; export const ShowcaseTest = component$(() => { diff --git a/apps/component-tests/src/entry.dev.tsx b/apps/component-tests/src/entry.dev.tsx index 14352ced5..7fc75931e 100644 --- a/apps/component-tests/src/entry.dev.tsx +++ b/apps/component-tests/src/entry.dev.tsx @@ -9,7 +9,7 @@ * - More code is transferred to the browser than in SSR mode. * - Optimizer/Serialization/Deserialization code is not exercised! */ -import { render, RenderOptions } from '@builder.io/qwik'; +import { render, RenderOptions } from '@qwik.dev/core'; import Root from './root'; export default function (opts: RenderOptions) { diff --git a/apps/component-tests/src/entry.preview.tsx b/apps/component-tests/src/entry.preview.tsx index d240a2d6a..4a1797783 100644 --- a/apps/component-tests/src/entry.preview.tsx +++ b/apps/component-tests/src/entry.preview.tsx @@ -10,12 +10,11 @@ * - https://vitejs.dev/config/preview-options.html#preview-options * */ -import { createQwikCity } from '@builder.io/qwik-city/middleware/node'; +import { createQwikRouter } from '@qwik.dev/router/middleware/node'; // The `render` import must stay after `qwikCityPlan` import: https://github.com/BuilderIO/qwik/issues/3634 -import qwikCityPlan from '@qwik-city-plan'; import render from './entry.ssr'; /** * The default export is the QwikCity adaptor used by Vite preview. */ -export default createQwikCity({ render, qwikCityPlan }); +export default createQwikRouter({ render }); diff --git a/apps/component-tests/src/entry.ssr.tsx b/apps/component-tests/src/entry.ssr.tsx index de09d8570..e7b621511 100644 --- a/apps/component-tests/src/entry.ssr.tsx +++ b/apps/component-tests/src/entry.ssr.tsx @@ -10,7 +10,7 @@ * - npm run build * */ -import { renderToStream, RenderToStreamOptions } from '@builder.io/qwik/server'; +import { renderToStream, RenderToStreamOptions } from '@qwik.dev/core/server'; import { manifest } from '@qwik-client-manifest'; import Root from './root'; diff --git a/apps/component-tests/src/root.tsx b/apps/component-tests/src/root.tsx index e6e890a4d..563a3f4fe 100644 --- a/apps/component-tests/src/root.tsx +++ b/apps/component-tests/src/root.tsx @@ -1,8 +1,8 @@ -import { component$, useStyles$ } from '@builder.io/qwik'; -import { QwikCityProvider, RouterOutlet } from '@builder.io/qwik-city'; +import { component$, useStyles$ } from '@qwik.dev/core'; +import { QwikRouterProvider, RouterOutlet } from '@qwik.dev/router'; import { RouterHead } from './components/router-head/router-head'; -import globalStyles from './global.css?inline'; +import global from './global.css?inline'; import { ThemeProvider } from '@qwik-ui/themes'; @@ -22,10 +22,10 @@ export default component$(() => { * * Don't remove the `` and `` elements. */ - useStyles$(globalStyles); + useStyles$(global); return ( - + @@ -47,6 +47,6 @@ export default component$(() => { - + ); }); diff --git a/apps/component-tests/src/routes/[kit]/[component]/[example]/index.tsx b/apps/component-tests/src/routes/[kit]/[component]/[example]/index.tsx index 05cdec8cf..06fd2ca1f 100644 --- a/apps/component-tests/src/routes/[kit]/[component]/[example]/index.tsx +++ b/apps/component-tests/src/routes/[kit]/[component]/[example]/index.tsx @@ -1,4 +1,4 @@ -import { component$ } from '@builder.io/qwik'; +import { component$ } from '@qwik.dev/core'; import { ShowcaseTest } from '../../../../components/showcase-test/showcase-test'; export default component$(() => { diff --git a/apps/component-tests/src/routes/index.tsx b/apps/component-tests/src/routes/index.tsx index 3b84958fe..4cd6bbe5c 100644 --- a/apps/component-tests/src/routes/index.tsx +++ b/apps/component-tests/src/routes/index.tsx @@ -1,5 +1,5 @@ -import { component$ } from '@builder.io/qwik'; -import type { DocumentHead } from '@builder.io/qwik-city'; +import { component$ } from '@qwik.dev/core'; +import type { DocumentHead } from '@qwik.dev/router'; export default component$(() => { return
kit/component/example
; diff --git a/apps/component-tests/src/routes/service-worker.ts b/apps/component-tests/src/routes/service-worker.ts deleted file mode 100644 index 068a6f78c..000000000 --- a/apps/component-tests/src/routes/service-worker.ts +++ /dev/null @@ -1,18 +0,0 @@ -/* - * WHAT IS THIS FILE? - * - * The service-worker.ts file is used to have state of the art prefetching. - * https://qwik.builder.io/qwikcity/prefetching/overview/ - * - * Qwik uses a service worker to speed up your site and reduce latency, ie, not used in the traditional way of offline. - * You can also use this file to add more functionality that runs in the service worker. - */ -import { setupServiceWorker } from '@builder.io/qwik-city/service-worker'; - -setupServiceWorker(); - -addEventListener('install', () => self.skipWaiting()); - -addEventListener('activate', () => self.clients.claim()); - -declare const self: ServiceWorkerGlobalScope; diff --git a/apps/component-tests/src/routes/test-route/index.tsx b/apps/component-tests/src/routes/test-route/index.tsx index 60a2f646c..73608b9c2 100644 --- a/apps/component-tests/src/routes/test-route/index.tsx +++ b/apps/component-tests/src/routes/test-route/index.tsx @@ -1,4 +1,4 @@ -import { component$ } from '@builder.io/qwik'; +import { component$ } from '@qwik.dev/core'; export default component$(() => { return
Test Route
; diff --git a/apps/component-tests/tsconfig.json b/apps/component-tests/tsconfig.json index 6e0cf3bc9..146f83cc8 100644 --- a/apps/component-tests/tsconfig.json +++ b/apps/component-tests/tsconfig.json @@ -6,7 +6,7 @@ "module": "ES2022", "lib": ["es2022", "DOM", "WebWorker", "DOM.Iterable"], "jsx": "react-jsx", - "jsxImportSource": "@builder.io/qwik", + "jsxImportSource": "@qwik.dev/core", "strict": true, "resolveJsonModule": true, "moduleResolution": "bundler", diff --git a/apps/component-tests/vite.config.ts b/apps/component-tests/vite.config.ts index 3eaf235c8..5b23ad335 100644 --- a/apps/component-tests/vite.config.ts +++ b/apps/component-tests/vite.config.ts @@ -1,13 +1,15 @@ -import { qwikVite } from '@builder.io/qwik/optimizer'; -import { qwikCity } from '@builder.io/qwik-city/vite'; +import { qwikVite } from '@qwik.dev/core/optimizer'; +import { qwikRouter } from '@qwik.dev/router/vite'; import { defineConfig } from 'vite'; import tsconfigPaths from 'vite-tsconfig-paths'; +import tailwindcss from '@tailwindcss/vite'; +const qwikLibs = ['@qwikest/icons']; export default defineConfig({ root: 'apps/component-tests', cacheDir: '../../node_modules/.vite/apps/component-tests', plugins: [ - qwikCity(), + qwikRouter(), qwikVite({ client: { outDir: '../../dist/apps/component-tests/client', @@ -18,7 +20,15 @@ export default defineConfig({ tsconfigFileNames: ['tsconfig.app.json'], }), tsconfigPaths({ root: '../../' }), + tailwindcss(), ], + + optimizeDeps: { + exclude: [...qwikLibs], + }, + ssr: { + noExternal: [...qwikLibs], + }, server: { fs: { // Allow serving files from the project root diff --git a/apps/website/adapters/static/vite.config.ts b/apps/website/adapters/static/vite.config.ts index ee303b124..5802ed0e5 100644 --- a/apps/website/adapters/static/vite.config.ts +++ b/apps/website/adapters/static/vite.config.ts @@ -1,13 +1,13 @@ -import { staticAdapter } from '@builder.io/qwik-city/adapters/static/vite'; -import { extendConfig } from '@builder.io/qwik-city/vite'; +import { staticAdapter } from '@qwik.dev/router/adapters/static/vite'; +import { extendConfig } from '@qwik.dev/router/vite'; import baseConfig from '../../vite.config'; -export default extendConfig(baseConfig, () => { +export default extendConfig(baseConfig as any, () => { return { build: { ssr: true, rollupOptions: { - input: ['@qwik-city-plan'], + input: ['@qwik-router-config'], }, }, plugins: [ diff --git a/apps/website/package.json b/apps/website/package.json index 8968c3652..6f9ab205f 100644 --- a/apps/website/package.json +++ b/apps/website/package.json @@ -3,4 +3,4 @@ "description": "The Qwik UI Website", "private": true, "type": "module" -} +} \ No newline at end of file diff --git a/apps/website/project.json b/apps/website/project.json index aff989143..55f2d083d 100644 --- a/apps/website/project.json +++ b/apps/website/project.json @@ -8,7 +8,7 @@ "executor": "qwik-nx:build", "options": { "runSequence": ["website:build.client", "website:build.ssr"], - "outputPath": "dist/apps/website" + "outputPath": "dist/apps/website/client" }, "configurations": { "preview": {}, @@ -31,7 +31,7 @@ "build.client": { "executor": "@nx/vite:build", "options": { - "outputPath": "dist/apps/website", + "outputPath": "dist/apps/website/client", "configFile": "apps/website/vite.config.ts" } }, @@ -39,7 +39,7 @@ "executor": "@nx/vite:build", "defaultConfiguration": "preview", "options": { - "outputPath": "dist/apps/website" + "outputPath": "dist/apps/website/server" }, "configurations": { "preview": { diff --git a/apps/website/recma-provide-components.ts b/apps/website/recma-provide-components.ts index 6b118b0ea..c36fa828c 100644 --- a/apps/website/recma-provide-components.ts +++ b/apps/website/recma-provide-components.ts @@ -105,7 +105,7 @@ export const recmaProvideComponents: Plugin = () => { local: { type: 'Identifier', name: '_inlinedQrl' }, }, ], - source: { type: 'Literal', value: '@builder.io/qwik' }, + source: { type: 'Literal', value: '@qwik.dev/core' }, }); }; }; diff --git a/apps/website/src/_state/MDXProvider.tsx b/apps/website/src/_state/MDXProvider.tsx index f0f727ed5..7c6b7bcf8 100644 --- a/apps/website/src/_state/MDXProvider.tsx +++ b/apps/website/src/_state/MDXProvider.tsx @@ -1,11 +1,11 @@ +import type { Component } from '@qwik.dev/core'; import { - Component, + Slot, component$, createContextId, useContext, - Slot, useContextProvider, -} from '@builder.io/qwik'; +} from '@qwik.dev/core'; export const MDXContext = createContextId('MDXContext'); diff --git a/apps/website/src/_state/app-state-context-id.ts b/apps/website/src/_state/app-state-context-id.ts index 24b181e00..68c2d1539 100644 --- a/apps/website/src/_state/app-state-context-id.ts +++ b/apps/website/src/_state/app-state-context-id.ts @@ -1,4 +1,4 @@ -import { createContextId } from '@builder.io/qwik'; +import { createContextId } from '@qwik.dev/core'; import { AppState } from './app-state.type'; export const APP_STATE_CONTEXT_ID = createContextId('app-state-context-id'); diff --git a/apps/website/src/_state/use-app-state.ts b/apps/website/src/_state/use-app-state.ts index 40cbb2b94..c5056b0f3 100644 --- a/apps/website/src/_state/use-app-state.ts +++ b/apps/website/src/_state/use-app-state.ts @@ -1,4 +1,4 @@ -import { useContext } from '@builder.io/qwik'; +import { useContext } from '@qwik.dev/core'; import { APP_STATE_CONTEXT_ID } from './app-state-context-id'; export const useAppState = () => { diff --git a/apps/website/src/components/anatomy-table/anatomy-table.tsx b/apps/website/src/components/anatomy-table/anatomy-table.tsx index a7875eeb4..f7fd603d6 100644 --- a/apps/website/src/components/anatomy-table/anatomy-table.tsx +++ b/apps/website/src/components/anatomy-table/anatomy-table.tsx @@ -1,4 +1,4 @@ -import { component$ } from '@builder.io/qwik'; +import { component$ } from '@qwik.dev/core'; type AnatomyTableProps = { firstColumnLabel?: string; diff --git a/apps/website/src/components/animations/caveats.tsx b/apps/website/src/components/animations/caveats.tsx index c9f0dfa2e..55184feef 100644 --- a/apps/website/src/components/animations/caveats.tsx +++ b/apps/website/src/components/animations/caveats.tsx @@ -1,4 +1,4 @@ -import { component$ } from '@builder.io/qwik'; +import { component$ } from '@qwik.dev/core'; import { Note, NoteStatus } from '../note/note'; // Adjust the import path based on your structure export const TopLayerAnimationsCaveats = component$(() => { diff --git a/apps/website/src/components/animations/compatability.tsx b/apps/website/src/components/animations/compatability.tsx index ff15fa2a4..82ea16be4 100644 --- a/apps/website/src/components/animations/compatability.tsx +++ b/apps/website/src/components/animations/compatability.tsx @@ -1,4 +1,4 @@ -import { component$ } from '@builder.io/qwik'; +import { component$ } from '@qwik.dev/core'; import { Note, NoteStatus } from '../note/note'; // Adjust the import path based on your structure export const BrowserAnimationsCompatability = component$(() => { diff --git a/apps/website/src/components/api-table/api-table.tsx b/apps/website/src/components/api-table/api-table.tsx index c3032a52a..63491ff26 100644 --- a/apps/website/src/components/api-table/api-table.tsx +++ b/apps/website/src/components/api-table/api-table.tsx @@ -1,4 +1,4 @@ -import { component$ } from '@builder.io/qwik'; +import { component$ } from '@qwik.dev/core'; import { InfoPopup } from '../info-popup/info-popup'; export type APITableProps = { propDescriptors: { diff --git a/apps/website/src/components/api-table/auto-api.tsx b/apps/website/src/components/api-table/auto-api.tsx index 450069698..abcc66fc4 100644 --- a/apps/website/src/components/api-table/auto-api.tsx +++ b/apps/website/src/components/api-table/auto-api.tsx @@ -1,4 +1,4 @@ -import { JSXOutput, component$, $, QRL, useTask$, useSignal } from '@builder.io/qwik'; +import { JSXOutput, component$, $, QRL, useTask$, useSignal } from '@qwik.dev/core'; import { APITable, type APITableProps } from './api-table'; //This is a workaround for not being able to export across packages due to nx rule: diff --git a/apps/website/src/components/code-copy/code-copy.tsx b/apps/website/src/components/code-copy/code-copy.tsx index 21f9697d8..8faed0539 100644 --- a/apps/website/src/components/code-copy/code-copy.tsx +++ b/apps/website/src/components/code-copy/code-copy.tsx @@ -1,4 +1,4 @@ -import { PropsOf, component$, useSignal } from '@builder.io/qwik'; +import { PropsOf, component$, useSignal } from '@qwik.dev/core'; import { Button } from '~/components/ui'; import { cn } from '@qwik-ui/utils'; import copy from 'clipboard-copy'; diff --git a/apps/website/src/components/code-snippet/code-snippet.tsx b/apps/website/src/components/code-snippet/code-snippet.tsx index 6f3d024c3..34009a97d 100644 --- a/apps/website/src/components/code-snippet/code-snippet.tsx +++ b/apps/website/src/components/code-snippet/code-snippet.tsx @@ -1,4 +1,4 @@ -import { PropsOf, component$ } from '@builder.io/qwik'; +import { PropsOf, component$ } from '@qwik.dev/core'; import { Highlight } from '../highlight/highlight'; type CodeSnippetProps = PropsOf<'div'> & { diff --git a/apps/website/src/components/component-status-badge/component-status-badge.tsx b/apps/website/src/components/component-status-badge/component-status-badge.tsx index 66f968f46..649806fe4 100644 --- a/apps/website/src/components/component-status-badge/component-status-badge.tsx +++ b/apps/website/src/components/component-status-badge/component-status-badge.tsx @@ -1,4 +1,4 @@ -import { component$ } from '@builder.io/qwik'; +import { component$ } from '@qwik.dev/core'; import { Badge } from '~/components/ui'; import { ComponentStatus } from '~/_state/component-status.type'; diff --git a/apps/website/src/components/copy-css-config/copy-css-config.tsx b/apps/website/src/components/copy-css-config/copy-css-config.tsx index 1f739c661..994ac64b1 100644 --- a/apps/website/src/components/copy-css-config/copy-css-config.tsx +++ b/apps/website/src/components/copy-css-config/copy-css-config.tsx @@ -1,4 +1,4 @@ -import { component$, useSignal } from '@builder.io/qwik'; +import { component$, useSignal } from '@qwik.dev/core'; import { Modal } from '@qwik-ui/headless'; import { Button } from '~/components/ui'; import { extractThemeCSS } from '@qwik-ui/utils'; diff --git a/apps/website/src/components/faq/faq.tsx b/apps/website/src/components/faq/faq.tsx index 0ffb6274c..e34147ecc 100644 --- a/apps/website/src/components/faq/faq.tsx +++ b/apps/website/src/components/faq/faq.tsx @@ -1,4 +1,4 @@ -import { component$ } from '@builder.io/qwik'; +import { component$ } from '@qwik.dev/core'; import { Accordion } from '@qwik-ui/styled'; export const FAQ = component$(() => { diff --git a/apps/website/src/components/feature-list/feature-list.tsx b/apps/website/src/components/feature-list/feature-list.tsx index 839a84a86..8cf407916 100644 --- a/apps/website/src/components/feature-list/feature-list.tsx +++ b/apps/website/src/components/feature-list/feature-list.tsx @@ -1,4 +1,4 @@ -import { component$ } from '@builder.io/qwik'; +import { component$ } from '@qwik.dev/core'; import { Note } from '../note/note'; import { LuBadge, LuBadgeAlert, LuBadgeCheck } from '@qwikest/icons/lucide'; diff --git a/apps/website/src/components/footer/footer.tsx b/apps/website/src/components/footer/footer.tsx index 420f2ebdf..112fe0801 100644 --- a/apps/website/src/components/footer/footer.tsx +++ b/apps/website/src/components/footer/footer.tsx @@ -1,4 +1,4 @@ -import { component$ } from '@builder.io/qwik'; +import { component$ } from '@qwik.dev/core'; import { GitHubIcon } from '../icons/GitHubIcon'; import { DiscordIcon } from '../icons/discord'; import { cn } from '@qwik-ui/utils'; diff --git a/apps/website/src/components/header/header.tsx b/apps/website/src/components/header/header.tsx index 453f2748f..02254f230 100644 --- a/apps/website/src/components/header/header.tsx +++ b/apps/website/src/components/header/header.tsx @@ -5,11 +5,11 @@ import { useComputed$, useSignal, useStyles$, -} from '@builder.io/qwik'; +} from '@qwik.dev/core'; // eslint-disable-next-line @nx/enforce-module-boundaries import { version as headlessVersion } from '../../../../../packages/kit-headless/package.json'; // eslint-disable-next-line @nx/enforce-module-boundaries -import { useLocation } from '@builder.io/qwik-city'; +import { useLocation } from '@qwik.dev/router'; // eslint-disable-next-line @nx/enforce-module-boundaries // eslint-disable-next-line @nx/enforce-module-boundaries import { version as styledKitVersion } from '../../../../../packages/kit-styled/package.json'; @@ -239,12 +239,12 @@ const DarkModeToggle = component$>(({ ...props }) => { (themeSig.value = await switchLightDark(themeSig.value || 'light')) } > - -
+ + -
+ ); }); diff --git a/apps/website/src/components/highlight/highlight.tsx b/apps/website/src/components/highlight/highlight.tsx index f17602784..75e11081d 100644 --- a/apps/website/src/components/highlight/highlight.tsx +++ b/apps/website/src/components/highlight/highlight.tsx @@ -1,4 +1,4 @@ -import { type ClassList, type PropsOf, component$ } from '@builder.io/qwik'; +import { type ClassList, type PropsOf, component$ } from '@qwik.dev/core'; import { CodeCopy } from '../code-copy/code-copy'; import { cn } from '@qwik-ui/utils'; import { createJavaScriptRegexEngine } from 'shiki/engine/javascript'; diff --git a/apps/website/src/components/icons/AstroLogo.tsx b/apps/website/src/components/icons/AstroLogo.tsx index 5b28a1865..be1bd2a6e 100644 --- a/apps/website/src/components/icons/AstroLogo.tsx +++ b/apps/website/src/components/icons/AstroLogo.tsx @@ -1,4 +1,4 @@ -import { component$, type PropsOf } from '@builder.io/qwik'; +import { component$, type PropsOf } from '@qwik.dev/core'; export default component$((props: PropsOf<'svg'>) => { return ( diff --git a/apps/website/src/components/icons/QwikLogo.tsx b/apps/website/src/components/icons/QwikLogo.tsx index 018223b4b..ec13b5514 100644 --- a/apps/website/src/components/icons/QwikLogo.tsx +++ b/apps/website/src/components/icons/QwikLogo.tsx @@ -1,4 +1,4 @@ -import { component$, type PropsOf } from '@builder.io/qwik'; +import { component$, type PropsOf } from '@qwik.dev/core'; export default component$((props: PropsOf<'svg'>) => { return ( diff --git a/apps/website/src/components/icons/logo.tsx b/apps/website/src/components/icons/logo.tsx index 7963229e6..1ced169e0 100644 --- a/apps/website/src/components/icons/logo.tsx +++ b/apps/website/src/components/icons/logo.tsx @@ -1,4 +1,4 @@ -import { PropsOf, component$ } from '@builder.io/qwik'; +import { PropsOf, component$ } from '@qwik.dev/core'; import { cn } from '@qwik-ui/utils'; import { useTheme } from '@qwik-ui/themes'; diff --git a/apps/website/src/components/info-popup/info-popup.tsx b/apps/website/src/components/info-popup/info-popup.tsx index d60f6f173..7a58eae19 100644 --- a/apps/website/src/components/info-popup/info-popup.tsx +++ b/apps/website/src/components/info-popup/info-popup.tsx @@ -1,4 +1,4 @@ -import { component$, useStyles$ } from '@builder.io/qwik'; +import { component$, useStyles$ } from '@qwik.dev/core'; import { Popover } from '@qwik-ui/headless'; type InfoProps = { @@ -25,7 +25,7 @@ export const InfoPopup = component$((props: InfoProps) => { return ( -
+ { clip-rule="evenodd" > -
+ diff --git a/apps/website/src/components/install-snippet/install-snippet.tsx b/apps/website/src/components/install-snippet/install-snippet.tsx index 13ea423f0..d8bd709f6 100644 --- a/apps/website/src/components/install-snippet/install-snippet.tsx +++ b/apps/website/src/components/install-snippet/install-snippet.tsx @@ -1,4 +1,4 @@ -import { component$ } from '@builder.io/qwik'; +import { component$ } from '@qwik.dev/core'; import { Tabs } from '@qwik-ui/headless'; import { CodeCopy } from '../code-copy/code-copy'; diff --git a/apps/website/src/components/keyboard-interaction-table/keyboard-interaction-table.tsx b/apps/website/src/components/keyboard-interaction-table/keyboard-interaction-table.tsx index c9144af50..365a8a745 100644 --- a/apps/website/src/components/keyboard-interaction-table/keyboard-interaction-table.tsx +++ b/apps/website/src/components/keyboard-interaction-table/keyboard-interaction-table.tsx @@ -1,4 +1,4 @@ -import { component$ } from '@builder.io/qwik'; +import { component$ } from '@qwik.dev/core'; type KBInteractionTableRowProps = { keyTitle: string; diff --git a/apps/website/src/components/make-it-yours/make-it-yours.tsx b/apps/website/src/components/make-it-yours/make-it-yours.tsx index d1e158cc8..bebf84943 100644 --- a/apps/website/src/components/make-it-yours/make-it-yours.tsx +++ b/apps/website/src/components/make-it-yours/make-it-yours.tsx @@ -1,4 +1,4 @@ -import { $, PropsOf, component$, useComputed$ } from '@builder.io/qwik'; +import { $, PropsOf, component$, useComputed$ } from '@qwik.dev/core'; import { ThemeBaseColors, ThemeBorderRadiuses, diff --git a/apps/website/src/components/mdx-components/index.tsx b/apps/website/src/components/mdx-components/index.tsx index 9a4c8a929..3d64b0968 100644 --- a/apps/website/src/components/mdx-components/index.tsx +++ b/apps/website/src/components/mdx-components/index.tsx @@ -1,4 +1,4 @@ -import { type Component, type PropsOf, Slot, component$ } from '@builder.io/qwik'; +import { type Component, type PropsOf, Slot, component$ } from '@qwik.dev/core'; import { cn } from '@qwik-ui/utils'; import { AnatomyTable } from '../anatomy-table/anatomy-table'; import { APITable } from '../api-table/api-table'; @@ -9,7 +9,6 @@ import { FeatureList } from '../feature-list/feature-list'; import { InstallSnippet } from '../install-snippet/install-snippet'; import { KeyboardInteractionTable } from '../keyboard-interaction-table/keyboard-interaction-table'; import { Note } from '../note/note'; -import { StatusBanner } from '../status-banner/status-banner'; import { TopLayerAnimationsCaveats } from '../animations/caveats'; import { BrowserAnimationsCompatability } from '../animations/compatability'; @@ -135,7 +134,6 @@ export const components: Record = { InstallSnippet, KeyboardInteractionTable, Note, - StatusBanner, AutoAPI, TopLayerAnimationsCaveats, BrowserAnimationsCompatability, diff --git a/apps/website/src/components/module-preload/module-preload.tsx b/apps/website/src/components/module-preload/module-preload.tsx index 50bc38e42..fd72791d4 100644 --- a/apps/website/src/components/module-preload/module-preload.tsx +++ b/apps/website/src/components/module-preload/module-preload.tsx @@ -1,4 +1,4 @@ -import { component$, sync$, useOnWindow } from '@builder.io/qwik'; +import { component$, sync$, useOnWindow } from '@qwik.dev/core'; export const ModulePreload = component$(() => { useOnWindow( diff --git a/apps/website/src/components/navigation-docs/navigation-docs.tsx b/apps/website/src/components/navigation-docs/navigation-docs.tsx index bb2afb986..9fb5cef3d 100644 --- a/apps/website/src/components/navigation-docs/navigation-docs.tsx +++ b/apps/website/src/components/navigation-docs/navigation-docs.tsx @@ -1,5 +1,5 @@ -import { PropsOf, component$ } from '@builder.io/qwik'; -import { useLocation } from '@builder.io/qwik-city'; +import { PropsOf, component$ } from '@qwik.dev/core'; +import { useLocation } from '@qwik.dev/router'; import { ComponentStatus } from '~/_state/component-status.type'; import { StatusBadge } from '../component-status-badge/component-status-badge'; import { cn } from '@qwik-ui/utils'; diff --git a/apps/website/src/components/note/note.tsx b/apps/website/src/components/note/note.tsx index afd8da279..eb8deec06 100644 --- a/apps/website/src/components/note/note.tsx +++ b/apps/website/src/components/note/note.tsx @@ -1,4 +1,4 @@ -import { component$, PropsOf, Slot } from '@builder.io/qwik'; +import { component$, PropsOf, Slot } from '@qwik.dev/core'; import { cn } from '@qwik-ui/utils'; export enum NoteStatus { diff --git a/apps/website/src/components/router-head/router-head.tsx b/apps/website/src/components/router-head/router-head.tsx index f6c787f91..add5d8ae2 100644 --- a/apps/website/src/components/router-head/router-head.tsx +++ b/apps/website/src/components/router-head/router-head.tsx @@ -1,5 +1,5 @@ -import { component$ } from '@builder.io/qwik'; -import { useDocumentHead, useLocation } from '@builder.io/qwik-city'; +import { component$ } from '@qwik.dev/core'; +import { useDocumentHead, useLocation } from '@qwik.dev/router'; import codeCave from '../../../public/images/contributing/code-cave.jpg'; /** @@ -53,16 +53,32 @@ export const RouterHead = component$(() => { - {head.meta.map((m, i) => ( - + {head.meta.map((m) => ( + ))} - {head.links.map((l, i) => ( - + {head.links.map((l) => ( + ))} - {head.styles.map((s, i) => ( -