Skip to content

Commit

Permalink
Merge branch 'dev' into izznatsir-cloudflare-websocket
Browse files Browse the repository at this point in the history
  • Loading branch information
izznat authored Feb 22, 2024
2 parents 972e14a + dc5cdb7 commit fdace75
Show file tree
Hide file tree
Showing 37 changed files with 138 additions and 38 deletions.
5 changes: 0 additions & 5 deletions .changeset/cold-suns-notice.md

This file was deleted.

6 changes: 6 additions & 0 deletions .changeset/many-grapes-confess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"remix": patch
"@remix-run/dev": patch
---

fix: mark Layout as browser safe route export
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,14 @@ Date: YYYY-MM-DD
-->

## 2.7.2

Date: 2024-02-21

### Patch Changes

- Vite: Fix error when building projects with `.css?url` imports ([#8829](https://github.com/remix-run/remix/pull/8829))

## 2.7.1

Date: 2024-02-20
Expand Down
1 change: 1 addition & 0 deletions contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
- bmac
- bmarvinb
- bmontalvo
- bobziroll
- bogas04
- BogdanDevBst
- bolchowka
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/client-data.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ These new exports are a bit of a sharp knife and are not recommended as your _pr
- **Client Cache:** Cache server loader data in the client and avoid some server calls
- **Migration:** Ease your migration from React Router -> Remix SPA -> Remix SSR (once Remix supports [SPA Mode][rfc-spa])

Please use these new exports with caution! If you're not careful - it's easy to get your UI out of sync. Remix out of the box tries _very_ hard to ensure that this doesn't happen - but once you take control over your own client-side cache, and potentially prevent Remix from performing it's normal server `fetch` calls - then Remix can no longer guarantee your UI remains in sync.
Please use these new exports with caution! If you're not careful - it's easy to get your UI out of sync. Remix out of the box tries _very_ hard to ensure that this doesn't happen - but once you take control over your own client-side cache, and potentially prevent Remix from performing its normal server `fetch` calls - then Remix can no longer guarantee your UI remains in sync.

## Skip the Hop

Expand Down
2 changes: 2 additions & 0 deletions packages/create-remix/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# `create-remix`

## 2.7.2

## 2.7.1

## 2.7.0
Expand Down
2 changes: 1 addition & 1 deletion packages/create-remix/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-remix",
"version": "2.7.1",
"version": "2.7.2",
"description": "Create a new Remix app",
"homepage": "https://remix.run",
"bugs": {
Expand Down
7 changes: 7 additions & 0 deletions packages/remix-architect/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# `@remix-run/architect`

## 2.7.2

### Patch Changes

- Updated dependencies:
- `@remix-run/[email protected]`

## 2.7.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/remix-architect/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@remix-run/architect",
"version": "2.7.1",
"version": "2.7.2",
"description": "Architect server request handler for Remix",
"bugs": {
"url": "https://github.com/remix-run/remix/issues"
Expand All @@ -15,7 +15,7 @@
"typings": "dist/index.d.ts",
"dependencies": {
"@architect/functions": "^5.2.0",
"@remix-run/node": "2.7.1",
"@remix-run/node": "2.7.2",
"@types/aws-lambda": "^8.10.82"
},
"devDependencies": {
Expand Down
7 changes: 7 additions & 0 deletions packages/remix-cloudflare-pages/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# `@remix-run/cloudflare-pages`

## 2.7.2

### Patch Changes

- Updated dependencies:
- `@remix-run/[email protected]`

## 2.7.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/remix-cloudflare-pages/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@remix-run/cloudflare-pages",
"version": "2.7.1",
"version": "2.7.2",
"description": "Cloudflare Pages request handler for Remix",
"bugs": {
"url": "https://github.com/remix-run/remix/issues"
Expand All @@ -15,7 +15,7 @@
"typings": "dist/index.d.ts",
"module": "dist/esm/index.js",
"dependencies": {
"@remix-run/cloudflare": "2.7.1"
"@remix-run/cloudflare": "2.7.2"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20230518.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/remix-cloudflare-workers/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# `@remix-run/cloudflare-workers`

## 2.7.2

### Patch Changes

- Updated dependencies:
- `@remix-run/[email protected]`

## 2.7.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/remix-cloudflare-workers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@remix-run/cloudflare-workers",
"version": "2.7.1",
"version": "2.7.2",
"description": "Cloudflare worker request handler for Remix",
"bugs": {
"url": "https://github.com/remix-run/remix/issues"
Expand All @@ -16,7 +16,7 @@
"module": "dist/esm/index.js",
"dependencies": {
"@cloudflare/kv-asset-handler": "^0.1.3",
"@remix-run/cloudflare": "2.7.1"
"@remix-run/cloudflare": "2.7.2"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20230518.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/remix-cloudflare/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# `@remix-run/cloudflare`

## 2.7.2

### Patch Changes

- Updated dependencies:
- `@remix-run/[email protected]`

## 2.7.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/remix-cloudflare/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@remix-run/cloudflare",
"version": "2.7.1",
"version": "2.7.2",
"description": "Cloudflare platform abstractions for Remix",
"bugs": {
"url": "https://github.com/remix-run/remix/issues"
Expand All @@ -15,7 +15,7 @@
"typings": "dist/index.d.ts",
"dependencies": {
"@cloudflare/kv-asset-handler": "^0.1.3",
"@remix-run/server-runtime": "2.7.1"
"@remix-run/server-runtime": "2.7.2"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20230518.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/remix-css-bundle/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @remix-run/css-bundle

## 2.7.2

## 2.7.1

## 2.7.0
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-css-bundle/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@remix-run/css-bundle",
"version": "2.7.1",
"version": "2.7.2",
"description": "CSS bundle href when using CSS bundling features in Remix",
"homepage": "https://remix.run",
"bugs": {
Expand Down
7 changes: 7 additions & 0 deletions packages/remix-deno/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# `@remix-run/deno`

## 2.7.2

### Patch Changes

- Updated dependencies:
- `@remix-run/[email protected]`

## 2.7.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/remix-deno/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@remix-run/deno",
"version": "2.7.1",
"version": "2.7.2",
"description": "Deno platform abstractions for Remix",
"homepage": "https://remix.run",
"main": "./index.ts",
Expand All @@ -15,7 +15,7 @@
"license": "MIT",
"sideEffects": false,
"dependencies": {
"@remix-run/server-runtime": "2.7.1",
"@remix-run/server-runtime": "2.7.2",
"mime": "^3.0.0"
},
"peerDependencies": {
Expand Down
9 changes: 9 additions & 0 deletions packages/remix-dev/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# `@remix-run/dev`

## 2.7.2

### Patch Changes

- Vite: Fix error when building projects with `.css?url` imports ([#8829](https://github.com/remix-run/remix/pull/8829))
- Updated dependencies:
- `@remix-run/[email protected]`
- `@remix-run/[email protected]`

## 2.7.1

### Patch Changes
Expand Down
1 change: 1 addition & 0 deletions packages/remix-dev/compiler/js/plugins/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const browserSafeRouteExports: { [name: string]: boolean } = {
clientLoader: true,
ErrorBoundary: true,
HydrateFallback: true,
Layout: true,
default: true,
handle: true,
links: true,
Expand Down
10 changes: 5 additions & 5 deletions packages/remix-dev/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@remix-run/dev",
"version": "2.7.1",
"version": "2.7.2",
"description": "Dev tools and CLI for Remix",
"homepage": "https://remix.run",
"bugs": {
Expand Down Expand Up @@ -28,9 +28,9 @@
"@babel/types": "^7.22.5",
"@mdx-js/mdx": "^2.3.0",
"@npmcli/package-json": "^4.0.1",
"@remix-run/node": "2.7.1",
"@remix-run/node": "2.7.2",
"@remix-run/router": "1.15.1",
"@remix-run/server-runtime": "2.7.1",
"@remix-run/server-runtime": "2.7.2",
"@types/mdx": "^2.0.5",
"@vanilla-extract/integration": "^6.2.0",
"arg": "^5.0.1",
Expand Down Expand Up @@ -73,7 +73,7 @@
"ws": "^7.4.5"
},
"devDependencies": {
"@remix-run/serve": "2.7.1",
"@remix-run/serve": "2.7.2",
"@types/cacache": "^17.0.0",
"@types/cross-spawn": "^6.0.2",
"@types/gunzip-maybe": "^1.4.0",
Expand All @@ -95,7 +95,7 @@
"wrangler": "^3.28.2"
},
"peerDependencies": {
"@remix-run/serve": "^2.7.1",
"@remix-run/serve": "^2.7.2",
"typescript": "^5.1.0",
"vite": "^5.1.0",
"wrangler": "^3.28.2"
Expand Down
2 changes: 2 additions & 0 deletions packages/remix-eslint-config/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# `@remix-run/eslint-config`

## 2.7.2

## 2.7.1

## 2.7.0
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@remix-run/eslint-config",
"version": "2.7.1",
"version": "2.7.2",
"description": "ESLint configuration for Remix projects",
"bugs": {
"url": "https://github.com/remix-run/remix/issues"
Expand Down
7 changes: 7 additions & 0 deletions packages/remix-express/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# `@remix-run/express`

## 2.7.2

### Patch Changes

- Updated dependencies:
- `@remix-run/[email protected]`

## 2.7.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/remix-express/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@remix-run/express",
"version": "2.7.1",
"version": "2.7.2",
"description": "Express server request handler for Remix",
"bugs": {
"url": "https://github.com/remix-run/remix/issues"
Expand All @@ -14,7 +14,7 @@
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"dependencies": {
"@remix-run/node": "2.7.1"
"@remix-run/node": "2.7.2"
},
"devDependencies": {
"@types/express": "^4.17.9",
Expand Down
7 changes: 7 additions & 0 deletions packages/remix-node/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# `@remix-run/node`

## 2.7.2

### Patch Changes

- Updated dependencies:
- `@remix-run/[email protected]`

## 2.7.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/remix-node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@remix-run/node",
"version": "2.7.1",
"version": "2.7.2",
"description": "Node.js platform abstractions for Remix",
"bugs": {
"url": "https://github.com/remix-run/remix/issues"
Expand All @@ -17,7 +17,7 @@
"./install.js"
],
"dependencies": {
"@remix-run/server-runtime": "2.7.1",
"@remix-run/server-runtime": "2.7.2",
"@remix-run/web-fetch": "^4.4.2",
"@remix-run/web-file": "^3.1.0",
"@remix-run/web-stream": "^1.1.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/remix-react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# `@remix-run/react`

## 2.7.2

### Patch Changes

- Updated dependencies:
- `@remix-run/[email protected]`

## 2.7.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/remix-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@remix-run/react",
"version": "2.7.1",
"version": "2.7.2",
"description": "React DOM bindings for Remix",
"bugs": {
"url": "https://github.com/remix-run/remix/issues"
Expand All @@ -17,7 +17,7 @@
"module": "dist/esm/index.js",
"dependencies": {
"@remix-run/router": "1.15.1",
"@remix-run/server-runtime": "2.7.1",
"@remix-run/server-runtime": "2.7.2",
"react-router": "6.22.1",
"react-router-dom": "6.22.1"
},
Expand Down
Loading

0 comments on commit fdace75

Please sign in to comment.