diff --git a/packages/docs/package.json b/packages/docs/package.json index e03573e35be..97b41b36c7c 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -20,7 +20,7 @@ "devDependencies": { "@builder.io/partytown": "^0.5.4", "@builder.io/qwik": "0.0.20-8", - "@builder.io/qwik-city": "0.0.5", + "@builder.io/qwik-city": "0.0.6", "@cloudflare/kv-asset-handler": "0.2.0", "@cloudflare/workers-types": "^3.10.0", "autoprefixer": "10.4.7", diff --git a/packages/docs/pages/docs/concepts/reactivity.mdx b/packages/docs/pages/docs/concepts/reactivity.mdx index 2770bb26e9a..e814a020ec1 100644 --- a/packages/docs/pages/docs/concepts/reactivity.mdx +++ b/packages/docs/pages/docs/concepts/reactivity.mdx @@ -1,9 +1,3 @@ - ---- -title: Overview -fetch: https://hackmd.io/@mhevery/SyYrShReq ---- - # Reactivity Reactivity is a key component of Qwik. Reactivity allows Qwik to track which components are subscribed to which state. This information enables Qwik to invalidate only the relevant component on state change, which minimizes the number of components that need to be rerendered. Without reactivity, a state change would require rerendering from the root component, which would force the whole component tree to be eagerly downloaded. diff --git a/packages/docs/pages/docs/getting-started.mdx b/packages/docs/pages/docs/getting-started.mdx index 46dba9e4d64..a24ad92e41a 100644 --- a/packages/docs/pages/docs/getting-started.mdx +++ b/packages/docs/pages/docs/getting-started.mdx @@ -28,9 +28,7 @@ $ npm init qwik@latest The CLI will guide you through an interactive menu to set the project-name and select one of the starters: - -[![asciicast](https://asciinema.org/a/ni3UZdIPYPNPNgaGlXrxcl1Bj.svg)](https://asciinema.org/a/ni3UZdIPYPNPNgaGlXrxcl1Bj) - + After your new app is created, you will see an output like the following in your terminal: diff --git a/packages/docs/pages/docs/README.md b/packages/docs/pages/docs/index.md similarity index 100% rename from packages/docs/pages/docs/README.md rename to packages/docs/pages/docs/index.md diff --git a/packages/docs/pages/examples/contribute.md b/packages/docs/pages/examples/readme.md similarity index 100% rename from packages/docs/pages/examples/contribute.md rename to packages/docs/pages/examples/readme.md diff --git a/packages/docs/src/components/repl/repl-console.tsx b/packages/docs/src/components/repl/repl-console.tsx index b36e4eb3492..9fa8cad29d7 100644 --- a/packages/docs/src/components/repl/repl-console.tsx +++ b/packages/docs/src/components/repl/repl-console.tsx @@ -1,4 +1,4 @@ -import { component$, Host } from '@builder.io/qwik'; +import { component$, Host, jsx } from '@builder.io/qwik'; import type { ReplEvent, ReplStore } from './types'; export interface ReplConsoleProps { @@ -19,6 +19,9 @@ export function ReplLog({ log }: { log: ReplEvent }) { if (log.end) { elapsed = renderElapsed(log.end - log.start); } + if (log.scope === 'build') { + return null; + } switch (log.kind) { case 'pause': return ( @@ -40,7 +43,7 @@ export function ReplLog({ log }: { log: ReplEvent }) { return (
{log.scope}
-
{log.message}
+
{renderConsoleMessage(log.message)}
{elapsed ?
{elapsed}
: null}
); @@ -62,6 +65,21 @@ export function ReplLog({ log }: { log: ReplEvent }) { return null; } +const styleprefix = '%c'; +function renderConsoleMessage(texts: string[]) { + const nodes = []; + for (let i = 0; i < texts.length; i++) { + const msg = texts[i]; + if (msg.startsWith(styleprefix)) { + nodes.push(jsx('span', { style: texts[i + 1], children: msg.slice(styleprefix.length) })); + i++; + } else { + nodes.push(' ' + msg); + } + } + return nodes; +} + function basename(str: string) { const index = str.lastIndexOf('/'); if (index > 0) { diff --git a/packages/docs/src/components/repl/worker/ssr-html.ts b/packages/docs/src/components/repl/worker/ssr-html.ts index 8a60e0dd254..756880ae1f7 100644 --- a/packages/docs/src/components/repl/worker/ssr-html.ts +++ b/packages/docs/src/components/repl/worker/ssr-html.ts @@ -84,7 +84,7 @@ export const ssrHtml = async ( result.events.push({ kind: 'pause', - scope: 'build', + scope: 'ssr', start, end: performance.now(), message: [], diff --git a/packages/qwik-city/package.json b/packages/qwik-city/package.json index 073ea73d06a..4e189946e3d 100644 --- a/packages/qwik-city/package.json +++ b/packages/qwik-city/package.json @@ -1,6 +1,6 @@ { "name": "@builder.io/qwik-city", - "version": "0.0.5", + "version": "0.0.6", "description": "Static Site Generator for Qwik", "main": "./dist/index.cjs", "module": "./dist/index.mjs", @@ -15,7 +15,7 @@ "@types/mdx": "2.0.2" }, "devDependencies": { - "@builder.io/qwik": "0.0.20-5", + "@builder.io/qwik": "0.0.20-8", "@microsoft/api-extractor": "7.24.0", "@types/github-slugger": "^1.3.0", "@types/marked": "^4.0.3", diff --git a/packages/qwik-city/src/runtime/api.md b/packages/qwik-city/src/runtime/api.md index 52cbb1b5df7..b910eb0a3c1 100644 --- a/packages/qwik-city/src/runtime/api.md +++ b/packages/qwik-city/src/runtime/api.md @@ -122,7 +122,7 @@ export interface PageHandler { // (undocumented) source: PageSource; // (undocumented) - url: URL; + url: string; } // @public (undocumented) diff --git a/packages/qwik-city/src/vite/load-pages.ts b/packages/qwik-city/src/vite/load-pages.ts index b5ae2b63ef1..efd75b073ae 100644 --- a/packages/qwik-city/src/vite/load-pages.ts +++ b/packages/qwik-city/src/vite/load-pages.ts @@ -2,7 +2,7 @@ import fs from 'fs'; import { extname, join } from 'path'; import { parseMarkdownFile, parseIndexFile } from './parse'; import type { PluginContext } from './types'; -import { IGNORE_EXT, IGNORE_NAMES, isMarkdownFile, isReadmeFile } from './utils'; +import { IGNORE_EXT, IGNORE_NAMES, isMarkdownFile, isIndexFile } from './utils'; export async function loadPages(ctx: PluginContext, warn: (msg: string) => void) { ctx.pages = []; @@ -19,7 +19,7 @@ async function loadPagesDir(ctx: PluginContext, dir: string, warn: (msg: string) if (!IGNORE_NAMES[itemName]) { try { const itemPath = join(dir, itemName); - if (isReadmeFile(itemName)) { + if (isIndexFile(itemName)) { const indexContent = await fs.promises.readFile(itemPath, 'utf-8'); const index = parseIndexFile(ctx, itemPath, indexContent); ctx.indexes.push(index); diff --git a/packages/qwik-city/src/vite/utils.ts b/packages/qwik-city/src/vite/utils.ts index 854029ed026..5d7284d291d 100644 --- a/packages/qwik-city/src/vite/utils.ts +++ b/packages/qwik-city/src/vite/utils.ts @@ -160,9 +160,9 @@ export function isMarkdownFile(ctx: PluginContext, filePath: string) { return ctx.extensions.includes(ext); } -export function isReadmeFile(filePath: string) { +export function isIndexFile(filePath: string) { filePath = filePath.toLowerCase(); - return filePath === 'readme.md' || filePath === 'readme'; + return filePath === 'index.md' || filePath === 'index'; } export function getPagesBuildPath(pathname: string) { diff --git a/yarn.lock b/yarn.lock index 97d1e02deff..27228c490d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -409,11 +409,11 @@ __metadata: languageName: node linkType: hard -"@builder.io/qwik-city@0.0.5, @builder.io/qwik-city@workspace:packages/qwik-city": +"@builder.io/qwik-city@0.0.6, @builder.io/qwik-city@workspace:packages/qwik-city": version: 0.0.0-use.local resolution: "@builder.io/qwik-city@workspace:packages/qwik-city" dependencies: - "@builder.io/qwik": 0.0.20-5 + "@builder.io/qwik": 0.0.20-8 "@mdx-js/mdx": ^2.1.1 "@microsoft/api-extractor": 7.24.0 "@types/github-slugger": ^1.3.0 @@ -456,13 +456,6 @@ __metadata: languageName: unknown linkType: soft -"@builder.io/qwik@npm:0.0.20-5": - version: 0.0.20-5 - resolution: "@builder.io/qwik@npm:0.0.20-5" - checksum: 72090bc226a5f380adb81a7f1fa9cde10cc08b0d619c11be6930e66fa73b38136943e9aa62e5e0e5724d5dd83b7c7bde484ab4901423465001fb783944c61439 - languageName: node - linkType: hard - "@cloudflare/kv-asset-handler@npm:0.2.0": version: 0.2.0 resolution: "@cloudflare/kv-asset-handler@npm:0.2.0" @@ -7628,7 +7621,7 @@ __metadata: dependencies: "@builder.io/partytown": ^0.5.4 "@builder.io/qwik": 0.0.20-8 - "@builder.io/qwik-city": 0.0.5 + "@builder.io/qwik-city": 0.0.6 "@cloudflare/kv-asset-handler": 0.2.0 "@cloudflare/workers-types": ^3.10.0 autoprefixer: 10.4.7