docker-react 0.0.4 → 0.1.0-modernization-hotfix.1

package/Dockerfile

@@ -0,0 +1,23 @@
+FROM node:24.11.1 as node
+
+FROM nginx
+ARG DOCKER_REACT_VERSION
+
+# Grab and link the node binaries from the node image.
+COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm
+RUN ln -s /usr/local/lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx
+
+# Override default nginx config
+COPY ./nginx.conf /etc/nginx/conf.d/default.conf
+
+# Set working directory
+WORKDIR /usr/app
+
+# Install docker-react package globally
+RUN npm install -g docker-react@"${DOCKER_REACT_VERSION}"
+COPY ./node_modules ./node_modules
+
+# Prepare startup script
+COPY ./docker-react-entrypoint.sh /docker-entrypoint.d

package/README.md

@@ -21,14 +21,11 @@ CLI & base image to deploy React applications with docker containers.
 
 ## Supported Tooling
 
-- [ ] Create React App
-- [x] Vite
-- [ ] React Static
+- Vite
 
 ## Supported Validation
 
-- [x] Joi
-- [ ] Yup
+- Zod
 
 ## Other TODOs
 
@@ -43,23 +40,23 @@ CLI & base image to deploy React applications with docker containers.
 
 ## Implementation Instructions
 
-1. Install `docker-react` and `joi`
+1. Install `docker-react` and `zod` (zod version should match the peer dependency version exactly)
 
    ```sh
-   npm i -S docker-react joi
+   npm i -S docker-react zod@4.1.12
    ```
 
-2. Create environment variable schema (currently only Joi supported but the future others will be available)
+2. Create environment variable schema (currently only Zod supported but the future others will be available)
 
    ```js
    // env.schema.js
-   const Joi = require('joi');
+   const { z } = require('zod');
 
-   module.exports = Joi.object()
-     .keys({
-       VITE_API_URL: Joi.string().uri().required(),
-     })
-     .required();
+   const envSchema = z.object({
+     VITE_API_URL: z.string().uri().required(),
+   });
+
+   module.exports = envSchema;
    ```
 
 3. Add env import to your `index.html` head (in a future version this will be generated for you)
@@ -93,10 +90,20 @@ CLI & base image to deploy React applications with docker containers.
    ```json
    {
      "dev": "npm run init-local && vite",
-     "init-local": "npx docker-react prep -s ./env.schema.js -e local -d public"
+     "init-local": "npx docker-react prep -s ./env.schema.js -d public"
    }
    ```
 
+   Note if you are using a `.env` file the current recommended way is to use node directly.
+   ```json
+   {
+     "init-local": "node --env-file=.env ./node_modules/.bin/docker-react prep -s ./env.schema.js -d public"
+   }
+   ```
+
+   There is a pending feature request for npx commands to support loading .env files directly, once it's implemented these docs will be updated accordingly.
+   https://github.com/npm/cli/issues/7069
+
 7. Replace all references to environment variables with `window.env`, eg.
    - `process.env` => `window.env` (for create-react-app and others)
    - `import.meta.env` => `window.env` (for vite)

package/dist/options.d.ts

@@ -1,6 +1,4 @@
-export declare type Environment = 'local' | 'docker';
 export interface Options {
-    environment: Environment;
     schema: string;
     destination: string;
 }

package/dist/prep.js

@@ -1,38 +1,25 @@
-import path from 'path';
 import { promises as fs } from 'fs';
-import dotenv from 'dotenv';
+import path from 'path';
 const ENVIRONMENT_DEFINITION_FILE_NAME = 'window.env.js';
 export function addPrepCommand(program) {
     return program
         .command('prep')
         .description('Prepare the application for serving')
-        .option('-e, --environment [string]', 'The environment to run preparation over', 'docker')
         .option('-s, --schema [string]', 'The path to the schema file')
         .option('-d, --destination [string', 'The path to the destination')
         .action((options) => {
-        const { environment, schema = './env.schema.js', destination = './', } = options;
-        generateEnvironmentFile(environment, schema, destination);
+        const { schema = './env.schema.js', destination = './', } = options;
+        generateEnvironmentFile(schema, destination);
     });
 }
 function validateEnvironmentVariables(schema, environmentVariables) {
-    const joiResult = schema.validate(environmentVariables, {
-        allowUnknown: true,
-        abortEarly: false,
-        stripUnknown: true,
-    });
-    if (joiResult.error) {
-        throw new Error(joiResult.error.message);
+    const zodResult = schema.safeParse(environmentVariables);
+    if (zodResult.error) {
+        throw new Error(zodResult.error.message);
     }
-    return joiResult.value;
+    return zodResult.data;
 }
-async function generateEnvironmentFile(environment, schemaPath, destinationPath) {
-    // For local environments attempt to load from `.env` files if available.
-    if (environment === 'local') {
-        const result = dotenv.config();
-        if (result.error) {
-            console.warn('Unable to load values from .env - all environment variables must be set', result.error);
-        }
-    }
+async function generateEnvironmentFile(schemaPath, destinationPath) {
     // Perform environment variable validation.
     const schemaLocation = path.join(process.cwd(), schemaPath);
     console.log(`Attempting to load schema from ${schemaLocation}`);

package/docker-react-entrypoint.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+docker-react prep -d ../share/nginx/html -s ./env.schema.js

package/nginx.conf

@@ -0,0 +1,19 @@
+server {
+    listen       80;
+    server_name  localhost;
+
+    root /usr/share/nginx/html;
+    index index.html;
+
+    location / {
+        # First attempt to serve request as file, then
+        # as directory, then fall back to redirecting to index.html
+        try_files $uri $uri/ $uri.html /index.html;
+    }
+
+    # redirect server error pages to the static page /50x.html
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}

package/package.json

@@ -26,16 +26,15 @@
   "homepage": "https://github.com/danielemery/docker-react#readme",
   "devDependencies": {
     "@danielemeryau/prettier-config": "^0.0.6",
-    "@types/node": "^16.0.0",
-    "typescript": "^4.5.4"
+    "@types/node": "^24.10.1",
+    "typescript": "^5.9.3"
   },
   "dependencies": {
-    "commander": "^8.3.0",
-    "dotenv": "^10.0.0",
-    "joi": "^17.5.0"
+    "commander": "^14.0.2",
+    "zod": "4.1.12"
   },
   "peerDependencies": {
-    "joi": "^17.5.0"
+    "zod": "4.1.12"
   },
-  "version": "0.0.4"
+  "version": "0.1.0-modernization-hotfix.1"
 }