@churchapps/helpers 1.0.48 → 1.0.49
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/DateHelper.d.ts.map +1 -1
- package/dist/DateHelper.js +14 -6
- package/dist/DateHelper.js.map +1 -1
- package/package.json +1 -4
- package/src/DateHelper.ts +15 -6
package/dist/DateHelper.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateHelper.d.ts","sourceRoot":"","sources":["../src/DateHelper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DateHelper.d.ts","sourceRoot":"","sources":["../src/DateHelper.ts"],"names":[],"mappings":"AAeA,qBAAa,UAAU;IAGrB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG;IAIxB,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG;IAK5B,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG;IAI/B,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM;IAMvC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI;IAK5B,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI;IAKhC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI;IAK5B,MAAM,CAAC,aAAa;IAMpB,MAAM,CAAC,aAAa;IAMpB,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAO/C,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IAU1C,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IAO1C,MAAM,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IAO9C,MAAM,CAAC,kBAAkB,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM;IAiB1C,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM;IAIpC,MAAM,CAAC,uBAAuB,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI;IAM7C,OAAO,CAAC,MAAM,CAAC,cAAc;WAcf,WAAW,CAAC,CAAC,EAAE,IAAI;WAOnB,oBAAoB,CAAC,IAAI,EAAE,MAAM;WAKjC,SAAS,CAAC,CAAC,EAAE,IAAI;CAIhC"}
|
package/dist/DateHelper.js
CHANGED
|
@@ -37,16 +37,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.DateHelper = void 0;
|
|
40
|
-
const date_fns_1 = require("date-fns");
|
|
41
40
|
const dayjs_1 = __importDefault(require("dayjs"));
|
|
42
41
|
// Use dynamic import for ES module compatibility with dayjs plugins
|
|
43
|
-
const
|
|
42
|
+
const loadPlugins = async () => {
|
|
44
43
|
const utc = await Promise.resolve().then(() => __importStar(require("dayjs/plugin/utc")));
|
|
44
|
+
const customParseFormat = await Promise.resolve().then(() => __importStar(require("dayjs/plugin/customParseFormat")));
|
|
45
45
|
dayjs_1.default.extend(utc.default || utc);
|
|
46
|
+
dayjs_1.default.extend(customParseFormat.default || customParseFormat);
|
|
46
47
|
};
|
|
47
|
-
// Initialize the
|
|
48
|
-
|
|
49
|
-
console.warn("Could not load dayjs
|
|
48
|
+
// Initialize the plugins
|
|
49
|
+
loadPlugins().catch(() => {
|
|
50
|
+
console.warn("Could not load dayjs plugins");
|
|
50
51
|
});
|
|
51
52
|
class DateHelper {
|
|
52
53
|
//Fixes timezone issues when you just need the date.
|
|
@@ -149,7 +150,14 @@ class DateHelper {
|
|
|
149
150
|
}
|
|
150
151
|
static formatDateTime(date, format) {
|
|
151
152
|
try {
|
|
152
|
-
|
|
153
|
+
// Convert date-fns format to dayjs format
|
|
154
|
+
const dayjsFormat = format
|
|
155
|
+
.replace(/yyyy/g, 'YYYY')
|
|
156
|
+
.replace(/yy/g, 'YY')
|
|
157
|
+
.replace(/d/g, 'D')
|
|
158
|
+
.replace(/DD/g, 'DD')
|
|
159
|
+
.replace(/a/g, 'A');
|
|
160
|
+
return (0, dayjs_1.default)(date).format(dayjsFormat);
|
|
153
161
|
}
|
|
154
162
|
catch {
|
|
155
163
|
return "";
|
package/dist/DateHelper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateHelper.js","sourceRoot":"","sources":["../src/DateHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"DateHelper.js","sourceRoot":"","sources":["../src/DateHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@churchapps/helpers",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.49",
|
|
4
4
|
"description": "Library of helper functions not specific to any one ChurchApps project or framework.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.js",
|
|
@@ -48,10 +48,7 @@
|
|
|
48
48
|
"typescript": "^5.9.2"
|
|
49
49
|
},
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"date-fns": "^4.1.0",
|
|
52
51
|
"dayjs": "^1.11.13",
|
|
53
|
-
"fs-extra": "^11.3.1",
|
|
54
|
-
"react-ga4": "^2.1.0",
|
|
55
52
|
"rrule": "^2.8.1"
|
|
56
53
|
}
|
|
57
54
|
}
|
package/src/DateHelper.ts
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
|
-
import { format as dateFormat } from "date-fns"
|
|
2
1
|
import dayjs from "dayjs"
|
|
3
2
|
|
|
4
3
|
// Use dynamic import for ES module compatibility with dayjs plugins
|
|
5
|
-
const
|
|
4
|
+
const loadPlugins = async () => {
|
|
6
5
|
const utc = await import("dayjs/plugin/utc");
|
|
6
|
+
const customParseFormat = await import("dayjs/plugin/customParseFormat");
|
|
7
7
|
dayjs.extend((utc as any).default || utc);
|
|
8
|
+
dayjs.extend((customParseFormat as any).default || customParseFormat);
|
|
8
9
|
};
|
|
9
10
|
|
|
10
|
-
// Initialize the
|
|
11
|
-
|
|
12
|
-
console.warn("Could not load dayjs
|
|
11
|
+
// Initialize the plugins
|
|
12
|
+
loadPlugins().catch(() => {
|
|
13
|
+
console.warn("Could not load dayjs plugins");
|
|
13
14
|
});
|
|
14
15
|
|
|
15
16
|
export class DateHelper {
|
|
@@ -121,7 +122,15 @@ export class DateHelper {
|
|
|
121
122
|
|
|
122
123
|
private static formatDateTime(date: Date, format: string) {
|
|
123
124
|
try {
|
|
124
|
-
|
|
125
|
+
// Convert date-fns format to dayjs format
|
|
126
|
+
const dayjsFormat = format
|
|
127
|
+
.replace(/yyyy/g, 'YYYY')
|
|
128
|
+
.replace(/yy/g, 'YY')
|
|
129
|
+
.replace(/d/g, 'D')
|
|
130
|
+
.replace(/DD/g, 'DD')
|
|
131
|
+
.replace(/a/g, 'A');
|
|
132
|
+
|
|
133
|
+
return dayjs(date).format(dayjsFormat);
|
|
125
134
|
} catch { return ""; }
|
|
126
135
|
}
|
|
127
136
|
|