@slicemachine/adapter-next 0.3.85-beta.2 → 0.3.85

package/dist/plugin.cjs

@@ -6,7 +6,7 @@ const pluginKit = require("@slicemachine/plugin-kit");
 const fs = require("@slicemachine/plugin-kit/fs");
 const rejectIfNecessary = require("./lib/rejectIfNecessary.cjs");
 const upsertSliceLibraryIndexFile = require("./lib/upsertSliceLibraryIndexFile.cjs");
-const _package = require("./package.json.cjs");
+const _package = require("./packages/adapter-next/package.json.cjs");
 const constants = require("./constants.cjs");
 const documentationRead = require("./hooks/documentation-read.cjs");
 const projectInit = require("./hooks/project-init.cjs");

package/dist/plugin.js

@@ -4,7 +4,7 @@ import { defineSliceMachinePlugin } from "@slicemachine/plugin-kit";
 import { writeProjectEnvironment, readProjectEnvironment, writeSliceModel, upsertGlobalTypeScriptTypes, renameSlice, deleteSliceDirectory, readSliceModel, writeSliceFile, deleteSliceFile, readSliceFile, readSliceLibrary, readSliceTemplateLibrary, writeCustomTypeModel, renameCustomType, deleteCustomTypeDirectory, readCustomTypeModel, writeCustomTypeFile, deleteCustomTypeFile, readCustomTypeFile, readCustomTypeLibrary } from "@slicemachine/plugin-kit/fs";
 import { rejectIfNecessary } from "./lib/rejectIfNecessary.js";
 import { upsertSliceLibraryIndexFile } from "./lib/upsertSliceLibraryIndexFile.js";
-import { name } from "./package.json.js";
+import { name } from "./packages/adapter-next/package.json.js";
 import { DEFAULT_ENVIRONMENT_VARIABLE_FILE_PATH, PRISMIC_ENVIRONMENT_ENVIRONMENT_VARIABLE_NAME, ENVIRONMENT_VARIABLE_PATHS } from "./constants.js";
 import { documentationRead } from "./hooks/documentation-read.js";
 import { projectInit } from "./hooks/project-init.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slicemachine/adapter-next",
-  "version": "0.3.85-beta.2",
+  "version": "0.3.85",
   "description": "Slice Machine adapter for Next.js.",
   "keywords": [
     "typescript",
@@ -68,7 +68,7 @@
   "dependencies": {
     "@prismicio/simulator": "^0.1.4",
     "@prismicio/types-internal": "3.11.2",
-    "@slicemachine/plugin-kit": "0.4.83-beta.2",
+    "@slicemachine/plugin-kit": "0.4.83",
     "common-tags": "^1.8.2",
     "fp-ts": "^2.13.1",
     "io-ts": "^2.2.20",
@@ -82,7 +82,7 @@
     "@prismicio/mock": "0.7.1",
     "@size-limit/preset-small-lib": "8.2.4",
     "@types/common-tags": "1.8.1",
-    "@types/react": "18.0.28",
+    "@types/react": "19.2.2",
     "@typescript-eslint/eslint-plugin": "5.55.0",
     "@typescript-eslint/parser": "5.55.0",
     "@vitejs/plugin-react": "3.1.0",
@@ -92,11 +92,11 @@
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-prettier": "5.0.1",
     "eslint-plugin-tsdoc": "0.2.17",
-    "next": "14.2.32",
+    "next": "16.0.0-beta.0",
     "prettier": "3.0.3",
     "prettier-plugin-jsdoc": "1.1.1",
     "prismic-ts-codegen": "0.1.27",
-    "react": "18.2.0",
+    "react": "19.2.0",
     "rollup-plugin-preserve-directives": "0.4.0",
     "size-limit": "8.2.4",
     "typescript": "4.9.5",
@@ -105,7 +105,7 @@
     "vitest": "0.32.0"
   },
   "peerDependencies": {
-    "next": "^11 || ^12 || ^13 || ^14 || ^15.0.0-rc.0",
+    "next": "^11 || ^12 || ^13 || ^14 || ^15 || ^16.0.0-beta.0",
     "react": "^17 || ^18 || ^19.0.0-rc.0"
   },
   "engines": {
@@ -113,6 +113,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "stableVersion": "0.3.84"
+  }
 }

package/src/hooks/project-init.ts

@@ -8,6 +8,7 @@ import {
 	writeProjectFile,
 } from "@slicemachine/plugin-kit/fs";
 import { source } from "common-tags";
+import semver from "semver";
 
 import { buildSrcPath } from "../lib/buildSrcPath";
 import { checkHasAppRouter } from "../lib/checkHasAppRouter";
@@ -18,6 +19,7 @@ import { upsertSliceLibraryIndexFile } from "../lib/upsertSliceLibraryIndexFile"
 
 import type { PluginOptions } from "../types";
 import { PRISMIC_ENVIRONMENT_ENVIRONMENT_VARIABLE_NAME } from "../constants";
+import { getNextJSVersion } from "../lib/getNextJSVersion";
 
 type InstallDependenciesArgs = {
 	installDependencies: ProjectInitHookData["installDependencies"];
@@ -541,6 +543,9 @@ const createRevalidateRoute = async ({
 		return;
 	}
 
+	const nextJSVersion = await getNextJSVersion();
+	const supportsCacheLife = semver.gte(nextJSVersion, "16.0.0-beta.0");
+
 	const extension = await getJSFileExtension({ helpers, options });
 	const filename = await buildSrcPath({
 		filename: `app/api/revalidate/route.${extension}`,
@@ -556,7 +561,7 @@ const createRevalidateRoute = async ({
 		import { revalidateTag } from "next/cache";
 
 		export async function POST() {
-			revalidateTag("prismic");
+			revalidateTag("prismic"${supportsCacheLife ? ', "max"' : ""});
 
 			return NextResponse.json({ revalidated: true, now: Date.now() });
 		}

package/src/lib/getNextJSVersion.ts

@@ -0,0 +1,16 @@
+import { join } from "node:path";
+
+import { requireResolve } from "./requireResolve";
+
+export const getNextJSVersion = async (): Promise<string> => {
+	// A dynamic import lets us easily mock the module.
+	const { readFile } = await import("node:fs/promises");
+
+	const packageJSONPath = requireResolve(
+		"next/package.json",
+		join(process.cwd(), "package.json"),
+	);
+	const { version } = JSON.parse(await readFile(packageJSONPath, "utf8"));
+
+	return version;
+};

package/src/lib/requireResolve.ts

@@ -0,0 +1,30 @@
+import _module, { createRequire } from "node:module";
+
+/**
+ * Resolves a module path with `createRequire().resolve()` with Yarn PnP
+ * support.
+ *
+ * @param id - Module to resolve.
+ * @param from - Location to resolve the module from.
+ *
+ * @returns - Resolved module path.
+ */
+export const requireResolve = (id: string, from: string): string => {
+	let resolvedID = id;
+
+	// Support Yarn PnP
+	if (
+		process.versions.pnp &&
+		"findPnpApi" in _module &&
+		typeof _module.findPnpApi === "function"
+	) {
+		const pnpApi = _module.findPnpApi(from);
+		if (pnpApi) {
+			resolvedID = pnpApi.resolveRequest(id, from);
+		}
+	}
+
+	const require = createRequire(from);
+
+	return require.resolve(resolvedID);
+};