dxfl 0.3.0 → 0.3.1

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.3.1
+
+- fix `deuxfleurs.toml`: always pass the user-provided value of index_page to garage
+
 # v0.3.0
 
 - improve `list` presentation

package/dist/index.js

@@ -6,7 +6,7 @@ import { deploy } from "./deploy.js";
 import { empty } from "./empty.js";
 import { vhostsList } from "./vhosts.js";
 import { inspect } from "./inspect.js";
-program.name("dxfl").description("Deuxfleurs CLI tool").version("0.3.0");
+program.name("dxfl").description("Deuxfleurs CLI tool").version("0.3.1");
 program
     .command("login")
     .description("Link your Deuxfleurs account with this tool.")

package/dist/website_config.js

@@ -143,8 +143,8 @@ function unescape(s) {
     }
 }
 function interpConfig(rawcfg) {
-    var _a, _b, _c, _d, _e;
-    function interpRedirect(i, r) {
+    var _a, _b, _c, _d, _e, _f;
+    function interpRedirect(r) {
         var _a, _b;
         const rfrom = withErrorMsg(() => unescape(r.from), msg => `from: ${msg}`);
         const rto = withErrorMsg(() => unescape(r.to), msg => `to: ${msg}`);
@@ -264,7 +264,7 @@ function interpConfig(rawcfg) {
         return s !== null && s !== void 0 ? s : def;
     };
     // use index.html as default index page
-    const index_page = withDefault(rawcfg.index_page, "index.html");
+    const index_page = (_a = rawcfg.index_page) !== null && _a !== void 0 ? _a : "index.html";
     // use error.html as default error page
     const error_page = withDefault(rawcfg.error_page, "error.html");
     let cfg = {
@@ -274,9 +274,9 @@ function interpConfig(rawcfg) {
         object_redirects: new Map(),
         cors_rules: [],
     };
-    for (const [i, raw] of ((_a = rawcfg.redirects) !== null && _a !== void 0 ? _a : []).entries()) {
+    for (const [i, raw] of ((_b = rawcfg.redirects) !== null && _b !== void 0 ? _b : []).entries()) {
         // `i+1` is only used for display: start counting redirects from 1 instead of 0
-        const r = withErrorMsg(() => interpRedirect(i + 1, raw), msg => `Redirect ${i + 1}: ${msg}`);
+        const r = withErrorMsg(() => interpRedirect(raw), msg => `Redirect ${i + 1}: ${msg}`);
         if (r.kind == "bucket") {
             cfg.bucket_redirects.push(r.r);
         }
@@ -287,15 +287,15 @@ function interpConfig(rawcfg) {
             cfg.object_redirects.set(r.from, r.to);
         }
     }
-    for (const [_, raw] of ((_b = rawcfg.cors) !== null && _b !== void 0 ? _b : []).entries()) {
+    for (const [_, raw] of ((_c = rawcfg.cors) !== null && _c !== void 0 ? _c : []).entries()) {
         const interpRawArray = (x) => {
             return typeof x === "string" ? [x] : x;
         };
         cfg.cors_rules.push({
             allowed_origins: interpRawArray(raw.allowed_origins),
-            allowed_methods: interpRawArray((_c = raw.allowed_methods) !== null && _c !== void 0 ? _c : ["GET", "HEAD"]),
-            allowed_headers: interpRawArray((_d = raw.allowed_methods) !== null && _d !== void 0 ? _d : []),
-            expose_headers: interpRawArray((_e = raw.expose_headers) !== null && _e !== void 0 ? _e : []),
+            allowed_methods: interpRawArray((_d = raw.allowed_methods) !== null && _d !== void 0 ? _d : ["GET", "HEAD"]),
+            allowed_headers: interpRawArray((_e = raw.allowed_methods) !== null && _e !== void 0 ? _e : []),
+            expose_headers: interpRawArray((_f = raw.expose_headers) !== null && _f !== void 0 ? _f : []),
         });
     }
     return cfg;
@@ -431,10 +431,10 @@ export function putBucketWebsiteConfig(bucket, index_page, error_page, bucket_re
     return __awaiter(this, void 0, void 0, function* () {
         // TODO: printing to show what changes are being applied?
         const WebsiteConfiguration = {};
-        if (error_page) {
+        if (error_page != undefined) {
             WebsiteConfiguration.ErrorDocument = { Key: error_page };
         }
-        if (index_page) {
+        if (index_page != undefined) {
             WebsiteConfiguration.IndexDocument = { Suffix: index_page };
         }
         if (bucket_redirects.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dxfl",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "",
   "license": "EUPL-1.2",
   "author": "Deuxfleurs Team <coucou@deuxfleurs.fr>",