@uniformdev/canvas-next-rsc 19.53.1-alpha.41 → 19.54.2-alpha.3

package/dist/components/evaluateComposition.js

@@ -1,13 +1,13 @@
 import { CANVAS_PERSONALIZATION_PARAM, CANVAS_PERSONALIZE_TYPE, CANVAS_TEST_TYPE, localize, mapSlotToPersonalizedVariations, mapSlotToTestVariations, walkComponentTree, } from '@uniformdev/canvas';
 import { UNIFORM_DEFAULT_COOKIE_NAME } from '@uniformdev/context';
-import serverConfig from '../config/uniform.server.config';
+import { getServerConfig } from '../config/helpers';
 import { serializeCookie } from '../score';
 import { isIncontextEditingEnabled } from '../utils/draft';
 import { getBaseUrl } from '../utils/url';
 import { getEnrichmentTags } from './getEnrichmentTags';
 import { getUniformContext } from './getUniformContext';
 import { resolvePath } from './resolvePath';
-export const evaluateComposition = async ({ root, params, searchParams, dynamicInputs, headers, cookies, update, config = serverConfig, }) => {
+export const evaluateComposition = async ({ root, params, searchParams, dynamicInputs, headers, cookies, update, config = getServerConfig(), }) => {
     // resolve the path from route params
     const path = resolvePath({
         params,

package/dist/components/getUniformContext.js

@@ -1,13 +1,14 @@
 import { Context, CookieTransitionDataStore } from '@uniformdev/context';
 import { getManifestFromApi } from '../client/manifestClient';
-import serverConfig from '../config/uniform.server.config';
+import { getServerConfig } from '../config/helpers';
 export const getUniformContext = async ({ searchParams, cookieValue, }) => {
     const manifest = await getManifestFromApi({
         searchParams,
     });
+    const config = getServerConfig();
     const context = new Context({
         manifest,
-        defaultConsent: serverConfig.defaultConsent,
+        defaultConsent: config.defaultConsent,
         transitionStore: new CookieTransitionDataStore({
             serverCookieValue: cookieValue,
         }),

package/dist/components/retrieveRoute.js

@@ -5,8 +5,7 @@ import { cookies, headers } from 'next/headers';
 import { notFound, redirect } from 'next/navigation';
 import { getManifestFromApi } from '../client/manifestClient';
 import { getRouteClient } from '../client/routeClient';
-import { getRouteRevalidateInterval } from '../config/helpers';
-import config from '../config/uniform.server.config';
+import { getRouteRevalidateInterval, getServerConfig } from '../config/helpers';
 import { isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment, } from '../utils/draft';
 import { buildPathTag } from '../utils/tag';
 import { getBaseUrl } from '../utils/url';
@@ -111,6 +110,7 @@ export const resolveRedirectHref = (resolveResult, path) => {
 };
 const resolveRouteByEdgeConfig = async (data) => {
     var _a;
+    const config = getServerConfig();
     if (!((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeRedirects) || !process.env.EDGE_CONFIG) {
         return undefined;
     }

package/dist/config/helpers.d.ts

@@ -1,3 +1,4 @@
+import { UniformServerConfig } from './models';
 export declare const getCanvasRevalidateInterval: (options: {
     searchParams: {
         [key: string]: string | undefined;
@@ -13,3 +14,4 @@ export declare const getRouteRevalidateInterval: (options: {
         [key: string]: string | undefined;
     } | undefined;
 }) => number | undefined;
+export declare const getServerConfig: () => UniformServerConfig;

package/dist/config/helpers.js

@@ -1,20 +1,34 @@
 import { isDraftModeEnabled, isOnVercelPreviewEnvironment } from '../utils/draft';
-import config from './uniform.server.config';
 export const getCanvasRevalidateInterval = (options) => {
     if (isDraftModeEnabled({ searchParams: options.searchParams }) || isOnVercelPreviewEnvironment()) {
         return -1;
     }
+    const config = getServerConfig();
     return 'canvasRevalidateInterval' in config ? config.canvasRevalidateInterval : undefined;
 };
 export const getManifestRevalidateInterval = (options) => {
     if (isDraftModeEnabled({ searchParams: options.searchParams }) || isOnVercelPreviewEnvironment()) {
         return -1;
     }
+    const config = getServerConfig();
     return 'manifestRevalidateInterval' in config ? config.manifestRevalidateInterval : undefined;
 };
 export const getRouteRevalidateInterval = (options) => {
     if (isDraftModeEnabled({ searchParams: options.searchParams }) || isOnVercelPreviewEnvironment()) {
         return -1;
     }
+    const config = getServerConfig();
     return 'routeRevalidateInterval' in config ? config.routeRevalidateInterval : undefined;
 };
+export const getServerConfig = () => {
+    let serverConfig;
+    try {
+        serverConfig = require('uniform.server.config.js');
+    }
+    catch (e) {
+        serverConfig = {
+            defaultConsent: false,
+        };
+    }
+    return serverConfig;
+};

package/dist/config.js

@@ -1,14 +1,11 @@
-const { existsSync, lstatSync, readFileSync, writeFileSync, readlinkSync } = require('fs');
-const { join, dirname, isAbsolute } = require('path');
-const getPackagePath = () => join(process.cwd(), 'node_modules', '@uniformdev/canvas-next-rsc');
-const getSymlinkAbsolutePath = (symlink) => join(dirname(getPackagePath()), symlink);
-const getConfigPath = (type) => {
-    const configFilePath = join(process.cwd(), `uniform.${type}.config.js`);
+const { existsSync } = require('fs');
+const { join } = require('path');
+const getConfigPath = () => {
+    const configFilePath = join(process.cwd(), `uniform.server.config.js`);
     if (!existsSync(configFilePath)) {
         return undefined;
     }
-    const content = readFileSync(configFilePath, 'utf8');
-    return content;
+    return configFilePath;
 };
 module.exports.withUniformConfig = (nextConfig) => ({
     ...nextConfig,
@@ -17,23 +14,15 @@ module.exports.withUniformConfig = (nextConfig) => ({
             nextConfig.webpack(config, context);
         }
         if (context.isServer) {
-            const uniformConfig = getConfigPath('server');
-            if (uniformConfig) {
-                const packagePath = getPackagePath();
-                const stat = lstatSync(packagePath);
-                const jsFilePath = 'dist/config/uniform.server.config.js';
-                if (stat === null || stat === void 0 ? void 0 : stat.isSymbolicLink()) {
-                    const symlink = readlinkSync(packagePath);
-                    if (symlink) {
-                        const absolute = join(!isAbsolute(symlink) ? getSymlinkAbsolutePath(symlink) : symlink, jsFilePath);
-                        // eslint-disable-next-line no-console
-                        console.log(`Writing Uniform config to ${absolute}`);
-                        writeFileSync(absolute, uniformConfig, 'utf8');
-                    }
-                }
-                else {
-                    writeFileSync(join(packagePath, jsFilePath), uniformConfig, 'utf8');
-                }
+            const uniformConfigPath = getConfigPath();
+            if (uniformConfigPath) {
+                /* eslint-disable-next-line no-console */
+                console.log('Using Uniform config from', uniformConfigPath);
+                config.module.rules.push({
+                    test: /uniform\.server\.config\.js$/,
+                    include: uniformConfigPath,
+                    use: context.defaultLoaders.babel, // Use ts-loader for TypeScript files, or babel-loader for JavaScript files
+                });
             }
         }
         return config;

package/dist/handler/helpers.js

@@ -2,7 +2,7 @@ import { parseConnectionString } from '@vercel/edge-config';
 import { Webhook } from 'svix';
 import { getProjectMapClient } from '../client/projectMapClient';
 import { getRouteClient } from '../client/routeClient';
-import config from '../config/uniform.server.config';
+import { getServerConfig } from '../config/helpers';
 import { buildCompositionTag, buildPathTag } from '../utils/tag';
 export const isSvixMessage = async (request) => {
     const requiredHeaders = ['svix-id', 'svix-timestamp', 'svix-signature'];
@@ -100,6 +100,7 @@ export const processEdgeConfigChange = async ({ source_url }) => {
         console.warn('UNIFORM_VERCEL_EDGE_CONFIG_TOKEN is not set, skipping edge redirect upsert');
         return;
     }
+    const config = getServerConfig();
     const routeClient = getRouteClient({
         revalidate: -1,
     });

package/dist/handler/messages/handleProjectMapNodeDelete.js

@@ -1,5 +1,5 @@
 import { ProjectMapNodeDeleteDefinition } from '@uniformdev/webhooks';
-import config from '../../config/uniform.server.config';
+import { getServerConfig } from '../../config/helpers';
 import { buildProjectMapNodePaths, processEdgeConfigChange } from '../helpers';
 export const handleProjectMapNodeDelete = async (body) => {
     var _a;
@@ -9,6 +9,7 @@ export const handleProjectMapNodeDelete = async (body) => {
     }
     const tags = [];
     tags.push(...buildProjectMapNodePaths(parsed.data.path));
+    const config = getServerConfig();
     if ((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeCompositions) {
         await processEdgeConfigChange({
             source_url: parsed.data.path,

package/dist/handler/messages/handleProjectMapNodeInsert.js

@@ -1,5 +1,5 @@
 import { ProjectMapNodeInsertDefinition } from '@uniformdev/webhooks';
-import config from '../../config/uniform.server.config';
+import { getServerConfig } from '../../config/helpers';
 import { buildProjectMapNodePaths, processEdgeConfigChange } from '../helpers';
 export const handleProjectMapNodeInsert = async (body) => {
     var _a;
@@ -9,6 +9,7 @@ export const handleProjectMapNodeInsert = async (body) => {
     }
     const tags = [];
     tags.push(...buildProjectMapNodePaths(parsed.data.path));
+    const config = getServerConfig();
     if ((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeCompositions) {
         await processEdgeConfigChange({
             source_url: parsed.data.path,

package/dist/handler/messages/handleProjectMapNodeUpdate.js

@@ -1,5 +1,5 @@
 import { ProjectMapNodeUpdateDefinition } from '@uniformdev/webhooks';
-import config from '../../config/uniform.server.config';
+import { getServerConfig } from '../../config/helpers';
 import { buildProjectMapNodePaths, processEdgeConfigChange } from '../helpers';
 export const handleProjectMapNodeUpdate = async (body) => {
     var _a;
@@ -10,6 +10,7 @@ export const handleProjectMapNodeUpdate = async (body) => {
     const tags = [];
     tags.push(...buildProjectMapNodePaths(parsed.data.path));
     tags.push(...buildProjectMapNodePaths(parsed.data.previous_path));
+    const config = getServerConfig();
     if ((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeCompositions) {
         await processEdgeConfigChange({
             source_url: parsed.data.path,

package/dist/handler/messages/handleRedirectDelete.js

@@ -1,5 +1,5 @@
 import { RedirectDeleteDefinition } from '@uniformdev/webhooks';
-import config from '../../config/uniform.server.config';
+import { getServerConfig } from '../../config/helpers';
 import { processEdgeConfigChange, processRedirectChange } from '../helpers';
 export const handleRedirectDelete = async (body) => {
     var _a;
@@ -7,6 +7,7 @@ export const handleRedirectDelete = async (body) => {
     if (!parsed.success) {
         return undefined;
     }
+    const config = getServerConfig();
     if ((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeRedirects) {
         await processEdgeConfigChange(parsed.data);
     }

package/dist/handler/messages/handleRedirectInsert.js

@@ -1,5 +1,5 @@
 import { RedirectInsertDefinition } from '@uniformdev/webhooks';
-import config from '../../config/uniform.server.config';
+import { getServerConfig } from '../../config/helpers';
 import { processEdgeConfigChange, processRedirectChange } from '../helpers';
 export const handleRedirectInsert = async (body) => {
     var _a;
@@ -7,6 +7,7 @@ export const handleRedirectInsert = async (body) => {
     if (!parsed.success) {
         return undefined;
     }
+    const config = getServerConfig();
     if ((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeRedirects) {
         await processEdgeConfigChange(parsed.data);
     }

package/dist/handler/messages/handleRedirectUpdate.js

@@ -1,5 +1,5 @@
 import { RedirectUpdateDefinition } from '@uniformdev/webhooks';
-import config from '../../config/uniform.server.config';
+import { getServerConfig } from '../../config/helpers';
 import { processEdgeConfigChange, processRedirectChange } from '../helpers';
 export const handleRedirectUpdate = async (body) => {
     var _a;
@@ -7,6 +7,7 @@ export const handleRedirectUpdate = async (body) => {
     if (!parsed.success) {
         return undefined;
     }
+    const config = getServerConfig();
     if ((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeRedirects) {
         await processEdgeConfigChange(parsed.data);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.53.1-alpha.41+27cb9eb2d",
+  "version": "19.54.2-alpha.3+f67adafcc",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "dev": "tsc --watch",
@@ -55,13 +55,13 @@
     "react-dom": "18.2.0"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.53.1-alpha.41+27cb9eb2d",
-    "@uniformdev/canvas-react": "19.53.1-alpha.41+27cb9eb2d",
-    "@uniformdev/context": "19.53.1-alpha.41+27cb9eb2d",
-    "@uniformdev/project-map": "19.53.1-alpha.41+27cb9eb2d",
-    "@uniformdev/redirect": "19.53.1-alpha.41+27cb9eb2d",
-    "@uniformdev/richtext": "19.53.1-alpha.41+27cb9eb2d",
-    "@uniformdev/webhooks": "19.53.1-alpha.41+27cb9eb2d",
+    "@uniformdev/canvas": "19.54.2-alpha.3+f67adafcc",
+    "@uniformdev/canvas-react": "19.54.2-alpha.3+f67adafcc",
+    "@uniformdev/context": "19.54.2-alpha.3+f67adafcc",
+    "@uniformdev/project-map": "19.54.2-alpha.3+f67adafcc",
+    "@uniformdev/redirect": "19.54.2-alpha.3+f67adafcc",
+    "@uniformdev/richtext": "19.54.2-alpha.3+f67adafcc",
+    "@uniformdev/webhooks": "19.54.2-alpha.3+f67adafcc",
     "@vercel/edge-config": "^0.2.0",
     "dequal": "^2.0.3",
     "js-cookie": "^3.0.5",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "27cb9eb2ddaae3cdb18163df96cf6e58440b700d"
+  "gitHead": "f67adafccc67437fbeb610b57f759ca45bd6140c"
 }

package/dist/config/uniform.server.config.d.ts

@@ -1,3 +0,0 @@
-import { UniformServerConfig } from './models';
-declare const config: UniformServerConfig;
-export default config;

package/dist/config/uniform.server.config.js

@@ -1,3 +0,0 @@
-// NOTE: this file will be replaced at build time with (project root)/uniform.client.config.js (if it exists)
-const config = {};
-export default config;