Merge branch 'release-hotfix'

remix-run · Aug 9, 2023 · e62ace4 · e62ace4
2 parents 6bfc67f + 21d2290
commit e62ace4
Show file tree

Hide file tree

Showing 37 changed files with 194 additions and 42 deletions.
diff --git a/docs/file-conventions/remix-config.md b/docs/file-conventions/remix-config.md
@@ -45,19 +45,23 @@ The path to the browser build, relative to remix.config.js. Defaults to
 The path to a directory Remix can use for caching things in development,
 relative to `remix.config.js`. Defaults to `".cache"`.
 
-## devServerBroadcastDelay (deprecated)
+## devServerBroadcastDelay
+
+<docs-warning>This option is deprecated and will likely be removed in a future
+stable release. Enable `v2_dev` to eliminate the race conditions that necessitated
+this option.</docs-warning>
 
 The delay, in milliseconds, before the dev server broadcasts a reload event.
 There is no delay by default.
 
-For `v2_dev`, the race conditions that necesitated this option have been eliminated.
+## devServerPort
 
-## devServerPort (deprecated)
+<docs-warning>This option is deprecated and will likely be removed in a future
+stable release. Enable `v2_dev` and use [`--port` / `v2_dev.port` option][port]
+instead.</docs-warning>
 
 The port number to use for the dev websocket server. Defaults to 8002.
 
-For `v2_dev`, use [`--port` / `v2_dev.port` option][port].
-
 ## ignoredRouteFiles
 
 This is an array of globs (via [minimatch][minimatch]) that Remix will match to
@@ -316,4 +320,4 @@ There are a few conventions that Remix uses you should be aware of.
 [tailwind-functions-and-directives]: https://tailwindcss.com/docs/functions-and-directives
 [jspm]: https://github.com/jspm/jspm-core
 [esbuild-plugins-node-modules-polyfill]: https://www.npmjs.com/package/esbuild-plugins-node-modules-polyfill
-[port]: ../other-api/dev-v2#option-1
+[port]: ../other-api/dev-v2#options-1
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `create-remix`
 
+## 1.19.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 1.19.2
 
 ### Patch Changes

diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "1.19.2",
+  "version": "1.19.3",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
@@ -17,7 +17,7 @@
     "create-remix": "dist/cli.js"
   },
   "dependencies": {
-    "@remix-run/dev": "1.19.2"
+    "@remix-run/dev": "1.19.3"
   },
   "engines": {
     "node": ">=14.0.0"

diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 1.19.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 1.19.2
 
 ### Patch Changes

diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "1.19.2",
+  "version": "1.19.3",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -15,7 +15,7 @@
   "typings": "dist/index.d.ts",
   "dependencies": {
     "@architect/functions": "^5.2.0",
-    "@remix-run/node": "1.19.2",
+    "@remix-run/node": "1.19.3",
     "@types/aws-lambda": "^8.10.82"
   },
   "devDependencies": {

diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 1.19.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 1.19.2
 
 ### Patch Changes

diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "1.19.2",
+  "version": "1.19.3",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -15,7 +15,7 @@
   "typings": "dist/index.d.ts",
   "module": "dist/esm/index.js",
   "dependencies": {
-    "@remix-run/cloudflare": "1.19.2"
+    "@remix-run/cloudflare": "1.19.3"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^3.4.0",

diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 1.19.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 1.19.2
 
 ### Patch Changes

diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "1.19.2",
+  "version": "1.19.3",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -16,7 +16,7 @@
   "module": "dist/esm/index.js",
   "dependencies": {
     "@cloudflare/kv-asset-handler": "^0.1.3",
-    "@remix-run/cloudflare": "1.19.2"
+    "@remix-run/cloudflare": "1.19.3"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^3.4.0"

diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 1.19.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 1.19.2
 
 ### Patch Changes

diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "1.19.2",
+  "version": "1.19.3",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -15,7 +15,7 @@
   "typings": "dist/index.d.ts",
   "dependencies": {
     "@cloudflare/kv-asset-handler": "^0.1.3",
-    "@remix-run/server-runtime": "1.19.2"
+    "@remix-run/server-runtime": "1.19.3"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^3.4.0"

diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,9 @@
 # @remix-run/css-bundle
 
+## 1.19.3
+
+No significant changes to this package were made in this release. [See the releases page on GitHub](https://github.com/remix-run/remix/releases/tag/remix%401.19.3) for an overview of all changes in v1.19.3.
+
 ## 1.19.2
 
 No significant changes to this package were made in this release. [See the releases page on GitHub](https://github.com/remix-run/remix/releases/tag/remix%401.19.2) for an overview of all changes in v1.19.2.

diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "1.19.2",
+  "version": "1.19.3",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {

diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 1.19.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 1.19.2
 
 ### Patch Changes

diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "1.19.2",
+  "version": "1.19.3",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
@@ -15,7 +15,7 @@
   "license": "MIT",
   "sideEffects": false,
   "dependencies": {
-    "@remix-run/server-runtime": "1.19.2",
+    "@remix-run/server-runtime": "1.19.3",
     "mime": "^3.0.0"
   },
   "engines": {

diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/dev`
 
+## 1.19.3
+
+### Patch Changes
+
+- Show deprecation warning when using `devServerBroadcastDelay` and `devServerPort` config options ([#7064](https://github.com/remix-run/remix/pull/7064))
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 1.19.2
 
 ### Patch Changes

diff --git a/packages/remix-dev/config.ts b/packages/remix-dev/config.ts
@@ -117,12 +117,17 @@ export interface AppConfig {
 
   /**
    * The port number to use for the dev server. Defaults to 8002.
+   *
+   * @deprecated Use {@link AppConfig.future.v2_dev.port} instead.
    */
   devServerPort?: number;
 
   /**
    * The delay, in milliseconds, before the dev server broadcasts a reload
    * event. There is no delay by default.
+   *
+   * @deprecated Enable {@link AppConfig.future.v2_dev} to eliminate the race
+   * conditions that necessitated this option.
    */
   devServerBroadcastDelay?: number;
 
@@ -296,11 +301,16 @@ export interface RemixConfig {
 
   /**
    * The port number to use for the dev (asset) server.
+   *
+   * @deprecated Use {@link RemixConfig.future.v2_dev.port} instead.
    */
   devServerPort: number;
 
   /**
    * The delay before the dev (asset) server broadcasts a reload event.
+   *
+   * @deprecated Enable {@link RemixConfig.future.v2_dev} to eliminate the race
+   * conditions that necessitated this option.
    */
   devServerBroadcastDelay: number;
 
@@ -804,6 +814,13 @@ export async function readConfig(
     assetsBuildDirectory
   );
 
+  if (appConfig.devServerPort) {
+    devServerPortWarning();
+  }
+  if (appConfig.devServerBroadcastDelay) {
+    devServerBroadcastDelayWarning();
+  }
+
   let devServerPort =
     Number(process.env.REMIX_DEV_SERVER_WS_PORT) ||
     (await getPort({ port: Number(appConfig.devServerPort) || 8002 }));
@@ -1036,6 +1053,27 @@ let browserBuildDirectoryWarning = () =>
     }
   );
 
+let devServerBroadcastDelayWarning = () =>
+  logger.warn(
+    "The `devServerBroadcastDelay` config option will be removed in v2",
+    {
+      details: [
+        "Enable `v2_dev` to eliminate the race conditions that necessitated this option.",
+        "-> https://remix.run/docs/en/v1.19.3/pages/v2#devserverbroadcastdelay",
+      ],
+      key: "devServerBroadcastDelayWarning",
+    }
+  );
+
+let devServerPortWarning = () =>
+  logger.warn("The `devServerPort` config option will be removed in v2", {
+    details: [
+      "Enable `v2_dev` and use `--port` / `v2_dev.port` option instead.",
+      "-> https://remix.run/docs/en/v1.19.3/pages/v2#devserverport",
+    ],
+    key: "devServerPortWarning",
+  });
+
 let serverBuildDirectoryWarning = () =>
   logger.warn(
     "The `serverBuildDirectory` config option will be removed in v2",

diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "1.19.2",
+  "version": "1.19.3",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -28,7 +28,7 @@
     "@babel/traverse": "^7.21.5",
     "@babel/types": "^7.21.5",
     "@npmcli/package-json": "^2.0.0",
-    "@remix-run/server-runtime": "1.19.2",
+    "@remix-run/server-runtime": "1.19.3",
     "@vanilla-extract/integration": "^6.2.0",
     "arg": "^5.0.1",
     "cacache": "^15.0.5",
@@ -74,7 +74,7 @@
     "xdm": "^2.0.0"
   },
   "devDependencies": {
-    "@remix-run/serve": "1.19.2",
+    "@remix-run/serve": "1.19.3",
     "@types/cacache": "^15.0.0",
     "@types/gunzip-maybe": "^1.4.0",
     "@types/inquirer": "^8.2.0",
@@ -94,7 +94,7 @@
     "type-fest": "^2.16.0"
   },
   "peerDependencies": {
-    "@remix-run/serve": "^1.19.2"
+    "@remix-run/serve": "^1.19.3"
   },
   "peerDependenciesMeta": {
     "@remix-run/serve": {

diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,9 @@
 # `@remix-run/eslint-config`
 
+## 1.19.3
+
+No significant changes to this package were made in this release. [See the releases page on GitHub](https://github.com/remix-run/remix/releases/tag/remix%401.19.3) for an overview of all changes in v1.19.3.
+
 ## 1.19.2
 
 No significant changes to this package were made in this release. [See the releases page on GitHub](https://github.com/remix-run/remix/releases/tag/remix%401.19.2) for an overview of all changes in v1.19.2.

diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "1.19.2",
+  "version": "1.19.3",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 1.19.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 1.19.2
 
 ### Patch Changes