Merge pull request #17 from CloudCannon/feat/eleventy-3

Fix for nested config files on 11ty
CloudCannon · Apr 26, 2024 · dd5f13b · dd5f13b
2 parents b3134a1 + 2a99633
commit dd5f13b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cloudcannon/command-builder",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "A script that builds the script that builds your site",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/lib/eleventy.js b/src/lib/eleventy.js
@@ -65,13 +65,16 @@ function getInstallCommands(buildConfig) {
 		'CONFIG_DIR=`dirname $CONFIG`',
 		'echo $CONFIG_DIR',
 
+		'PWD=`pwd`',
+		'echo $PWD',
+
 		'CONFIG_BASE=`basename $CONFIG`',
 		'echo $CONFIG_BASE',
 
-		'CONFIG_INJECTED="$CONFIG_DIR/inject-cloudcannon.config.cjs"',
+		'CONFIG_INJECTED="$PWD/$CONFIG_DIR/inject-cloudcannon.config.cjs"',
 		'echo $CONFIG_INJECTED',
 
-		'export CC_ELEVENTY_CONFIG="$CONFIG_DIR/default-$CONFIG_BASE"',
+		'export CC_ELEVENTY_CONFIG="$PWD/$CONFIG_DIR/default-$CONFIG_BASE"',
 		'echo $CC_ELEVENTY_CONFIG',
 
 		// Move the site config file to injected config require location

diff --git a/tests/eleventy.test.js b/tests/eleventy.test.js
@@ -31,16 +31,20 @@ test('outputs with empty config', () => {
 		'CONFIG_DIR=`dirname $CONFIG`',
 		"echo '$ echo $CONFIG_DIR'",
 		'echo $CONFIG_DIR',
+		"echo '$ PWD=`pwd`'",
+		'PWD=`pwd`',
+		"echo '$ echo $PWD'",
+		'echo $PWD',
 		"echo '$ CONFIG_BASE=`basename $CONFIG`'",
 		'CONFIG_BASE=`basename $CONFIG`',
 		"echo '$ echo $CONFIG_BASE'",
 		'echo $CONFIG_BASE',
-		"echo '$ CONFIG_INJECTED=\"$CONFIG_DIR/inject-cloudcannon.config.cjs\"'",
-		'CONFIG_INJECTED="$CONFIG_DIR/inject-cloudcannon.config.cjs"',
+		"echo '$ CONFIG_INJECTED=\"$PWD/$CONFIG_DIR/inject-cloudcannon.config.cjs\"'",
+		'CONFIG_INJECTED="$PWD/$CONFIG_DIR/inject-cloudcannon.config.cjs"',
 		"echo '$ echo $CONFIG_INJECTED'",
 		'echo $CONFIG_INJECTED',
-		"echo '$ export CC_ELEVENTY_CONFIG=\"$CONFIG_DIR/default-$CONFIG_BASE\"'",
-		'export CC_ELEVENTY_CONFIG="$CONFIG_DIR/default-$CONFIG_BASE"',
+		"echo '$ export CC_ELEVENTY_CONFIG=\"$PWD/$CONFIG_DIR/default-$CONFIG_BASE\"'",
+		'export CC_ELEVENTY_CONFIG="$PWD/$CONFIG_DIR/default-$CONFIG_BASE"',
 		"echo '$ echo $CC_ELEVENTY_CONFIG'",
 		'echo $CC_ELEVENTY_CONFIG',
 		"echo '$ if [ -f $CONFIG ]; then mv $CONFIG $CC_ELEVENTY_CONFIG; fi'",
@@ -114,16 +118,20 @@ test('outputs with @next config', () => {
 		'CONFIG_DIR=`dirname $CONFIG`',
 		"echo '$ echo $CONFIG_DIR'",
 		'echo $CONFIG_DIR',
+		"echo '$ PWD=`pwd`'",
+		'PWD=`pwd`',
+		"echo '$ echo $PWD'",
+		'echo $PWD',
 		"echo '$ CONFIG_BASE=`basename $CONFIG`'",
 		'CONFIG_BASE=`basename $CONFIG`',
 		"echo '$ echo $CONFIG_BASE'",
 		'echo $CONFIG_BASE',
-		"echo '$ CONFIG_INJECTED=\"$CONFIG_DIR/inject-cloudcannon.config.cjs\"'",
-		'CONFIG_INJECTED="$CONFIG_DIR/inject-cloudcannon.config.cjs"',
+		"echo '$ CONFIG_INJECTED=\"$PWD/$CONFIG_DIR/inject-cloudcannon.config.cjs\"'",
+		'CONFIG_INJECTED="$PWD/$CONFIG_DIR/inject-cloudcannon.config.cjs"',
 		"echo '$ echo $CONFIG_INJECTED'",
 		'echo $CONFIG_INJECTED',
-		"echo '$ export CC_ELEVENTY_CONFIG=\"$CONFIG_DIR/default-$CONFIG_BASE\"'",
-		'export CC_ELEVENTY_CONFIG="$CONFIG_DIR/default-$CONFIG_BASE"',
+		"echo '$ export CC_ELEVENTY_CONFIG=\"$PWD/$CONFIG_DIR/default-$CONFIG_BASE\"'",
+		'export CC_ELEVENTY_CONFIG="$PWD/$CONFIG_DIR/default-$CONFIG_BASE"',
 		"echo '$ echo $CC_ELEVENTY_CONFIG'",
 		'echo $CC_ELEVENTY_CONFIG',
 		"echo '$ if [ -f $CONFIG ]; then mv $CONFIG $CC_ELEVENTY_CONFIG; fi'",