Skip to content

Commit

Permalink
Merge branch 'dev' into markdalgleish/browser-node-polyfills
Browse files Browse the repository at this point in the history
  • Loading branch information
markdalgleish committed Aug 29, 2023
2 parents 6aac9e0 + 9154f35 commit 8e3540e
Show file tree
Hide file tree
Showing 23 changed files with 145 additions and 273 deletions.
8 changes: 8 additions & 0 deletions .changeset/beige-pugs-drive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@remix-run/serve": major
---

`remix-serve` picks an open port if 3000 is taken

- If `PORT` env var is set, `remix-serve` will use that port
- Otherwise, `remix-serve` picks an open port (3000 unless that is already taken)
5 changes: 5 additions & 0 deletions .changeset/get-dependencies-from-esm-without-main.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@remix-run/dev": patch
---

Update `getDependenciesToBundle` to handle ESM packages without main exports. Note that these packages must expose `package.json` in their `exports` field so that their path can be resolved.
7 changes: 7 additions & 0 deletions .changeset/light-rivers-tell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@remix-run/react": patch
"@remix-run/server-runtime": patch
"@remix-run/testing": patch
---

Bump router to 1.9.0/6.16.0 prereleases
19 changes: 0 additions & 19 deletions .github/workflows/release-test.yml

This file was deleted.

195 changes: 0 additions & 195 deletions .github/workflows/reusable-test.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/shared-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.11.0

- name: ⬇️ Checkout repo
uses: actions/checkout@v3

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/shared-test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ jobs:

runs-on: ${{ inputs.os }}
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.11.0

- name: ⬇️ Checkout repo
uses: actions/checkout@v3

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/shared-test-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ jobs:
node: ${{ fromJSON(inputs.node_version) }}
runs-on: ${{ inputs.os }}
steps:
- name: 🛑 Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.11.0

- name: ⬇️ Checkout repo
uses: actions/checkout@v3

Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/test-full.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
name: Branch

# main/dev branches will get the full run across all OS/browsers
# main/dev/release-* branches and nightly tags will get the full run across
# all OS/browsers for multiple node versions

on:
push:
branches:
- main
- dev
- release-*
tags:
- "v0.0.0-nightly-*"
paths-ignore:
- "docs/**"
- "scripts/**"
Expand All @@ -25,23 +29,23 @@ jobs:
uses: ./.github/workflows/shared-test-unit.yml
with:
os: "ubuntu-latest"
node_version: '["latest"]'
node_version: "[18, 20]"

unit-windows:
name: "🧪 Unit Test"
if: github.repository == 'remix-run/remix'
uses: ./.github/workflows/shared-test-unit.yml
with:
os: "windows-latest"
node_version: '["latest"]'
node_version: "[18, 20]"

integration-ubuntu:
name: "👀 Integration Test"
if: github.repository == 'remix-run/remix'
uses: ./.github/workflows/shared-test-integration.yml
with:
os: "ubuntu-latest"
node_version: '["latest"]'
node_version: "[18, 20]"
browser: '["chromium", "firefox"]'

integration-windows:
Expand All @@ -50,7 +54,7 @@ jobs:
uses: ./.github/workflows/shared-test-integration.yml
with:
os: "windows-latest"
node_version: '["latest"]'
node_version: "[18, 20]"
browser: '["msedge"]'

integration-macos:
Expand All @@ -59,5 +63,5 @@ jobs:
uses: ./.github/workflows/shared-test-integration.yml
with:
os: "macos-latest"
node_version: '["latest"]'
node_version: "[18, 20]"
browser: '["webkit"]'
4 changes: 4 additions & 0 deletions .github/workflows/test-pr-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ on:
- "contributors.yml"
- "**/*.md"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
name: "⚙️ Build"
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test-pr-windows-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
- "packages/remix-dev/**"
- "!**/*.md"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
unit-windows:
name: "🧪 Unit Test"
Expand Down
5 changes: 5 additions & 0 deletions docs/utils/sessions.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,11 @@ console.log(isSession(session));

Remix makes it easy to store sessions in your own database if needed. The `createSessionStorage()` API requires a `cookie` (or options for creating a cookie, see [cookies][cookies]) and a set of create, read, update, and delete (CRUD) methods for managing the session data. The cookie is used to persist the session ID.

- `createData` will be called from `commitSession` on the initial session creation when no session ID exists in the cookie
- `readData` will be called from `getSession` when a session ID exists in the cookie
- `updateData` will be called from `commitSession` when a session ID already exists in the cookie
- `deleteData` is called from `destorySession`

The following example shows how you could do this using a generic database client:

```ts
Expand Down
Loading

0 comments on commit 8e3540e

Please sign in to comment.