Skip to content

Commit

Permalink
Merge branch 'main' into 711_search_box
Browse files Browse the repository at this point in the history
  • Loading branch information
JerryWu1234 authored Aug 14, 2024
2 parents 5882576 + b19a887 commit 92febac
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 59 deletions.
2 changes: 1 addition & 1 deletion apps/website/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"options": {
"dist": "dist/apps/website/client",
"branch": "main",
"projectName": "qwik-ui"
"projectName": "qwik-ui-site"
},
"dependsOn": ["build-cloudflare"]
},
Expand Down
18 changes: 7 additions & 11 deletions apps/website/src/root.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import { component$, useContextProvider, useStore, useStyles$ } from '@builder.io/qwik';
import {
component$,
PrefetchGraph,
PrefetchServiceWorker,
useContextProvider,
useStore,
useStyles$,
} from '@builder.io/qwik';
import { QwikCityProvider, RouterOutlet } from '@builder.io/qwik-city';
QwikCityProvider,
RouterOutlet,
ServiceWorkerRegister,
} 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,11 +43,10 @@ export default component$(() => {
return (
<QwikCityProvider>
<head>
<meta charSet="utf-8" />
<meta charset="utf-8" />
<link rel="manifest" href="/manifest.json" />
<RouterHead />
<PrefetchGraph />
<PrefetchServiceWorker />
<ServiceWorkerRegister />
</head>
<body lang="en">
<ThemeProvider
Expand Down
43 changes: 21 additions & 22 deletions apps/website/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@ import { qwikNxVite } from 'qwik-nx/plugins';
import { defineConfig } from 'vite';
import tsconfigPaths from 'vite-tsconfig-paths';
import { recmaProvideComponents } from './recma-provide-components';
import { isDev } from '@builder.io/qwik/build';

export default defineConfig(async () => {
const { default: rehypePrettyCode } = await import('rehype-pretty-code');
const { visit } = await import('unist-util-visit');

// Commented out for qwik v1.7.0
// let output: any = {};
// if (!isDev) {
// // Client-specific configuration
// output = {
// // Customize the client build structure
// entryFileNames: ({ name }: any) => {
// if (name.startsWith('entry')) {
// return '[name].js';
// }
// return `build/[name]-[hash].js`;
// },
// chunkFileNames: () => {
// return `build/[name]-[hash].js`;
// },
// assetFileNames: `build/[name]-[hash].[ext]`,
// };
// }
let output: any = {};
if (!isDev) {
// Client-specific configuration
output = {
// Customize the client build structure
entryFileNames: ({ name }: any) => {
if (name.startsWith('entry')) {
return '[name].js';
}
return `build/[name]-[hash].js`;
},
chunkFileNames: () => {
return `build/[name]-[hash].js`;
},
assetFileNames: `build/[name]-[hash].[ext]`,
};
}

return {
plugins: [
Expand Down Expand Up @@ -95,10 +95,9 @@ export default defineConfig(async () => {
},
build: {
target: 'es2022',
// Commented out for qwik v1.7.0
// rollupOptions: {
// output,
// },
rollupOptions: {
output,
},
},
preview: {
headers: {
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.2",
"@builder.io/qwik-city": "^1.7.2",
"@builder.io/qwik": "1.7.3",
"@builder.io/qwik-city": "1.7.3",
"@changesets/cli": "^2.27.3",
"@changesets/get-github-info": "^0.6.0",
"@changesets/types": "^6.0.0",
Expand Down Expand Up @@ -105,7 +105,7 @@
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-cypress": "^3.2.0",
"eslint-plugin-playwright": "^1.6.2",
"eslint-plugin-qwik": "^1.7.2",
"eslint-plugin-qwik": "1.7.3",
"focus-trap": "7.5.4",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
Expand Down
62 changes: 40 additions & 22 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 92febac

Please sign in to comment.