fix conflict

Author: wuls

Diff for: .changeset/afraid-months-mix.md

@@ -0,0 +1,54 @@
+---
+'@builder.io/qwik': minor
+---
+
+FEAT: Major improvements to prefetching with automatic bundle preloading
+
+- This removes the need for service workers, and instead utilize `modulepreload` link tags for better browser integration.
+- Improves initial load performance by including dynamic imports in the prefetch
+- Reduces complexity while maintaining similar (and even better) functionality
+- Enables some preloading capabilities in dev mode (SSR result only)
+- Includes path-to-bundle mapping in bundle graph (this improves the experience using the `<Link>` component, AKA "single page app" mode)
+- Server now has built-in manifest support (so no need to pass `manifest` around)
+- Moves insights-related build code to insights plugin
+
+---
+
+⚠️ **ATTENTION:**
+
+**Keep** your service worker code as is (either `<ServiceWorkerRegister/>` or `<PrefetchServiceWorker/>`).
+
+This new implementation will use it to uninstall the current service worker to reduce the unnecessary duplication.
+
+The builtin service workers components are deprecated but still exist for backwards compatibility.
+
+---
+
+You can configure the prefetch behavior in your SSR configuration:
+
+```ts
+// entry.ssr.ts
+export default function (opts: RenderToStreamOptions) {
+  return renderToStream(<Root />, {
+    prefetchStrategy: {
+      implementation: {
+        // Enable debug logging for prefetch operations
+        debug: true,
+        // Maximum simultaneous preload links
+        maxSimultaneousPreloads: 5,
+        // Minimum probability threshold for preloading
+        minPreloadProbability: 0.25
+      },
+    },
+    ...opts,
+  });
+}
+```
+
+For legacy apps that still need service worker functionality, you can add it back using:
+
+```bash
+npm run qwik add service-worker
+```
+
+This will add a basic service worker setup that you can customize for specific caching strategies, offline support, or other PWA features beyond just prefetching.

Diff for: .changeset/approach-bed-gift.md

@@ -0,0 +1,5 @@
+---
+'@builder.io/qwik-city': minor
+---
+
+CHORE: the service workers have been deprecated and replaced with entries that unregister them. If you have it enabled in production, you can remove it after a while once you are sure all your users have the new version.

Diff for: .changeset/breezy-toes-help.md

@@ -720,6 +720,9 @@ jobs:
       - name: Playwright E2E Tests
         run: pnpm run test.e2e.${{ matrix.settings.browser }} --timeout 60000 --retries 7 --workers 1
 
+      - name: Playwright E2E Integration Tests
+        run: pnpm run test.e2e.integrations.${{ matrix.settings.browser }} --timeout 60000 --retries 7 --workers 1
+
       - name: Validate Create Qwik Cli
         if: matrix.settings.host != 'windows-latest'
         run: pnpm cli.validate

Diff for: .changeset/cyan-deers-glow.md

@@ -19,29 +19,62 @@ jobs:
   deploy:
     name: Cloudflare Pages Deployment
     if: >
-      github.repository == 'QwikDev/qwik' &&
-      github.event.workflow_run.conclusion == 'success'
+      github.repository == 'QwikDev/qwik'
     runs-on: ubuntu-latest
     steps:
+      - name: Check for docs artifact
+        id: check-artifact
+        uses: actions/github-script@v7
+        with:
+          retries: 3
+          script: |
+            try {
+              const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: context.payload.workflow_run.id
+              });
+              const hasDocsArtifact = artifacts.data.artifacts.some(a => a.name === 'artifact-docs');
+              core.setOutput('has-docs', hasDocsArtifact);
+            } catch (error) {
+              console.error('Error checking for artifacts:', error);
+              core.setOutput('has-docs', false);
+            }
+
       - name: Checkout code
+        if: ${{ steps.check-artifact.outputs.has-docs == 'true' }}
         uses: actions/checkout@v4
 
       - name: Download docs artifact
+        if: ${{ steps.check-artifact.outputs.has-docs == 'true' }}
         uses: actions/download-artifact@v4
-        id: download-artifact
         with:
           name: artifact-docs
           github-token: ${{ secrets.GITHUB_TOKEN }}
           run-id: ${{ github.event.workflow_run.id }}
-          # This will download both dist/ and server/
           path: packages/docs
 
+      - name: Verify dist directory exists
+        if: ${{ steps.check-artifact.outputs.has-docs == 'true' }}
+        run: |
+          ls -la packages/docs
+          if [ ! -d "packages/docs/dist" ]; then
+            echo "Creating dist directory"
+            mkdir -p packages/docs/dist
+            cp -r packages/docs/* packages/docs/dist/ || true
+          fi
+
       # not the official version, so be careful when updating
       - name: Deploy to Cloudflare Pages
+        if: ${{ steps.check-artifact.outputs.has-docs == 'true' }}
         uses: AdrianGonz97/refined-cf-pages-action@6c0d47ff7c97c48fa702b6d9f71f7e3a7c30c7d8
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           projectName: 'qwik-docs'
           directory: packages/docs/dist
           githubToken: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Skip message when no docs artifact
+        if: ${{ steps.check-artifact.outputs.has-docs != 'true' }}
+        run: echo "No docs artifact found, skipping deployment"