@blakearoberts/visage 0.0.5-rc.16 → 0.0.5-rc.18

package/dist/compose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../src/compose.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,IAAI,CAsD7D"}
+{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../src/compose.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,IAAI,CA6E7D"}

package/dist/index.js

@@ -5,6 +5,7 @@ import { parse, stringify } from 'yaml';
 import { spawnSync, spawn } from 'node:child_process';
 import { hashSync } from 'bcryptjs';
 import { Eta } from 'eta';
+import { isIP } from 'node:net';
 
 const VisageEdgeKeyHeader$1 = 'X-Visage-Edge-Key';
 const DockerImages = parse(readFileSync(new URL('../docker-compose.images.yml', import.meta.url), 'utf8')).services;
@@ -593,6 +594,29 @@ function startCompose(config) {
         [config.secrets.cookieSecret]: randomBytes(32).toString('base64url'),
     };
     const opts = { cwd: config.cache, env };
+    function validate() {
+        const args = [
+            ...compose,
+            'run',
+            '--build',
+            '--quiet-build',
+            '--rm',
+            '--no-deps',
+            'nginx',
+            'nginx',
+            '-t',
+            '-q',
+        ];
+        const result = spawnSync('docker', args, {
+            ...opts,
+            stdio: ['ignore', 'ignore', 'inherit'],
+        });
+        if (result.error)
+            throw result.error;
+        if (result.status !== 0) {
+            throw new Error('Failed to validate NGINX configuration');
+        }
+    }
     function up() {
         const out = openSync(join(dir, 'compose.log'), 'w');
         const args = [
@@ -615,6 +639,7 @@ function startCompose(config) {
         return spawn('docker', args, { ...opts, stdio: ['ignore', out, out] });
     }
     down();
+    validate();
     const result = up();
     if (result.error)
         throw result.error;
@@ -791,6 +816,7 @@ function renderDexConfig(config) {
 
 const template = `
 load_module modules/ngx_http_js_module.so;
+include /etc/nginx/modules/*.conf;
 
 events {}
 
@@ -986,7 +1012,7 @@ function renderNginxConfig(config) {
                 ...upstream,
                 resolve: upstream.host === 'host.docker.internal'
                     ? process.platform !== 'linux'
-                    : upstream.external,
+                    : isIP(upstream.host) === 0,
             },
         ])),
     };

package/dist/render/nginx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nginx.d.ts","sourceRoot":"","sources":["../../src/render/nginx.ts"],"names":[],"mappings":"AAIA,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,WAAW,CAAC;AA4KnE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAQ3D"}
+{"version":3,"file":"nginx.d.ts","sourceRoot":"","sources":["../../src/render/nginx.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,WAAW,CAAC;AA6KnE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAQ3D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blakearoberts/visage",
-  "version": "0.0.5-rc.16",
+  "version": "0.0.5-rc.18",
   "description": "Vite plugin for local development with HMR and OIDC session cookie lifecycle semantics.",
   "type": "module",
   "author": "Blake Roberts",