eddev 2.0.0-beta.252 → 2.0.0-beta.253
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/app/lib/blocks/BlockPropMutator.d.ts +33 -0
- package/dist/app/lib/blocks/BlockPropMutator.d.ts.map +1 -0
- package/dist/app/lib/blocks/BlockPropMutator.js +20 -0
- package/dist/app/lib/blocks/InnerBlocks.js +1 -1
- package/dist/app/lib/blocks/SlotBlocks.d.ts.map +1 -1
- package/dist/app/lib/blocks/SlotBlocks.js +2 -3
- package/dist/app/lib/blocks/block-utils.d.ts.map +1 -1
- package/dist/app/lib/blocks/block-utils.js +16 -1
- package/dist/app/lib/blocks/editor/EditingContext.d.ts +2 -0
- package/dist/app/lib/blocks/editor/EditingContext.d.ts.map +1 -0
- package/dist/app/lib/blocks/editor/EditingContext.js +31 -0
- package/dist/app/lib/blocks/editor/EditorSupport.d.ts +0 -4
- package/dist/app/lib/blocks/editor/EditorSupport.d.ts.map +1 -1
- package/dist/app/lib/blocks/editor/EditorSupport.js +19 -13
- package/dist/app/lib/blocks/editor/editor-config.d.ts +2 -1
- package/dist/app/lib/blocks/editor/editor-config.d.ts.map +1 -1
- package/dist/app/lib/blocks/editor/installGutenbergHooks.d.ts.map +1 -1
- package/dist/app/lib/blocks/editor/installGutenbergHooks.js +57 -31
- package/dist/app/lib/blocks/index.js +1 -0
- package/dist/app/lib/blocks/inline-editing.d.ts +6 -1
- package/dist/app/lib/blocks/inline-editing.d.ts.map +1 -1
- package/dist/app/lib/blocks/inline-editing.js +6 -1
- package/dist/app/lib/devtools/loader.d.ts +1 -1
- package/dist/app/lib/devtools/loader.d.ts.map +1 -1
- package/dist/app/lib/devtools/loader.js +2 -1
- package/dist/app/lib/hooks/query-hooks.d.ts.map +1 -1
- package/dist/app/lib/hooks/query-hooks.js +5 -3
- package/dist/app/lib/routing/components/BrowserRouter.d.ts.map +1 -1
- package/dist/app/lib/routing/components/BrowserRouter.js +4 -2
- package/dist/app/lib/routing/hooks/useHydrating.d.ts.map +1 -1
- package/dist/app/lib/routing/hooks/useHydrating.js +4 -2
- package/dist/app/lib/routing/hooks/useRestorableState.d.ts.map +1 -1
- package/dist/app/lib/routing/hooks/useRestorableState.js +7 -2
- package/dist/app/server/rpc.d.ts +14 -41
- package/dist/app/server/rpc.d.ts.map +1 -1
- package/dist/app/server/server-context.d.ts +1 -1
- package/dist/node/cli/cli.js +3 -2
- package/dist/node/cli/version.d.ts +1 -1
- package/dist/node/cli/version.js +1 -1
- package/dist/node/project/manifest/block-manifest.d.ts.map +1 -1
- package/dist/node/project/manifest/block-manifest.js +2 -0
- package/package.json +4 -6
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { PropsWithChildren } from "react";
|
|
2
|
+
import { ContentBlock } from "./ContentBlocks";
|
|
3
|
+
type BlockPropsMutator = (block: ContentBlock) => void;
|
|
4
|
+
type MutationContext = {
|
|
5
|
+
mutate?: BlockPropsMutator;
|
|
6
|
+
};
|
|
7
|
+
export declare const MutationContext: import("react").Context<MutationContext>;
|
|
8
|
+
type Props = PropsWithChildren<{
|
|
9
|
+
/**
|
|
10
|
+
* Whether any parent mutators declared in ancestor components should continue to apply.
|
|
11
|
+
*
|
|
12
|
+
* If set to false, then this mutator will override any previous ones.
|
|
13
|
+
*
|
|
14
|
+
* @default false
|
|
15
|
+
*/
|
|
16
|
+
inherit?: boolean;
|
|
17
|
+
/**
|
|
18
|
+
* A function which is called before rendering a block.
|
|
19
|
+
*
|
|
20
|
+
* If your mutation function depends on any local variables that may change over time, you should pass them into the `deps` prop (like `useEffect/useMemo`)
|
|
21
|
+
*/
|
|
22
|
+
mutateProps: BlockPropsMutator;
|
|
23
|
+
/**
|
|
24
|
+
* An array of dependencies. When the value of these dependencies changes, the mutation will run again.
|
|
25
|
+
*
|
|
26
|
+
* @default `[]`
|
|
27
|
+
*/
|
|
28
|
+
deps?: any[];
|
|
29
|
+
}>;
|
|
30
|
+
export declare function useBlockMutation(): MutationContext;
|
|
31
|
+
export declare function BlockPropMutator(props: Props): import("react/jsx-runtime").JSX.Element;
|
|
32
|
+
export {};
|
|
33
|
+
//# sourceMappingURL=BlockPropMutator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BlockPropMutator.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/BlockPropMutator.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAiB,iBAAiB,EAAuB,MAAM,OAAO,CAAA;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAS9C,KAAK,iBAAiB,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;AAEtD,KAAK,eAAe,GAAG;IACrB,MAAM,CAAC,EAAE,iBAAiB,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,eAAe,0CAAqC,CAAA;AAEjE,KAAK,KAAK,GAAG,iBAAiB,CAAC;IAC7B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;OAIG;IACH,WAAW,EAAE,iBAAiB,CAAA;IAC9B;;;;OAIG;IACH,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;CACb,CAAC,CAAA;AAEF,wBAAgB,gBAAgB,oBAE/B;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,2CAe5C"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import { createContext, useContext, useMemo } from "react";
|
|
3
|
+
export const MutationContext = createContext({});
|
|
4
|
+
export function useBlockMutation() {
|
|
5
|
+
return useContext(MutationContext);
|
|
6
|
+
}
|
|
7
|
+
export function BlockPropMutator(props) {
|
|
8
|
+
const parent = useContext(MutationContext);
|
|
9
|
+
const value = useMemo(() => {
|
|
10
|
+
return {
|
|
11
|
+
mutate: (block) => {
|
|
12
|
+
if (props.inherit) {
|
|
13
|
+
parent.mutate?.(block);
|
|
14
|
+
}
|
|
15
|
+
props.mutateProps(block);
|
|
16
|
+
},
|
|
17
|
+
};
|
|
18
|
+
}, [parent, props.inherit, ...(props.deps ?? [])]);
|
|
19
|
+
return _jsx(MutationContext.Provider, { value: value, children: props.children });
|
|
20
|
+
}
|
|
@@ -91,7 +91,7 @@ export function InnerBlocks(props) {
|
|
|
91
91
|
wp.data.dispatch(wp.blockEditor.store).replaceInnerBlocks(blockId, newBlocks);
|
|
92
92
|
}
|
|
93
93
|
}, [
|
|
94
|
-
hash(inlineContext?.innerBlocks.map((b) => [b.blockName, b.clientId])),
|
|
94
|
+
hash(inlineContext?.innerBlocks.filter((b) => !!b).map((b) => [b.blockName, b.clientId])),
|
|
95
95
|
hash([props.template, props.defaultBlocks, props.headerTemplate, props.footerTemplate]),
|
|
96
96
|
blockId,
|
|
97
97
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SlotBlocks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/SlotBlocks.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAEhD,KAAK,SAAS,GAAG;IACf,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,GAAG,gBAAgB,CAAA;AAEpB,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"SlotBlocks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/SlotBlocks.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAEhD,KAAK,SAAS,GAAG;IACf,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,GAAG,gBAAgB,CAAA;AAEpB,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,kDAyD1C"}
|
|
@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
2
2
|
import { hash } from "object-code";
|
|
3
3
|
import { useEffect } from "react";
|
|
4
4
|
import { ContentBlocks } from "./ContentBlocks";
|
|
5
|
-
import { useBlockContext, useInnerBlocks } from "./inline-editing";
|
|
5
|
+
import { InlineEditingContextProvider, useBlockContext, useInnerBlocks } from "./inline-editing";
|
|
6
6
|
export function SlotBlocks(props) {
|
|
7
7
|
if (env.admin) {
|
|
8
8
|
const clientId = useBlockContext()?.block[1].clientId;
|
|
@@ -26,13 +26,12 @@ export function SlotBlocks(props) {
|
|
|
26
26
|
else {
|
|
27
27
|
return;
|
|
28
28
|
}
|
|
29
|
-
console.log("Changed");
|
|
30
29
|
if (changed) {
|
|
31
30
|
wp.data.dispatch("core/block-editor").replaceInnerBlocks(clientId, blocks);
|
|
32
31
|
}
|
|
33
32
|
}, [block?.clientId, hash(props)]);
|
|
34
33
|
if (block) {
|
|
35
|
-
return _jsx(wp.blockEditor.BlockEdit, { ...block });
|
|
34
|
+
return (_jsx(InlineEditingContextProvider, { values: {}, innerBlocks: block.innerBlocks, block: ["core/slot-group", block], index: -1, onChange: (attrs) => { }, insertBlocksAfter: () => { }, children: _jsx(wp.blockEditor.BlockEdit, { ...block }) }));
|
|
36
35
|
}
|
|
37
36
|
else {
|
|
38
37
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block-utils.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/block-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD;;;GAGG;AACH,wBAAgB,kBAAkB;;EAEjC;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"block-utils.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/block-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD;;;GAGG;AACH,wBAAgB,kBAAkB;;EAEjC;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,YAAY,EAAE,CA4B1F;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM;;;;;;;;EAYjD"}
|
|
@@ -18,13 +18,28 @@ export function addBlockMetadata(blocks) {
|
|
|
18
18
|
for (let block of out) {
|
|
19
19
|
if (!block)
|
|
20
20
|
continue;
|
|
21
|
-
const info = infos[block.blockName];
|
|
21
|
+
const info = infos[block.blockName ?? block.name];
|
|
22
22
|
block.tags = info?.tags ?? [];
|
|
23
23
|
block.flags = info?.flags ?? {};
|
|
24
24
|
block.slug = (info?.slug ?? block.blockName);
|
|
25
25
|
if (block.innerBlocks && block.innerBlocks.length) {
|
|
26
26
|
addBlockMetadata(block.innerBlocks);
|
|
27
27
|
}
|
|
28
|
+
if (env.admin) {
|
|
29
|
+
if (!Object.hasOwn(block, "props")) {
|
|
30
|
+
Object.defineProperty(block, "props", {
|
|
31
|
+
// @ts-ignore
|
|
32
|
+
get: () => block.attributes?.props || {},
|
|
33
|
+
set: (value) => {
|
|
34
|
+
// @ts-ignore
|
|
35
|
+
if (!block.attributes)
|
|
36
|
+
block.attributes = {};
|
|
37
|
+
// @ts-ignore
|
|
38
|
+
block.attributes.props = value;
|
|
39
|
+
},
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
}
|
|
28
43
|
}
|
|
29
44
|
return out;
|
|
30
45
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EditingContext.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/EditingContext.tsx"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
export {};
|
|
2
|
+
// type BlockAttributes = Record<string, unknown>
|
|
3
|
+
// type EditableBlock = ContentBlock & {
|
|
4
|
+
// name: string
|
|
5
|
+
// slug: BlockTypeName | (string & {})
|
|
6
|
+
// attributes: BlockAttributes
|
|
7
|
+
// clientId: string
|
|
8
|
+
// rootClientId: string
|
|
9
|
+
// isRootBlock: boolean
|
|
10
|
+
// getParent: () => EditableBlock | null
|
|
11
|
+
// canMove: boolean
|
|
12
|
+
// canRemove: boolean
|
|
13
|
+
// isSelected: boolean
|
|
14
|
+
// isSelectionEnabled: boolean
|
|
15
|
+
// tags?: DefinedBlockTags
|
|
16
|
+
// flags?: DefinedBlockFlags
|
|
17
|
+
// }
|
|
18
|
+
// type EditingContext = {
|
|
19
|
+
// block: BlockEditingContext
|
|
20
|
+
// }
|
|
21
|
+
// type BlockEditingContext = {
|
|
22
|
+
// clientId: string
|
|
23
|
+
// attributes: BlockAttributes
|
|
24
|
+
// insertBlock: (block: BlockInstance) => void
|
|
25
|
+
// setAttributes: (attrs: BlockAttributes) => void
|
|
26
|
+
// block: ContentBlock & BlockInstance
|
|
27
|
+
// }
|
|
28
|
+
// const EditingContext = createContext<EditingContext>(undefined!)
|
|
29
|
+
// export function useEditingContext() {
|
|
30
|
+
// return
|
|
31
|
+
// }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EditorSupport.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/EditorSupport.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"EditorSupport.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/EditorSupport.tsx"],"names":[],"mappings":"AAUA,wBAAgB,aAAa,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,kDAkC7C"}
|
|
@@ -1,26 +1,32 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import {
|
|
2
|
+
import { Suspense, useMemo } from "react";
|
|
3
3
|
import { blockManifestReader } from "../../internal/read-block-manifest.js";
|
|
4
4
|
import { APIProvider } from "../../../utils/APIProvider.js";
|
|
5
|
+
import { useBlockMutation } from "../BlockPropMutator.js";
|
|
6
|
+
import { useBlockContext } from "../inline-editing.js";
|
|
5
7
|
import { ErrorBoundaryEditor } from "./ErrorBoundaryEditor.js";
|
|
6
|
-
export const BlockContext = createContext(undefined)
|
|
8
|
+
// export const BlockContext = createContext<{ name: string; props: any } | undefined>(undefined)
|
|
7
9
|
export function EditableBlock({ payload }) {
|
|
8
10
|
if (!env.admin)
|
|
9
11
|
throw new Error("`EditableBlock` can only be used in the admin environment");
|
|
10
|
-
const info =
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
if (block
|
|
16
|
-
|
|
17
|
-
|
|
12
|
+
const info = useBlockContext();
|
|
13
|
+
const mutation = useBlockMutation();
|
|
14
|
+
const block = info?.editorBlock;
|
|
15
|
+
const props = useMemo(() => {
|
|
16
|
+
let props = payload ?? {};
|
|
17
|
+
if (!block)
|
|
18
|
+
return props;
|
|
19
|
+
props.blockStyle = info?.editorBlock?.attributes?.className?.replace("is-style-", "");
|
|
20
|
+
block.props = props;
|
|
21
|
+
if (mutation.mutate) {
|
|
22
|
+
mutation.mutate(block);
|
|
18
23
|
}
|
|
19
|
-
|
|
24
|
+
return block.props;
|
|
25
|
+
}, [block, payload, mutation.mutate]);
|
|
20
26
|
if (!info)
|
|
21
27
|
return null;
|
|
22
|
-
const BlockComponent = blockManifestReader.value[info.name];
|
|
28
|
+
const BlockComponent = blockManifestReader.value[info.editorBlock?.name ?? ""];
|
|
23
29
|
if (!BlockComponent)
|
|
24
30
|
return _jsx("div", { children: "Unable to load block component" });
|
|
25
|
-
return (_jsx(ErrorBoundaryEditor, { children: _jsx(APIProvider, { children: _jsx(Suspense, { children: _jsx(BlockComponent, { ...
|
|
31
|
+
return (_jsx(ErrorBoundaryEditor, { children: _jsx(APIProvider, { children: _jsx(Suspense, { children: _jsx(BlockComponent, { ...props }) }) }) }));
|
|
26
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor-config.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/editor-config.tsx"],"names":[],"mappings":"AACA,OAAO,EAEL,aAAa,EAId,MAAM,sBAAsB,CAAA;AAE7B,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;QAGI;IACJ,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;;;;;;;QAQI;IACJ,UAAU,CAAC,EAAE,CAAC,kBAAkB,GAAG,YAAY,CAAC,EAAE,CAAA;IAClD,4FAA4F;IAC5F,sBAAsB,CAAC,EAAE,0BAA0B,CAAA;IACnD,4EAA4E;IAC5E,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,2DAA2D;IAC3D,cAAc,CAAC,EAAE,aAAa,CAAA;IAC9B,8DAA8D;IAC9D,cAAc,CAAC,EAAE,aAAa,CAAA;IAC9B,iCAAiC;IACjC,QAAQ,CAAC,EAAE,aAAa,CAAA;CACzB,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,aAAa,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;IACnC,UAAU,EAAE,GAAG,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"editor-config.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/editor-config.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installGutenbergHooks.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/installGutenbergHooks.tsx"],"names":[],"mappings":"AA4BA,eAAO,MAAM,oBAAoB;;CAAgC,CAAA;AAEjE,wBAAgB,iBAAiB,kBAsBhC;AAED,wBAAgB,uBAAuB,
|
|
1
|
+
{"version":3,"file":"installGutenbergHooks.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/blocks/editor/installGutenbergHooks.tsx"],"names":[],"mappings":"AA4BA,eAAO,MAAM,oBAAoB;;CAAgC,CAAA;AAEjE,wBAAgB,iBAAiB,kBAsBhC;AAED,wBAAgB,uBAAuB,SAyQtC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import { useEffect
|
|
2
|
+
import { useEffect } from "react";
|
|
3
3
|
import { subscribe, useSnapshot } from "valtio";
|
|
4
4
|
import { proxyMap } from "valtio/utils";
|
|
5
|
-
import { getBlockMetadata } from "../block-utils.js";
|
|
5
|
+
import { addBlockMetadata, getBlockMetadata } from "../block-utils.js";
|
|
6
6
|
import { registerBuiltinBlocks } from "../builtin-blocks.js";
|
|
7
7
|
import { InlineEditingContextProvider } from "../inline-editing.js";
|
|
8
8
|
import { EditorHighlights } from "./EditorHighlights.js";
|
|
9
|
-
import {
|
|
9
|
+
import { EditableBlock } from "./EditorSupport.js";
|
|
10
10
|
import { resolveAcfBlockName } from "./block-templates.js";
|
|
11
11
|
import { blocksByTag } from "./blocks-by-tag.js";
|
|
12
12
|
import { editorConfigStore, getEditingPostInfo, watchEditorTemplate } from "./editor-config.js";
|
|
@@ -58,11 +58,64 @@ export function installEDGutenbergHooks() {
|
|
|
58
58
|
const generateClass = useSnapshot(editorConfigStore).currentBlocksConfig?.generateBlockClassName;
|
|
59
59
|
Object.assign(props, getBlockMetadata(props.name));
|
|
60
60
|
props.isRootBlock = !props.rootClientId;
|
|
61
|
+
props.getParent = () => props.rootClientId ? wp.data.select("core/block-editor").getBlock(props.rootClientId) : null;
|
|
61
62
|
let className = generateClass ? generateClass(props, getEditingPostInfo()) : "";
|
|
62
63
|
return _jsx(BlockListBlock, { ...props, className: className });
|
|
63
64
|
};
|
|
64
65
|
}, "withClientIdClassName");
|
|
65
66
|
wp.hooks.addFilter("editor.BlockListBlock", "ed", withClientIdClassName);
|
|
67
|
+
const withBlockContext = wp.compose.createHigherOrderComponent((BlockEdit) => {
|
|
68
|
+
return (props) => {
|
|
69
|
+
function getChildren() {
|
|
70
|
+
const { getBlock, getBlockOrder, getBlockIndex, getBlockRootClientId } = wp.data.select("core/block-editor");
|
|
71
|
+
const block = getBlock(props.clientId);
|
|
72
|
+
const rootClientId = getBlockRootClientId(props.clientId);
|
|
73
|
+
const index = getBlockIndex(props.clientId, rootClientId || undefined);
|
|
74
|
+
const innerBlockIDs = getBlockOrder(props.clientId);
|
|
75
|
+
if (block) {
|
|
76
|
+
addBlockMetadata([block]);
|
|
77
|
+
}
|
|
78
|
+
const children = innerBlockIDs.map((id) => {
|
|
79
|
+
return getBlock(id);
|
|
80
|
+
});
|
|
81
|
+
addBlockMetadata(children);
|
|
82
|
+
return {
|
|
83
|
+
block,
|
|
84
|
+
children,
|
|
85
|
+
index,
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
const { block, children, index } = getChildren();
|
|
89
|
+
// const block = wp.data.useSelect(
|
|
90
|
+
// (select) => {
|
|
91
|
+
// // @ts-ignore
|
|
92
|
+
// return select("block-editor").getBlock(props.clientId)
|
|
93
|
+
// },
|
|
94
|
+
// [props.clientId],
|
|
95
|
+
// )
|
|
96
|
+
// const [index, setIndex] = useState(getIndex)
|
|
97
|
+
// const [children, setChildren] = useState<any[]>(getChildren)
|
|
98
|
+
// useEffect(() => {
|
|
99
|
+
// return wp.data.subscribe(() => {
|
|
100
|
+
// setIndex(getIndex())
|
|
101
|
+
// const children = getChildren()
|
|
102
|
+
// setChildren((current) =>
|
|
103
|
+
// current.length === children.length
|
|
104
|
+
// ? current.every((item, i) => item === children[i])
|
|
105
|
+
// ? current
|
|
106
|
+
// : children
|
|
107
|
+
// : children,
|
|
108
|
+
// )
|
|
109
|
+
// }, [])
|
|
110
|
+
// }, [props.clientId, props.attributes])
|
|
111
|
+
if (!block)
|
|
112
|
+
return null;
|
|
113
|
+
return (_jsx(InlineEditingContextProvider, { values: props.attributes.inline || {}, innerBlocks: children, block: [props.name, props], editorBlock: block, index: index ?? -1, onChange: (attrs) => {
|
|
114
|
+
props.setAttributes({ ...props.attributes, inline: attrs });
|
|
115
|
+
}, insertBlocksAfter: props.insertBlocksAfter, clientId: props.clientId, children: _jsx(BlockEdit, { ...props }, "edit") }));
|
|
116
|
+
};
|
|
117
|
+
}, "withMyPluginControls");
|
|
118
|
+
wp.hooks.addFilter("editor.BlockEdit", "ed", withBlockContext);
|
|
66
119
|
// if (wp.blocks) {
|
|
67
120
|
// }
|
|
68
121
|
// Manage custom rich text formats
|
|
@@ -142,34 +195,7 @@ export function installEDGutenbergHooks() {
|
|
|
142
195
|
;
|
|
143
196
|
wp.data.dispatch("core/block-editor").setTemplateValidity(true);
|
|
144
197
|
}, []);
|
|
145
|
-
|
|
146
|
-
const { getBlockIndex } = wp.data.select("core/block-editor");
|
|
147
|
-
return getBlockIndex(props.clientId);
|
|
148
|
-
}
|
|
149
|
-
function getChildren() {
|
|
150
|
-
const { getBlock, getBlockOrder } = wp.data.select("core/block-editor");
|
|
151
|
-
const innerBlockIDs = getBlockOrder(props.clientId);
|
|
152
|
-
const children = innerBlockIDs.map((id) => {
|
|
153
|
-
return getBlock(id);
|
|
154
|
-
});
|
|
155
|
-
return children;
|
|
156
|
-
}
|
|
157
|
-
const [index, setIndex] = useState(getIndex);
|
|
158
|
-
const [children, setChildren] = useState(getChildren);
|
|
159
|
-
useEffect(() => {
|
|
160
|
-
return wp.data.subscribe(() => {
|
|
161
|
-
setIndex(getIndex());
|
|
162
|
-
const children = getChildren();
|
|
163
|
-
setChildren((current) => current.length === children.length
|
|
164
|
-
? current.every((item, i) => item === children[i])
|
|
165
|
-
? current
|
|
166
|
-
: children
|
|
167
|
-
: children);
|
|
168
|
-
}, []);
|
|
169
|
-
}, [props.clientId, props.attributes]);
|
|
170
|
-
return (_jsx(BlockContext.Provider, { value: { name, props }, children: _jsx(InlineEditingContextProvider, { values: props.attributes.inline || {}, innerBlocks: children, block: [name, props], index: index ?? -1, onChange: (attrs) => {
|
|
171
|
-
props.setAttributes({ ...props.attributes, inline: attrs });
|
|
172
|
-
}, insertBlocksAfter: props.insertBlocksAfter, children: _jsx(EditorHighlights, { enabled: true, clientId: props.clientId, children: edit.call(self, props) }) }) }));
|
|
198
|
+
return (_jsx(EditorHighlights, { enabled: true, clientId: props.clientId, children: edit.call(self, props) }));
|
|
173
199
|
};
|
|
174
200
|
}
|
|
175
201
|
// Find PHP-defined 'tags' for core blocks.
|
|
@@ -9,3 +9,4 @@ export * from "./editor/usePostEditor.js";
|
|
|
9
9
|
export { useBlockContext, useInlineEditableValue, useInnerBlocks, useTemplate, useBlockSelection, } from "./inline-editing.js";
|
|
10
10
|
export * from "./InnerBlocks.js";
|
|
11
11
|
export * from "./SlotBlocks.js";
|
|
12
|
+
// export { BlockPropMutator } from "./BlockPropMutator.js"
|
|
@@ -9,27 +9,32 @@ export type BlockInstance = {
|
|
|
9
9
|
isValid: boolean;
|
|
10
10
|
name: string;
|
|
11
11
|
originalContent?: string | undefined;
|
|
12
|
+
props?: any;
|
|
12
13
|
};
|
|
13
14
|
type InlineEditingContext = {
|
|
14
15
|
values: Attributes;
|
|
15
16
|
innerBlocks: ContentBlock[];
|
|
16
17
|
parents: [string, Attributes][];
|
|
17
18
|
block: [string, Attributes];
|
|
19
|
+
editorBlock?: BlockInstance;
|
|
18
20
|
index: number;
|
|
19
21
|
setValue(key: string, value: any): any;
|
|
20
22
|
getValue(key: string): any;
|
|
21
23
|
insertBlocksAfter?: (block: any) => void;
|
|
22
24
|
readonly?: boolean;
|
|
25
|
+
clientId?: string;
|
|
23
26
|
};
|
|
24
|
-
declare const InlineEditingContext: import("react").Context<InlineEditingContext | undefined>;
|
|
27
|
+
export declare const InlineEditingContext: import("react").Context<InlineEditingContext | undefined>;
|
|
25
28
|
type ProviderProps = PropsWithChildren<{
|
|
26
29
|
values: Attributes;
|
|
27
30
|
innerBlocks: ContentBlock[];
|
|
28
31
|
block: [string, Attributes];
|
|
32
|
+
editorBlock?: BlockInstance;
|
|
29
33
|
index: number;
|
|
30
34
|
onChange?: (attrs: Attributes) => void;
|
|
31
35
|
insertBlocksAfter?: (block: any) => void;
|
|
32
36
|
readonly?: boolean;
|
|
37
|
+
clientId?: string;
|
|
33
38
|
}>;
|
|
34
39
|
export declare function InlineEditingContextProvider(props: ProviderProps): import("react/jsx-runtime").JSX.Element;
|
|
35
40
|
export declare function ReadonlyInlineEditingProvider(props: PropsWithChildren<{}>): import("react/jsx-runtime").JSX.Element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-editing.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/inline-editing.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAiB,iBAAiB,EAAuB,MAAM,OAAO,CAAA;AAK7E,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAErC,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC,CAAA;AAE1E,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,GAAG,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,aAAa,EAAE,CAAA;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"inline-editing.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/blocks/inline-editing.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { createContext, useContext, useMemo } from "react";
|
|
|
3
3
|
import { usePostEditor } from "./editor/usePostEditor.js";
|
|
4
4
|
import { useRoute } from "../routing/index.js";
|
|
5
5
|
import { addBlockMetadata } from "./block-utils.js";
|
|
6
|
-
const InlineEditingContext = createContext(undefined);
|
|
6
|
+
export const InlineEditingContext = createContext(undefined);
|
|
7
7
|
export function InlineEditingContextProvider(props) {
|
|
8
8
|
const parentContext = useContext(InlineEditingContext);
|
|
9
9
|
useMemo(() => {
|
|
@@ -14,6 +14,7 @@ export function InlineEditingContextProvider(props) {
|
|
|
14
14
|
innerBlocks: props.innerBlocks,
|
|
15
15
|
block: props.block,
|
|
16
16
|
index: props.index,
|
|
17
|
+
clientId: props.clientId,
|
|
17
18
|
parents: [...(parentContext?.block ? [parentContext?.block] : []), ...(parentContext?.parents || [])].filter(Boolean),
|
|
18
19
|
getValue(key) {
|
|
19
20
|
return props.values?.[key];
|
|
@@ -28,6 +29,7 @@ export function InlineEditingContextProvider(props) {
|
|
|
28
29
|
},
|
|
29
30
|
insertBlocksAfter: props.insertBlocksAfter,
|
|
30
31
|
readonly: props.readonly || parentContext?.readonly,
|
|
32
|
+
editorBlock: props.editorBlock,
|
|
31
33
|
}, children: props.children }));
|
|
32
34
|
}
|
|
33
35
|
export function ReadonlyInlineEditingProvider(props) {
|
|
@@ -81,6 +83,9 @@ export function useBlockAppender() {
|
|
|
81
83
|
}
|
|
82
84
|
export function useInnerBlocks() {
|
|
83
85
|
const ctx = useContext(InlineEditingContext);
|
|
86
|
+
if (env.admin && ctx?.innerBlocks) {
|
|
87
|
+
addBlockMetadata(ctx?.innerBlocks);
|
|
88
|
+
}
|
|
84
89
|
return ctx?.innerBlocks || [];
|
|
85
90
|
}
|
|
86
91
|
export function useBlockParents() {
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function DevUILoader(): import("react
|
|
1
|
+
export declare function DevUILoader(): import("react").ReactPortal | null;
|
|
2
2
|
//# sourceMappingURL=loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/devtools/loader.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/devtools/loader.tsx"],"names":[],"mappings":"AAOA,wBAAgB,WAAW,uCAqB1B"}
|
|
@@ -2,6 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
2
2
|
import { lazy, useEffect } from "react";
|
|
3
3
|
import { usePersistState } from "./hooks/usePersistState.js";
|
|
4
4
|
import { useHydrating } from "../routing/hooks/useHydrating.js";
|
|
5
|
+
import { createPortal } from "react-dom";
|
|
5
6
|
const DevUI = lazy(() => import("./components/DevUI.js"));
|
|
6
7
|
export function DevUILoader() {
|
|
7
8
|
const ssr = useHydrating();
|
|
@@ -16,7 +17,7 @@ export function DevUILoader() {
|
|
|
16
17
|
if (ssr)
|
|
17
18
|
return null;
|
|
18
19
|
if (render) {
|
|
19
|
-
return _jsx(DevUI, {});
|
|
20
|
+
return createPortal(_jsx(DevUI, {}), document.body);
|
|
20
21
|
}
|
|
21
22
|
else {
|
|
22
23
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-hooks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/hooks/query-hooks.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"query-hooks.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/hooks/query-hooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useInfiniteQuery, useMutation, useQuery, useQueryClient, } from "@tanstack/react-query";
|
|
2
|
-
import { useEffect, useState } from "react";
|
|
2
|
+
import { startTransition, useEffect, useState } from "react";
|
|
3
3
|
import { joinURL } from "ufo";
|
|
4
4
|
import { getQueryClient as utilGetQueryClient } from "../../utils/query-client.js";
|
|
5
5
|
import { getRPCClient } from "../../utils/trpc-client.js";
|
|
@@ -116,8 +116,10 @@ export function createUseInfiniteQuery(init) {
|
|
|
116
116
|
}
|
|
117
117
|
});
|
|
118
118
|
useEffect(() => {
|
|
119
|
-
|
|
120
|
-
|
|
119
|
+
startTransition(() => {
|
|
120
|
+
setInitial({
|
|
121
|
+
initialData: undefined,
|
|
122
|
+
});
|
|
121
123
|
});
|
|
122
124
|
}, []);
|
|
123
125
|
return useInfiniteQuery({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrowserRouter.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/BrowserRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"BrowserRouter.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/components/BrowserRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAOlB,MAAM,OAAO,CAAA;AAKd,OAAO,EAGL,cAAc,EAId,KAAK,SAAS,EAGf,MAAM,aAAa,CAAA;AAWpB,KAAK,KAAK,GAAG,iBAAiB,CAAC;IAC7B,SAAS,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;IACpD,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB,CAAC,CAAA;AAuEF,wBAAgB,eAAe;WAFJ,cAAc;SAAO,SAAS;SAIxD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,2CAkezC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import { useEffect, useMemo, useRef, useState, useTransition } from "react";
|
|
2
|
+
import { useEffect, useMemo, useRef, useState, useTransition, startTransition as startTransitionRaw, } from "react";
|
|
3
3
|
import { isEqual, isRelative, parseURL, resolveURL } from "ufo";
|
|
4
4
|
import { clientMetaTags, RouterContext, RouterStateContext } from "../context.js";
|
|
5
5
|
import { $routeMetaStore } from "../hooks/useRouteMeta.js";
|
|
@@ -97,7 +97,9 @@ export function BrowserRouter(props) {
|
|
|
97
97
|
document.title = title;
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
|
-
|
|
100
|
+
startTransitionRaw(() => {
|
|
101
|
+
setRouterState(state);
|
|
102
|
+
});
|
|
101
103
|
};
|
|
102
104
|
// If a dynamic compojnent fails to load during a page transition, we need to reload the page
|
|
103
105
|
subscribers.add((event) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useHydrating.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/hooks/useHydrating.tsx"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,wBAAgB,YAAY,
|
|
1
|
+
{"version":3,"file":"useHydrating.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/hooks/useHydrating.tsx"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,wBAAgB,YAAY,YAe3B;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,YAEvB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { useEffect, useState } from "react";
|
|
1
|
+
import { startTransition, useEffect, useState } from "react";
|
|
2
2
|
let isSSR = true;
|
|
3
3
|
/**
|
|
4
4
|
* Use this function to help with SSR edge-cases.
|
|
@@ -12,7 +12,9 @@ export function useHydrating() {
|
|
|
12
12
|
useEffect(() => {
|
|
13
13
|
if (!isSSR)
|
|
14
14
|
return;
|
|
15
|
-
|
|
15
|
+
startTransition(() => {
|
|
16
|
+
setValue(false);
|
|
17
|
+
});
|
|
16
18
|
const timer = setTimeout(() => {
|
|
17
19
|
isSSR = false;
|
|
18
20
|
}, 5000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRestorableState.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/hooks/useRestorableState.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"useRestorableState.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/hooks/useRestorableState.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA0C,MAAM,OAAO,CAAA;AAIxE;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAkBhF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { useState } from "react";
|
|
1
|
+
import { startTransition, useCallback, useState } from "react";
|
|
2
2
|
import { useRouterEvents } from "./useRouterEvents.js";
|
|
3
3
|
import { useRoute } from "./useRoute.js";
|
|
4
4
|
/**
|
|
@@ -9,10 +9,15 @@ export function useRestorableState(key, fallback) {
|
|
|
9
9
|
const route = useRoute();
|
|
10
10
|
const initial = route.returnState?.[key] ?? fallback;
|
|
11
11
|
const [state, setState] = useState(initial);
|
|
12
|
+
const dispatch = useCallback((value) => {
|
|
13
|
+
startTransition(() => {
|
|
14
|
+
setState(value);
|
|
15
|
+
});
|
|
16
|
+
}, []);
|
|
12
17
|
useRouterEvents((event) => {
|
|
13
18
|
if (event.type === "capture-restorable-state") {
|
|
14
19
|
event.state[key] = state;
|
|
15
20
|
}
|
|
16
21
|
});
|
|
17
|
-
return [state,
|
|
22
|
+
return [state, dispatch];
|
|
18
23
|
}
|
package/dist/app/server/rpc.d.ts
CHANGED
|
@@ -1,55 +1,28 @@
|
|
|
1
1
|
import { AnyProcedure } from "@trpc/server";
|
|
2
2
|
import { FetchCreateContextFnOptions } from "@trpc/server/adapters/fetch";
|
|
3
|
+
import superjson from "superjson";
|
|
3
4
|
import { ServerContext } from "./server-context";
|
|
4
|
-
export declare const rpcApi: {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
middleware: <$ContextOverrides>(fn: import("@trpc/server/unstable-core-do-not-import").MiddlewareFunction<RPCContext, object, object, $ContextOverrides, unknown>) => import("@trpc/server/unstable-core-do-not-import").MiddlewareBuilder<RPCContext, object, $ContextOverrides, unknown>;
|
|
13
|
-
router: {
|
|
14
|
-
<TInput extends import("@trpc/server").RouterRecord>(input: TInput): import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
|
|
15
|
-
ctx: RPCContext;
|
|
16
|
-
meta: object;
|
|
17
|
-
errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
|
|
18
|
-
transformer: true;
|
|
19
|
-
}, TInput>;
|
|
20
|
-
<TInput extends import("@trpc/server/unstable-core-do-not-import").CreateRouterOptions>(input: TInput): import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
|
|
21
|
-
ctx: RPCContext;
|
|
22
|
-
meta: object;
|
|
23
|
-
errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
|
|
24
|
-
transformer: true;
|
|
25
|
-
}, import("@trpc/server/unstable-core-do-not-import").DecorateCreateRouterOptions<TInput>>;
|
|
26
|
-
};
|
|
27
|
-
mergeRouters: typeof import("@trpc/server/unstable-core-do-not-import").mergeRouters;
|
|
28
|
-
createCallerFactory: <TRecord extends import("@trpc/server").RouterRecord>(router: Pick<import("@trpc/server/unstable-core-do-not-import").Router<{
|
|
29
|
-
ctx: RPCContext;
|
|
30
|
-
meta: object;
|
|
31
|
-
errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
|
|
32
|
-
transformer: true;
|
|
33
|
-
}, TRecord>, "_def">) => import("@trpc/server/unstable-core-do-not-import").RouterCaller<{
|
|
34
|
-
ctx: RPCContext;
|
|
35
|
-
meta: object;
|
|
36
|
-
errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
|
|
37
|
-
transformer: true;
|
|
38
|
-
}, TRecord>;
|
|
39
|
-
};
|
|
5
|
+
export declare const rpcApi: import("@trpc/server").TRPCRootObject<RPCContext, object, {
|
|
6
|
+
transformer: typeof superjson;
|
|
7
|
+
}, {
|
|
8
|
+
ctx: RPCContext;
|
|
9
|
+
meta: object;
|
|
10
|
+
errorShape: import("@trpc/server").TRPCDefaultErrorShape;
|
|
11
|
+
transformer: true;
|
|
12
|
+
}>;
|
|
40
13
|
type RouterSchema = Record<string, Record<string, AnyProcedure> | AnyProcedure>;
|
|
41
14
|
export declare const rpc: {
|
|
42
|
-
middleware: <$ContextOverrides>(fn: import("@trpc/server
|
|
43
|
-
procedure: import("@trpc/server
|
|
15
|
+
middleware: <$ContextOverrides>(fn: import("@trpc/server").TRPCMiddlewareFunction<RPCContext, object, object, $ContextOverrides, unknown>) => import("@trpc/server").TRPCMiddlewareBuilder<RPCContext, object, $ContextOverrides, unknown>;
|
|
16
|
+
procedure: import("@trpc/server").TRPCProcedureBuilder<RPCContext, object, object, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, false>;
|
|
44
17
|
router<T extends RouterSchema>(routes: T): T;
|
|
45
18
|
};
|
|
46
19
|
export declare function defineServerContext<T>(func: (opts: FetchCreateContextFnOptions) => T): (opts: FetchCreateContextFnOptions) => T;
|
|
47
|
-
export declare function instantiateRouter<T extends RouterSchema>(routes: T): import("@trpc/server
|
|
20
|
+
export declare function instantiateRouter<T extends RouterSchema>(routes: T): import("@trpc/server").TRPCBuiltRouter<{
|
|
48
21
|
ctx: RPCContext;
|
|
49
22
|
meta: object;
|
|
50
|
-
errorShape: import("@trpc/server
|
|
23
|
+
errorShape: import("@trpc/server").TRPCDefaultErrorShape;
|
|
51
24
|
transformer: true;
|
|
52
|
-
}, T
|
|
25
|
+
}, import("@trpc/server").TRPCDecorateCreateRouterOptions<T>>;
|
|
53
26
|
export type InferRPCServerContext<TFunc extends null | ((opts: FetchCreateContextFnOptions) => any)> = {
|
|
54
27
|
req: Request;
|
|
55
28
|
searchParams: URLSearchParams;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../../src/app/server/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,MAAM,cAAc,CAAA;AACrD,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../../src/app/server/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,MAAM,cAAc,CAAA;AACrD,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,SAAS,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,eAAO,MAAM,MAAM;;;;;;;EAEjB,CAAA;AAEF,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,YAAY,CAAC,CAAA;AAE/E,eAAO,MAAM,GAAG;;;WAGP,CAAC,SAAS,YAAY,UAAU,CAAC,GAAG,CAAC;CAG7C,CAAA;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,IAAI,EAAE,CAAC,IAAI,EAAE,2BAA2B,KAAK,CAAC,GAC7C,CAAC,IAAI,EAAE,2BAA2B,KAAK,CAAC,CAE1C;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,YAAY,EAAE,MAAM,EAAE,CAAC;;;;;8DAElE;AAED,MAAM,MAAM,qBAAqB,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,2BAA2B,KAAK,GAAG,CAAC,IAAI;IACrG,GAAG,EAAE,OAAO,CAAA;IACZ,YAAY,EAAE,eAAe,CAAA;IAC7B,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,aAAa,CAAA;CACtB,GAAG,CAAC,KAAK,SAAS,CAAC,IAAI,EAAE,2BAA2B,KAAK,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAA"}
|
|
@@ -50,7 +50,7 @@ export declare class ServerContext {
|
|
|
50
50
|
bypass?: boolean;
|
|
51
51
|
newOrigin?: string;
|
|
52
52
|
}): Promise<ServerAppData>;
|
|
53
|
-
extractRequestHeaders(req?: RequestHeaders): Partial<Record<import("
|
|
53
|
+
extractRequestHeaders(req?: RequestHeaders): Partial<Record<import("h3").HTTPHeaderName, string | undefined>>;
|
|
54
54
|
fetchNamedQuery(req: {
|
|
55
55
|
name: string;
|
|
56
56
|
bypass: boolean;
|
package/dist/node/cli/cli.js
CHANGED
|
@@ -291,7 +291,7 @@ program
|
|
|
291
291
|
.command("preview")
|
|
292
292
|
.description("Run a local production build, which was previously built with `eddev build --serverless`")
|
|
293
293
|
.option("--host", "Hostname to serve the application", "")
|
|
294
|
-
.option("--port", "Port to serve the application", "8080")
|
|
294
|
+
.option("--port <port>", "Port to serve the application", "8080")
|
|
295
295
|
.action(async (options) => {
|
|
296
296
|
const project = await Project.create({
|
|
297
297
|
rootDir: process.cwd(),
|
|
@@ -301,7 +301,7 @@ program
|
|
|
301
301
|
process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
|
|
302
302
|
process.env["NODE_ENV"] = "production";
|
|
303
303
|
process.env["HOST"] = options.host;
|
|
304
|
-
process.env["PORT"] = options.port;
|
|
304
|
+
process.env["PORT"] = options.port ?? process.env["PORT"] ?? "8080";
|
|
305
305
|
if (!options.host) {
|
|
306
306
|
process.env["HOST"] = defaultHostname;
|
|
307
307
|
const keys = await ensureSelfSignedCert(defaultHostname, process.cwd());
|
|
@@ -321,6 +321,7 @@ program
|
|
|
321
321
|
const entry = ".output/server/index.mjs";
|
|
322
322
|
console.info("Looking for production serverless build in: " + entry + "...");
|
|
323
323
|
await import(join(process.cwd(), ".output/server/index.mjs"));
|
|
324
|
+
console.log("Visit " + chalk.cyan(`https://${process.env.HOST}:${process.env.PORT}`) + " to see your app.");
|
|
324
325
|
});
|
|
325
326
|
program
|
|
326
327
|
.command("info")
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "2.0.0-beta.
|
|
1
|
+
export declare const VERSION = "2.0.0-beta.253";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/node/cli/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const VERSION = "2.0.0-beta.
|
|
1
|
+
export const VERSION = "2.0.0-beta.253";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block-manifest.d.ts","sourceRoot":"","sources":["../../../../src/node/project/manifest/block-manifest.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,aAAa,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAIpG,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAMvC,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE;QACN,CAAC,CAAC,EAAE,MAAM,GAAG,aAAa,CAAA;KAC3B,CAAA;IACD,kBAAkB,EAAE;QAClB,QAAQ,EAAE,MAAM,CAAA;QAChB,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAA;KAC9B,EAAE,CAAA;CACJ,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,wBAAwB,GAAG,IAAI,CAAA;IACrC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAA;AAEzE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"block-manifest.d.ts","sourceRoot":"","sources":["../../../../src/node/project/manifest/block-manifest.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,aAAa,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAIpG,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAMvC,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE;QACN,CAAC,CAAC,EAAE,MAAM,GAAG,aAAa,CAAA;KAC3B,CAAA;IACD,kBAAkB,EAAE;QAClB,QAAQ,EAAE,MAAM,CAAA;QAChB,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAA;KAC9B,EAAE,CAAA;CACJ,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,wBAAwB,GAAG,IAAI,CAAA;IACrC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAA;AAEzE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,6EA2GjD"}
|
|
@@ -53,6 +53,8 @@ export function loadBlockManifest(project) {
|
|
|
53
53
|
},
|
|
54
54
|
getKey(path) {
|
|
55
55
|
// Ignore files which start with an underscore
|
|
56
|
+
if (path.match(/blocks\/[^\/]+\/_/))
|
|
57
|
+
return null;
|
|
56
58
|
if (path.startsWith("_core"))
|
|
57
59
|
return null;
|
|
58
60
|
// Strip the blocks folder name + extension
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "eddev",
|
|
3
|
-
"version": "2.0.0-beta.
|
|
3
|
+
"version": "2.0.0-beta.253",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -93,8 +93,8 @@
|
|
|
93
93
|
"@nozbe/microfuzz": "^1.0.0",
|
|
94
94
|
"@rollup/plugin-replace": "^6.0.2",
|
|
95
95
|
"@tanstack/react-query": "^5.51.23",
|
|
96
|
-
"@trpc/client": "
|
|
97
|
-
"@trpc/server": "
|
|
96
|
+
"@trpc/client": "11.4.4",
|
|
97
|
+
"@trpc/server": "11.4.4",
|
|
98
98
|
"@types/qs": "^6.9.15",
|
|
99
99
|
"@types/react": "^18",
|
|
100
100
|
"@types/react-dom": "^18",
|
|
@@ -126,8 +126,7 @@
|
|
|
126
126
|
"undent": "^0.1.0",
|
|
127
127
|
"undici": "6.21.0",
|
|
128
128
|
"valtio": "^2.1.2",
|
|
129
|
-
"vinxi": "^0.5.
|
|
130
|
-
"vite": "^6.3.0",
|
|
129
|
+
"vinxi": "^0.5.8",
|
|
131
130
|
"vite-tsconfig-paths": "4.3.2",
|
|
132
131
|
"zod": "^3.22.4",
|
|
133
132
|
"zod-to-json-schema": "^3.21.4",
|
|
@@ -140,7 +139,6 @@
|
|
|
140
139
|
"typescript": "^5.5.2"
|
|
141
140
|
},
|
|
142
141
|
"peerDependencies": {
|
|
143
|
-
"openai": "^4.93.0",
|
|
144
142
|
"react": "^18.3.1",
|
|
145
143
|
"react-dom": "^18.3.1",
|
|
146
144
|
"tailwindcss": "^3.4.4"
|