Merge branch 'main' into fixutres/private

Author: atilafassina

.github/workflows/cr.yml

@@ -32,12 +32,14 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
-      - name: Build start
+      - name: Build Packages
         run: |
           pnpm run build
-          # rewrite .ts exports to .js
-          pnpm --filter='./packages/*' -c exec "echo \$(cat package.json | jq '.exports = .publishConfig.exports') > package.json"
+          pnpm rewrite-exports
 
-      - name: Release
+      - name: Release Packages
+        # remove the compat flag until all packages are available on npm
+        # run: |
+        #   pnpm dlx [email protected] publish './packages/*' --template './examples/*' --compact
         run: |
-          pnpm dlx [email protected] publish './packages/start' --template './examples/*' --compact
+          pnpm dlx [email protected] publish './packages/*'

.github/workflows/dist-typecheck.yml

@@ -0,0 +1,40 @@
+name: Type Check Distribution
+
+on:
+  pull_request: ~
+  push:
+    branches:
+      - main
+
+jobs:
+  typecheck-dist:
+    name: Check ${{ matrix.package }} distributed types
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ## to add other packages from the monorepo, add them to the matrix
+        package: [start]
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+
+      - name: Use Node.js from nvmrc
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+          registry-url: "https://registry.npmjs.org"
+          cache: "pnpm"
+
+      - name: Install Dependencies
+        run: pnpm i --frozen-lockfile
+
+      - name: Build ${{ matrix.package }} package and dependencies
+        # build the package and all its dependencies
+        run: pnpm --filter ${{ matrix.package }}... build
+
+      - run: pnpm rewrite-exports
+
+      - name: Check types with @arethetypeswrong/cli
+        run: pnpm --filter ${{ matrix.package }} typecheck:dist

.github/workflows/release.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 1.x
+      - main
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 

apps/fixtures/experiments/src/routes/index.tsx

@@ -23,7 +23,7 @@ export default function Home() {
     console.log(await v.hello);
   });
   const port = isServer ? new URL(getRequestEvent()!.request.url).port: location.port;
-  fetch(`http://localhost:${port}/${import.meta.env.SERVER_BASE_URL}/unknown`, {
+  fetch(`http://localhost:${port}${import.meta.env.BASE_URL}/unknown`, {
     headers: { Accept: "application/json" }
   }).then(async res => console.log(await res.json()));
   return (

apps/fixtures/experiments/tsconfig.json

@@ -11,6 +11,7 @@
     "strict": true,
     "noEmit": true,
     "isolatedModules": true,
+    "types": ["vite/client"],
     "paths": {
       "~/*": ["./src/*"]
     }

apps/tests/src/e2e/api-call.test.ts

@@ -5,4 +5,18 @@ test.describe("api calls", () => {
     const response = await fetch("http://localhost:3000/api/text-plain");
     expect(await response.text()).toBe("test");
   });
+
+  test("should include headers from both event and returned request", async () => {
+    const okResp = await fetch("http://localhost:3000/api/header-merging?status=ok");
+    expect(okResp.headers.get("Set-Cookie")).toBeTruthy();
+    expect(okResp.headers.get("x-event-header")).toBe("value");
+    expect(okResp.headers.get("x-return-header")).toBe("value");
+    expect(okResp.headers.get("x-shared-header")).toBe("event");
+
+    const redirectResp = await fetch("http://localhost:3000/api/header-merging?status=redirect", { redirect: "manual" });
+    expect(redirectResp.headers.get("Set-Cookie")).toBeTruthy();
+    expect(redirectResp.headers.get("x-event-header")).toBe("value");
+    expect(redirectResp.headers.get("x-return-header")).toBe("value");
+    expect(redirectResp.headers.get("x-shared-header")).toBe("event");
+  })
 });

apps/tests/src/e2e/http-header.test.ts

@@ -0,0 +1,10 @@
+import { expect, test } from "@playwright/test";
+
+test.describe("http header", () => {
+    // couldn't get this to see the headers but verified in chrome devtools
+    test.skip("should set http header", async ({ page }) => {
+        const response = await page.goto("/http-header");
+
+        expect(response?.headers()["test-header"]).toBe("test-value");
+    });
+});

apps/tests/src/routes/api/header-merging.ts

@@ -0,0 +1,29 @@
+import { getRequestURL, setHeader, useSession } from "@solidjs/start/http";
+
+export async function GET() {
+  const url = getRequestURL();
+
+  const s = await useSession({ password: "0".repeat(32) });
+  await s.update(d => ({count: (d.count || 0) + 1}))
+
+  setHeader("x-event-header", "value");
+  setHeader("x-shared-header", "event");
+
+  if(url.searchParams.get("status") === "redirect") {
+    return new Response(null, {
+      status: 301,
+      headers: {
+        location: "http://::/abc",
+        "x-return-header": "value",
+        "x-shared-header": "return"
+      }
+    })
+  } else {
+    return new Response(null, {
+      headers: {
+        "x-return-header": "value",
+        "x-shared-header": "return"
+      }
+    })
+  }
+}

apps/tests/src/routes/http-header.tsx

@@ -0,0 +1,10 @@
+import { HttpHeader } from "@solidjs/start";
+
+export default function HttpHeaderRoute() {
+    return (
+        <main>
+            <h1>Http Header</h1>
+            <HttpHeader name="test-header" value="test-value" />
+        </main>
+    );
+}

package.json

@@ -24,7 +24,8 @@
     "packages:build": "pnpm --filter=./packages/* build",
     "packages:clean": "pnpx rimraf ./packages/*/node_modules/ ./packages/*/dist/",
     "clean:test": "pnpx rimraf .tmp",
-    "release": "pnpm build && changeset publish"
+    "release": "pnpm build && changeset publish",
+    "rewrite-exports": "pnpm --filter='./packages/*' -c exec \"echo \\$(cat package.json | jq '.exports = .publishConfig.exports') > package.json\""
   },
   "devDependencies": {
     "@changesets/cli": "^2.27.12",