Merge branch 'v2-merge-main' into build/v2

Author: wmertens

.changeset/changelog-github-custom.ts

@@ -12,13 +12,15 @@ const changelogFunctions: ChangelogFunctions = {
         'Please provide a repo to this changelog generator like this:\n"changelog": ["@changesets/changelog-github", { "repo": "org/repo" }]'
       );
     }
-    if (dependenciesUpdated.length === 0) return '';
+    if (dependenciesUpdated.length === 0) {
+      return '';
+    }
 
     const changesetLink = `- Updated dependencies [${(
       await Promise.all(
         changesets.map(async (cs) => {
           if (cs.commit) {
-            let { links } = await getInfo({
+            const { links } = await getInfo({
               repo: options.repo,
               commit: cs.commit,
             });
@@ -45,12 +47,14 @@ const changelogFunctions: ChangelogFunctions = {
 
     let prFromSummary: number | undefined;
     let commitFromSummary: string | undefined;
-    let usersFromSummary: string[] = [];
+    const usersFromSummary: string[] = [];
 
     const replacedChangelog = changeset.summary
       .replace(/^\s*(?:pr|pull|pull\s+request):\s*#?(\d+)/im, (_, pr) => {
-        let num = Number(pr);
-        if (!isNaN(num)) prFromSummary = num;
+        const num = Number(pr);
+        if (!isNaN(num)) {
+          prFromSummary = num;
+        }
         return '';
       })
       .replace(/^\s*commit:\s*([^\s]+)/im, (_, commit) => {
@@ -91,7 +95,7 @@ const changelogFunctions: ChangelogFunctions = {
       }
       const commitToFetchFrom = commitFromSummary || changeset.commit;
       if (commitToFetchFrom) {
-        let { links } = await getInfo({
+        const { links } = await getInfo({
           repo: options.repo,
           commit: commitToFetchFrom,
         });

.eslintignore

@@ -695,6 +695,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
+
       # RE-ENABBLE THIS AFTER qwik.dev/ packages are published
       # - name: Validate Create Qwik Cli
       # if: matrix.settings.host != 'windows-latest'

.eslintrc.cjs

@@ -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"

.github/workflows/ci.yml

@@ -2,43 +2,43 @@
 **/*.log
 **/.DS_Store
 *.
-.history
-.yarn
-.yarnrc.yml
-.pnpm-store
 pnpm-lock.yaml
-.mf
+.*
+!.eslintrc.cjs
+!.prettierignore
+!.prettierrc.json
+
+# Build output
 dist
 dist-dev
 lib
-etc
-external
-node_modules
-qwik-app
 target
-output
-rollup.config.js
-build
-!packages/qwik/src/build
-.cache
-.rollup.cache
+starters/apps/**/dist
+node_modules
+
 tsconfig.tsbuildinfo
-packages/docs/api/**/*
+
+# REPL files
 packages/docs/public/repl/repl-sw.js*
-packages/docs/src/routes/**/*.mdx
-**/server/**/*.js
-starters/**/*.js
-# explicit exclusion for tailwind prettier.config.js
-starters/features/tailwind/*
-packages/docs/server
+
+# build output
+packages/*/lib
+packages/*/dist
+packages/*/server
+
+# API output files
 packages/docs/src/routes/api
-packages/docs/**/*.md
+
+# Prettier doesn't handle mdx files well
 packages/docs/**/*.mdx
+
 packages/insights/drizzle
 packages/insights/.netlify
 packages/insights/scripts
 packages/insights/**/*.gen.d.ts
 
-# TODO: Figure out why this doesn't pass in CI
-packages/qwik/src/core/props/props.ts
-packages/docs/src/routes/docs/overview/index.mdx
+# insights cache files
+**/q-insights.json
+
+# Exclude builder js files from formatting - delete after migration
+packages/docs/public/builder