tungsten 0.3.7 → 0.3.9

package/dist/.build-complete

@@ -1 +1 @@
-1786060222778
+1786138356533

package/dist/Servers/StaticSiteServer.d.ts

@@ -3,7 +3,6 @@ import express from 'express';
 import { FrameworkConfigComplete } from 'tungsten/FrameworkConfig.js';
 export declare class StaticSiteServer {
     config: FrameworkConfigComplete;
-    port: number;
     location?: string;
     app: express.Application;
     server?: Server;

package/dist/Servers/StaticSiteServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StaticSiteServer.d.ts","sourceRoot":"","sources":["../../src/Servers/StaticSiteServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AAErE,qBAAa,gBAAgB;IACzB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;gBAEd,MAAM,EAAE,uBAAuB;IAa3C,KAAK,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAQ3B;IACD,IAAI,aAEH;CACJ"}
+{"version":3,"file":"StaticSiteServer.d.ts","sourceRoot":"","sources":["../../src/Servers/StaticSiteServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AAGrE,qBAAa,gBAAgB;IACzB,MAAM,EAAE,uBAAuB,CAAA;IAE/B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,kBAAkB,EAAE,MAAM,CAAA;gBAEd,MAAM,EAAE,uBAAuB;IAa3C,KAAK,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAW3B;IACD,IAAI,aAEH;CACJ"}

package/dist/Servers/StaticSiteServer.js

@@ -9,16 +9,18 @@ export class StaticSiteServer {
   // to do
   constructor(config) {
     _defineProperty(this, "config", void 0);
-    _defineProperty(this, "port", void 0);
+    //port: number
     _defineProperty(this, "location", void 0);
     _defineProperty(this, "app", void 0);
     _defineProperty(this, "server", void 0);
     _defineProperty(this, "staticSiteLocation", void 0);
     _defineProperty(this, "start", () => {
-      const location = this.location = `http://localhost:${this.port}${this.config.siteBasePath}`;
       return new Promise(resolve => {
-        this.server = this.app.listen(this.port, () => {
-          cliNews(`Static preview ready at ${this.location}`);
+        const staticSiteServer = this; // eslint-disable-line @typescript-eslint/no-this-alias
+        this.server = this.app.listen(0, function () {
+          const port = this.address().port; // eslint-disable-line no-type-assertion/no-type-assertion
+          const location = staticSiteServer.location = `http://localhost:${port}${staticSiteServer.config.siteBasePath}`;
+          cliNews(`Static preview ready at ${location}`);
           resolve(location);
         });
       });
@@ -27,7 +29,7 @@ export class StaticSiteServer {
       if (this.server !== undefined) this.server.close();
     });
     this.config = config;
-    this.port = 3001;
+    //this.port = 3001
     this.app = express();
     this.staticSiteLocation = join(process.cwd(), staticSiteFolder);
     this.app.use(this.config.siteBasePath, express.static(this.staticSiteLocation));

package/dist/staticGen/staticGen.js

@@ -65,7 +65,9 @@ export async function staticGen(framework) {
     const finalRoutes = objectFilter(appRoutes, (path, route) => {
       if (!path.startsWith('/')) {
         //cliWarn(`Static gen skipping route ${route.path}, because it does not start with /, and is not default or 404`)
-        cliWarn(`Static gen skipping route ${path}, because it does not start with /`);
+        if (!['error', '404', 'default'].includes(path)) {
+          cliWarn(`Static gen skipping route ${path}, because it does not start with /`);
+        }
         return false;
       }
       if (path.includes(':')) {
@@ -96,6 +98,7 @@ export async function staticGen(framework) {
         links = findLinks(result);
         const newPaths = [];
         for (const link of links) {
+          if (link.startsWith('http://') || link.startsWith('https://')) continue; // ignore external links
           if (link.startsWith('#')) continue; // ignore anchors/hash links
           if (!StringIsPath(link)) {
             throwError('renderRoute', `Found a link '${link}' that did not start with /`);
@@ -104,9 +107,6 @@ export async function staticGen(framework) {
             for (const [path, dynamicRoute] of dynamicRoutes) {
               if (RouteKeyIsPath(path)) {
                 if (matchPath(path, link)) {
-                  //console.log('link', link)
-                  //console.log('in?', link in rewriteMap)
-                  //console.log(`link ${link} matched dynamic route ${dynamicRoute.path}`)
                   newPaths.push(link);
                   rewriteMap[link] = pathToLink(link, siteBasePath);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tungsten",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "description": "",
   "type": "module",
   "bin": {