Merge branch 'main' into rc-jobs-clear

.changesets/11572.md

@@ -0,0 +1,3 @@
+- Default NODE_ENV to "development" if it's `undefined` when starting jobs worker (#11572) by @cannikin
+
+This mimics the behavior of `yarn rw dev` where `NODE_ENV` will equal `development` if you don't set it explicitly.

__fixtures__/test-project/web/package.json

@@ -27,6 +27,6 @@
     "postcss": "^8.4.47",
     "postcss-loader": "^8.1.1",
     "prettier-plugin-tailwindcss": "^0.5.12",
-    "tailwindcss": "^3.4.11"
+    "tailwindcss": "^3.4.12"
   }
 }

docs/docs/background-jobs.md

@@ -701,7 +701,7 @@ By checking the `lastError` field in the database you can see what the last erro
 
 ## Deployment
 
-For many use cases you may simply be able to rely on the job runner to start your job workers, which will run forever:
+For many use cases you may be able to rely on the job runner to start and detach your job workers, which will then run forever:
 
 ```bash
 yarn rw jobs start
@@ -723,6 +723,20 @@ Of course if you have a process monitor system watching your workers you'll want
 
 :::
 
+### NODE_ENV
+
+You'll need to explicitly set your `NODE_ENV` when in environments other than development or test. We like having a `.env` file in a serverfull production environment, and you just include:
+
+```bash
+NODE_ENV=production
+```
+
+If you're using Docker, make sure you have an `ENV` declaration for it:
+
+```docker
+ENV NODE_ENV="production"
+```
+
 ## Advanced Job Workers
 
 As noted above, although the workers are started and detached using the `yarn rw jobs start` command, there is nothing to monitor those workers to make sure they keep running. To do that, you'll want to start the workers yourself (or have your process monitor start them) using command line flags.

docs/versioned_docs/version-8.0/background-jobs.md

@@ -705,7 +705,7 @@ By checking the `lastError` field in the database you can see what the last erro
 
 ## Deployment
 
-For many use cases you may simply be able to rely on the job runner to start your job workers, which will run forever:
+For many use cases you may be able to rely on the job runner to start and detach your job workers, which will then run forever:
 
 ```bash
 yarn rw jobs start
@@ -727,6 +727,20 @@ Of course if you have a process monitor system watching your workers you'll want
 
 :::
 
+### NODE_ENV
+
+You'll need to explicitly set your `NODE_ENV` when in environments other than development or test. We like having a `.env` file in a serverfull production environment, and you just include:
+
+```bash
+NODE_ENV=production
+```
+
+If you're using Docker, make sure you have an `ENV` declaration for it:
+
+```docker
+ENV NODE_ENV="production"
+```
+
 ## Advanced Job Workers
 
 As noted above, although the workers are started and detached using the `yarn rw jobs start` command, there is nothing to monitor those workers to make sure they keep running. To do that, you'll want to start the workers yourself (or have your process monitor start them) using command line flags.

docs/versioned_docs/version-8.1/background-jobs.md

@@ -701,7 +701,7 @@ By checking the `lastError` field in the database you can see what the last erro
 
 ## Deployment
 
-For many use cases you may simply be able to rely on the job runner to start your job workers, which will run forever:
+For many use cases you may be able to rely on the job runner to start and detach your job workers, which will then run forever:
 
 ```bash
 yarn rw jobs start
@@ -723,6 +723,20 @@ Of course if you have a process monitor system watching your workers you'll want
 
 :::
 
+### NODE_ENV
+
+You'll need to explicitly set your `NODE_ENV` when in environments other than development or test. We like having a `.env` file in a serverfull production environment, and you just include:
+
+```bash
+NODE_ENV=production
+```
+
+If you're using Docker, make sure you have an `ENV` declaration for it:
+
+```docker
+ENV NODE_ENV=production
+```
+
 ## Advanced Job Workers
 
 As noted above, although the workers are started and detached using the `yarn rw jobs start` command, there is nothing to monitor those workers to make sure they keep running. To do that, you'll want to start the workers yourself (or have your process monitor start them) using command line flags.

packages/jobs/src/__tests__/setupEnv.test.ts

@@ -0,0 +1,29 @@
+import { describe, expect, it, vi, afterEach } from 'vitest'
+
+import { setupEnv } from '../setupEnv'
+
+vi.mock('@redwoodjs/cli-helpers/loadEnvFiles', () => {
+  return {
+    loadEnvFiles: () => {},
+  }
+})
+
+const ORIGNAL_NODE_ENV = process.env.NODE_ENV
+
+describe('setupEnv', () => {
+  afterEach(() => {
+    process.env.NODE_ENV = ORIGNAL_NODE_ENV
+  })
+
+  it('if not called, NODE_ENV is not overridden in any way', () => {
+    expect(process.env.NODE_ENV).toEqual(ORIGNAL_NODE_ENV)
+  })
+
+  it('sets NODE_ENV to development if it starts undefined', () => {
+    delete process.env.NODE_ENV
+
+    setupEnv()
+
+    expect(process.env.NODE_ENV).toEqual('development')
+  })
+})

packages/jobs/src/bins/rw-jobs-worker.ts

@@ -8,14 +8,13 @@ import process from 'node:process'
 import { hideBin } from 'yargs/helpers'
 import yargs from 'yargs/yargs'
 
-import { loadEnvFiles } from '@redwoodjs/cli-helpers/loadEnvFiles'
-
 import { PROCESS_TITLE_PREFIX } from '../consts.js'
 import type { Worker } from '../core/Worker.js'
 import { WorkerConfigIndexNotFoundError } from '../errors.js'
 import { loadJobsManager } from '../loaders.js'
+import { setupEnv } from '../setupEnv.js'
 
-loadEnvFiles()
+setupEnv()
 
 const parseArgs = (argv: string[]) => {
   return yargs(hideBin(argv))

packages/jobs/src/bins/rw-jobs.ts

@@ -13,10 +13,9 @@ import { setTimeout } from 'node:timers'
 import { hideBin } from 'yargs/helpers'
 import yargs from 'yargs/yargs'
 
-import { loadEnvFiles } from '@redwoodjs/cli-helpers/loadEnvFiles'
-
 import { DEFAULT_LOGGER, PROCESS_TITLE_PREFIX } from '../consts.js'
 import { loadJobsManager } from '../loaders.js'
+import { setupEnv } from '../setupEnv.js'
 import type {
   Adapters,
   BasicLogger,
@@ -26,7 +25,7 @@ import type {
 
 export type NumWorkersConfig = [number, number][]
 
-loadEnvFiles()
+setupEnv()
 
 process.title = 'rw-jobs'
 

packages/jobs/src/setupEnv.ts

@@ -0,0 +1,11 @@
+import { loadEnvFiles } from '@redwoodjs/cli-helpers/loadEnvFiles'
+
+export const setupEnv = () => {
+  loadEnvFiles()
+
+  // If even after loading `.env` we find that `NODE_ENV` is `undefined` default
+  // to `development` to mimic what the other CLI tools to
+  if (process.env.NODE_ENV === undefined) {
+    process.env.NODE_ENV = 'development'
+  }
+}

packages/ogimage-gen/package.json

@@ -53,7 +53,7 @@
     "ts-toolbelt": "9.6.0",
     "tsx": "4.19.1",
     "typescript": "5.6.2",
-    "vite": "5.4.5",
+    "vite": "5.4.6",
     "vitest": "2.0.5"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

packages/storybook/package.json

@@ -62,7 +62,7 @@
     "@types/node": "20.16.5",
     "tsx": "4.19.1",
     "typescript": "5.6.2",
-    "vite": "5.4.5"
+    "vite": "5.4.6"
   },
   "peerDependencies": {
     "@redwoodjs/project-config": "workspace:*",

packages/vite/package.json

@@ -90,7 +90,7 @@
     "react": "19.0.0-rc-f2df5694-20240916",
     "react-server-dom-webpack": "19.0.0-rc-f2df5694-20240916",
     "rimraf": "6.0.1",
-    "vite": "5.4.5",
+    "vite": "5.4.6",
     "vite-plugin-cjs-interop": "2.1.3",
     "vite-plugin-node-polyfills": "0.22.0",
     "ws": "8.18.0",

yarn.lock

@@ -8469,7 +8469,7 @@ __metadata:
     ts-toolbelt: "npm:9.6.0"
     tsx: "npm:4.19.1"
     typescript: "npm:5.6.2"
-    vite: "npm:5.4.5"
+    vite: "npm:5.4.6"
     vitest: "npm:2.0.5"
   languageName: unknown
   linkType: soft
@@ -8795,7 +8795,7 @@ __metadata:
     rollup: "npm:4.21.2"
     tsx: "npm:4.19.1"
     typescript: "npm:5.6.2"
-    vite: "npm:5.4.5"
+    vite: "npm:5.4.6"
     vite-plugin-cjs-interop: "npm:2.1.3"
     vite-plugin-node-polyfills: "npm:0.22.0"
     vitest: "npm:2.0.5"
@@ -27627,7 +27627,7 @@ __metadata:
     tsx: "npm:4.19.1"
     typescript: "npm:5.6.2"
     unplugin-auto-import: "npm:0.18.3"
-    vite: "npm:5.4.5"
+    vite: "npm:5.4.6"
   peerDependencies:
     "@redwoodjs/project-config": "workspace:*"
     "@redwoodjs/router": "workspace:*"
@@ -29670,9 +29670,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:5.4.5, vite@npm:^5.0.0":
-  version: 5.4.5
-  resolution: "vite@npm:5.4.5"
+"vite@npm:5.4.6, vite@npm:^5.0.0":
+  version: 5.4.6
+  resolution: "vite@npm:5.4.6"
   dependencies:
     esbuild: "npm:^0.21.3"
     fsevents: "npm:~2.3.3"
@@ -29709,7 +29709,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 10c0/89c6459452fc238cdf8e99681b30996af171c9c557af476f96408a18a639fb5a0a6ee2d2257e005b21dc284edceb604595c34920cd4a007ad18f7ebafb654c76
+  checksum: 10c0/5f87be3a10e970eaf9ac52dfab39cf9fff583036685252fb64570b6d7bfa749f6d221fb78058f5ef4b5664c180d45a8e7a7ff68d7f3770e69e24c7c68b958bde
   languageName: node
   linkType: hard