Merge remote-tracking branch 'origin/main' into solid-router-v2-pre

Author: birkskyum

docs/start/framework/react/guide/static-prerendering.md

@@ -19,10 +19,10 @@ export default defineConfig({
   plugins: [
     tanstackStart({
       prerender: {
-        // Enable prerendering
-        enabled: true,
+        // Switch to true to enable prerendering
+        enabled: false,
 
-        // Enable if you need pages to be at `/page/index.html` instead of `/page.html`
+        // Disable if you need pages to be at `/page.html` instead of `/page/index.html`
         autoSubfolderIndex: true,
 
         // If disabled, only the root path or the paths defined in the pages config will be prerendered

e2e/react-start/basic-test-suite/src/special-characters.spec.ts

@@ -67,6 +67,11 @@ test.describe('Unicode route rendering', () => {
   })
 
   test.describe('Special characters in search params', () => {
+    test.skip(
+      isSpaMode,
+      'SPA direct navigation currently drops these search-param cases before the route renders',
+    )
+
     test('should render route correctly on direct navigation', async ({
       page,
       baseURL,
@@ -223,14 +228,18 @@ test.describe('Unicode route rendering', () => {
       const link = page.getByTestId('special-malformed-path-link')
 
       await link.click()
-
       await page.waitForLoadState('load')
 
       await expect(
         page.getByTestId('default-not-found-component'),
       ).toBeInViewport()
     })
 
+    test.skip(
+      isSpaMode,
+      'SPA direct navigation currently drops these search-param cases before the route renders',
+    )
+
     test('un-matched malformed paths should return not found on direct navigation in search params', async ({
       page,
       baseURL,

e2e/solid-start/basic-test-suite/src/special-characters.spec.ts

@@ -82,11 +82,23 @@ test.describe('Unicode route rendering', () => {
         `${baseURL}/specialChars/search?searchParam=%EB%8C%80|`,
       )
 
+      await page.waitForLoadState('networkidle')
+
       const searchParam = await page
         .getByTestId('special-search-param')
         .textContent()
 
       expect(searchParam).toBe('대|')
+
+      const loadedOn = await page
+        .getByTestId('special-search-loaded-info')
+        .textContent()
+
+      if (isSpaMode) {
+        expect(loadedOn).toBe('Loaded on: client')
+      } else {
+        expect(loadedOn).toBe('Loaded on: server')
+      }
     })
 
     test('should render route correctly on router navigation', async ({

e2e/vue-start/basic-test-suite/src/not-found.spec.ts

@@ -12,7 +12,7 @@ test.use({
   ],
 })
 test.describe('not-found', () => {
-  test(`global not found`, async ({ page }) => {
+  test.skip(`global not found`, async ({ page }) => {
     const response = await page.goto(`/this-page-does-not-exist/foo/bar`)
 
     expect(response?.status()).toBe(isSpaMode ? 200 : 404)
@@ -84,7 +84,7 @@ test.describe('not-found', () => {
       ).not.toBeInViewport()
     })
 
-    test('direct visit: beforeLoad notFound with routeId targets root boundary', async ({
+    test.skip('direct visit: beforeLoad notFound with routeId targets root boundary', async ({
       page,
     }) => {
       await page.goto('/not-found/via-beforeLoad-target-root')

e2e/vue-start/basic-test-suite/src/special-characters.spec.ts

@@ -77,11 +77,23 @@ test.describe('Unicode route rendering', () => {
         `${baseURL}/specialChars/search?searchParam=%EB%8C%80|`,
       )
 
+      await page.waitForLoadState('networkidle')
+
       const searchParam = await page
         .getByTestId('special-search-param')
         .textContent()
 
       expect(searchParam).toBe('대|')
+
+      const loadedOn = await page
+        .getByTestId('special-search-loaded-info')
+        .textContent()
+
+      if (isSpaMode) {
+        expect(loadedOn).toBe('Loaded on: client')
+      } else {
+        expect(loadedOn).toBe('Loaded on: server')
+      }
     })
 
     test('should render route correctly on router navigation', async ({
@@ -211,6 +223,7 @@ test.describe('Unicode route rendering', () => {
       const link = page.getByTestId('special-malformed-path-link')
 
       await link.click()
+
       await page.waitForLoadState('load')
 
       await expect(

examples/solid/authenticated-routes-firebase/README.md

@@ -24,17 +24,18 @@
 
 Copy the .env.example provided and configure with your firebase credentials
 
-````VITE_FIREBASE_API_KEY=
+```
+VITE_FIREBASE_API_KEY=
 VITE_FIREBASE_AUTH_DOMAIN=
 VITE_FIREBASE_PROJECT_ID=
 VITE_FIREBASE_STORAGE_BUCKET=
 VITE_FIREBASE_MESSAGING_SENDER_ID=
-VITE_FIREBASE_APP_ID=```
+VITE_FIREBASE_APP_ID=
+```
 
 ## Run the app
 
 To run this example:
 
 - `npm install` or `yarn`
 - `npm start` or `yarn start`
-````