fix: backports from v2

packages/docs/src/repl/bundled.tsx

@@ -1,4 +1,4 @@
-import { version as qwikVersion } from '../../../qwik';
+import { version as qwikVersion } from '@builder.io/qwik';
 import type { PkgUrls } from './types';
 
 import prettierPkgJson from 'prettier/package.json';

packages/docs/src/routes/api/qwik-testing/api.json

@@ -12,7 +12,7 @@
         }
       ],
       "kind": "Function",
-      "content": "CreatePlatform and CreateDocument\n\n\n```typescript\ncreateDOM: ({ html }?: {\n    html?: string;\n}) => Promise<{\n    render: (jsxElement: JSXOutput) => Promise<import(\"@builder.io/qwik/jsx-runtime\").RenderResult>;\n    screen: HTMLElement;\n    userEvent: (queryOrElement: string | Element | keyof HTMLElementTagNameMap | null, eventNameCamel: string | keyof WindowEventMap, eventPayload?: any) => Promise<void>;\n}>\n```\n\n\n<table><thead><tr><th>\n\nParameter\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n{ html }\n\n\n</td><td>\n\n{ html?: string; }\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n</tbody></table>\n**Returns:**\n\nPromise&lt;{ render: (jsxElement: JSXOutput) =&gt; Promise&lt;import(\"@builder.io/qwik/jsx-runtime\").RenderResult&gt;; screen: HTMLElement; userEvent: (queryOrElement: string \\| Element \\| keyof HTMLElementTagNameMap \\| null, eventNameCamel: string \\| keyof WindowEventMap, eventPayload?: any) =&gt; Promise&lt;void&gt;; }&gt;",
+      "content": "CreatePlatform and CreateDocument\n\n\n```typescript\ncreateDOM: ({ html }?: {\n    html?: string;\n}) => Promise<{\n    render: (jsxElement: JSXOutput) => Promise<import(\"@builder.io/qwik\").RenderResult>;\n    screen: HTMLElement;\n    userEvent: (queryOrElement: string | Element | keyof HTMLElementTagNameMap | null, eventNameCamel: string | keyof WindowEventMap, eventPayload?: any) => Promise<void>;\n}>\n```\n\n\n<table><thead><tr><th>\n\nParameter\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n{ html }\n\n\n</td><td>\n\n{ html?: string; }\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n</tbody></table>\n**Returns:**\n\nPromise&lt;{ render: (jsxElement: JSXOutput) =&gt; Promise&lt;import(\"@builder.io/qwik\").RenderResult&gt;; screen: HTMLElement; userEvent: (queryOrElement: string \\| Element \\| keyof HTMLElementTagNameMap \\| null, eventNameCamel: string \\| keyof WindowEventMap, eventPayload?: any) =&gt; Promise&lt;void&gt;; }&gt;",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/testing/library.ts",
       "mdFile": "qwik.createdom.md"
     }

packages/docs/src/routes/api/qwik-testing/index.md

@@ -13,7 +13,7 @@ createDOM: ({ html }?: { html?: string }) =>
   Promise<{
     render: (
       jsxElement: JSXOutput,
-    ) => Promise<import("@builder.io/qwik/jsx-runtime").RenderResult>;
+    ) => Promise<import("@builder.io/qwik").RenderResult>;
     screen: HTMLElement;
     userEvent: (
       queryOrElement: string | Element | keyof HTMLElementTagNameMap | null,
@@ -52,6 +52,6 @@ _(Optional)_
 </tbody></table>
 **Returns:**
 
-Promise&lt;{ render: (jsxElement: JSXOutput) =&gt; Promise&lt;import("@builder.io/qwik/jsx-runtime").RenderResult&gt;; screen: HTMLElement; userEvent: (queryOrElement: string \| Element \| keyof HTMLElementTagNameMap \| null, eventNameCamel: string \| keyof WindowEventMap, eventPayload?: any) =&gt; Promise&lt;void&gt;; }&gt;
+Promise&lt;{ render: (jsxElement: JSXOutput) =&gt; Promise&lt;import("@builder.io/qwik").RenderResult&gt;; screen: HTMLElement; userEvent: (queryOrElement: string \| Element \| keyof HTMLElementTagNameMap \| null, eventNameCamel: string \| keyof WindowEventMap, eventPayload?: any) =&gt; Promise&lt;void&gt;; }&gt;
 
 [Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/testing/library.ts)

packages/insights/tsconfig.json

@@ -18,7 +18,8 @@
     "noEmit": true,
     "types": ["node", "vite/client"],
     "paths": {
-      "~/*": ["./src/*"]
+      "~/*": ["./src/*"],
+      "@qwik-client-manifest": ["../../qwik/src/server/server-modules.d.ts"]
     }
   },
   "exclude": ["./dist"]

packages/qwik-city/buildtime/vite/api.md

@@ -5,7 +5,7 @@
 ```ts
 
 import type { BuiltinsWithOptionalParams } from 'svgo/plugins/plugins-types';
-import { CompileOptions } from '@mdx-js/mdx';
+import type { CompileOptions } from '@mdx-js/mdx';
 import type { Config } from 'svgo';
 import { ConfigEnv } from 'vite';
 import type { PluginOption } from 'vite';

packages/qwik-city/buildtime/vite/types.ts

@@ -1,3 +1,4 @@
+import type { CompileOptions } from '@mdx-js/mdx';
 import type { MdxTransform } from '../markdown/mdx';
 import type { BuildContext, BuildEntry, BuildRoute, PluginOptions, MdxPlugins } from '../types';
 import type { Config as SVGOConfig } from 'svgo';
@@ -28,7 +29,8 @@ export interface QwikCityVitePluginOptions extends Omit<PluginOptions, 'basePath
 }
 
 /** @public */
-export type MdxOptions = import('@mdx-js/mdx').CompileOptions;
+
+export type MdxOptions = CompileOptions;
 
 export interface PluginContext {
   buildCtx: BuildContext | null;

packages/qwik-city/runtime/src/server-functions.ts

@@ -5,12 +5,12 @@ import {
   type QRL,
   useContext,
   type ValueOrPromise,
-  _wrapSignal,
   useStore,
   _serializeData,
   _deserializeData,
   _getContextElement,
   _getContextEvent,
+  _wrapProp,
 } from '@builder.io/qwik';
 
 import type { RequestEventLoader } from '../../middleware/request-handler/types';
@@ -189,7 +189,7 @@ export const routeLoaderQrl = ((
     If your are managing reusable logic or a library it is essential that this function is re-exported from within 'layout.tsx' or 'index.tsx file of the existing route otherwise it will not run or throw exception.
     For more information check: https://qwik.dev/docs/cookbook/re-exporting-loaders/`);
       }
-      return _wrapSignal(state, id);
+      return _wrapProp(state, id);
     });
   }
   loader.__brand = 'server_loader' as const;

packages/qwik-labs/tsconfig.json

@@ -14,7 +14,10 @@
     "skipLibCheck": true,
     "incremental": true,
     "isolatedModules": true,
-    "types": ["vite/client"]
+    "types": ["vite/client"],
+    "paths": {
+      "@qwik-client-manifest": ["../../qwik/src/server/server-modules.d.ts"]
+    }
   },
   "include": ["src"]
 }

packages/qwik/package.json

@@ -27,6 +27,7 @@
     "vite": "^5.2.10"
   },
   "devDependencies": {
+    "@builder.io/qwik": "workspace:^",
     "@builder.io/qwik-dom": "workspace:^",
     "image-size": "^1.0.2",
     "kleur": "4.1.5"

packages/qwik/src/core/render/types.ts

@@ -30,9 +30,6 @@ export interface RenderStaticContext {
   readonly $rmSlots$: QwikElement[];
 }
 
-/** @public */
-export interface RenderContext2 {}
-
 // Polyfills for ViewTransition API & scroll restoration
 declare global {
   interface ViewTransition {

packages/qwik/src/testing/api.md

@@ -5,7 +5,7 @@
 ```ts
 
 import type { JSXOutput } from '@builder.io/qwik';
-import { RenderResult } from '@builder.io/qwik/jsx-runtime';
+import { RenderResult } from '@builder.io/qwik';
 
 // @public
 export const createDOM: ({ html }?: {

packages/qwik/tsconfig.json

@@ -3,13 +3,14 @@
   "compilerOptions": {
     "paths": {
       "@builder.io/qwik": ["packages/qwik/src/core"],
-      "@builder.io/qwik/jsx-runtime": ["packages/qwik/src/core"],
-      "@builder.io/qwik/jsx-dev-runtime": ["packages/qwik/src/core"],
+      "@builder.io/qwik/jsx-runtime": ["packages/qwik/src/jsx-runtime"],
+      "@builder.io/qwik/jsx-dev-runtime": ["packages/qwik/src/jsx-runtime"],
       "@builder.io/qwik/build": ["packages/qwik/src/build"],
       "@builder.io/qwik/optimizer": ["packages/qwik/src/optimizer/src"],
       "@builder.io/qwik/server": ["packages/qwik/src/server"],
       "@builder.io/qwik/testing": ["packages/qwik/src/testing"]
     }
   },
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["dist"]
 }

packages/qwik/tsdoc.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
+
+  "extends": ["@microsoft/api-extractor/extends/tsdoc-base.json"],
+
+  "tagDefinitions": [
+    {
+      "tagName": "@file",
+      "syntaxKind": "block",
+      "allowMultiple": false
+    }
+  ],
+
+  "supportForTags": {
+    "@file": true
+  }
+}