gemstack 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b4da4865f171f049ffb5861de51b0f9e376e8e684dac8c897c760194b1269ad
-  data.tar.gz: 678190d65346a0542c88f0e977227c477666d98c92bf252eb5d03cae23116796
+  metadata.gz: '08b7f22bd22a410de8638e6249f629fc05d73c55c451ee15aaf5060aaceed7e9'
+  data.tar.gz: c4729f7d3833d7645abf7f1ca70f7e281b9a4ec8406d0482baedf0f039668162
 SHA512:
-  metadata.gz: 6d16bf203a45f8b40a37dd13cac7d31c983b5f71ea84c6ae90d5dc566f306b650b6ab3410edcfe1c21248f0accf3af9870db4f57567727a0395678beb65d6897
-  data.tar.gz: 392c2b983fb86297436e835136c92fc37c19fe6649bb55b3ea5c7f9d0e058849e397634ebcd612806d264f27edaced07ed55689c4b1504e28d0abcfe5ed8c531
+  metadata.gz: 8892c3a10498fda83a04ab4323c86f29898eb250f9a4cae8f3c90aa2b32c83ae60f0c79e87459c28f6eaa7bdc99812d0acb675062a79de981ec942ec450052f1
+  data.tar.gz: b3d2dc8f1d33abb5eca014e4679e5aa8a6a37772c1fb30d5720fcc638923787902a5324aeaaa2652476e1ce0e9815693f22f149d3a8e8b33e28a4bd288868ed6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.1
+
+See the [GemStack changelog](https://github.com/gemstack-rb/gemstack/blob/main/CHANGELOG.md).
+
 ## 0.4.0
 
 See the [GemStack changelog](https://github.com/gemstack-rb/gemstack/blob/main/CHANGELOG.md).

data/lib/gemstack/application.rb

@@ -7,7 +7,7 @@ module GemStack
   # as a Rack app. There is one per process, available as GemStack.application.
   #
   # Boot sequence (idempotent):
-  #   1. load .env files (development/test)          config.env_files
+  #   1. load .env files                             config.env_files
   #   2. load config/environments/<env>.rb if present
   #   3. run plugin hooks                             GemStack::Plugins
   #   4. set up Zeitwerk for every directory in app/  (+ config.autoload_paths)

data/lib/gemstack/cli/deploy_generator.rb

@@ -13,7 +13,7 @@ module GemStack
       end
 
       KAMAL_GEM = %(gem "kamal", require: false, group: :development # bundle exec kamal deploy (config/deploy.yml)\n)
-      # The image runs Next.js's standalone server (node frontend/server.js); the
+      # The image runs Next.js's standalone server (node -r … frontend/server.js); the
       # Dockerfile asks for that build with GEMSTACK_NEXT_OUTPUT=standalone.
       STANDALONE = %(  output: process.env.GEMSTACK_NEXT_OUTPUT === "standalone" ? "standalone" : undefined,\n)
 

data/lib/gemstack/cli.rb

@@ -241,7 +241,7 @@ module GemStack
       are updated, and for ones you edited you choose: overwrite, skip, see the diff, or FILE.new.
 
         gemstack update                       # the latest release
-        gemstack update 0.4.0                 # a specific version
+        gemstack update 0.4.1                 # a specific version
         gemstack update --templates --dry-run # only the template step, preview
         gemstack update --templates --from 0.3.5
     DESC

data/lib/gemstack/core.rb

@@ -20,10 +20,13 @@ module GemStack
     setting :name, default: -> { File.basename(root) }
     setting :root, default: -> { Dir.pwd }
 
-    # .env files loaded at boot, earlier files win. Real ENV always wins.
+    # .env files loaded at boot from the app root, in every environment (one
+    # .env for the API and the frontend: next.config.ts reads the same files).
+    # Earlier files win; real ENV always wins. Missing files are skipped, so
+    # production containers configured through ENV are unaffected.
     setting :env_files, default: lambda {
       env = GemStack.env
-      env.local? ? [".env.#{env}.local", ".env.local", ".env.#{env}", ".env"] : []
+      [".env.#{env}.local", ".env.local", ".env.#{env}", ".env"]
     }
 
     # Root secret for signatures (storage URLs, derived keys). Production must
@@ -70,7 +73,7 @@ module GemStack
     end
 
     # First call in config/app.rb: sets the application root and loads .env
-    # files (development/test) before anything reads configuration or ENV.
+    # files before anything reads configuration or ENV.
     def setup(root:)
       config.root = root.to_s
       load_env_files!

data/lib/gemstack/version.rb

@@ -2,5 +2,5 @@
 
 module GemStack
   # All GemStack gems are released together under a single version.
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/templates/app/config/app.rb.tt

@@ -9,7 +9,7 @@ require "gemstack/jobs"     # background jobs (app/jobs)
 require "gemstack/mail"     # mailers (app/mailers)
 # require "gemstack/storage" # file uploads — `gemstack add storage` turns this on
 
-# Sets the application root and loads .env files (development/test).
+# Sets the application root and loads the .env files there (the frontend reads them too).
 GemStack.setup(root: File.expand_path("..", __dir__))
 
 # Require the gems listed in the Gemfile for the current environment.

data/templates/deploy/Dockerfile.tt

@@ -3,7 +3,7 @@
 #
 # One image runs every process; config/deploy.yml (Kamal) gives each role its command:
 <% if frontend? -%>
-#   web   node frontend/server.js              Next.js
+#   web   node -r … frontend/server.js         Next.js (standalone server)
 <% end -%>
 #   api   bundle exec puma -C config/puma.rb   Ruby API (bin/docker-entrypoint migrates first)
 <% if jobs? -%>
@@ -13,7 +13,8 @@
 #   docker build -t <%= service %> .
 #
 # Configuration comes from the environment at runtime (SECRET_KEY_BASE,
-# DATABASE_URL, …); nothing secret is baked into the image.
+# DATABASE_URL, …); nothing secret is baked into the image. The frontend's
+# NEXT_PUBLIC_* values, public by design, are compiled in at build time.
 
 ARG RUBY_VERSION=<%= ruby_version %>
 <% if frontend? -%>
@@ -42,7 +43,10 @@ COPY frontend/package.json frontend/package-lock.json ./
 RUN npm ci
 COPY frontend/ ./
 ENV NEXT_TELEMETRY_DISABLED=1 GEMSTACK_NEXT_OUTPUT=standalone
-RUN npm run build \
+# NEXT_PUBLIC_* values are compiled into the JavaScript here. They come from the
+# root .env as a build secret (.kamal/secrets: GEMSTACK_PUBLIC_ENV), mounted where
+# next.config.ts reads the root .env, for this step only: never stored in the image.
+RUN --mount=type=secret,id=GEMSTACK_PUBLIC_ENV,target=/.env,required=false npm run build \
     && mkdir -p public && cp -r public .next/standalone/ && cp -r .next/static .next/standalone/.next/
 <% end -%>
 
@@ -57,6 +61,7 @@ COPY --from=gems --chown=app:app /app /app
 <% if frontend? -%>
 COPY --from=frontend /usr/local/bin/node /usr/local/bin/node
 COPY --from=frontend --chown=app:app /frontend/.next/standalone /app/frontend
+COPY --from=frontend --chown=app:app /frontend/lib/gemstack/root-env.cjs /app/frontend/lib/gemstack/root-env.cjs
 <% end -%>
 ENV GEMSTACK_API_HOST=0.0.0.0 GEMSTACK_API_PORT=4000<% if frontend? %> NODE_ENV=production NEXT_TELEMETRY_DISABLED=1 PORT=3000<% end %>
 USER app

data/templates/deploy/config/deploy.yml.tt

@@ -16,7 +16,7 @@ servers:
   web:
     hosts:
       - 192.168.0.1 # CHANGE: your server's IP or hostname
-    cmd: node frontend/server.js
+    cmd: node -r ./frontend/lib/gemstack/root-env.cjs frontend/server.js
     env:
       clear:
         # Server Components call the API directly, through the alias below.
@@ -111,6 +111,11 @@ volumes:
 
 builder:
   arch: amd64
+<% if frontend? -%>
+  # The root .env's NEXT_PUBLIC_* lines, for `next build` (see .kamal/secrets).
+  secrets:
+    - GEMSTACK_PUBLIC_ENV
+<% end -%>
 <% if postgresql? || mysql? || redis? -%>
 
 accessories:

data/templates/deploy/dot_kamal/secrets.tt

@@ -5,6 +5,11 @@
 # never a secret's value. `gemstack doctor` flags values written in place.
 
 KAMAL_REGISTRY_PASSWORD=$KAMAL_REGISTRY_PASSWORD
+<% if frontend? -%>
+# The frontend's NEXT_PUBLIC_* settings from the root .env (.env.production first),
+# compiled into the JavaScript at build time — public by design, nothing else is read.
+GEMSTACK_PUBLIC_ENV=$(grep -hsE '^(export )?NEXT_PUBLIC_' .env.production .env)
+<% end -%>
 SECRET_KEY_BASE=$SECRET_KEY_BASE
 <% if postgresql? -%>
 POSTGRES_PASSWORD=$POSTGRES_PASSWORD

data/templates/frontend/lib/gemstack/root-env.cjs

@@ -0,0 +1,44 @@
+// One .env for the whole app: the root one, which the Ruby API reads too.
+// Loads it into process.env when required — by next.config.ts (next dev,
+// next build, next start) and, for Next.js's standalone server, which doesn't
+// run next.config.ts, as a preload:
+//
+//   node -r ./lib/gemstack/root-env.cjs .next/standalone/server.js
+//
+// Same files and order as GemStack: .env.<env>.local, .env.local, .env.<env>,
+// .env (earlier files win); the real environment always wins. <env> is
+// GEMSTACK_ENV, else NODE_ENV, else production (a bare `node server.js`).
+const { readFileSync } = require("node:fs");
+const { resolve } = require("node:path");
+
+const ESCAPES = { n: "\n", t: "\t", r: "\r" };
+
+function parseValue(value) {
+  if (value.startsWith('"')) {
+    const body = /^"((?:[^"\\]|\\.)*)"/.exec(value)?.[1] ?? value.slice(1);
+    return body.replace(/\\(.)/g, (_, char) => ESCAPES[char] ?? char);
+  }
+  if (value.startsWith("'")) return /^'([^']*)'/.exec(value)?.[1] ?? value.slice(1);
+  return value.replace(/\s+#.*$/, "");
+}
+
+function loadRootEnv(root = resolve(__dirname, "../../..")) {
+  const env = process.env.GEMSTACK_ENV || process.env.NODE_ENV || "production";
+  for (const file of [`.env.${env}.local`, ".env.local", `.env.${env}`, ".env"]) {
+    let source;
+    try {
+      source = readFileSync(resolve(root, file), "utf8");
+    } catch {
+      continue;
+    }
+    for (const line of source.split(/\r?\n/)) {
+      const match = /^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_.]*)\s*=\s*(.*)$/.exec(line);
+      if (!match || process.env[match[1]] !== undefined) continue;
+      process.env[match[1]] = parseValue(match[2].trim());
+    }
+  }
+}
+
+loadRootEnv();
+
+module.exports = { loadRootEnv };

data/templates/frontend/next.config.ts

@@ -1,5 +1,10 @@
 import type { NextConfig } from "next";
 
+// The root .env (shared with the Ruby API) — here so `next build` and
+// `next start` see it wherever they run: NEXT_PUBLIC_* values are compiled
+// into the JavaScript at build time. See lib/gemstack/root-env.cjs.
+require("./lib/gemstack/root-env.cjs");
+
 // One public origin, in every environment:
 // - `gemstack dev`: the GemStack gateway routes /api/* to Ruby before requests reach Next.js.
 // - Production with Kamal (gemstack generate deploy): kamal-proxy routes /api/* to Ruby.

data/templates/frontend/package.json.tt

@@ -6,6 +6,7 @@
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
+    "start:standalone": "node -r ./lib/gemstack/root-env.cjs .next/standalone/server.js",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemstack
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Adware Technologies
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +346,7 @@ files:
 - templates/frontend/app/page.tsx.tt
 - templates/frontend/app/providers.tsx
 - templates/frontend/lib/gemstack/client.ts
+- templates/frontend/lib/gemstack/root-env.cjs
 - templates/frontend/next-env.d.ts
 - templates/frontend/next.config.ts
 - templates/frontend/package.json.tt