Merge branch 'main' of github.com:prismicio/slice-machine into repeat…

…able-link
prismicio · Nov 5, 2024 · a74aecd · a74aecd
2 parents 00371f5 + b8eb04e
commit a74aecd
Show file tree

Hide file tree

Showing 15 changed files with 53 additions and 43 deletions.
diff --git a/packages/adapter-next/package.json b/packages/adapter-next/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-next",
-	"version": "0.3.54",
+	"version": "0.3.55",
 	"description": "Slice Machine adapter for Next.js.",
 	"keywords": [
 		"typescript",

diff --git a/packages/adapter-next/src/hooks/documentation-read.ts b/packages/adapter-next/src/hooks/documentation-read.ts
@@ -41,10 +41,11 @@ export const documentationRead: DocumentationReadHook<PluginOptions> = async (
 
 					type Params = { uid: string };
 
-					export default async function Page({ params }: { params: Params }) {
+					export default async function Page({ params }: { params: Promise<Params> }) {
+						const { uid } = await params
 						const client = createClient();
 						const page = await client
-							.getByUID("${model.id}", params.uid)
+							.getByUID("${model.id}", uid)
 							.catch(() => notFound());
 
 						return <SliceZone slices={page.data.slices} components={components} />;
@@ -53,11 +54,12 @@ export const documentationRead: DocumentationReadHook<PluginOptions> = async (
 					export async function generateMetadata({
 						params,
 					}: {
-						params: Params;
+						params: Promise<Params>;
 					}): Promise<Metadata> {
+						const { uid } = await params
 						const client = createClient();
 						const page = await client
-							.getByUID("${model.id}", params.uid)
+							.getByUID("${model.id}", uid)
 							.catch(() => notFound());
 
 						return {
@@ -205,18 +207,20 @@ export const documentationRead: DocumentationReadHook<PluginOptions> = async (
 
 
 					export default async function Page({ params }) {
+						const { uid } = await params
 						const client = createClient();
 						const page = await client
-							.getByUID("${model.id}", params.uid)
+							.getByUID("${model.id}", uid)
 							.catch(() => notFound());
 
 						return <SliceZone slices={page.data.slices} components={components} />;
 					}
 
 					export async function generateMetadata({ params }) {
+						const { uid } = await params
 						const client = createClient();
 						const page = await client
-							.getByUID("${model.id}", params.uid)
+							.getByUID("${model.id}", uid)
 							.catch(() => notFound());
 
 						return {

diff --git a/packages/adapter-next/src/hooks/project-init.ts b/packages/adapter-next/src/hooks/project-init.ts
@@ -284,10 +284,11 @@ const createSliceSimulatorPage = async ({
 
 				import { components } from "../../slices";
 
-				export default function SliceSimulatorPage({
+				export default async function SliceSimulatorPage({
 					searchParams,
 				}: SliceSimulatorParams) {
-					const slices = getSlices(searchParams.state);
+					const { state } = await searchParams
+					const slices = getSlices(state);
 
 					return (
 						<SliceSimulator>
@@ -306,8 +307,9 @@ const createSliceSimulatorPage = async ({
 
 				import { components } from "../../slices";
 
-				export default function SliceSimulatorPage({ searchParams }) {
-					const slices = getSlices(searchParams.state);
+				export default async function SliceSimulatorPage({ searchParams }) {
+					const { state } = await searchParams
+					const slices = getSlices(state);
 
 					return (
 						<SliceSimulator>

diff --git a/packages/adapter-next/src/simulator/types.ts b/packages/adapter-next/src/simulator/types.ts
@@ -5,7 +5,7 @@
  * Server Component.
  */
 export type SliceSimulatorParams = {
-	searchParams: {
+	searchParams: Promise<{
 		state?: string;
-	};
+	}>;
 };
diff --git a/packages/adapter-next/test/__snapshots__/plugin-documentation-read.test.ts.snap b/packages/adapter-next/test/__snapshots__/plugin-documentation-read.test.ts.snap
@@ -16,19 +16,17 @@ import { createClient } from \\"@/prismicio\\";
 import { components } from \\"@/slices\\";
 
 export default async function Page({ params }) {
+  const { uid } = await params;
   const client = createClient();
-  const page = await client
-    .getByUID(\\"foo_bar\\", params.uid)
-    .catch(() => notFound());
+  const page = await client.getByUID(\\"foo_bar\\", uid).catch(() => notFound());
 
   return <SliceZone slices={page.data.slices} components={components} />;
 }
 
 export async function generateMetadata({ params }) {
+  const { uid } = await params;
   const client = createClient();
-  const page = await client
-    .getByUID(\\"foo_bar\\", params.uid)
-    .catch(() => notFound());
+  const page = await client.getByUID(\\"foo_bar\\", uid).catch(() => notFound());
 
   return {
     title: page.data.meta_title,
@@ -69,24 +67,22 @@ import { components } from \\"@/slices\\";
 
 type Params = { uid: string };
 
-export default async function Page({ params }: { params: Params }) {
+export default async function Page({ params }: { params: Promise<Params> }) {
+  const { uid } = await params;
   const client = createClient();
-  const page = await client
-    .getByUID(\\"foo_bar\\", params.uid)
-    .catch(() => notFound());
+  const page = await client.getByUID(\\"foo_bar\\", uid).catch(() => notFound());
 
   return <SliceZone slices={page.data.slices} components={components} />;
 }
 
 export async function generateMetadata({
   params,
 }: {
-  params: Params;
+  params: Promise<Params>;
 }): Promise<Metadata> {
+  const { uid } = await params;
   const client = createClient();
-  const page = await client
-    .getByUID(\\"foo_bar\\", params.uid)
-    .catch(() => notFound());
+  const page = await client.getByUID(\\"foo_bar\\", uid).catch(() => notFound());
 
   return {
     title: page.data.meta_title,

diff --git a/packages/adapter-next/test/plugin-project-init.test.ts b/packages/adapter-next/test/plugin-project-init.test.ts
@@ -850,8 +850,9 @@ describe("Slice Simulator route", () => {
 
 				import { components } from \\"../../slices\\";
 
-				export default function SliceSimulatorPage({ searchParams }) {
-				  const slices = getSlices(searchParams.state);
+				export default async function SliceSimulatorPage({ searchParams }) {
+				  const { state } = await searchParams;
+				  const slices = getSlices(state);
 
 				  return (
 				    <SliceSimulator>
@@ -915,8 +916,9 @@ describe("Slice Simulator route", () => {
 
 				import { components } from \\"../../slices\\";
 
-				export default function SliceSimulatorPage({ searchParams }) {
-				  const slices = getSlices(searchParams.state);
+				export default async function SliceSimulatorPage({ searchParams }) {
+				  const { state } = await searchParams;
+				  const slices = getSlices(state);
 
 				  return (
 				    <SliceSimulator>
@@ -1012,10 +1014,11 @@ describe("Slice Simulator route", () => {
 
 				import { components } from \\"../../slices\\";
 
-				export default function SliceSimulatorPage({
+				export default async function SliceSimulatorPage({
 				  searchParams,
 				}: SliceSimulatorParams) {
-				  const slices = getSlices(searchParams.state);
+				  const { state } = await searchParams;
+				  const slices = getSlices(state);
 
 				  return (
 				    <SliceSimulator>

diff --git a/packages/adapter-nuxt/package.json b/packages/adapter-nuxt/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-nuxt",
-	"version": "0.3.54",
+	"version": "0.3.55",
 	"description": "Slice Machine adapter for Nuxt 3.",
 	"keywords": [
 		"typescript",

diff --git a/packages/adapter-nuxt2/package.json b/packages/adapter-nuxt2/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-nuxt2",
-	"version": "0.3.54",
+	"version": "0.3.55",
 	"description": "Slice Machine adapter for Nuxt 2.",
 	"keywords": [
 		"typescript",

diff --git a/packages/adapter-sveltekit/package.json b/packages/adapter-sveltekit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-sveltekit",
-	"version": "0.3.54",
+	"version": "0.3.55",
 	"description": "Slice Machine adapter for SvelteKit.",
 	"keywords": [
 		"typescript",

diff --git a/packages/init/package.json b/packages/init/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/init",
-	"version": "2.10.11",
+	"version": "2.10.12",
 	"description": "Init Prismic Slice Machine in your project",
 	"keywords": [
 		"typescript",

diff --git a/packages/manager/package.json b/packages/manager/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/manager",
-	"version": "0.22.0",
+	"version": "0.22.1",
 	"description": "Manage all aspects of a Slice Machine project.",
 	"repository": {
 		"type": "git",

diff --git a/packages/plugin-kit/package.json b/packages/plugin-kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/plugin-kit",
-	"version": "0.4.54",
+	"version": "0.4.55",
 	"description": "A set of helpers to develop and run Slice Machine plugins",
 	"keywords": [
 		"typescript",

diff --git a/packages/slice-machine/package.json b/packages/slice-machine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "slice-machine-ui",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "license": "MIT",
   "description": "A visual builder for your Slice Models with all the tools you need to generate data models and mock CMS content locally.",
   "repository": {

diff --git a/packages/slice-machine/src/legacy/lib/builders/common/Zone/Card/components/Hints/index.tsx b/packages/slice-machine/src/legacy/lib/builders/common/Zone/Card/components/Hints/index.tsx
@@ -20,9 +20,14 @@ const Hint: React.FC<HintProps> = ({
 }) => {
   const fieldPathString = renderHintBase({ item });
 
-  // TODO: Call `swr`'s global `mutate` function when something changes to clear the cache.
+  const snippetCacheKey = [fieldPathString];
+  if (item.value.type === "Link") {
+    if (item.value.config?.allowText ?? false)
+      snippetCacheKey.push("allowText");
+  }
+
   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  const { data, error } = useSWR(fieldPathString, async () => {
+  const { data, error } = useSWR(snippetCacheKey.join("$"), async () => {
     return await managerClient.snippets.readSnippets({
       fieldPath: fieldPathString.split("."),
       model: item.value,

diff --git a/packages/start-slicemachine/package.json b/packages/start-slicemachine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "start-slicemachine",
-	"version": "0.12.34",
+	"version": "0.12.35",
 	"description": "Start Slice Machine from within a project.",
 	"repository": {
 		"type": "git",