solve conflict

Author: JerryWu1234

.changeset/eager-coats-retire.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/core': patch
+---
+
+fix: allow to modify inline component's children component props

.changeset/tricky-dogs-cross.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/core': patch
+---
+
+FIX: The types for the JSX event handlers are more precise about their scope (e.g. no `document:OnQVisible$` or `onQIdle$`).

.node-version

@@ -1 +1 @@
-18
+24

.nvmrc

@@ -1 +1 @@
-22
+24

package.json

@@ -151,7 +151,6 @@
     "terser": "5.44.0",
     "tmp": "0.2.5",
     "tree-kill": "1.2.2",
-    "tsx": "4.20.6",
     "typescript": "5.9.3",
     "typescript-eslint": "8.45.0",
     "vfile": "6.0.3",
@@ -173,37 +172,37 @@
   "packageManager": "pnpm@10.17.1+sha512.17c560fca4867ae9473a3899ad84a88334914f379be46d455cbf92e5cf4b39d34985d452d2583baf19967fa76cb5c17bc9e245529d0b98745721aa7200ecaf7a",
   "private": true,
   "scripts": {
-    "api.update": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --api --dev",
-    "build": "tsx --require ./scripts/runBefore.ts scripts/index.ts",
+    "api.update": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --api --dev",
+    "build": "node --require ./scripts/runBefore.ts scripts/index.ts",
     "build.changelog-formatter": "tsc .changeset/changelog-github-custom.ts && mv .changeset/changelog-github-custom.js .changeset/changelog-github-custom.cjs",
-    "build.clean": "tsx ./scripts/build-clean.ts",
-    "build.cli": "tsx --require ./scripts/runBefore.ts scripts/index.ts --cli --dev",
-    "build.cli.prod": "tsx --require ./scripts/runBefore.ts scripts/index.ts --cli",
-    "build.core": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwik --insights --qwikrouter --api --platform-binding",
-    "build.eslint": "tsx --require ./scripts/runBefore.ts scripts/index.ts --eslint",
-    "build.full": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --tsc-docs --qwik --insights --supabaseauthhelpers --api --eslint --qwikrouter --qwikworker --qwikreact --cli --platform-binding --wasm",
-    "build.local": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --tsc-docs --qwik --insights --supabaseauthhelpers --api --eslint --qwikrouter --qwikworker --qwikreact --cli --platform-binding-wasm-copy",
-    "build.only_javascript": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwik --api",
+    "build.clean": "node ./scripts/build-clean.ts",
+    "build.cli": "node --require ./scripts/runBefore.ts scripts/index.ts --cli --dev",
+    "build.cli.prod": "node --require ./scripts/runBefore.ts scripts/index.ts --cli",
+    "build.core": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwik --insights --qwikrouter --api --platform-binding",
+    "build.eslint": "node --require ./scripts/runBefore.ts scripts/index.ts --eslint",
+    "build.full": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --tsc-docs --qwik --insights --supabaseauthhelpers --api --eslint --qwikrouter --qwikworker --qwikreact --cli --platform-binding --wasm",
+    "build.local": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --tsc-docs --qwik --insights --supabaseauthhelpers --api --eslint --qwikrouter --qwikworker --qwikreact --cli --platform-binding-wasm-copy",
+    "build.only_javascript": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwik --api",
     "build.packages.docs": "pnpm -C ./packages/docs/ run build",
     "build.packages.insights": "pnpm -C ./packages/insights/ run build",
-    "build.platform": "tsx --require ./scripts/runBefore.ts scripts/index.ts --platform-binding",
-    "build.platform.copy": "tsx --require ./scripts/runBefore.ts scripts/index.ts --platform-binding-wasm-copy",
-    "build.qwik-react": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikreact",
-    "build.qwik-router": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikrouter",
-    "build.router": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikrouter --api",
-    "build.validate": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwik --api --eslint --qwikrouter --platform-binding --wasm --validate",
-    "build.vite": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwik --insights --api --qwikrouter --eslint --platform-binding-wasm-copy",
-    "build.wasm": "tsx --require ./scripts/runBefore.ts scripts/index.ts --wasm",
-    "build.watch": "tsx --require ./scripts/runBefore.ts scripts/index.ts --qwik --qwikrouter --watch --dev --platform-binding",
+    "build.platform": "node --require ./scripts/runBefore.ts scripts/index.ts --platform-binding",
+    "build.platform.copy": "node --require ./scripts/runBefore.ts scripts/index.ts --platform-binding-wasm-copy",
+    "build.qwik-react": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikreact",
+    "build.qwik-router": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikrouter",
+    "build.router": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikrouter --api",
+    "build.validate": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwik --api --eslint --qwikrouter --platform-binding --wasm --validate",
+    "build.vite": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwik --insights --api --qwikrouter --eslint --platform-binding-wasm-copy",
+    "build.wasm": "node --require ./scripts/runBefore.ts scripts/index.ts --wasm",
+    "build.watch": "node --require ./scripts/runBefore.ts scripts/index.ts --qwik --qwikrouter --watch --dev --platform-binding",
     "change": "changeset",
-    "cli": "pnpm build.cli && node packages/create-qwik/create-qwik.mjs && tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts --copy-local-qwik-dist",
+    "cli": "pnpm build.cli && node packages/create-qwik/create-qwik.mjs && node --require ./scripts/runBefore.ts scripts/validate-cli.ts --copy-local-qwik-dist",
     "cli.qwik": "pnpm build.cli && node packages/qwik/qwik-cli.mjs",
-    "cli.validate": "tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts",
+    "cli.validate": "node --require ./scripts/runBefore.ts scripts/validate-cli.ts",
     "deps": "corepack pnpm upgrade -i -r --latest && syncpack fix-mismatches && corepack pnpm dedupe",
     "docs.dev": "pnpm -C packages/docs build.repl-sw && pnpm -C packages/docs dev",
     "docs.preview": "pnpm -C packages/docs preview",
-    "docs.sync": "tsx --require ./scripts/runBefore.ts scripts/docs_sync/index.ts && pnpm fmt",
-    "eslint.update": "tsx --require ./scripts/runBefore.ts scripts/eslint-docs.ts",
+    "docs.sync": "node --require ./scripts/runBefore.ts scripts/docs_sync/index.ts && pnpm fmt",
+    "eslint.update": "node --require ./scripts/runBefore.ts scripts/eslint-docs.ts",
     "fmt": "pnpm prettier.fix && pnpm syncpack format",
     "fmt.staged": "pretty-quick --staged",
     "link.dist": "cd packages/qwik && pnpm link --global && cd ../qwik-router && pnpm link --global && cd ../eslint-plugin-qwik && pnpm link --global && cd ../qwik-react && pnpm link --global",
@@ -218,13 +217,13 @@
     "preinstall": "npx only-allow pnpm",
     "prepare": "simple-git-hooks",
     "prettier.fix": "prettier --cache --write .",
-    "qwik-push-build-repos": "tsx --require ./scripts/runBefore.ts ./scripts/qwik-push-build-repos.ts",
+    "qwik-push-build-repos": "node --require ./scripts/runBefore.ts ./scripts/qwik-push-build-repos.ts",
     "release": "changeset publish",
     "release.fixup-package-json": "syncpack fix-mismatches --config syncpack-release-conf.json",
     "release.pkg-pr-new": "pnpm dlx pkg-pr-new@^0.0.9 publish --pnpm ./packages/qwik ./packages/qwik-router ./packages/eslint-plugin-qwik ./packages/create-qwik",
     "release.prepare": "pnpm build --prepare-release",
-    "serve": "tsx --require ./scripts/runBefore.ts --inspect --conditions=development starters/dev-server.ts 3300",
-    "serve.debug": "tsx --require ./scripts/runBefore.ts --inspect-brk --conditions=development starters/dev-server.ts 3300",
+    "serve": "node --require ./scripts/runBefore.ts --inspect --conditions=development starters/dev-server.ts 3300",
+    "serve.debug": "node --require ./scripts/runBefore.ts --inspect-brk --conditions=development starters/dev-server.ts 3300",
     "start": "pnpm run --stream \"/.*\\.watch/\"",
     "test": "pnpm build.full && pnpm test.unit && pnpm test.e2e",
     "test.e2e": "pnpm test.e2e.chromium && pnpm test.e2e.webkit && test.e2e.integrations",
@@ -248,7 +247,7 @@
     "tsc.check": "tsc --noEmit",
     "tsc.trace": "tsc -p tsconfig.json --traceResolution > tsc.log",
     "tsc.watch": "tsc --noEmit --watch --preserveWatchOutput",
-    "update.qwik.builds": "tsx --require ./scripts/runBefore.ts scripts/update-qwik-builds.ts packages/docs && tsx scripts/update-qwik-builds.ts packages/insights; pnpm install",
+    "update.qwik.builds": "node --require ./scripts/runBefore.ts scripts/update-qwik-builds.ts packages/docs && node scripts/update-qwik-builds.ts packages/insights; pnpm install",
     "vitest": "vitest"
   },
   "simple-git-hooks": {

packages/docs/package.json

@@ -7,8 +7,6 @@
   "devDependencies": {
     "@algolia/autocomplete-core": "1.7.4",
     "@algolia/client-search": "4.14.3",
-    "@builder.io/qwik": "npm:@qwik.dev/core@*",
-    "@builder.io/qwik-city": "npm:@qwik.dev/router@*",
     "@emotion/react": "11.14.0",
     "@emotion/styled": "11.14.1",
     "@modular-forms/qwik": "0.29.1",
@@ -76,12 +74,12 @@
     "build.repl-sw": "vite --config vite.config-repl-sw build",
     "build.server": "NODE_OPTIONS=--max-old-space-size=8192 vite build -c adapters/cloudflare-pages/vite.config",
     "build.showcase": "pnpm node scripts/showcase.js",
-    "codesandbox.sync": "tsx codesandbox.sync.ts",
-    "contributors": "tsx contributors.ts",
+    "codesandbox.sync": "node codesandbox.sync.ts",
+    "contributors": "node contributors.ts",
     "deploy": "wrangler pages publish ./dist",
-    "dev": "tsx check-qwik-build.ts && vite --mode ssr --open",
+    "dev": "node check-qwik-build.ts && vite --mode ssr --open",
     "dev.debug": "node --inspect-brk ../../node_modules/vite/bin/vite.js --mode ssr --force",
-    "prebuild.core": "tsx check-qwik-build.ts",
+    "prebuild.core": "node check-qwik-build.ts",
     "preview": "qwik build preview && vite preview --open",
     "preview.only": "NODE_DEBUG=net,http node --inspect-brk ../../node_modules/vite/bin/vite.js preview",
     "preview.wrangler": "wrangler pages dev ./dist --compatibility-flags=nodejs_als",

packages/docs/src/components/docsearch/doc-search.tsx

@@ -77,7 +77,7 @@ export const DocSearch = component$((props: DocSearchProps) => {
     <div
       class={{ docsearch: true, 'ai-result-open': aiResultOpen.value }}
       window:onKeyDown$={[
-        sync$((event: KeyboardEvent) => {
+        sync$((event) => {
           if (event.key === 'k' && (event.metaKey || event.ctrlKey)) {
             event.preventDefault();
           }

packages/docs/src/components/theme-toggle/Brilliance.tsx

@@ -1,4 +1,4 @@
-import { component$ } from '@builder.io/qwik';
+import { component$ } from '@qwik.dev/core';
 
 interface BrillianceIconProps {
   class?: string;

packages/docs/src/components/theme-toggle/Moon.tsx

@@ -1,4 +1,4 @@
-import { component$ } from '@builder.io/qwik';
+import { component$ } from '@qwik.dev/core';
 
 interface MoonIconProps {
   class?: string;

packages/docs/src/components/theme-toggle/Sun.tsx

@@ -1,4 +1,4 @@
-import { component$ } from '@builder.io/qwik';
+import { component$ } from '@qwik.dev/core';
 
 interface SunIconProps {
   class?: string;