update with Sayan changes from #1920

package.json

@@ -70,11 +70,12 @@
     "serve-static": "^1.15.0",
     "socket.io": "^4.5.4",
     "tslib": "^2.4.1",
-    "typescript": "5.4.2",
-    "vite": "^4.3.9",
-    "vite-plugin-sass-glob-import": "^2.0.0"
+    "typescript": "5.4.5",
+    "vite": "5.2.11",
+    "vite-plugin-sass-glob-import": "3.0.2"
   },
   "overrides": {
+    "esbuild": "^0.21.3",
     "chokidar": "^3.5.3",
     "glob-stream": "^7.0.0",
     "glob-parent": "^6.0.2",

src/pages/resume/resume.ts

@@ -1,4 +1,4 @@
-import { customElement, IContainer } from "aurelia";
+import { customElement, IContainer, resolve } from "aurelia";
 import { IRouteViewModel, NavigationInstruction, Params, RouteNode } from "@aurelia/router-lite";
 
 import { IBasics, IResumeStore } from "../../stores/resume-store";
@@ -17,17 +17,18 @@ export class ResumeDependencies {
 
 @customElement({ name: "resume", template })
 export class Resume implements IRouteViewModel {
+  readonly resumeStore = resolve(IResumeStore);
   /**
    * given the name or alias of a skill, return the skill json
    */
-  basics!: IBasics;
+  readonly basics: IBasics = this.resumeStore.basics;
   /**
    * used by CSS
    */
   isShort = false;
   expanded = false;
 
-  constructor(@IResumeStore private readonly resumeStore: IResumeStore) {
+  constructor() {
     this.basics = this.resumeStore.basics;
   }
 

src/pages/resume/sections/accomplishments/accomplishments.ts

@@ -1,12 +1,10 @@
-import { customElement } from "aurelia";
+import { customElement, resolve } from "aurelia";
 
 import { IAccomplishment, IResumeStore } from "../../../../stores/resume-store";
 
 import template from "./accomplishments.html";
 @customElement({ name: "accomplishments", template })
 export class Accomplishments {
-  accomplishments!: Array<IAccomplishment>;
-  constructor(@IResumeStore private readonly resumeStore: IResumeStore) {
-    this.accomplishments = this.resumeStore.accomplishments;
-  }
+  readonly resumeStore = resolve(IResumeStore);
+  readonly accomplishments: Array<IAccomplishment> = this.resumeStore.accomplishments; 
 }

src/pages/resume/sections/citizenship/citizenship.ts

@@ -1,13 +1,11 @@
-import { customElement } from "aurelia";
+import { customElement, resolve } from "aurelia";
 
 import { ICitizenship, IResumeStore } from "../../../../stores/resume-store";
 
 import template from "./citizenship.html";
 
 @customElement({ name: "citizenship", template })
 export class Citizenship {
-  citizenship!: Array<ICitizenship>;
-  constructor(@IResumeStore private readonly resumeStore: IResumeStore) {
-    this.citizenship = this.resumeStore.citizenship;
-  }
+  readonly resumeStore = resolve(IResumeStore);
+  readonly citizenship: Array<ICitizenship> = this.resumeStore.citizenship;
 }

src/pages/resume/sections/contact/contact.ts

@@ -1,4 +1,4 @@
-import { bindable, customElement } from "aurelia";
+import { bindable, customElement, resolve } from "aurelia";
 
 import { IBasics, IProfile, IResumeStore } from "../../../../stores/resume-store";
 
@@ -7,10 +7,7 @@ import template from "./contact.html";
 @customElement({ name: "contact", template })
 export class Contact {
   @bindable inline = false;
-  basics!: IBasics;
-  profiles!: Array<IProfile>;
-  constructor(@IResumeStore private readonly resumeStore: IResumeStore) {
-    this.basics = this.resumeStore.basics;
-    this.profiles = this.resumeStore.profiles;
-  }
+  readonly resumeStore = resolve(IResumeStore);
+  readonly basics: IBasics = this.resumeStore.basics;
+  readonly profiles: Array<IProfile> = this.resumeStore.profiles;
 }

src/pages/resume/sections/education/education.ts

@@ -1,4 +1,4 @@
-import { bindable, customElement } from "aurelia";
+import { bindable, customElement, resolve } from "aurelia";
 
 import { evaluateDateTime } from "../../../../services/utils";
 import { IResumeStore, ISchool } from "../../../../stores/resume-store";
@@ -7,10 +7,8 @@ import template from "./education.html";
 
 @customElement({ name: "education", template })
 export class Education {
-  schools!: Array<ISchool>;
-  constructor(@IResumeStore private readonly resumeStore: IResumeStore) {
-    this.schools = this.resumeStore.schools.sort((a, b) => {
-      return evaluateDateTime(a.startDate, b.startDate, -1);
-    });
-  }
+  readonly resumeStore = resolve(IResumeStore);
+  readonly schools: Array<ISchool> = this.resumeStore.schools.sort((a, b) => {
+    return evaluateDateTime(a.startDate, b.startDate, -1);
+  });
 }

src/pages/resume/sections/history/history.ts

@@ -1,29 +1,27 @@
-import { bindable, customElement } from "aurelia";
+import { bindable, customElement, resolve } from "aurelia";
 
 import { ICompany, IResumeStore, ISkill } from "../../../../stores/resume-store";
 
 import template from "./history.html";
 
 @customElement({ name: "history", template })
 export class History {
-  companies!: Array<ICompany>;
+  @bindable expanded = false;
   showingEntireHistory = false;
   entireHistoryStartIndex = 3;
-  skillByName!: Map<string, ISkill>; 
-  @bindable expanded = false;
-
-  constructor(@IResumeStore private readonly resumeStore: IResumeStore) {
-    this.companies = this.resumeStore.companies
+  readonly skillByName: Map<string, ISkill>= new Map<string, ISkill>(); 
+  readonly resumeStore = resolve(IResumeStore);
+  readonly companies: Array<ICompany> = this.resumeStore.companies
     // .sort((a, b) => {
-      //   return evaluateDateTime(a.endDate, b.endDate, -1);
-      // })
-      .map((s, _index) => {
-        s.showingHighlights = false;
-        return s;
-      });
-      
-    this.skillByName = new Map<string, ISkill>();
-     /**
+    //   return evaluateDateTime(a.endDate, b.endDate, -1);
+    // })
+    .map((s, _index) => {
+      s.showingHighlights = false;
+      return s;
+    });
+
+    constructor() {
+      /**
       * Key the skill element by its lowercase name and all its aliases.
       * If there is a circular reference here between
       * name and the alias, then what ever is the last one encountered

src/pages/resume/sections/index.ts

@@ -1,11 +1,12 @@
+export * from "./accomplishments/accomplishments";
 export * from "./contact/contact";
+export * from "./education/education";
+export * from "./history/history";
 export * from "./introduction/introduction";
+export * from "./languages/languages";
+export * from "./publications/publications";
 export * from "./reasons/reasons";
 export * from "./testimonials/testimonials";
-export * from "./accomplishments/accomplishments";
 export * from "./skills/skills";
-export * from "./history/history";
-export * from "./education/education";
-export * from "./publications/publications";
 export * from "./toc/toc";
 export * from "./travel/travel";

src/pages/resume/sections/introduction/introduction.ts

@@ -1,12 +1,11 @@
-import { bindable, customElement } from "aurelia";
+import { customElement, resolve } from "aurelia";
 
 import { IBasics, IResumeStore } from "../../../../stores/resume-store";
 
 import template from "./introduction.html";
+
 @customElement({ name: "introduction", template })
 export class Introduction {
-  basics!: IBasics;
-  constructor(@IResumeStore private readonly resumeStore: IResumeStore) {
-    this.basics = this.resumeStore.basics;
-  }
+  readonly resumeStore = resolve(IResumeStore);
+  readonly basics:IBasics = this.resumeStore.basics;
 }

src/pages/resume/sections/languages/languages.ts

@@ -1,13 +1,11 @@
-import { customElement } from "aurelia";
+import { customElement, resolve } from "aurelia";
 
 import { ILanguage, IResumeStore } from "../../../../stores/resume-store";
 
 import template from "./languages.html";
 
 @customElement({ name: "languages", template })
 export class Languages {
-  languages!: Array<ILanguage>;
-  constructor(@IResumeStore private readonly resumeStore: IResumeStore) {
-    this.languages = this.resumeStore.languages;
-  }
+  readonly resumeStore = resolve(IResumeStore);
+  readonly languages:Array<ILanguage> = this.resumeStore.languages;
 }

src/pages/resume/sections/publications/publications.ts

@@ -1,18 +1,15 @@
-import { bindable, customElement } from "aurelia";
+import { bindable, customElement, resolve } from "aurelia";
 
 import { IPublication, IResumeStore } from "../../../../stores/resume-store";
 
 import template from "./publications.html";
 
 @customElement({ name: "publications", template })
 export class Publications {
-  publications!: Array<IPublication>;
   showingPublications = false;
   @bindable expanded = false;
-
-  constructor(@IResumeStore private readonly resumeStore: IResumeStore) {
-    this.publications = this.resumeStore.publications;
-  }
+  readonly resumeStore = resolve(IResumeStore);
+  readonly publications: Array<IPublication> = this.resumeStore.publications;
 
   binding() {
     this.showingPublications = this.expanded;

src/pages/resume/sections/reasons/reasons.ts

@@ -1,13 +1,11 @@
-import { customElement } from "aurelia";
+import { customElement, resolve } from "aurelia";
 
 import { IQuality, IResumeStore } from "../../../../stores/resume-store";
 
 import template from "./reasons.html";
 
 @customElement({ name: "reasons", template })
 export class Reasons {
-  qualities!: Array<IQuality>;
-  constructor(@IResumeStore private readonly resumeStore: IResumeStore) {
-    this.qualities = this.resumeStore.qualities;
-  }
+  readonly resumeStore = resolve(IResumeStore);
+  readonly qualities: Array<IQuality> = this.resumeStore.qualities;
 }

src/pages/resume/sections/skills/skills.ts

@@ -1,4 +1,4 @@
-import { bindable, customElement } from "aurelia";
+import { bindable, customElement, resolve } from "aurelia";
 
 import { ICategory, IResumeStore, ISkill } from "../../../../stores/resume-store";
 
@@ -10,13 +10,10 @@ export class Skills {
    * Map a category of skills to a set of skill names.
    */
   categoryToSkills = new Map<string, Set<ISkill>>();
-  skillCategories!: Array<ICategory>;
   @bindable expanded = false;
   showSkillCategories = false;
-
-  constructor(@IResumeStore private readonly resumeStore: IResumeStore) {
-    this.skillCategories = this.resumeStore.skillCategories;
-  }
+  readonly resumeStore = resolve(IResumeStore);
+  readonly skillCategories: Array<ICategory> = this.resumeStore.skillCategories;
 
   binding() {
     this.showSkillCategories = this.expanded;

src/pages/resume/sections/testimonials/testimonials.ts

@@ -1,14 +1,12 @@
-import { bindable, customElement } from "aurelia";
+import { bindable, customElement, resolve } from "aurelia";
 
 import { IResumeStore, ITestimonial } from "../../../../stores/resume-store";
 
 import template from "./testimonials.html";
 
 @customElement({ name: "testimonials", template })
 export class Testimonials {
-  testimonials!: Array<ITestimonial>;
   @bindable justOne = false;
-  constructor(@IResumeStore private readonly resumeStore: IResumeStore) {
-    this.testimonials = this.resumeStore.testimonials;
-  }
+  readonly resumeStore = resolve(IResumeStore);
+  readonly testimonials:  Array<ITestimonial> = this.resumeStore.testimonials;
 }

src/pages/resume/sections/travel/travel.ts

@@ -1,17 +1,13 @@
-import { bindable, customElement } from "aurelia";
+import { bindable, customElement, resolve } from "aurelia";
 
 import { IBasics, ICitizenship, ILanguage, IResumeStore } from "../../../../stores/resume-store";
 
 import template from "./travel.html";
 
 @customElement({ name: "travel", template })
 export class Travel {
-  citizenship!: Array<ICitizenship>;
-  basics!: IBasics;
-  languages!: Array<ILanguage>;
-  constructor(@IResumeStore private readonly resumeStore: IResumeStore) {
-    this.citizenship = this.resumeStore.citizenship;
-    this.languages = this.resumeStore.languages;
-    this.basics = this.resumeStore.basics;
-  }
+  readonly resumeStore = resolve(IResumeStore);
+  readonly languages: Array<ILanguage> = this.resumeStore.languages;
+  readonly basics: IBasics = this.resumeStore.basics;
+  readonly citizenship: Array<ICitizenship> = this.resumeStore.citizenship;
 }

tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "noEmit": true,
     "strict": true,
-    "module": "esnext",
+    "module": "es2022",
     "moduleResolution": "node",
     "skipLibCheck": true,
     "target": "es2022",