fix: update environment variable usage in Contentful setup to remove NEXT_PUBLIC prefix for consistency across configurations

Author: Lotfi Arif

packages/playgrounds/easy-hr/.env.local.example

@@ -6,10 +6,10 @@ NEXT_PUBLIC_NINETAILED_MANAGEMENT_SECRET=
 
 NEXT_PUBLIC_GTM_ID=
 
-NEXT_PUBLIC_CONTENTFUL_SPACE_ID=
-NEXT_PUBLIC_CONTENTFUL_ENVIRONMENT=
-CONTENTFUL_TOKEN=
-CONTENTFUL_PREVIEW_TOKEN=
+CONTENTFUL_SPACE_ID=
+CONTENTFUL_ENVIRONMENT=
+NEXT_PUBLIC_CONTENTFUL_TOKEN=
+NEXT_PUBLIC_CONTENTFUL_PREVIEW_TOKEN=
 CONTENTFUL_PREVIEW_SECRET=
 
 CONTENTFUL_MANAGEMENT_TOKEN=

packages/playgrounds/easy-hr/contentful/deleteEntriesOfContentType.js

@@ -26,23 +26,21 @@ async function unpublishAndDeleteEntry(entry) {
   }
 }
 
-contentfulClient
-  .getSpace(process.env.NEXT_PUBLIC_CONTENTFUL_SPACE_ID)
-  .then((space) => {
-    space
-      .getEnvironment(process.env.NEXT_PUBLIC_CONTENTFUL_ENVIRONMENT)
-      .then((environment) => {
-        console.info(`Accessing Environment: ${environment.sys.id}`);
-        console.info(
-          `Deleting Entries Of ContentType: ${process.env.CONTENT_TYPE} `
-        );
-        environment
-          .getEntries({
-            content_type: `${process.env.CONTENT_TYPE}`,
-            limit: `${process.env.LIMIT}`,
-          })
-          .then(async (response) => {
-            await Promise.all(response.items.map(unpublishAndDeleteEntry));
-          });
-      });
-  });
+contentfulClient.getSpace(process.env.CONTENTFUL_SPACE_ID).then((space) => {
+  space
+    .getEnvironment(process.env.CONTENTFUL_ENVIRONMENT)
+    .then((environment) => {
+      console.info(`Accessing Environment: ${environment.sys.id}`);
+      console.info(
+        `Deleting Entries Of ContentType: ${process.env.CONTENT_TYPE} `
+      );
+      environment
+        .getEntries({
+          content_type: `${process.env.CONTENT_TYPE}`,
+          limit: `${process.env.LIMIT}`,
+        })
+        .then(async (response) => {
+          await Promise.all(response.items.map(unpublishAndDeleteEntry));
+        });
+    });
+});

packages/playgrounds/easy-hr/contentful/export.js

@@ -8,8 +8,8 @@ dotEnv.config({ path: `${process.env.PATH_TO_ENV_FILE}` });
  * just the latest published versions of your content
  * */
 const exportOptions = {
-  spaceId: process.env.NEXT_PUBLIC_CONTENTFUL_SPACE_ID,
-  environmentId: process.env.NEXT_PUBLIC_CONTENTFUL_ENVIRONMENT || 'master',
+  spaceId: process.env.CONTENTFUL_SPACE_ID,
+  environmentId: process.env.CONTENTFUL_ENVIRONMENT || 'master',
   managementToken: process.env.CONTENTFUL_MANAGEMENT_TOKEN,
   contentFile:
     process.env.CONTENTFUL_SPACE_DATA_LOCATION ||
@@ -20,14 +20,14 @@ const exportOptions = {
 };
 
 if (
-  !process.env.NEXT_PUBLIC_CONTENTFUL_SPACE_ID ||
+  !process.env.CONTENTFUL_SPACE_ID ||
   !process.env.CONTENTFUL_MANAGEMENT_TOKEN
 ) {
   throw new Error(
     [
       'Parameters missing...',
       'Please insert the following credentials into your .env.local file:',
-      '- NEXT_PUBLIC_CONTENTFUL_SPACE_ID=XXX',
+      '- CONTENTFUL_SPACE_ID=XXX',
       '- CONTENTFUL_MANAGEMENT_TOKEN=CFPAT-XXX',
       'Afterwards run the export command as follows:',
       '"npm run export" or "yarn export"',

packages/playgrounds/easy-hr/contentful/setup.js

@@ -5,23 +5,23 @@ const dotEnv = require('dotenv');
 dotEnv.config({ path: `${process.env.PATH_TO_ENV_FILE}` });
 
 const importOptions = {
-  spaceId: process.env.NEXT_PUBLIC_CONTENTFUL_SPACE_ID,
-  environmentId: process.env.NEXT_PUBLIC_CONTENTFUL_ENVIRONMENT || 'master',
+  spaceId: process.env.CONTENTFUL_SPACE_ID,
+  environmentId: process.env.CONTENTFUL_ENVIRONMENT || 'master',
   managementToken: process.env.CONTENTFUL_MANAGEMENT_TOKEN,
   contentFile:
     process.env.CONTENTFUL_SPACE_DATA_LOCATION ||
     './packages/playgrounds/easy-hr/contentful/data/contentful-space-data.json',
 };
 
 if (
-  !process.env.NEXT_PUBLIC_CONTENTFUL_SPACE_ID ||
+  !process.env.CONTENTFUL_SPACE_ID ||
   !process.env.CONTENTFUL_MANAGEMENT_TOKEN
 ) {
   throw new Error(
     [
       'Parameters missing...',
       'Please insert the following credentials into your .env.local file:',
-      '- NEXT_PUBLIC_CONTENTFUL_SPACE_ID=XXX',
+      '- CONTENTFUL_SPACE_ID=XXX',
       '- CONTENTFUL_MANAGEMENT_TOKEN=CFPAT-XXX',
       'Afterwards run the setup command as follows:',
       '"npm run setup" or "yarn setup"',

packages/playgrounds/easy-hr/lib/api.ts

@@ -11,13 +11,13 @@ import {
 
 const contentfulClient = createClient({
   space: process.env.NEXT_PUBLIC_CONTENTFUL_SPACE_ID ?? '',
-  accessToken: process.env.CONTENTFUL_TOKEN ?? '',
+  accessToken: process.env.NEXT_PUBLIC_CONTENTFUL_TOKEN ?? '',
   environment: process.env.NEXT_PUBLIC_CONTENTFUL_ENVIRONMENT ?? 'master',
 });
 
 const previewClient = createClient({
   space: process.env.NEXT_PUBLIC_CONTENTFUL_SPACE_ID ?? '',
-  accessToken: process.env.CONTENTFUL_PREVIEW_TOKEN ?? '',
+  accessToken: process.env.NEXT_PUBLIC_CONTENTFUL_PREVIEW_TOKEN ?? '',
   host: 'preview.contentful.com',
 });