From 667bec22632e004d4b5f2dcbe6432e5443296513 Mon Sep 17 00:00:00 2001 From: "Florine W. Dekker" Date: Tue, 29 Mar 2022 16:20:38 +0200 Subject: [PATCH] Work around issue moment/luxon#1167 --- Gruntfile.js | 2 +- package-lock.json | Bin 215122 -> 215122 bytes package.json | 6 +++--- src/main/js/Main.ts | 15 +++++++++------ 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 166e196..80f3b0b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -50,7 +50,7 @@ module.exports = grunt => { files: ["src/main/**/*.html"], tasks: ["copy:html"], }, - js: { + ts: { files: ["src/main/**/*.ts"], tasks: ["webpack:dev", "replace:dev"], }, diff --git a/package-lock.json b/package-lock.json index 04c3887c887fde0f6bba8369135f3c4b61ec853a..17f52cb65b0dd957b2122e5f6c215e86e1ca6137 100644 GIT binary patch delta 542 zcmcaKf%nn`-U)h)h76%;ZO>HA5@?JQGV?5=}D`^V7oetAh1Q z1HD{xjJ<-weZ0Nhy}UEbA`>&q4BUO(gG)0C+`LlF1B`={JfbZ0E3+Iuf&$CEgYq5C zBBKg((y}7LbHl3g!-9RMC&n`BOjbyf+`ef(<0=Dsd2{;1M~uePKb&J^o4%fvk$rOw uk0Rsr`8OE(C)+8oZQjo-&)9z8GUN6Gmzh|C=@ANrEKEk*PpC6@DF6T|gS({w delta 539 zcmcaKf%nn`-U)is<*qYvOf>5N(Snl;q?IOqOrM@9$1FN|0we3@BF3qV)0K^xMW-ih zWn|y1%xuds{q#L1fyo8jj?>HB88t(5!y{6Ha?-U;Q^LzCLbXd1GqaqGf+9`*io8mE zT_b|bvb0^y!p+Pw0!mY>g2N(;0t*An!V~qq{5VFbkR>sN;XPN4)sk7)y{Euv9yS=Ff8^C&@OOG zv`jN_iOO{@cd~TPOLClEc$ZOUvO=2V_D%B{R~gX5kJBGMVlkkR%N>dajV0QJ|m)&Kwi diff --git a/package.json b/package.json index e8d8ce0..28392d8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "doomsday", - "version": "1.4.0", + "version": "1.4.1", "description": "Test your mastery of Conway's Doomsday rule.", "author": "Florine W. Dekker", "browser": "dist/bundle.js", @@ -19,7 +19,7 @@ "luxon": "^2.3.1" }, "devDependencies": { - "@types/luxon": "^2.3.0", + "@types/luxon": "^2.3.1", "grunt": "^1.4.1", "grunt-cli": "^1.4.3", "grunt-contrib-clean": "^2.0.0", @@ -29,7 +29,7 @@ "grunt-text-replace": "^0.4.0", "grunt-webpack": "^5.0.0", "ts-loader": "^9.2.8", - "typescript": "^4.6.2", + "typescript": "^4.6.3", "webpack": "^5.70.0", "webpack-cli": "^4.9.2" } diff --git a/src/main/js/Main.ts b/src/main/js/Main.ts index 0413f1d..dbad7a6 100644 --- a/src/main/js/Main.ts +++ b/src/main/js/Main.ts @@ -24,15 +24,15 @@ class ValidatableInput { /** * The input that is validatable. */ - readonly input: HTMLInputElement + readonly input: HTMLInputElement; /** * The label of which to update the text. */ - readonly titleLabel: HTMLElement + readonly titleLabel: HTMLElement; /** * The submission button that activates validation. */ - readonly button: HTMLButtonElement + readonly button: HTMLButtonElement; /** @@ -285,7 +285,8 @@ class DoomsdayDate { * @return the day of the week of the anchor of this `DoomsdayDate`'s century */ getCenturyAnchorString(): string { - return this.date.set({year: this.getCentury() * 100, month: 4, day: 4}).setLocale("en-US").weekdayLong; + // TODO: Support BCE years + return this.date.set({year: (this.getCentury() + 4) * 100, month: 4, day: 4}).setLocale("en-US").weekdayLong; }; /** @@ -294,7 +295,8 @@ class DoomsdayDate { * @return the day of the week of the anchor day of this `DoomsdayDate`'s year */ getYearAnchorString(): string { - return this.date.set({day: 4, month: 4}).setLocale("en-US").weekdayLong; + // TODO: Support BCE years + return this.date.set({year: this.date.year + 400, day: 4, month: 4}).setLocale("en-US").weekdayLong; }; /** @@ -303,7 +305,8 @@ class DoomsdayDate { * @return the day of the week of this `DoomsdayDate` */ getWeekdayString(): string { - return this.date.setLocale("en-US").weekdayLong; + // TODO: Support BCE years + return this.date.set({year: this.date.year + 400}).setLocale("en-US").weekdayLong; };