Adds SSG as CLI option and adjusts code to check for string rather th…

…an boolean.

package.json

@@ -7,10 +7,10 @@
   ],
   "scripts": {
     "setup": "node scripts/yarn/setup.js",
-    "dev": "yarn build:env-loader && node ./scripts/yarn/dev.js",
+    "dev": "yarn build:env-loader && node ./scripts/yarn/dev.js --no-SSG",
     "build": "yarn build:env-loader && node ./scripts/yarn/build.js",
     "build:env-loader": "tsc -b ./packages/env-loader/tsconfig.json",
-    "build:preview": "yarn build:env-loader && node ./scripts/yarn/build:preview.js",
+    "build:preview": "yarn build:env-loader && node ./scripts/yarn/build.js --no-SSG",
     "build:sitemap": "yarn build:env-loader & node ./scripts/yarn/build:sitemap.js",
     "start": "yarn build:env-loader && node ./scripts/yarn/start.js",
     "export": "yarn build:env-loader && node ./scripts/yarn/export.js --USE_REDIS",

packages/env-loader/src/cli-options.ts

@@ -83,6 +83,11 @@ export const getCliOptions = (scriptName: string): EnvVars => {
     .option('--USE_REDIS', 'Enable redis')
     .option('--REDIS_URL <url>', 'Redis URL')
     .option('--SITE_URL <url>', 'Origin used for generated absolute paths')
+    .option('--SSG', 'Run logic in getStaticPaths to generate all page URLs')
+    .option(
+      '--no-SSG',
+      'Do not run logic in getStaticPaths to generate all page URLs'
+    )
 
   configureAdditionalHelpText(program, scriptName)
 

scripts/yarn/build.js

@@ -1,3 +1,3 @@
 const { processEnv } = require('env-loader')
 
-processEnv('SSG=true next build')
+processEnv('next build')

scripts/yarn/dev.js

@@ -1,3 +1,3 @@
 const { processEnv } = require('env-loader')
 
-processEnv('yarn setup && SSG=false next dev')
+processEnv('yarn setup && next dev')

scripts/yarn/export.js

@@ -1,3 +1,3 @@
 const { processEnv } = require('env-loader')
 
-processEnv('SSG=true next build && next export')
+processEnv('next build && next export')

src/lib/drupal/drupalClient.ts

@@ -14,8 +14,9 @@ export const drupalClient = new DrupalClient(baseUrl, {
     clientSecret: process.env.DRUPAL_CLIENT_SECRET,
   },
   // Generally use cache for `yarn export` as it generates all pages
-  cache: process.env.USE_REDIS
-    ? redisCache(createRedisClient(process.env.REDIS_URL))
-    : null,
+  cache:
+    process.env.USE_REDIS === 'true'
+      ? redisCache(createRedisClient(process.env.REDIS_URL))
+      : null,
   previewSecret: process.env.DRUPAL_PREVIEW_SECRET,
 })