Skip to content

Commit ce80ac6

Browse files
committed
Merge remote-tracking branch 'upstream/main' into supabase-ssr
2 parents ad786be + ec0bd04 commit ce80ac6

File tree

3 files changed

+5
-4
lines changed
  • packages/docs/src/routes/docs
  • starters/features/styled-vanilla-extract

3 files changed

+5
-4
lines changed

packages/docs/src/routes/docs/(qwikcity)/re-exporting-loaders/index.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import CodeSandbox, {CodeFile} from '../../../../components/code-sandbox/index.t
1414
`routeAction$` and `routeLoader$` are typically declared in route boundary files such as layout.tsx, index.tsx and plugin.tsx inside the routesDir directory
1515
[here is docs](https://qwik.dev/docs/route-loader/).
1616

17-
Sometimes you would like to declared them outside of the route boundaries.
17+
Sometimes you would like to declare them outside of the route boundaries.
1818
This may be useful when you want to create reusable logic or a library.
1919
In such a case, it is essential that this function is re-exported from within the router boundary otherwise it will not run or throw exception.
2020

@@ -96,7 +96,7 @@ Here, if this library needs `routeAction$` or `routeLoader$` we must re-export t
9696
<CodeSandbox src="/src/routes/demo/cookbook/re-exporting-loaders/third-party/index.tsx" style={{ height: '20em' }}>
9797
```tsx
9898
import { component$ } from '@builder.io/qwik';
99-
import { ThirdPartyPaymentComponent } from './third-party-library';
99+
import { ThirdPartyPaymentComponent, useThirdPartyPaymentLoader } from './third-party-library';
100100

101101
// As mentioned, here we are re-exporting the third-party loader
102102
export { useThirdPartyPaymentLoader } from './third-party-library';

packages/docs/src/routes/docs/integrations/supabase/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ PUBLIC_SUPABASE_URL=https://xxxxxxx.supabase.co
5252
PUBLIC_SUPABASE_ANON_KEY=eyJhb.......
5353
```
5454

55-
You should be able to get this values from the Supabase dashboard, create a new `.env.local` file at the root of the project and paste them there.
55+
You should be able to get these values from the Supabase dashboard, create a new `.env.local` file at the root of the project and paste them there.
5656

5757
> Note: It's possible to use Supabase with Qwik completely client-side, however, you would lose some of the performance benefits that you can achieve with leveraging the server. For a working example and code head over to [this repository](https://github.com/hamatoyogi/qwik-supabase-example).
5858

starters/features/styled-vanilla-extract/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
},
2525
"devDependencies": {
2626
"@vanilla-extract/css": "^1.12.0",
27-
"styled-vanilla-extract": "^0.5.4"
27+
"styled-vanilla-extract": "^0.5.4",
28+
"@vanilla-extract/vite-plugin": "^5.0.1"
2829
}
2930
}

0 commit comments

Comments
 (0)