flowershow 0.0.7 → 0.0.8

package/CHANGELOG.md

@@ -0,0 +1,7 @@
+# flowershow
+
+## 0.0.8
+
+### Patch Changes
+
+- ebc6872: Disallow installing the template inside the content folder.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowershow",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Publish your digital garden",
   "bin": {
     "flowershow": "src/bin/cli.js"

package/project.json

@@ -37,6 +37,5 @@
       "outputs": ["coverage/packages/cli-e2e"]
     }
   },
-  "tags": [],
-  "implicitDependencies": ["template"]
+  "tags": []
 }

package/src/lib/Installer.js

@@ -15,6 +15,7 @@ import {
   success,
   logWithSpinner,
   stopSpinner,
+  isSubdir,
 } from "./utils/index.js";
 
 import { FLOWERSHOW_FOLDER_NAME } from "./const.js";
@@ -77,6 +78,20 @@ export default class Creator {
     ]);
 
     const contentDir = path.resolve(context, contentPath);
+
+    // don't allow for installing the template anywhere within the content folder
+    // as it will break esbuild
+    if (isSubdir(flowershowDir, contentDir)) {
+      log(`Provided content directory: ${contentDir}`);
+      log(
+        `Provided Flowershow template installation directory: ${flowershowDir}`
+      );
+      error(
+        `You can't install the Flowershow template inside your content folder.`
+      );
+      exit(1);
+    }
+
     const assetFolderChoices = fs
       .readdirSync(contentDir, { withFileTypes: true })
       .filter((d) => d.isDirectory())

package/src/lib/utils/index.js

@@ -1,5 +1,6 @@
 export { error, info, log, success, warn } from "./logger.js";
 export { exit } from "./exit.js";
+export { isSubdir } from "./isSubdir.js";
 export {
   logWithSpinner,
   stopSpinner,

package/src/lib/utils/isSubdir.js

@@ -0,0 +1,7 @@
+import path from "path";
+
+// test if dir is a subdirectory of or same as ofDir
+export function isSubdir(dir, ofDir) {
+  const relative = path.relative(ofDir, dir);
+  return relative && !relative.startsWith("..") && !path.isAbsolute(relative);
+}