@mano8/astro-media-m8 1.0.0 → 1.1.0
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/README.md +2 -0
- package/dist/src/runtime/api/internal.server.d.ts.map +1 -1
- package/dist/src/runtime/api/internal.server.js +4 -1
- package/dist/src/runtime/api/internal.server.js.map +1 -1
- package/dist/src/runtime/compatibility.d.ts.map +1 -1
- package/dist/src/runtime/compatibility.js +11 -10
- package/dist/src/runtime/compatibility.js.map +1 -1
- package/dist/src/runtime/hooks/useDownloadUrl.d.ts.map +1 -1
- package/dist/src/runtime/hooks/useDownloadUrl.js +30 -10
- package/dist/src/runtime/hooks/useDownloadUrl.js.map +1 -1
- package/dist/src/runtime/hooks/useMediaVariants.js +1 -1
- package/dist/src/runtime/hooks/useMediaVariants.js.map +1 -1
- package/dist/src/runtime/react/MediaLibrary.d.ts.map +1 -1
- package/dist/src/runtime/react/MediaLibrary.js +21 -18
- package/dist/src/runtime/react/MediaLibrary.js.map +1 -1
- package/dist/src/runtime/routes.js +1 -1
- package/dist/src/runtime/routes.js.map +1 -1
- package/package.json +19 -7
package/README.md
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
# @mano8/astro-media-m8
|
|
2
2
|
|
|
3
3
|
|
|
4
|
+
[](https://codecov.io/github/mano8/astro-media-m8)
|
|
5
|
+
[](https://app.codacy.com/gh/mano8/astro-media-m8/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
|
|
4
6
|
|
|
5
7
|
Astro integration and headless client for [`media-service-m8`]. The media-side
|
|
6
8
|
analog of `@mano8/astro-auth-m8`: typed Zod schemas, API wrappers for the full
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal.server.d.ts","sourceRoot":"","sources":["../../../../src/runtime/api/internal.server.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,sBAAsB,EAC5B,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"internal.server.d.ts","sourceRoot":"","sources":["../../../../src/runtime/api/internal.server.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,sBAAsB,EAC5B,MAAM,eAAe,CAAC;AA6BvB,MAAM,MAAM,qBAAqB,GAAG;IAClC,sFAAsF;IACtF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mEAAmE;IACnE,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACvF,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACxF,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACpF,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,GAAE,qBAA0B,GAAG,mBAAmB,CAqClG"}
|
|
@@ -12,8 +12,11 @@ function assertServerOnly() {
|
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
function resolveServiceToken(envVar) {
|
|
15
|
+
if (!/^[A-Z][A-Z0-9_]*$/.test(envVar)) {
|
|
16
|
+
throw new Error("serviceTokenEnv must be a valid environment variable name");
|
|
17
|
+
}
|
|
15
18
|
const env = globalThis.process?.env;
|
|
16
|
-
const token = env
|
|
19
|
+
const token = env && Object.hasOwn(env, envVar) ? Reflect.get(env, envVar) : undefined;
|
|
17
20
|
if (!token) {
|
|
18
21
|
throw new Error(`Missing service token: set ${envVar} in the server environment`);
|
|
19
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal.server.js","sourceRoot":"","sources":["../../../../src/runtime/api/internal.server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,EAOpB,MAAM,eAAe,CAAC;AAEvB,MAAM,iBAAiB,GAAG,8BAA8B,CAAC;AAEzD;;;;GAIG;AACH,SAAS,gBAAgB;IACvB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CACb,2EAA2E,CAC5E,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAc;IACzC,MAAM,GAAG,GAAI,UAAyE,CAAC,OAAO,EAAE,GAAG,CAAC;IACpG,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"internal.server.js","sourceRoot":"","sources":["../../../../src/runtime/api/internal.server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,EAOpB,MAAM,eAAe,CAAC;AAEvB,MAAM,iBAAiB,GAAG,8BAA8B,CAAC;AAEzD;;;;GAIG;AACH,SAAS,gBAAgB;IACvB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CACb,2EAA2E,CAC5E,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAc;IACzC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;IAC/E,CAAC;IACD,MAAM,GAAG,GAAI,UAAyE,CAAC,OAAO,EAAE,GAAG,CAAC;IACpG,MAAM,KAAK,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACvF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,4BAA4B,CAAC,CAAC;IACpF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAeD;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,UAAiC,EAAE;IAC3E,gBAAgB,EAAE,CAAC;IACnB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,mBAAmB,CAAC,OAAO,CAAC,eAAe,IAAI,iBAAiB,CAAC,CAAC;IACjG,MAAM,OAAO,GAAG,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE,CAAC;IAErD,OAAO;QACL,eAAe,CAAC,QAAQ,EAAE,IAAI;YAC5B,OAAO,OAAO,CAAC;gBACb,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,qBAAqB,kBAAkB,CAAC,QAAQ,CAAC,cAAc;gBACrE,IAAI,EAAE,uBAAuB,CAAC,KAAK,CAAC,IAAI,CAAC;gBACzC,MAAM,EAAE,uBAAuB;gBAC/B,OAAO;gBACP,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;QACL,CAAC;QACD,eAAe,CAAC,QAAQ,EAAE,IAAI;YAC5B,OAAO,OAAO,CAAC;gBACb,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,qBAAqB,kBAAkB,CAAC,QAAQ,CAAC,WAAW;gBAClE,IAAI;gBACJ,MAAM,EAAE,mBAAmB;gBAC3B,OAAO;gBACP,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;QACL,CAAC;QACD,gBAAgB,CAAC,KAAK,EAAE,IAAI;YAC1B,OAAO,OAAO,CAAC;gBACb,MAAM,EAAE,OAAO;gBACf,IAAI,EAAE,0BAA0B,kBAAkB,CAAC,KAAK,CAAC,EAAE;gBAC3D,IAAI;gBACJ,MAAM,EAAE,sBAAsB;gBAC9B,OAAO;gBACP,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compatibility.d.ts","sourceRoot":"","sources":["../../../src/runtime/compatibility.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,4BAA4B,qBAAqB,CAAC;AAC/D,eAAO,MAAM,iCAAiC,QAAQ,CAAC;AACvD,eAAO,MAAM,yBAAyB,wBAAkF,CAAC;AACzH,eAAO,MAAM,uCAAuC,UAAU,CAAC;AAC/D,eAAO,MAAM,oCAAoC,UAAU,CAAC;AAC5D,eAAO,MAAM,8CAA8C,UAAU,CAAC;AACtE,eAAO,MAAM,sCAAsC,mBAAiG,CAAC;AAErJ,MAAM,MAAM,iCAAiC,GAAG,YAAY,GAAG,cAAc,GAAG,SAAS,CAAC;AAE1F,MAAM,MAAM,6BAA6B,GAAG;IAG1C,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAEnC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,iCAAiC,CAAC;IAC1C,gBAAgB,EAAE,OAAO,yBAAyB,CAAC;IACnD,2BAA2B,EAAE,OAAO,sCAAsC,CAAC;IAC3E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;
|
|
1
|
+
{"version":3,"file":"compatibility.d.ts","sourceRoot":"","sources":["../../../src/runtime/compatibility.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,4BAA4B,qBAAqB,CAAC;AAC/D,eAAO,MAAM,iCAAiC,QAAQ,CAAC;AACvD,eAAO,MAAM,yBAAyB,wBAAkF,CAAC;AACzH,eAAO,MAAM,uCAAuC,UAAU,CAAC;AAC/D,eAAO,MAAM,oCAAoC,UAAU,CAAC;AAC5D,eAAO,MAAM,8CAA8C,UAAU,CAAC;AACtE,eAAO,MAAM,sCAAsC,mBAAiG,CAAC;AAErJ,MAAM,MAAM,iCAAiC,GAAG,YAAY,GAAG,cAAc,GAAG,SAAS,CAAC;AAE1F,MAAM,MAAM,6BAA6B,GAAG;IAG1C,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAEnC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,iCAAiC,CAAC;IAC1C,gBAAgB,EAAE,OAAO,yBAAyB,CAAC;IACnD,2BAA2B,EAAE,OAAO,sCAAsC,CAAC;IAC3E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAqCF,wBAAgB,wCAAwC,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAIjF;AAED,wBAAgB,8BAA8B,CAC5C,QAAQ,GAAE,6BAAkC,GAC3C,2BAA2B,CAuD7B;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,6BAA6B,EACvC,YAAY,UAAO,GAClB,2BAA2B,CAM7B"}
|
|
@@ -16,23 +16,24 @@ function contractObjectVersion(value) {
|
|
|
16
16
|
return undefined;
|
|
17
17
|
}
|
|
18
18
|
function parseSemver(version) {
|
|
19
|
-
const
|
|
20
|
-
|
|
19
|
+
const [withoutBuild = ""] = version.split("+", 1);
|
|
20
|
+
const [core = ""] = withoutBuild.split("-", 1);
|
|
21
|
+
const parts = core.split(".");
|
|
22
|
+
if (parts.length !== 3 ||
|
|
23
|
+
parts.some((part) => part.length === 0 || [...part].some((character) => character < "0" || character > "9"))) {
|
|
21
24
|
return undefined;
|
|
22
|
-
|
|
25
|
+
}
|
|
26
|
+
const [major, minor, patch] = parts.map(Number);
|
|
27
|
+
return [major, minor, patch];
|
|
23
28
|
}
|
|
24
29
|
function compareSemver(left, right) {
|
|
25
30
|
const parsedLeft = parseSemver(left);
|
|
26
31
|
const parsedRight = parseSemver(right);
|
|
27
32
|
if (!parsedLeft || !parsedRight)
|
|
28
33
|
return undefined;
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
if (parsedLeft[index] < parsedRight[index])
|
|
33
|
-
return -1;
|
|
34
|
-
}
|
|
35
|
-
return 0;
|
|
34
|
+
const [leftMajor, leftMinor, leftPatch] = parsedLeft;
|
|
35
|
+
const [rightMajor, rightMinor, rightPatch] = parsedRight;
|
|
36
|
+
return leftMajor - rightMajor || leftMinor - rightMinor || leftPatch - rightPatch;
|
|
36
37
|
}
|
|
37
38
|
export function isMediaServiceM8ServiceVersionCompatible(version) {
|
|
38
39
|
const aboveMin = compareSemver(version, MEDIA_SERVICE_M8_MIN_SERVICE_VERSION);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compatibility.js","sourceRoot":"","sources":["../../../src/runtime/compatibility.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,4BAA4B,GAAG,kBAAkB,CAAC;AAC/D,MAAM,CAAC,MAAM,iCAAiC,GAAG,KAAK,CAAC;AACvD,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,4BAA4B,IAAI,iCAAiC,EAAW,CAAC;AACzH,MAAM,CAAC,MAAM,uCAAuC,GAAG,OAAO,CAAC;AAC/D,MAAM,CAAC,MAAM,oCAAoC,GAAG,OAAO,CAAC;AAC5D,MAAM,CAAC,MAAM,8CAA8C,GAAG,OAAO,CAAC;AACtE,MAAM,CAAC,MAAM,sCAAsC,GAAG,KAAK,oCAAoC,KAAK,8CAA8C,EAAE,CAAC;AA6BrJ,SAAS,WAAW,CAAC,KAAc;IACjC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC9E,CAAC;AAED,uEAAuE;AACvE,SAAS,qBAAqB,CAAC,KAAc;IAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,WAAW,CAAE,KAA+B,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,WAAW,CAAC,OAAe;IAClC,MAAM,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"compatibility.js","sourceRoot":"","sources":["../../../src/runtime/compatibility.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDownloadUrl.d.ts","sourceRoot":"","sources":["../../../../src/runtime/hooks/useDownloadUrl.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,0DAA0D;IAC1D,OAAO,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC5C,uDAAuD;IACvD,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;CAC1D,CAAC;
|
|
1
|
+
{"version":3,"file":"useDownloadUrl.d.ts","sourceRoot":"","sources":["../../../../src/runtime/hooks/useDownloadUrl.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,0DAA0D;IAC1D,OAAO,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC5C,uDAAuD;IACvD,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;CAC1D,CAAC;AAUF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,cAAc,CAkDtE"}
|
|
@@ -1,10 +1,17 @@
|
|
|
1
|
-
import { useCallback } from "react";
|
|
1
|
+
import { useCallback, useRef, useState } from "react";
|
|
2
2
|
import { useMutation, useQueryClient } from "@tanstack/react-query";
|
|
3
3
|
import { getDownloadUrl } from "../api/objects.js";
|
|
4
4
|
import { resolveShare } from "../api/shares.js";
|
|
5
5
|
import { mediaKeys } from "../queryKeys.js";
|
|
6
|
+
const INITIAL_DOWNLOAD_STATE = {
|
|
7
|
+
data: null,
|
|
8
|
+
loading: false,
|
|
9
|
+
error: null
|
|
10
|
+
};
|
|
6
11
|
export function useDownloadUrl(objectId) {
|
|
7
12
|
const queryClient = useQueryClient();
|
|
13
|
+
const operationId = useRef(0);
|
|
14
|
+
const [latest, setLatest] = useState(INITIAL_DOWNLOAD_STATE);
|
|
8
15
|
const requestMutation = useMutation({
|
|
9
16
|
mutationKey: objectId ? mediaKeys.downloadUrl(objectId) : ["media", "download-url", ""],
|
|
10
17
|
mutationFn: async () => {
|
|
@@ -20,19 +27,32 @@ export function useDownloadUrl(objectId) {
|
|
|
20
27
|
});
|
|
21
28
|
const { mutateAsync: requestDownloadUrlAsync } = requestMutation;
|
|
22
29
|
const { mutateAsync: resolveShareAsync } = resolveMutation;
|
|
30
|
+
const runLatest = useCallback(async (operation) => {
|
|
31
|
+
const id = operationId.current + 1;
|
|
32
|
+
operationId.current = id;
|
|
33
|
+
setLatest({ data: null, loading: true, error: null });
|
|
34
|
+
try {
|
|
35
|
+
const result = await operation();
|
|
36
|
+
if (operationId.current === id) {
|
|
37
|
+
setLatest({ data: result, loading: false, error: null });
|
|
38
|
+
}
|
|
39
|
+
return result;
|
|
40
|
+
}
|
|
41
|
+
catch (error) {
|
|
42
|
+
if (operationId.current === id) {
|
|
43
|
+
setLatest({ data: null, loading: false, error });
|
|
44
|
+
}
|
|
45
|
+
throw error;
|
|
46
|
+
}
|
|
47
|
+
}, []);
|
|
23
48
|
const request = useCallback(() => {
|
|
24
49
|
if (!objectId)
|
|
25
50
|
throw new Error("No object selected");
|
|
26
|
-
return requestDownloadUrlAsync
|
|
27
|
-
}, [objectId, requestDownloadUrlAsync]);
|
|
28
|
-
const resolve = useCallback((token) => resolveShareAsync(token), [resolveShareAsync]);
|
|
29
|
-
const requestIsLatest = requestMutation.submittedAt >= resolveMutation.submittedAt;
|
|
30
|
-
const latestData = requestIsLatest ? requestMutation.data : resolveMutation.data;
|
|
31
|
-
const latestError = requestIsLatest ? requestMutation.error : resolveMutation.error;
|
|
51
|
+
return runLatest(requestDownloadUrlAsync);
|
|
52
|
+
}, [objectId, requestDownloadUrlAsync, runLatest]);
|
|
53
|
+
const resolve = useCallback((token) => runLatest(() => resolveShareAsync(token)), [resolveShareAsync, runLatest]);
|
|
32
54
|
return {
|
|
33
|
-
|
|
34
|
-
loading: requestMutation.isPending || resolveMutation.isPending,
|
|
35
|
-
error: latestError ?? null,
|
|
55
|
+
...latest,
|
|
36
56
|
request,
|
|
37
57
|
resolve
|
|
38
58
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDownloadUrl.js","sourceRoot":"","sources":["../../../../src/runtime/hooks/useDownloadUrl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"useDownloadUrl.js","sourceRoot":"","sources":["../../../../src/runtime/hooks/useDownloadUrl.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ export function useMediaVariants(objectId) {
|
|
|
23
23
|
setJob(started);
|
|
24
24
|
return waitForVariantJob(objectId, started.id, { onUpdate: setJob });
|
|
25
25
|
},
|
|
26
|
-
onSuccess: async (
|
|
26
|
+
onSuccess: async () => {
|
|
27
27
|
await Promise.all([
|
|
28
28
|
queryClient.invalidateQueries({ queryKey, exact: true }),
|
|
29
29
|
objectId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMediaVariants.js","sourceRoot":"","sources":["../../../../src/runtime/hooks/useMediaVariants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAA0B,MAAM,uBAAuB,CAAC;AACtG,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,YAAY,EACZ,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAkB5C,MAAM,UAAU,gBAAgB,CAAC,QAAuB;IACtD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,QAAQ,CAA0B,IAAI,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,QAAQ,CAA+B;QACnD,QAAQ;QACR,OAAO,EAAE,GAAG,EAAE;YACZ,IAAI,CAAC,QAAQ;gBAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YAC9C,OAAO,YAAY,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC;KAC3B,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,WAAW,CAAsC;QACxE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAC5B,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACrD,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YAC9D,MAAM,CAAC,OAAO,CAAC,CAAC;YAChB,OAAO,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,SAAS,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"useMediaVariants.js","sourceRoot":"","sources":["../../../../src/runtime/hooks/useMediaVariants.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MediaLibrary.d.ts","sourceRoot":"","sources":["../../../../src/runtime/react/MediaLibrary.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAuD,gBAAgB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"MediaLibrary.d.ts","sourceRoot":"","sources":["../../../../src/runtime/react/MediaLibrary.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAuD,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAkM3G,wBAAgB,YAAY,CAAC,EAC3B,UAAU,EACV,OAAY,EACb,EAAE;IACD,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,MAAM,CAAC;IACpC,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B,+BA6IA"}
|
|
@@ -3,21 +3,21 @@ import { useEffect, useState } from "react";
|
|
|
3
3
|
import { deleteObject } from "../api/objects.js";
|
|
4
4
|
import { useDownloadUrl } from "../hooks/useDownloadUrl.js";
|
|
5
5
|
import { useMediaObjects } from "../hooks/useMediaObjects.js";
|
|
6
|
-
const
|
|
7
|
-
pending_upload: "Pending",
|
|
8
|
-
uploaded: "Uploaded",
|
|
9
|
-
processing: "Processing",
|
|
10
|
-
ready: "Ready",
|
|
11
|
-
failed: "Failed",
|
|
12
|
-
deleted: "Deleted",
|
|
13
|
-
rejected: "Rejected"
|
|
14
|
-
|
|
6
|
+
const STATUS_OPTIONS = [
|
|
7
|
+
{ value: "pending_upload", label: "Pending" },
|
|
8
|
+
{ value: "uploaded", label: "Uploaded" },
|
|
9
|
+
{ value: "processing", label: "Processing" },
|
|
10
|
+
{ value: "ready", label: "Ready" },
|
|
11
|
+
{ value: "failed", label: "Failed" },
|
|
12
|
+
{ value: "deleted", label: "Deleted" },
|
|
13
|
+
{ value: "rejected", label: "Rejected" }
|
|
14
|
+
];
|
|
15
15
|
const inputClassName = "fa-media-control h-8 w-full min-w-0 rounded-lg border border-input bg-transparent px-2.5 py-1 text-base transition-colors outline-none file:inline-flex file:h-6 file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-input/50 disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 md:text-sm dark:bg-input/30 dark:disabled:bg-input/80 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40";
|
|
16
|
-
const
|
|
17
|
-
list: "List",
|
|
18
|
-
grid: "Grid",
|
|
19
|
-
masonry: "Masonry"
|
|
20
|
-
|
|
16
|
+
const VIEW_OPTIONS = [
|
|
17
|
+
{ value: "list", label: "List" },
|
|
18
|
+
{ value: "grid", label: "Grid" },
|
|
19
|
+
{ value: "masonry", label: "Masonry" }
|
|
20
|
+
];
|
|
21
21
|
const titleRowClassName = "fa-media-title-row flex w-full flex-wrap items-center justify-between gap-3";
|
|
22
22
|
const filterRowClassName = "fa-media-filter-row flex w-full flex-col gap-3 md:flex-row md:items-center";
|
|
23
23
|
const viewSwitcherClassName = "fa-media-view-switcher inline-flex shrink-0 rounded-lg border border-input bg-transparent p-0.5";
|
|
@@ -74,7 +74,10 @@ function humanizeBytes(bytes) {
|
|
|
74
74
|
value /= 1024;
|
|
75
75
|
unitIndex += 1;
|
|
76
76
|
}
|
|
77
|
-
return `${value.toFixed(value >= 10 ? 0 : 1)} ${units
|
|
77
|
+
return `${value.toFixed(value >= 10 ? 0 : 1)} ${units.at(unitIndex) ?? "TB"}`;
|
|
78
|
+
}
|
|
79
|
+
function statusLabel(status) {
|
|
80
|
+
return STATUS_OPTIONS.find((option) => option.value === status)?.label ?? status;
|
|
78
81
|
}
|
|
79
82
|
function MediaObjectPreview({ object, view, index }) {
|
|
80
83
|
const { data, loading, error, request } = useDownloadUrl(isImage(object) ? object.id : null);
|
|
@@ -97,7 +100,7 @@ function MediaObjectName({ object, objectHref }) {
|
|
|
97
100
|
return objectHref ? _jsx("a", { href: objectHref(object.id), children: label }) : label;
|
|
98
101
|
}
|
|
99
102
|
function MediaObjectMeta({ object }) {
|
|
100
|
-
return (_jsxs(_Fragment, { children: [_jsx("span", { children: object.category }), _jsx("span", { className: `fa-media-badge fa-media-badge--${object.status}`, children:
|
|
103
|
+
return (_jsxs(_Fragment, { children: [_jsx("span", { children: object.category }), _jsx("span", { className: `fa-media-badge fa-media-badge--${object.status}`, children: statusLabel(object.status) }), _jsx("span", { children: humanizeBytes(object.size_bytes) })] }));
|
|
101
104
|
}
|
|
102
105
|
function MediaObjectActions({ object, objectHref, deletingId, onDelete }) {
|
|
103
106
|
const label = objectLabel(object);
|
|
@@ -124,7 +127,7 @@ export function MediaLibrary({ objectHref, initial = {} }) {
|
|
|
124
127
|
setDeletingId(null);
|
|
125
128
|
}
|
|
126
129
|
}
|
|
127
|
-
return (_jsxs("section", { className: "not-content fa-media-panel", children: [_jsxs("header", { className: "fa-media-toolbar", children: [_jsxs("div", { className: titleRowClassName, children: [_jsxs("h2", { children: ["Media library (", count, ")"] }), _jsx("div", { className: viewSwitcherClassName, "aria-label": "Media library view", children:
|
|
130
|
+
return (_jsxs("section", { className: "not-content fa-media-panel", children: [_jsxs("header", { className: "fa-media-toolbar", children: [_jsxs("div", { className: titleRowClassName, children: [_jsxs("h2", { children: ["Media library (", count, ")"] }), _jsx("div", { className: viewSwitcherClassName, "aria-label": "Media library view", children: VIEW_OPTIONS.map(({ value, label }) => (_jsx("button", { type: "button", "aria-pressed": view === value, className: viewButtonClassName, style: view === value ? activeViewButtonStyle : undefined, onClick: () => setView(value), children: label }, value))) })] }), _jsxs("div", { className: filterRowClassName, children: [_jsx("input", { className: inputClassName, type: "search", placeholder: "Search filename", onChange: (event) => {
|
|
128
131
|
const q = event.currentTarget.value || undefined;
|
|
129
132
|
setQuery((prev) => ({ ...prev, q }));
|
|
130
133
|
} }), _jsxs("select", { className: inputClassName, onChange: (event) => {
|
|
@@ -133,6 +136,6 @@ export function MediaLibrary({ objectHref, initial = {} }) {
|
|
|
133
136
|
}, children: [_jsx("option", { value: "", children: "All categories" }), ["avatar", "document", "asset", "chat_attachment", "export", "receipt"].map((value) => (_jsx("option", { value: value, children: value }, value)))] }), _jsxs("select", { className: inputClassName, onChange: (event) => {
|
|
134
137
|
const status = (event.currentTarget.value || undefined);
|
|
135
138
|
setQuery((prev) => ({ ...prev, status }));
|
|
136
|
-
}, children: [_jsx("option", { value: "", children: "All statuses" }),
|
|
139
|
+
}, children: [_jsx("option", { value: "", children: "All statuses" }), STATUS_OPTIONS.map(({ value, label }) => (_jsx("option", { value: value, children: label }, value)))] })] })] }), error ? _jsx("p", { role: "alert", children: "Failed to load media" }) : null, actionError ? _jsx("p", { role: "alert", children: actionError }) : null, view === "list" ? (_jsxs("table", { className: "fa-media-table", children: [_jsx("thead", { children: _jsxs("tr", { children: [_jsx("th", { children: "Preview" }), _jsx("th", { children: "Filename" }), _jsx("th", { children: "Actions" }), _jsx("th", { children: "Category" }), _jsx("th", { children: "Status" }), _jsx("th", { children: "Size" })] }) }), _jsx("tbody", { children: items.map((object, index) => (_jsxs("tr", { children: [_jsx("td", { children: _jsx(MediaObjectPreview, { object: object, view: view, index: index }) }), _jsx("td", { children: _jsx(MediaObjectName, { object: object, objectHref: objectHref }) }), _jsx("td", { children: _jsx(MediaObjectActions, { object: object, objectHref: objectHref, deletingId: deletingId, onDelete: handleDelete }) }), _jsx("td", { children: object.category }), _jsx("td", { children: _jsx("span", { className: `fa-media-badge fa-media-badge--${object.status}`, children: statusLabel(object.status) }) }), _jsx("td", { children: humanizeBytes(object.size_bytes) })] }, object.id))) })] })) : (_jsx("div", { className: view === "grid" ? gridClassName : masonryClassName, children: items.map((object, index) => (_jsxs("article", { className: cardClassName, children: [_jsx(MediaObjectPreview, { object: object, view: view, index: index }), _jsxs("div", { className: cardBodyClassName, children: [_jsx("h3", { className: cardTitleClassName, children: _jsx(MediaObjectName, { object: object, objectHref: objectHref }) }), _jsx("div", { className: cardMetaClassName, children: _jsx(MediaObjectMeta, { object: object }) }), _jsx(MediaObjectActions, { object: object, objectHref: objectHref, deletingId: deletingId, onDelete: handleDelete })] })] }, object.id))) })), loading ? _jsx("p", { children: "Loading..." }) : null, hasMore ? (_jsx("button", { type: "button", disabled: loading, onClick: () => void loadMore(), children: "Load more" })) : null] }));
|
|
137
140
|
}
|
|
138
141
|
//# sourceMappingURL=MediaLibrary.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MediaLibrary.js","sourceRoot":"","sources":["../../../../src/runtime/react/MediaLibrary.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAsB,MAAM,OAAO,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAU9D,MAAM,
|
|
1
|
+
{"version":3,"file":"MediaLibrary.js","sourceRoot":"","sources":["../../../../src/runtime/react/MediaLibrary.tsx"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ export function routeForLocale(pattern, locale) {
|
|
|
27
27
|
: pattern.replace("/:locale", "").replace("[locale]", "");
|
|
28
28
|
}
|
|
29
29
|
export function mediaRedirect(routes, page, locale) {
|
|
30
|
-
const route = routes
|
|
30
|
+
const route = Reflect.get(routes, page);
|
|
31
31
|
if (!route)
|
|
32
32
|
return "/";
|
|
33
33
|
return routeForLocale(route, locale);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/runtime/routes.ts"],"names":[],"mappings":"AAiBA,MAAM,iBAAiB,GAAmE;IACxF,IAAI,EAAE,EAAE;IACR,MAAM,EAAE,eAAe;IACvB,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,oBAAoB;IAC5B,OAAO,EAAE,gBAAgB;IACzB,KAAK,EAAE,cAAc;CACtB,CAAC;AAEF,SAAS,SAAS,CAAC,IAAY,EAAE,QAAgB;IAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpE,OAAO,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,SAA8B,EAAE;IAC/D,MAAM,MAAM,GAAG,EAAE,GAAG,iBAAiB,EAAE,GAAG,MAAM,EAAE,CAAC;IACnD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;IAC/B,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QAC5E,OAAO,EAAE,MAAM,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC;QAC/E,MAAM,EAAE,MAAM,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QAC5E,OAAO,EAAE,MAAM,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC;QAC/E,KAAK,EAAE,MAAM,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC;KAC1E,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe,EAAE,MAAe;IAC7D,OAAO,MAAM;QACX,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC;QACrC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,MAAwB,EACxB,IAA4B,EAC5B,MAAe;IAEf,MAAM,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/runtime/routes.ts"],"names":[],"mappings":"AAiBA,MAAM,iBAAiB,GAAmE;IACxF,IAAI,EAAE,EAAE;IACR,MAAM,EAAE,eAAe;IACvB,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,oBAAoB;IAC5B,OAAO,EAAE,gBAAgB;IACzB,KAAK,EAAE,cAAc;CACtB,CAAC;AAEF,SAAS,SAAS,CAAC,IAAY,EAAE,QAAgB;IAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpE,OAAO,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,SAA8B,EAAE;IAC/D,MAAM,MAAM,GAAG,EAAE,GAAG,iBAAiB,EAAE,GAAG,MAAM,EAAE,CAAC;IACnD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;IAC/B,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QAC5E,OAAO,EAAE,MAAM,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC;QAC/E,MAAM,EAAE,MAAM,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QAC5E,OAAO,EAAE,MAAM,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC;QAC/E,KAAK,EAAE,MAAM,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC;KAC1E,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe,EAAE,MAAe;IAC7D,OAAO,MAAM;QACX,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC;QACrC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,MAAwB,EACxB,IAA4B,EAC5B,MAAe;IAEf,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAuB,CAAC;IAC9D,IAAI,CAAC,KAAK;QAAE,OAAO,GAAG,CAAC;IACvB,OAAO,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mano8/astro-media-m8",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"description": "Astro integration and headless client for media-service-m8.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -55,15 +55,18 @@
|
|
|
55
55
|
"verify:starter-routes": "node scripts/verify-starter-routes.mjs",
|
|
56
56
|
"test": "vitest run --coverage",
|
|
57
57
|
"typecheck": "tsc -p tsconfig.json --noEmit",
|
|
58
|
+
"lint": "cross-env ESLINT_USE_FLAT_CONFIG=false eslint \"src/**/*.{ts,tsx}\"",
|
|
58
59
|
"test:unit": "vitest run"
|
|
59
60
|
},
|
|
60
61
|
"dependencies": {
|
|
61
|
-
"@mano8/astro-ui-m8": "^1.
|
|
62
|
+
"@mano8/astro-ui-m8": "^1.3.1"
|
|
62
63
|
},
|
|
63
64
|
"peerDependencies": {
|
|
64
|
-
"@
|
|
65
|
+
"@astrojs/react": "^6.0.1",
|
|
66
|
+
"@astrojs/starlight": "^0.41.3",
|
|
67
|
+
"@mano8/astro-auth-m8": "^1.4.1",
|
|
65
68
|
"@tanstack/react-query": "^5.101.1",
|
|
66
|
-
"astro": "^
|
|
69
|
+
"astro": "^7.0.9",
|
|
67
70
|
"react": "^18.0.0 || ^19.0.0",
|
|
68
71
|
"react-dom": "^18.0.0 || ^19.0.0",
|
|
69
72
|
"zod": "^4.0.0"
|
|
@@ -77,13 +80,22 @@
|
|
|
77
80
|
}
|
|
78
81
|
},
|
|
79
82
|
"devDependencies": {
|
|
80
|
-
"@astrojs/react": "^
|
|
81
|
-
"@
|
|
83
|
+
"@astrojs/react": "^6.0.1",
|
|
84
|
+
"@astrojs/starlight": "^0.41.3",
|
|
85
|
+
"@eslint/js": "^9.39.5",
|
|
86
|
+
"@mano8/astro-auth-m8": "^1.4.1",
|
|
82
87
|
"@tanstack/react-query": "^5.101.1",
|
|
83
88
|
"@types/node": "^22.0.0",
|
|
84
89
|
"@types/react": "^19.0.0",
|
|
90
|
+
"@typescript-eslint/eslint-plugin": "^8.65.0",
|
|
91
|
+
"@typescript-eslint/parser": "^8.65.0",
|
|
85
92
|
"@vitest/coverage-v8": "^4.1.9",
|
|
86
|
-
"astro": "^
|
|
93
|
+
"astro": "^7.0.9",
|
|
94
|
+
"cross-env": "^7.0.3",
|
|
95
|
+
"eslint": "^9.39.5",
|
|
96
|
+
"eslint-plugin-react": "^7.37.5",
|
|
97
|
+
"eslint-plugin-react-hooks": "^5.1.0",
|
|
98
|
+
"eslint-plugin-security": "^4.0.1",
|
|
87
99
|
"jsdom": "^29.1.1",
|
|
88
100
|
"react": "^19.0.0",
|
|
89
101
|
"react-dom": "^19.0.0",
|