diff --git a/.changeset/quiet-zebras-smile.md b/.changeset/quiet-zebras-smile.md new file mode 100644 index 00000000000..d0156382b94 --- /dev/null +++ b/.changeset/quiet-zebras-smile.md @@ -0,0 +1,5 @@ +--- +'@qwik.dev/router': patch +--- + +fix: preserve tree-shaking for the exported zod namespace diff --git a/e2e/qwik-e2e/apps/qwikrouter-test/src/routes/(common)/actions/validated/index.tsx b/e2e/qwik-e2e/apps/qwikrouter-test/src/routes/(common)/actions/validated/index.tsx index 9c1f0004274..c88e50155ac 100644 --- a/e2e/qwik-e2e/apps/qwikrouter-test/src/routes/(common)/actions/validated/index.tsx +++ b/e2e/qwik-e2e/apps/qwikrouter-test/src/routes/(common)/actions/validated/index.tsx @@ -82,9 +82,7 @@ export default component$(() => { if (action1.value) { if (action1.value.failed) { action1.value satisfies { failed: true } & ( - | TypedDataValidatorError - | DataValidatorError - | ActionFailedObject + TypedDataValidatorError | DataValidatorError | ActionFailedObject ); } else { action1.value satisfies ActionSuccessObject; @@ -116,9 +114,7 @@ export default component$(() => { if (action4.value) { if (action4.value.failed) { action4.value satisfies { failed: true } & ( - | TypedDataValidatorError - | DataValidatorError - | ActionFailedObject + TypedDataValidatorError | DataValidatorError | ActionFailedObject ); } else { action4.value satisfies ActionSuccessObject; diff --git a/package.json b/package.json index 341bbfb9134..1d7f13cacad 100644 --- a/package.json +++ b/package.json @@ -108,8 +108,8 @@ "@clack/prompts": "0.11.0", "@eslint/js": "9.39.2", "@mdx-js/mdx": "3.1.1", - "@microsoft/api-documenter": "7.29.6", - "@microsoft/api-extractor": "7.57.6", + "@microsoft/api-documenter": "7.30.10", + "@microsoft/api-extractor": "7.58.12", "@napi-rs/cli": "2.18.4", "@napi-rs/triples": "1.2.0", "@node-rs/helper": "1.6.0", @@ -130,7 +130,7 @@ "@types/tmp": "0.2.6", "@types/which-pm-runs": "1.0.2", "@vitejs/plugin-basic-ssl": "2.1.4", - "@vitest/coverage-v8": "4.0.18", + "@vitest/coverage-v8": "4.1.10", "all-contributors-cli": "6.26.1", "brotli": "1.3.3", "create-qwik": "workspace:*", @@ -150,9 +150,9 @@ "monaco-editor": "0.54.0", "mri": "1.2.0", "path-browserify": "1.0.1", - "prettier": "3.7.4", - "prettier-plugin-jsdoc": "1.8.0", - "prettier-plugin-tailwindcss": "0.7.2", + "prettier": "3.9.6", + "prettier-plugin-jsdoc": "1.8.1", + "prettier-plugin-tailwindcss": "0.8.1", "pretty-quick": "4.2.2", "prompts": "2.4.2", "rollup": "4.61.0", diff --git a/packages/browser-extension/public/qwikloader.js b/packages/browser-extension/public/qwikloader.js index feca56920ba..0ed66e09359 100644 --- a/packages/browser-extension/public/qwikloader.js +++ b/packages/browser-extension/public/qwikloader.js @@ -24,7 +24,7 @@ const l = (e, t) => Array.from(e.querySelectorAll(t)), p = (t) => { if (void 0 === t._qwikjson_) { let n = (t === e.documentElement ? e.body : t).lastElementChild; - for (; n; ) { + for (; n;) { if ('SCRIPT' === n.tagName && 'qwik/json' === n.getAttribute('type')) { t._qwikjson_ = JSON.parse(n.textContent.replace(/\\x3C(\/?script)/gi, '<$1')); break; @@ -105,7 +105,7 @@ const l = (e, t) => Array.from(e.querySelectorAll(t)), const t = g(e.type), n = 'e:' + t; let o = e.target; - for (; o && o.getAttribute; ) { + for (; o && o.getAttribute;) { const r = w(o, e, n, t), s = e.bubbles && !e.cancelBubble; (f(r) && (await r), (o = s && e.bubbles && !e.cancelBubble ? o.parentElement : null)); diff --git a/packages/devtools/kit/src/client-bridge.ts b/packages/devtools/kit/src/client-bridge.ts index 91ca0c3df13..7808aa93824 100644 --- a/packages/devtools/kit/src/client-bridge.ts +++ b/packages/devtools/kit/src/client-bridge.ts @@ -86,8 +86,7 @@ function getPageWindow(isBrowser: boolean): Window | null { function getHook(pageWindow: Window | null): QwikDevtoolsHookExtended | undefined { return getQwikDevtoolsGlobal(pageWindow)?.[QWIK_DEVTOOLS_GLOBAL.props.hook] as - | QwikDevtoolsHookExtended - | undefined; + QwikDevtoolsHookExtended | undefined; } export function createInPageBridge(options: InPageBridgeOptions): InPageBridge { diff --git a/packages/devtools/kit/src/globals.ts b/packages/devtools/kit/src/globals.ts index f8644453ff8..dc0c06a9a21 100644 --- a/packages/devtools/kit/src/globals.ts +++ b/packages/devtools/kit/src/globals.ts @@ -54,11 +54,7 @@ export type QwikPreloadOriginKind = | 'unknown'; export type QwikPreloadPhase = 'csr' | 'ssr' | 'unknown'; export type QwikPreloadMatchMode = - | 'href' - | 'normalized-href' - | 'chunk-hash' - | 'resource-name' - | 'none'; + 'href' | 'normalized-href' | 'chunk-hash' | 'resource-name' | 'none'; export type QwikPreloadLoadMatchQuality = 'best-effort' | 'none'; export interface QwikPreloadQrlRequestRemembered { diff --git a/packages/devtools/package.json b/packages/devtools/package.json index 768eeaf0114..4561f671474 100644 --- a/packages/devtools/package.json +++ b/packages/devtools/package.json @@ -37,8 +37,8 @@ "nodemon": "3.1.14", "np": "11.0.2", "postcss": "8.5.18", - "prettier": "3.7.4", - "prettier-plugin-tailwindcss": "0.7.2", + "prettier": "3.9.6", + "prettier-plugin-tailwindcss": "0.8.1", "react": "19.2.4", "react-dom": "19.2.4", "shiki": "4.0.2", diff --git a/packages/devtools/ui/src/components/Tree/type.ts b/packages/devtools/ui/src/components/Tree/type.ts index 5d2f86344b0..53e89588452 100644 --- a/packages/devtools/ui/src/components/Tree/type.ts +++ b/packages/devtools/ui/src/components/Tree/type.ts @@ -14,13 +14,7 @@ export type StoreTarget = Record; export type TreeNodePropValue = string | number | boolean | null | undefined | object; export type ElementType = - | 'null' - | 'boolean' - | 'number' - | 'string' - | 'function' - | 'array' - | 'object'; + 'null' | 'boolean' | 'number' | 'string' | 'function' | 'array' | 'object'; export interface TreeNode { name?: string; diff --git a/packages/devtools/ui/src/devtools/page-data-source.ts b/packages/devtools/ui/src/devtools/page-data-source.ts index 0cc34298ecf..75fac5b3572 100644 --- a/packages/devtools/ui/src/devtools/page-data-source.ts +++ b/packages/devtools/ui/src/devtools/page-data-source.ts @@ -97,8 +97,7 @@ const defaultSource = new InPageDataSource(); export function getPageDataSource(): PageDataSource { const source = isBrowser ? (getQwikDevtoolsGlobal(window)?.[QWIK_DEVTOOLS_GLOBAL.props.pageDataSource] as - | PageDataSource - | undefined) + PageDataSource | undefined) : undefined; if (source) { return source; diff --git a/packages/devtools/ui/src/devtools/rpc.ts b/packages/devtools/ui/src/devtools/rpc.ts index 86e7b3246e6..78c6b61c2d8 100644 --- a/packages/devtools/ui/src/devtools/rpc.ts +++ b/packages/devtools/ui/src/devtools/rpc.ts @@ -124,7 +124,6 @@ const viteDataProvider: DataProvider = { export async function loadDevtoolsData(state: DevtoolsState) { const provider = (getQwikDevtoolsGlobal(window)?.[QWIK_DEVTOOLS_GLOBAL.props.dataProvider] as - | DataProvider - | undefined) ?? viteDataProvider; + DataProvider | undefined) ?? viteDataProvider; await provider.loadData(state); } diff --git a/packages/devtools/ui/src/features/HookTree/HookTree.tsx b/packages/devtools/ui/src/features/HookTree/HookTree.tsx index ca31ae39733..fb2c98d0a3e 100644 --- a/packages/devtools/ui/src/features/HookTree/HookTree.tsx +++ b/packages/devtools/ui/src/features/HookTree/HookTree.tsx @@ -403,8 +403,7 @@ export const HookTree = component$(() => { } const qrlChunk = (node.props as Record | undefined)?.__qrlChunk as - | string - | undefined; + string | undefined; selectedNode.value = { name, nodeId: node.id, qrlChunk }; // Read hooks from global state AND VNode props diff --git a/packages/devtools/ui/src/features/HookTree/hookTreeHelpers.ts b/packages/devtools/ui/src/features/HookTree/hookTreeHelpers.ts index 597b48e6e74..e21c23938e7 100644 --- a/packages/devtools/ui/src/features/HookTree/hookTreeHelpers.ts +++ b/packages/devtools/ui/src/features/HookTree/hookTreeHelpers.ts @@ -9,8 +9,7 @@ export function toTreeNodes(vnodes: VNodeTreeNode[]): TreeNode[] { name: v.name, label: v.name, props: v.props as - | Record - | undefined, + Record | undefined, children: v.children ? toTreeNodes(v.children) : undefined, })); } diff --git a/packages/devtools/ui/src/features/RenderTree/formatTreeData.ts b/packages/devtools/ui/src/features/RenderTree/formatTreeData.ts index e27e9a5314b..272bec1ecec 100644 --- a/packages/devtools/ui/src/features/RenderTree/formatTreeData.ts +++ b/packages/devtools/ui/src/features/RenderTree/formatTreeData.ts @@ -162,8 +162,7 @@ export class HookStore { findScopeVariables(item: HookDataEntry): string { const targets = (item.data as Record)?.[QWIK_VNODE_PROTOCOL.qrl.captureRef] as - | unknown[] - | undefined; + unknown[] | undefined; if (!targets) { return 'Scope []'; diff --git a/packages/devtools/ui/src/runtime/preloads.ts b/packages/devtools/ui/src/runtime/preloads.ts index df3a2db6199..c1f33d065c2 100644 --- a/packages/devtools/ui/src/runtime/preloads.ts +++ b/packages/devtools/ui/src/runtime/preloads.ts @@ -184,8 +184,7 @@ const syncLoadDuration = (entry: QwikPreloadEntryRemembered, loadDuration?: numb const createStore = (): MutablePreloadStore => { const devtoolsGlobal = getOrCreateQwikDevtoolsGlobal(window); const existing = devtoolsGlobal[QWIK_DEVTOOLS_GLOBAL.props.preloads] as - | MutablePreloadStore - | undefined; + MutablePreloadStore | undefined; if (existing) { return existing; } diff --git a/packages/docs/package.json b/packages/docs/package.json index 896d9b1955c..a5d121231f5 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -43,7 +43,7 @@ "magic-string": "0.30.21", "pagefind": "1.4.0", "playwright": "1.61.0", - "prettier": "3.7.4", + "prettier": "3.9.6", "prism-themes": "1.9.0", "prismjs": "1.30.0", "qwik-image": "0.0.16", diff --git a/packages/docs/src/repl/bundler/repl-ssr-worker.ts b/packages/docs/src/repl/bundler/repl-ssr-worker.ts index 21dbd1a6e64..7d5d8846fa4 100644 --- a/packages/docs/src/repl/bundler/repl-ssr-worker.ts +++ b/packages/docs/src/repl/bundler/repl-ssr-worker.ts @@ -46,10 +46,7 @@ export interface SSRErrorMessage extends MessageBase { type IncomingMessage = InitSSRMessage; export type OutgoingMessage = - | SSRReadyMessage - | SSRResultMessage - | SSRChunkMessage - | SSRErrorMessage; + SSRReadyMessage | SSRResultMessage | SSRChunkMessage | SSRErrorMessage; let replId: string; diff --git a/packages/docs/src/repl/types.ts b/packages/docs/src/repl/types.ts index 8ec7db3f873..d9d105fb123 100644 --- a/packages/docs/src/repl/types.ts +++ b/packages/docs/src/repl/types.ts @@ -131,11 +131,6 @@ export interface SSRErrorMessage { } export type OutputPanel = - | 'app' - | 'html' - | 'segments' - | 'clientBundles' - | 'serverModules' - | 'diagnostics'; + 'app' | 'html' | 'segments' | 'clientBundles' | 'serverModules' | 'diagnostics'; export type OutputDetail = 'options' | 'console'; diff --git a/packages/docs/src/routes/api/qwik-optimizer/index.mdx b/packages/docs/src/routes/api/qwik-optimizer/index.mdx index d11d37271e3..6f02e75e2bc 100644 --- a/packages/docs/src/routes/api/qwik-optimizer/index.mdx +++ b/packages/docs/src/routes/api/qwik-optimizer/index.mdx @@ -1338,8 +1338,7 @@ registerBundleGraphAdder ```typescript export type QwikVitePluginOptions = - | QwikVitePluginCSROptions - | QwikVitePluginSSROptions; + QwikVitePluginCSROptions | QwikVitePluginSSROptions; ``` [Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik-vite/src/plugins/vite.ts) diff --git a/packages/docs/src/routes/api/qwik-router/index.mdx b/packages/docs/src/routes/api/qwik-router/index.mdx index 88b684cdb51..a5c7c50e303 100644 --- a/packages/docs/src/routes/api/qwik-router/index.mdx +++ b/packages/docs/src/routes/api/qwik-router/index.mdx @@ -194,8 +194,7 @@ Note: valid cacheKeys are non-empty strings. ```typescript export type CacheKeyFn = - | true - | ((requestEv: RequestEvent, eTag: string) => string | null); + true | ((requestEv: RequestEvent, eTag: string) => string | null); ``` [Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/runtime/src/types.ts) @@ -360,8 +359,7 @@ When set (and a value is produced), the server includes an `ETag` header and ret ```typescript export type ContentModuleETag = - | string - | ((props: DocumentHeadProps) => string | null); + string | ((props: DocumentHeadProps) => string | null); ``` **References:** [DocumentHeadProps](#documentheadprops) @@ -459,8 +457,7 @@ export type DataValidator = {}> = { ```typescript export type DocumentHead = - | DocumentHeadValue - | ((props: DocumentHeadProps) => DocumentHeadValue); + DocumentHeadValue | ((props: DocumentHeadProps) => DocumentHeadValue); ``` **References:** [DocumentHeadValue](#documentheadvalue), [DocumentHeadProps](#documentheadprops) @@ -2162,8 +2159,7 @@ When a module exports `routeConfig`, the separate `head`, `eTag`, and `cacheKey` ```typescript export type RouteConfig = - | RouteConfigValue - | ((props: DocumentHeadProps) => RouteConfigValue); + RouteConfigValue | ((props: DocumentHeadProps) => RouteConfigValue); ``` **References:** [RouteConfigValue](#routeconfigvalue), [DocumentHeadProps](#documentheadprops) @@ -2674,7 +2670,7 @@ export type ServerData = { }; ``` -**References:** [Q_ROUTE](#q_route), [QwikRouterEnvData](#qwikrouterenvdata) +**References:** [Q\_ROUTE](#q_route), [QwikRouterEnvData](#qwikrouterenvdata) [Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/runtime/src/types.ts) @@ -3086,9 +3082,8 @@ export type ValidatorErrorKeyDotNotation = ? IsAny extends true ? never : U extends object - ? - | `${Prefix}${K}[]` - | ValidatorErrorKeyDotNotation + ? | `${Prefix}${K}[]` + | ValidatorErrorKeyDotNotation : `${Prefix}${K}[]` : T[K] extends object ? ValidatorErrorKeyDotNotation @@ -3107,9 +3102,9 @@ export type ValidatorErrorKeyDotNotation = export type ValidatorErrorType = { formErrors: U[]; fieldErrors: Partial<{ - [K in ValidatorErrorKeyDotNotation]: K extends `${infer _Prefix}[]${infer _Suffix}` - ? U[] - : U; + [ + K in ValidatorErrorKeyDotNotation + ]: K extends `${infer _Prefix}[]${infer _Suffix}` ? U[] : U; }>; }; ``` @@ -3122,8 +3117,7 @@ export type ValidatorErrorType = { ```typescript export type ValidatorReturn = {}> = - | ValidatorReturnSuccess - | ValidatorReturnFail; + ValidatorReturnSuccess | ValidatorReturnFail; ``` [Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/runtime/src/types.ts) diff --git a/packages/docs/src/routes/api/qwik/index.mdx b/packages/docs/src/routes/api/qwik/index.mdx index 4ed253f1267..20be20beb8c 100644 --- a/packages/docs/src/routes/api/qwik/index.mdx +++ b/packages/docs/src/routes/api/qwik/index.mdx @@ -985,7 +985,7 @@ Description -\_\_brand_context_type\_\_ +\_\_brand\_context\_type\_\_ @@ -2543,13 +2543,7 @@ Any valid output for a component ```typescript export type JSXOutput = - | JSXNode - | string - | number - | boolean - | null - | undefined - | JSXOutput[]; + JSXNode | string | number | boolean | null | undefined | JSXOutput[]; ``` **References:** [JSXNode](#jsxnode), [JSXOutput](#jsxoutput) @@ -2656,8 +2650,7 @@ _(Optional)_ ```typescript export type JSXTagName = - | keyof HTMLElementTagNameMap - | Omit; + keyof HTMLElementTagNameMap | Omit; ``` [Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/core/shared/jsx/types/jsx-qwik-attributes.ts) @@ -3318,10 +3311,7 @@ An event handler for Qwik events, can be a handler QRL or an array of handler QR ```typescript export type QRLEventHandlerMulti = - | QRL> - | undefined - | null - | QRLEventHandlerMulti[]; + QRL> | undefined | null | QRLEventHandlerMulti[]; ``` **References:** [QRL](#qrl-type-alias), [EventHandler](#eventhandler), [QRLEventHandlerMulti](#qrleventhandlermulti) @@ -3682,10 +3672,9 @@ The SVG props without plain handlers, for use inside functions ```typescript export type QwikSVGElements = { - [K in keyof Omit< - SVGElementTagNameMap, - keyof HTMLElementTagNameMap - >]: SVGProps; + [ + K in keyof Omit + ]: SVGProps; }; ``` @@ -10679,7 +10668,7 @@ export type ValueOrPromise = T | Promise;

version

-QWIK_VERSION +QWIK\_VERSION ```typescript version: string; @@ -10691,9 +10680,7 @@ version: string; ```typescript export type VisibleTaskStrategy = - | "intersection-observer" - | "document-ready" - | "document-idle"; + "intersection-observer" | "document-ready" | "document-idle"; ``` [Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/core/use/use-visible-task.ts) diff --git a/packages/eslint-plugin-qwik/src/scope-use-task.ts b/packages/eslint-plugin-qwik/src/scope-use-task.ts index 622234e7de8..ead691e4ba4 100644 --- a/packages/eslint-plugin-qwik/src/scope-use-task.ts +++ b/packages/eslint-plugin-qwik/src/scope-use-task.ts @@ -45,9 +45,7 @@ export const scopeUseTask: Rule.RuleModule = { const sourceCode = context.sourceCode; let currentUseTaskFunction: - | TSESTree.FunctionExpression - | TSESTree.ArrowFunctionExpression - | null = null; + TSESTree.FunctionExpression | TSESTree.ArrowFunctionExpression | null = null; /** * Checks if the given AST node (API usage or call) is guarded by an `if @@ -234,8 +232,7 @@ export const scopeUseTask: Rule.RuleModule = { parent.arguments[0] === node ) { currentUseTaskFunction = node as - | TSESTree.FunctionExpression - | TSESTree.ArrowFunctionExpression; + TSESTree.FunctionExpression | TSESTree.ArrowFunctionExpression; } }, ':function:exit'( diff --git a/packages/insights/package.json b/packages/insights/package.json index bb7deda0cd6..16710df3b93 100644 --- a/packages/insights/package.json +++ b/packages/insights/package.json @@ -28,8 +28,8 @@ "globals": "17.0.0", "netlify-cli": "24.5.1", "postcss": "8.5.18", - "prettier": "3.7.4", - "prettier-plugin-tailwindcss": "0.7.2", + "prettier": "3.9.6", + "prettier-plugin-tailwindcss": "0.8.1", "tailwindcss": "4.2.4", "typescript": "5.9.3", "typescript-eslint": "8.56.1", diff --git a/packages/optimizer/src/path.ts b/packages/optimizer/src/path.ts index 2bc4ed9fa8d..99029c9ff7c 100644 --- a/packages/optimizer/src/path.ts +++ b/packages/optimizer/src/path.ts @@ -41,7 +41,7 @@ export function createPath(opts: { cwd?: () => string } = {}): Path { } else if (code === 47 /*/*/) { break; } else { - code = 47 /*/*/; + code = 47; /*/*/ } if (code === 47 /*/*/) { if (lastSlash === i - 1 || dots === 1) { @@ -145,7 +145,7 @@ export function createPath(opts: { cwd?: () => string } = {}): Path { } resolvedPath = path + '/' + resolvedPath; - resolvedAbsolute = path.charCodeAt(0) === 47 /*/*/; + resolvedAbsolute = path.charCodeAt(0) === 47; /*/*/ } // At this point the path should be resolved to a full absolute path, but @@ -195,7 +195,7 @@ export function createPath(opts: { cwd?: () => string } = {}): Path { const isAbsolute = function isAbsolute(path: string) { assertPath(path); - return path.length > 0 && path.charCodeAt(0) === 47 /*/*/; + return path.length > 0 && path.charCodeAt(0) === 47; /*/*/ }; const join = function join(...paths: string[]) { diff --git a/packages/qwik-router/package.json b/packages/qwik-router/package.json index ea14d9be064..cd724b46e21 100644 --- a/packages/qwik-router/package.json +++ b/packages/qwik-router/package.json @@ -33,7 +33,7 @@ "zod": "^3.25.48" }, "devDependencies": { - "@microsoft/api-extractor": "7.57.6", + "@microsoft/api-extractor": "7.58.12", "@qwik.dev/core": "workspace:*", "@types/mdast": "4.0.4", "@types/node": "24.10.0", diff --git a/packages/qwik-router/src/buildtime/runtime-generation/generate-routes.ts b/packages/qwik-router/src/buildtime/runtime-generation/generate-routes.ts index ab17039ec89..06890863a37 100644 --- a/packages/qwik-router/src/buildtime/runtime-generation/generate-routes.ts +++ b/packages/qwik-router/src/buildtime/runtime-generation/generate-routes.ts @@ -21,7 +21,7 @@ export type RouteLoaderSourceFiles = ReadonlyMap; /** Check if a build trie key is a group directory name like `(common)` */ function isGroupKey(key: string) { - return key.charCodeAt(0) === 40 /* '(' */; + return key.charCodeAt(0) === 40; /* '(' */ } /** diff --git a/packages/qwik-router/src/middleware/request-handler/handlers/action-handler.ts b/packages/qwik-router/src/middleware/request-handler/handlers/action-handler.ts index 2f44400a548..5e7bb2785dc 100644 --- a/packages/qwik-router/src/middleware/request-handler/handlers/action-handler.ts +++ b/packages/qwik-router/src/middleware/request-handler/handlers/action-handler.ts @@ -68,8 +68,7 @@ export function actionHandler(routeActions: ActionInternal[]): RequestHandler { // Try global actions map if not found in route if (!action) { const serverActionsMap = globalThis._qwikActionsMap as - | Map - | undefined; + Map | undefined; action = serverActionsMap?.get(actionId); } diff --git a/packages/qwik-router/src/middleware/request-handler/request-event-core.ts b/packages/qwik-router/src/middleware/request-handler/request-event-core.ts index b4b5898ae2d..7b07a8193e2 100644 --- a/packages/qwik-router/src/middleware/request-handler/request-event-core.ts +++ b/packages/qwik-router/src/middleware/request-handler/request-event-core.ts @@ -331,8 +331,7 @@ export function createRequestEvent( if (writableStream === null) { if (isDev) { const serverTiming = sharedMap.get(RequestEvShareServerTiming) as - | [string, number][] - | undefined; + [string, number][] | undefined; if (serverTiming) { headers.set( 'Server-Timing', diff --git a/packages/qwik-router/src/middleware/request-handler/resolve-request-handlers-core.ts b/packages/qwik-router/src/middleware/request-handler/resolve-request-handlers-core.ts index 0f7d88910f7..0f5e4f0c03e 100644 --- a/packages/qwik-router/src/middleware/request-handler/resolve-request-handlers-core.ts +++ b/packages/qwik-router/src/middleware/request-handler/resolve-request-handlers-core.ts @@ -279,8 +279,7 @@ function createResolveRequestHandlers() { const selectedActionId = requestEv.query.get(QACTION_KEY); if (selectedActionId) { const serverActionsMap = globalThis._qwikActionsMap as - | Map - | undefined; + Map | undefined; const action = routeActions.find((action) => action.__id === selectedActionId) ?? serverActionsMap?.get(selectedActionId); @@ -556,8 +555,7 @@ function createResolveRequestHandlers() { ) { ev.exit(); const data = (await ev.parseBody()) as - | [args?: unknown[] | undefined, ...captured: unknown[]] - | undefined; + [args?: unknown[] | undefined, ...captured: unknown[]] | undefined; if (!Array.isArray(data) || !(Array.isArray(data[0]) || data[0] === undefined)) { throw ev.error(500, 'Invalid request'); } @@ -735,8 +733,7 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}" } const cachePlan = requestEv.sharedMap.get(RequestEvETagCacheKey) as - | { key: string; eTag: string } - | undefined; + { key: string; eTag: string } | undefined; const { readable, writable } = new TextEncoderStream(); const writableStream = requestEv.getWritableStream(); diff --git a/packages/qwik-router/src/middleware/request-handler/types.ts b/packages/qwik-router/src/middleware/request-handler/types.ts index 0682d8f5a13..0ae79b9a71e 100644 --- a/packages/qwik-router/src/middleware/request-handler/types.ts +++ b/packages/qwik-router/src/middleware/request-handler/types.ts @@ -78,12 +78,7 @@ export interface SendMethod { } export type StatusCodes = - | InformationalCode - | SuccessCode - | ClientErrorCode - | ServerErrorCode - | RedirectCode - | number; + InformationalCode | SuccessCode | ClientErrorCode | ServerErrorCode | RedirectCode | number; export type ErrorCodes = ClientErrorCode | ServerErrorCode; @@ -604,12 +599,4 @@ export interface CookieValue { /** @public */ export type HttpMethod = - | 'GET' - | 'POST' - | 'PUT' - | 'DELETE' - | 'PATCH' - | 'HEAD' - | 'OPTIONS' - | 'CONNECT' - | 'TRACE'; + 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'OPTIONS' | 'CONNECT' | 'TRACE'; diff --git a/packages/qwik-router/src/runtime/src/form-component.tsx b/packages/qwik-router/src/runtime/src/form-component.tsx index af7863a2188..428934f5b2e 100644 --- a/packages/qwik-router/src/runtime/src/form-component.tsx +++ b/packages/qwik-router/src/runtime/src/form-component.tsx @@ -32,8 +32,7 @@ export interface FormProps extends Omit< /** Event handler executed right after the action is executed successfully and returns some data. */ onSubmitCompleted$?: - | QRLEventHandlerMulti>, HTMLFormElement> - | undefined; + QRLEventHandlerMulti>, HTMLFormElement> | undefined; key?: string | number | null; } diff --git a/packages/qwik-router/src/runtime/src/index.ts b/packages/qwik-router/src/runtime/src/index.ts index f31e05c8409..e598b2006b3 100644 --- a/packages/qwik-router/src/runtime/src/index.ts +++ b/packages/qwik-router/src/runtime/src/index.ts @@ -101,7 +101,8 @@ export { usePreventNavigateQrl, } from './use-functions'; -export { z } from 'zod'; +import * as z from 'zod'; +export { z }; export { Form } from './form-component'; export type { FormProps } from './form-component'; diff --git a/packages/qwik-router/src/runtime/src/qwik-router.runtime.api.md b/packages/qwik-router/src/runtime/src/qwik-router.runtime.api.md index 0934b305766..9ad19de902b 100644 --- a/packages/qwik-router/src/runtime/src/qwik-router.runtime.api.md +++ b/packages/qwik-router/src/runtime/src/qwik-router.runtime.api.md @@ -34,8 +34,7 @@ import type { Signal } from '@qwik.dev/core'; import type * as v from 'valibot'; import type { ValueOrPromise } from '@qwik.dev/core'; import { ValueOrPromise as ValueOrPromise_2 } from '@qwik.dev/core/internal'; -import { z } from 'zod'; -import type * as z_2 from 'zod'; +import * as z from 'zod'; // @public (undocumented) export type Action, OPTIONAL extends boolean = true> = { @@ -236,10 +235,10 @@ export const getRequestEvent: (thisArg?: unknown) => RequestEvent | undefined; // Warning: (ae-forgotten-export) The symbol "ZodDataValidator" needs to be exported by the entry point index.d.ts // // @public (undocumented) -export type GetValidatorInputType = VALIDATOR extends ValibotDataValidator ? v.InferInput : VALIDATOR extends ZodDataValidator ? z_2.input : never; +export type GetValidatorInputType = VALIDATOR extends ValibotDataValidator ? v.InferInput : VALIDATOR extends ZodDataValidator ? z.input : never; // @public (undocumented) -export type GetValidatorOutputType = VALIDATOR extends ValibotDataValidator ? v.InferOutput : VALIDATOR extends ZodDataValidator ? z_2.output : never; +export type GetValidatorOutputType = VALIDATOR extends ValibotDataValidator ? v.InferOutput : VALIDATOR extends ZodDataValidator ? z.output : never; // @public (undocumented) export type GetValidatorType = GetValidatorOutputType; @@ -677,10 +676,10 @@ export const zod$: ZodConstructor; // @public (undocumented) export type ZodConstructor = { - (schema: T): ZodDataValidator>; - (schema: (zod: typeof z_2.z, ev: RequestEvent) => T): ZodDataValidator>; - (schema: T): ZodDataValidator; - (schema: (zod: typeof z_2.z, ev: RequestEvent) => T): ZodDataValidator; + (schema: T): ZodDataValidator>; + (schema: (zod: typeof z.z, ev: RequestEvent) => T): ZodDataValidator>; + (schema: T): ZodDataValidator; + (schema: (zod: typeof z.z, ev: RequestEvent) => T): ZodDataValidator; }; // Warning: (ae-forgotten-export) The symbol "ZodConstructorQRL" needs to be exported by the entry point index.d.ts diff --git a/packages/qwik-router/src/runtime/src/route-loaders.ts b/packages/qwik-router/src/runtime/src/route-loaders.ts index dfa7623e89e..0df2289df79 100644 --- a/packages/qwik-router/src/runtime/src/route-loaders.ts +++ b/packages/qwik-router/src/runtime/src/route-loaders.ts @@ -543,8 +543,7 @@ export function getRouteLoaderState(requestEv: RequestEventBase): RouteLoaderSta /** Get/create the record of pre-loaded loader values (used by middleware before component). */ export function getRouteLoaderValues(requestEv: RequestEventBase): Record { let values = requestEv.sharedMap.get(REQUEST_ROUTE_LOADER_VALUES) as - | Record - | undefined; + Record | undefined; if (!values) { values = {}; requestEv.sharedMap.set(REQUEST_ROUTE_LOADER_VALUES, values); @@ -554,8 +553,7 @@ export function getRouteLoaderValues(requestEv: RequestEventBase): Record> { let promises = requestEv.sharedMap.get(REQUEST_ROUTE_LOADER_PROMISES) as - | Record> - | undefined; + Record> | undefined; if (!promises) { promises = {}; requestEv.sharedMap.set(REQUEST_ROUTE_LOADER_PROMISES, promises); diff --git a/packages/qwik-router/src/runtime/src/types.ts b/packages/qwik-router/src/runtime/src/types.ts index 549b05cd63a..ca6b8d88c1b 100644 --- a/packages/qwik-router/src/runtime/src/types.ts +++ b/packages/qwik-router/src/runtime/src/types.ts @@ -1056,8 +1056,7 @@ export interface ActionInternal extends Action { } /** @public */ export type ValidatorReturn = {}> = - | ValidatorReturnSuccess - | ValidatorReturnFail; + ValidatorReturnSuccess | ValidatorReturnFail; export type ValidatorReturnSuccess = { readonly success: true; diff --git a/packages/qwik-vite/src/plugins/plugin.ts b/packages/qwik-vite/src/plugins/plugin.ts index d60ecccc5ae..3b015a3377b 100644 --- a/packages/qwik-vite/src/plugins/plugin.ts +++ b/packages/qwik-vite/src/plugins/plugin.ts @@ -1604,8 +1604,7 @@ export interface QwikPluginOptions { resolveQwikBuild?: boolean; target?: QwikBuildTarget; transformedModuleOutput?: - | ((transformedModules: TransformModule[]) => Promise | void) - | null; + ((transformedModules: TransformModule[]) => Promise | void) | null; devTools?: QwikPluginDevTools; /** * Inline styles up to a certain size (in bytes) instead of using a separate file. diff --git a/packages/qwik-vite/src/plugins/rollup.ts b/packages/qwik-vite/src/plugins/rollup.ts index 8408ea73a5f..1a57d2832f5 100644 --- a/packages/qwik-vite/src/plugins/rollup.ts +++ b/packages/qwik-vite/src/plugins/rollup.ts @@ -371,8 +371,7 @@ export interface QwikRollupPluginOptions { * before bundling. */ transformedModuleOutput?: - | ((transformedModules: TransformModule[]) => Promise | void) - | null; + ((transformedModules: TransformModule[]) => Promise | void) | null; /** * Run eslint on the source files for the ssr build or dev server. This can slow down startup on * large projects. Defaults to `true` diff --git a/packages/qwik-vite/src/plugins/vite.ts b/packages/qwik-vite/src/plugins/vite.ts index 7a7f168d322..381cae5ebe6 100644 --- a/packages/qwik-vite/src/plugins/vite.ts +++ b/packages/qwik-vite/src/plugins/vite.ts @@ -1036,8 +1036,7 @@ interface QwikVitePluginCommonOptions { * before bundling. */ transformedModuleOutput?: - | ((transformedModules: TransformModule[]) => Promise | void) - | null; + ((transformedModules: TransformModule[]) => Promise | void) | null; devTools?: QwikPluginDevTools; /** * Predicate function to filter out files from the optimizer. hook for resolveId, load, and diff --git a/packages/qwik/package.json b/packages/qwik/package.json index 5d1533ecf4e..e8e8ced5266 100644 --- a/packages/qwik/package.json +++ b/packages/qwik/package.json @@ -22,7 +22,7 @@ "ignore": "5.3.1", "image-size": "1.2.1", "kleur": "4.1.5", - "prettier": "3.7.4", + "prettier": "3.9.6", "vitest": "4.1.10" }, "engines": { @@ -162,7 +162,7 @@ "peerDependencies": { "prettier": "*", "vite": ">=6 <9", - "vitest": ">=2 <4" + "vitest": ">=2 <5" }, "peerDependenciesMeta": { "vitest": { diff --git a/packages/qwik/src/core/client/vnode-diff.ts b/packages/qwik/src/core/client/vnode-diff.ts index 3fe9f9d8de8..ed012c3c9c5 100644 --- a/packages/qwik/src/core/client/vnode-diff.ts +++ b/packages/qwik/src/core/client/vnode-diff.ts @@ -574,8 +574,7 @@ function descend( diffContext.$vSiblings$ = null; diffContext.$vSiblingsArray$ = null; diffContext.$vParent$ = (diffContext.$vNewNode$ || diffContext.$vCurrent$!) as - | ElementVNode - | VirtualVNode; + ElementVNode | VirtualVNode; diffContext.$vCurrent$ = vnode_getFirstChild(diffContext.$vParent$!); diffContext.$vNewNode$ = null; } diff --git a/packages/qwik/src/core/client/vnode-utils.ts b/packages/qwik/src/core/client/vnode-utils.ts index 71923e1d89b..5e139e0e5fc 100644 --- a/packages/qwik/src/core/client/vnode-utils.ts +++ b/packages/qwik/src/core/client/vnode-utils.ts @@ -743,9 +743,7 @@ export const vnode_ensureTextInflated = (journal: VNodeJournal, vnode: TextVNode const insertBeforeNode: Element | Text | null = sharedTextNode || (((node && vnode_isElementVNode(node) ? node.node : node?.node) || null) as - | Element - | Text - | null); + Element | Text | null); let lastPreviousTextNode = insertBeforeNode; while (vCursor && vnode_isTextVNode(vCursor)) { @@ -856,13 +854,13 @@ export const vnode_locate = (rootVNode: ElementVNode, id: string | Element): VNo let childIdx = 0; while (idx < idLength) { const ch = localId.charCodeAt(idx); - childIdx *= 26 /* a-z */; + childIdx *= 26; /* a-z */ if (ch >= 97 /* a */) { // is lowercase - childIdx += ch - 97 /* a */; + childIdx += ch - 97; /* a */ } else { // is uppercase - childIdx += ch - 65 /* A */; + childIdx += ch - 65; /* A */ vNode = vnode_getChildWithIdx(vNode, childIdx); childIdx = 0; } @@ -2267,11 +2265,11 @@ function materializeFromVNodeData( export const vnode_getType = (vnode: VNode): 1 | 3 | 11 => { const type = vnode.flags; if (type & VNodeFlags.Element) { - return 1 /* Element */; + return 1; /* Element */ } else if (type & VNodeFlags.Virtual) { - return 11 /* Virtual */; + return 11; /* Virtual */ } else if (type & VNodeFlags.Text) { - return 3 /* Text */; + return 3; /* Text */ } throw qError(QError.invalidVNodeType, [type]); }; diff --git a/packages/qwik/src/core/control-flow/suspense-utils.ts b/packages/qwik/src/core/control-flow/suspense-utils.ts index 4855b77fcff..d7ca53dc495 100644 --- a/packages/qwik/src/core/control-flow/suspense-utils.ts +++ b/packages/qwik/src/core/control-flow/suspense-utils.ts @@ -93,8 +93,7 @@ export const isOutOfOrderStreaming = (): boolean => { return false; } const container = tryGetInvokeContext()?.$container$ as - | ({ readonly outOfOrderStreaming?: boolean } & Container) - | undefined; + ({ readonly outOfOrderStreaming?: boolean } & Container) | undefined; return container?.outOfOrderStreaming === true && !isOutOfOrderSegmentContainer(container); }; diff --git a/packages/qwik/src/core/shared/component-execution.ts b/packages/qwik/src/core/shared/component-execution.ts index f7dc1088835..1cfdafd5f8c 100644 --- a/packages/qwik/src/core/shared/component-execution.ts +++ b/packages/qwik/src/core/shared/component-execution.ts @@ -190,9 +190,9 @@ function addUseOnEvents( // in a ``) would otherwise place the placeholder `