flowershow 0.1.7 → 0.1.9

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # flowershow
 
+## 0.1.9
+
+### Patch Changes
+
+- Kill subprocesses when parent process is terminated.
+
+## 0.1.8
+
+### Patch Changes
+
+- Adjust the CLI Installer after migrating Flowershow template to datopian/flowershow-template.
+
 ## 0.1.7
 
 ### Patch Changes

package/package.json

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

package/src/lib/Installer.js

@@ -10,15 +10,10 @@ import { exit, error, log, info, success, logWithSpinner, stopSpinner, isSubdir,
 import { FLOWERSHOW_FOLDER_NAME } from "./const.js";
 export default class Installer {
     constructor(context, targetDir) {
+        this.templateRepo = "https://github.com/datopian/flowershow-template";
         this.context = context;
         this.targetDir = targetDir;
     }
-    get templateRepo() {
-        // simplify importing data from package.json with this line after we no longer want to support node 16
-        // import packageJson from "#package.json" assert { type: "json" };
-        const flowershowRepo = require("../../package.json").repository.url.replace("git+", "");
-        return `${flowershowRepo}/packages/template`;
-    }
     async install() {
         const { context, targetDir, templateRepo } = this;
         const flowershowDir = path.resolve(targetDir, FLOWERSHOW_FOLDER_NAME);
@@ -131,10 +126,10 @@ export default class Installer {
             symbol: "🌷",
             msg: `Creating Flowershow template in ${chalk.magenta(flowershowDir)}`,
         });
-        if (existsAction === "overwrite") {
-            fs.rmSync(flowershowDir, { recursive: true, force: true });
-        }
         try {
+            if (existsAction === "overwrite") {
+                fs.rmSync(flowershowDir, { recursive: true, force: true });
+            }
             const emitter = degit(templateRepo);
             await emitter.clone(flowershowDir);
         }
@@ -143,26 +138,40 @@ export default class Installer {
             log(err);
             exit(1);
         }
-        // remove unneeded dev files
-        fs.rmSync(`${flowershowDir}/project.json`, { force: true });
-        fs.rmSync(`${flowershowDir}/.eslintrc.json`, { force: true });
-        fs.rmSync(`${flowershowDir}/jest.config.js`, { force: true });
-        // TODO (temporary here) remove Flowershow app home page
-        fs.rmSync(`${flowershowDir}/pages/index.tsx`, { force: true });
-        fs.rename(`${flowershowDir}/pages/[...slug].tsx`, `${flowershowDir}/pages/[[...slug]].tsx`, () => { });
         // update content and assets symlinks
-        const contentSymlinkPath = path.relative(`${flowershowDir}`, contentDir);
-        fs.symlinkSync(contentSymlinkPath, `${flowershowDir}/content`, "junction");
-        if (assetsFolder !== "none") {
-            const assetsSymlinkPath = path.relative(`${flowershowDir}/public`, `${contentDir}/${assetsFolder}`);
-            fs.symlinkSync(assetsSymlinkPath, `${flowershowDir}/public/${assetsFolder}`, "junction");
+        try {
+            // flowershow template includes starter content folder, so we need
+            // to remove it before creating symlinks
+            if (fs.existsSync(`${flowershowDir}/content`)) {
+                fs.rmSync(`${flowershowDir}/content`, { recursive: true, force: true });
+            }
+            const contentSymlinkPath = path.relative(`${flowershowDir}`, contentDir);
+            fs.symlinkSync(contentSymlinkPath, `${flowershowDir}/content`, "junction");
+            if (assetsFolder !== "none") {
+                const assetsSymlinkPath = path.relative(`${flowershowDir}/public`, `${contentDir}/${assetsFolder}`);
+                fs.symlinkSync(assetsSymlinkPath, `${flowershowDir}/public/${assetsFolder}`, "junction");
+            }
+            stopSpinner();
+            log("Created symlinks:");
+            log(`${chalk.cyan(`${flowershowDir}/content`)} -> ${chalk.magenta(contentDir)}`);
+            if (assetsFolder !== "none") {
+                log(`${chalk.cyan(`${flowershowDir}/public/${assetsFolder}`)} -> ${chalk.magenta(`${contentDir}/${assetsFolder}`)}`);
+            }
+        }
+        catch (err) {
+            error(`Failed to create symlinks to content and assets folders: ${err.message}`);
+            exit(err.exitCode);
         }
         // install flowershow dependencies
         logWithSpinner({ symbol: "🌸", msg: `Installing Flowershow dependencies` });
         try {
-            const { stdout, stderr } = await execa("npm", ["install"], {
+            const subprocess = execa("npm", ["install"], {
                 cwd: flowershowDir,
             });
+            process.on("SIGINT", () => {
+                subprocess.kill("SIGINT");
+            });
+            const { stdout, stderr } = await subprocess;
             log(stdout);
             log(stderr);
             stopSpinner();

package/src/lib/build.js

@@ -12,4 +12,7 @@ export default async function build(dir) {
     }
     const subprocess = execa("npm", ["run", "build"], { cwd: flowershowDir });
     subprocess.stdout.pipe(process.stdout);
+    process.on("SIGINT", () => {
+        subprocess.kill("SIGINT");
+    });
 }

package/src/lib/buildExport.js

@@ -5,4 +5,7 @@ export default async function buildExport(dir) {
     const flowershowDir = path.resolve(dir, FLOWERSHOW_FOLDER_NAME);
     const subprocess = execa("npm", ["run", "export"], { cwd: flowershowDir });
     subprocess.stdout.pipe(process.stdout);
+    process.on("SIGINT", () => {
+        subprocess.kill("SIGINT");
+    });
 }

package/src/lib/preview.js

@@ -12,4 +12,7 @@ export default async function preview(dir) {
     }
     const subprocess = execa("npm", ["run", "dev"], { cwd: flowershowDir });
     subprocess.stdout.pipe(process.stdout);
+    process.on("SIGINT", () => {
+        subprocess.kill("SIGINT");
+    });
 }