Skip to content

Commit

Permalink
Merge next branch into main (#560)
Browse files Browse the repository at this point in the history
* Update changeset config and git workflow

* Update to ci pipeline latest LTS nodejs

* Storage adapter (#507)

* add storage adapters

* Remove unused filterCookies function

* add pkce support

* update sveltekit example

* Add pre-release changeset

* Bump SvelteKit version

---------

Co-authored-by: David Plugge <[email protected]>

* chore: update versions (next) (#508)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* simplifying defaults for storage adapter (#510)

* chore: update versions (next) (#511)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* remove unused type (#512)

* remove unused type

* add changeset

* chore: update versions (next) (#513)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: add jose to .next branch (#526)

* Add jose for it's base64url decode support

* Remove js-base64 becuase buffer check Vercel issue

* chore: update versions (next) (#527)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Fix Failed to parse cookie string in middleware (#532)

* chore: update versions (next) (#533)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* fix cookie saving in middleware/routeHandler (#536)

* chore: update versions (next) (#537)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* add lint and format scripts (#538)

* change prettier config
* format md files with spaces
* add husky and pre-commit script
* add lint-staged
* configure lint-staged
* use tsc as linter
* add ci workflow
* add checks permission
* use prettierignore

* WIP: Writable cookies (#543)

* wip: example for writable cookies - server actions and route handlers

* add ReadonlyRequestCookies type for Server Component client

* swap routeHandler and serverActions client (#544)

* Chore: Implement naming convention for createClient functions (#547)

* implement consistent naming convention for createClient functions

* Add deprecated functions and changeset

---------

Co-authored-by: Andrew Smith <[email protected]>

* chore: update versions (next) (#548)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Ignore changeset and github actions

* Chore: Implement singleton pattern for createClientComponentClient function (#550)

* implement singleton pattern for createClientComponentClient

* Fix type issue (#554)

* Fix: Set response cookie (#551)

* add cookie header to make refreshed session available in Server Components

* add guard around setting headers

* Chore: Update Next.js and remove custom type for WritableCookies (#552)

* update next.js and remove custom type

* chore: update versions (next) (#555)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Fix: Typedefs for clientClient functions (#556)

* add explicit return types for createClient functions

* add deprecated functions for App Router createClient functions

* add changeset

* Fix: missing type from SvelteKit and remix package (#557)

* chore: update versions (next) (#558)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Final release of auth-helpers PKCE

* chore: update versions (#559)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: David Plugge <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: David Plugge <[email protected]>
Co-authored-by: Jon Meyers <[email protected]>
  • Loading branch information
6 people authored May 25, 2023
1 parent 8e05c8c commit 6e349e2
Show file tree
Hide file tree
Showing 204 changed files with 17,239 additions and 6,973 deletions.
18 changes: 9 additions & 9 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": "@changesets/cli/changelog",
"commit": false,
"fixed": [],
"linked": [],
"access": "restricted",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": ["@example/*"]
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": "@changesets/cli/changelog",
"commit": false,
"fixed": [],
"linked": [],
"access": "restricted",
"baseBranch": "next",
"updateInternalDependencies": "patch",
"ignore": ["@example/*"]
}
64 changes: 64 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: CI

on:
push:
branches:
- '**'

# cancel in-progress runs on new commits to same PR (gitub.event.number)
concurrency:
group: ${{ github.workflow }}-${{ github.event.number || github.sha }}
cancel-in-progress: true

permissions:
contents: read # to fetch code (actions/checkout)
checks: write

jobs:
Lint:
strategy:
matrix:
node: ['18']

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: pnpm/[email protected]
with:
version: 8.1.0

- name: Set up Node
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
cache: pnpm

- run: pnpm install --frozen-lockfile

- uses: wearerequired/lint-action@v2
with:
tsc: true
prettier: true

# Lint:
# strategy:
# matrix:
# node: ['18']

# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3

# - uses: pnpm/action-setup@v2
# with:
# version: 8.1.0

# - uses: actions/setup-node@v3
# with:
# node-version: 18.x
# cache: pnpm

# - run: pnpm install --frozen-lockfile
# - run: pnpm run lint
# - run: pnpm run check
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: ['16']
node: ['18']

runs-on: ${{ matrix.os }}

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ on:
push:
branches:
- main
- next
workflow_dispatch:

jobs:
release:
name: Release / Node ${{ matrix.node }}
strategy:
matrix:
node: ['16']
node: ['18']

runs-on: ubuntu-latest

Expand Down
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

pnpx lint-staged
47 changes: 47 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
node_modules
.pnp
.pnp.js

# testing
coverage

# next.js
.next/
out/
build

# misc
.DS_Store
*.pem

pnpm-lock.yaml

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# local env files
.env.local
.env.development.local
.env.test.local
.env.production.local

# Distribution directories
dist/
package/
docs/

# turbo
.turbo

# svelte kit
.svelte-kit

# changesets and github
.changeset/
.github/
27 changes: 25 additions & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
{
"singleQuote": true,
"trailingComma": "none"
"useTabs": true,
"singleQuote": true,
"trailingComma": "none",
"printWidth": 100,
"overrides": [
{
"files": ["*.svelte"],
"options": {
"bracketSameLine": false
}
},
{
"files": ["*.md", "*.yaml", "*.yml"],
"options": {
"useTabs": false,
"tabWidth": 2
}
},
{
"files": ["**/CHANGELOG.md"],
"options": {
"requirePragma": true
}
}
]
}
2 changes: 1 addition & 1 deletion examples/nextjs-server-components/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "next/core-web-vitals"
"extends": "next/core-web-vitals"
}
6 changes: 3 additions & 3 deletions examples/nextjs-server-components/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"typescript.tsdk": "./node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true
}
"typescript.tsdk": "./node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true
}
28 changes: 14 additions & 14 deletions examples/nextjs-server-components/app/globals.css
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
html,
body {
padding: 0;
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
padding: 0;
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell,
Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
}

a {
color: inherit;
text-decoration: none;
color: inherit;
text-decoration: none;
}

* {
box-sizing: border-box;
box-sizing: border-box;
}

@media (prefers-color-scheme: dark) {
html {
color-scheme: dark;
}
body {
color: white;
background: black;
}
html {
color-scheme: dark;
}
body {
color: white;
background: black;
}
}
16 changes: 8 additions & 8 deletions examples/nextjs-server-components/app/head.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
export default function Head() {
return (
<>
<title>Create Next App</title>
<meta content="width=device-width, initial-scale=1" name="viewport" />
<meta name="description" content="Generated by create next app" />
<link rel="icon" href="/favicon.ico" />
</>
);
return (
<>
<title>Create Next App</title>
<meta content="width=device-width, initial-scale=1" name="viewport" />
<meta name="description" content="Generated by create next app" />
<link rel="icon" href="/favicon.ico" />
</>
);
}
40 changes: 18 additions & 22 deletions examples/nextjs-server-components/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,27 @@ export type TypedSupabaseClient = SupabaseClient<Database>;
// do not cache this layout
export const revalidate = 0;

export default async function RootLayout({
children
}: {
children: React.ReactNode;
}) {
const supabase = createServerClient();
export default async function RootLayout({ children }: { children: React.ReactNode }) {
const supabase = createServerClient();

const {
data: { session }
} = await supabase.auth.getSession();
const {
data: { session }
} = await supabase.auth.getSession();

return (
<html lang="en">
{/*
return (
<html lang="en">
{/*
<head /> will contain the components returned by the nearest parent
head.tsx. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head
*/}
<head />
<body>
<SupabaseProvider session={session}>
<SupabaseListener serverAccessToken={session?.access_token} />
<Login />
{children}
</SupabaseProvider>
</body>
</html>
);
<head />
<body>
<SupabaseProvider session={session}>
<SupabaseListener serverAccessToken={session?.access_token} />
<Login />
{children}
</SupabaseProvider>
</body>
</html>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export const revalidate = 0;

// this page will display with or without a user session
export default async function OptionalSession() {
const supabase = createServerClient();
const { data } = await supabase.from('posts').select('*');
const supabase = createServerClient();
const { data } = await supabase.from('posts').select('*');

return <pre>{JSON.stringify({ data }, null, 2)}</pre>;
return <pre>{JSON.stringify({ data }, null, 2)}</pre>;
}
Loading

0 comments on commit 6e349e2

Please sign in to comment.