@citolab/tspci 2.3.0-alpha-5 → 2.3.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citolab/tspci",
-  "version": "2.3.0-alpha-5",
+  "version": "2.3.0-alpha.1",
   "description": "an opiniated typescript ims-pci builder with tao integration",
   "author": "patrick <patrick.deklein@cito.nl>",
   "repository": "@citolab/tspci",
@@ -46,5 +46,5 @@
     "help": "tspci --help",
     "init": "tspci init --force --path=../../pcis"
   },
-  "gitHead": "26d14ec486587e5eadaa9ffc2b4869f16e7a83f3"
+  "gitHead": "478292d5b580061e989a3a16a933081d23970962"
 }

package/preset/base/package.json

@@ -7,12 +7,11 @@
   "private": true,
   "dependencies": {},
   "devDependencies": {
-    "@citolab/tspci": "next"
+    "@citolab/tspci": "^2.2.0"
   },
   "scripts": {
     "dev": "tspci --dev",
-    "prod": "tspci",
-    "tspci": "tspci"
+    "prod": "tspci"
   },
   "config": {
     "tspci": {

package/src/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { loadConfigFile } from "rollup/dist/loadConfigFile.js";
-import { execSync, spawn } from "child_process";
+import { spawn } from "child_process";
 import { rollup, watch } from "rollup";
 import readline from "readline";
 import chalk from "chalk";
@@ -241,7 +241,7 @@ const run = async () => {
     // if args contains --force then delete the directory if already exists
     if (args.indexOf("--force") >= 0 || args.indexOf("-f") >= 0) {
       if (fs.existsSync(destinationFolder)) {
-        console.log(chalk.yellow("🗑 Force deleting directory"));
+        console.log(chalk.yellow("Force deleting directory"));
         fs.rmSync(destinationFolder, { recursive: true, force: true });
       }
     }
@@ -262,9 +262,7 @@ const run = async () => {
       pciName = pciName.replace(/[^a-zA-Z0-9]/g, "");
     }
     console.log(chalk.green(`pci: ${pciName}`));
-    const description =
-      (await askOption("What is the description of your pci? (default: pci created with tspci)")) ||
-      "pci created with tspci";
+    const description = await askOption("What is the description of your pci? (default: pci created with tspci)") || "pci created with tspci"; 
 
     const options = await selectOptions("Would you like to add other features?", ["tailwind css", "preact"]);
     console.log(chalk.green(`Options: ${options.values.length === 0 ? "none" : options.values}`));
@@ -277,7 +275,7 @@ const run = async () => {
     // copy the content of preset folder to the current folder
     const presetFolder = path.resolve(cliPath, "./../preset/base");
     if (!fs.existsSync(presetFolder)) {
-      console.log(chalk.red("❌ Preset folder not found"));
+      console.log(chalk.red("Preset folder not found"));
     }
 
     console.log(chalk.green("Copying files to PCI project folder"));
@@ -345,11 +343,21 @@ const run = async () => {
       fs.writeFileSync(packageJson, newPackageJsonContent);
     }
 
-    // run npm install in destination folder
+    // run npm instaal in destination folder
     if (args.indexOf("--no-install") === -1) {
-      console.log(chalk.green("📦 Installing dependencies"));
-      execSync("npm install", { cwd: destinationFolder, stdio: [0, 1, 2] });
-      console.log(chalk.green(`📦 Done! Navigate to ${destinationFolder} or open this folder (e.g. with vscode). You can now start the dev server with: npm run dev`));
+      console.log(chalk.green("Installing dependencies"));
+      const npm = spawn("npm", ["install"], { cwd: destinationFolder, shell: true });
+      npm.stdout.on("data", (data) => {
+        console.log(chalk.green(data.toString()));
+        console.log(chalk.green("Done! You can now start the dev server with npm run dev"));
+      
+        // console.log(chalk.blue("Starting dev server..."));
+        // // run npm run dev in destination folder
+        // const npm = spawn("npm", ["run", "dev"], { cwd: destinationFolder });
+        // npm.stdout.on("data", (data) => {
+        //   console.log(chalk.blue(data.toString()));
+        // });
+      });
       return;
     } else {
       console.log(chalk.yellow("Skipping npm install, run npm install in the project folder to install dependencies"));
@@ -362,16 +370,12 @@ const run = async () => {
       console.error("Missing target name. Use tspci add --target target");
       return;
     }
-    const version = args.indexOf("--next") ? "next" : "latest";
     const targetname = args[targetIndex + 1];
     const packageFileContent = fs.readFileSync(path.join(PACKAGE_ROOT_PATH, "package.json"), "utf8");
     const packageJson = JSON.parse(packageFileContent);
 
     const modifyPci = () => {
-      const scriptFile = path.join(
-        path.join(path.join(path.join(NODE_MODULES, `@citolab`), `tspci-${targetname}`), "src"),
-        `init.mjs`
-      );
+      const scriptFile = path.join(path.join(path.join(path.join(NODE_MODULES, `@citolab`), `tspci-${targetname}`), 'src'), `init.mjs`);
       let init = false;
       if (fs.existsSync(scriptFile)) {
         // run init() script
@@ -386,15 +390,23 @@ const run = async () => {
       if (!init) {
         console.log(chalk.green(`No init script found for @citolab/tspci-${targetname}`));
       }
-    };
+    }
 
     // check if `@citolab/tspci-${targetname}]}` is already in devDependencies
     if (!packageJson.devDependencies || !packageJson.devDependencies[`@citolab/tspci-${targetname}`]) {
       console.log(chalk.white(`Adding @citolab/tspci-${targetname}`));
       // install @citolab/tspci-${targetname} to devDepencies
-      execSync(`npm install @citolab/tspci-${targetname}@${version} --save-dev`, { cwd: PACKAGE_ROOT_PATH, stdio: [0, 1, 2] });
+      const npm = spawn("npm", ["install", `@citolab/tspci-${targetname}`, "--save-dev"], { cwd: process.cwd(), shell: true });
+      // wait till npm install is done
+      npm.stdout.on("data", (data) => {
+        console.log(chalk.green(`successfull installed @citolab/tspci-${targetname}`));
+        // run init script if available
+        modifyPci();
+      });
+    } else {
+      modifyPci();
     }
-    modifyPci();
+
 
     return;
   }
@@ -423,10 +435,7 @@ const run = async () => {
         console.error("Missing target name. Use tspci --target target");
       }
       const targetname = args[targetIndex + 1];
-      const scriptFile = path.join(
-        path.join(path.join(path.join(NODE_MODULES, `@citolab`), `tspci-${targetname}`), "src"),
-        `createPackage.mjs`
-      );
+      const scriptFile = path.join(path.join(path.join(path.join(NODE_MODULES, `@citolab`), `tspci-${targetname}`), 'src'), `createPackage.mjs`);
       import(`file:///${scriptFile}`).then((script) => {
         script.bundle();
       });