Using import rather than require for date-holidays (#1126)

TTLApp · Jan 15, 2025 · eb7ddbc · eb7ddbc
1 parent 7777f68
commit eb7ddbc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/__tests__/__renderer__/workday-waiver.mjs b/__tests__/__renderer__/workday-waiver.mjs
@@ -4,6 +4,7 @@
 import '../../__mocks__/jquery.mjs';
 
 import assert from 'assert';
+import Holidays from 'date-holidays';
 import Store from 'electron-store';
 import { JSDOM } from 'jsdom';
 import sinon from 'sinon';
@@ -23,10 +24,6 @@ import {
     savePreferences,
 } from '../../js/user-preferences.mjs';
 
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
-
-const Holidays = require('date-holidays');
 
 import { i18nTranslatorMock } from '../../renderer/i18n-translator.js';
 i18nTranslatorMock.mock('translatePage', sinon.stub().returnsThis());

diff --git a/main/workday-waiver-aux.mjs b/main/workday-waiver-aux.mjs
@@ -1,19 +1,13 @@
 'use strict';
 
-// Allow require()
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
-
+import Holidays from 'date-holidays';
 import { ipcMain } from 'electron';
 import Store from 'electron-store';
-const waiverStore = new Store({name: 'waived-workdays'});
 
-// 'date-holidays' must be required and not imported
-const Holidays = require('date-holidays');
 const hd = new Holidays();
+const waiverStore = new Store({name: 'waived-workdays'});
 
 // Waiver Store handlers
-
 function getWaiverStore()
 {
     return waiverStore.store;