@citolab/tspci 2.5.5 → 2.5.16

package/CHANGELOG.md

@@ -3,6 +3,94 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2.5.16 (2024-10-15)
+
+**Note:** Version bump only for package @citolab/tspci
+
+
+
+
+
+## 2.5.15 (2024-10-11)
+
+**Note:** Version bump only for package @citolab/tspci
+
+
+
+
+
+## 2.5.14 (2024-10-11)
+
+**Note:** Version bump only for package @citolab/tspci
+
+
+
+
+
+## 2.5.13 (2024-10-11)
+
+**Note:** Version bump only for package @citolab/tspci
+
+
+
+
+
+## 2.5.12 (2024-10-11)
+
+**Note:** Version bump only for package @citolab/tspci
+
+
+
+
+
+## 2.5.11 (2024-10-11)
+
+**Note:** Version bump only for package @citolab/tspci
+
+
+
+
+
+## 2.5.10 (2024-10-11)
+
+**Note:** Version bump only for package @citolab/tspci
+
+
+
+
+
+## 2.5.9 (2024-10-11)
+
+**Note:** Version bump only for package @citolab/tspci
+
+
+
+
+
+## 2.5.8 (2024-10-10)
+
+**Note:** Version bump only for package @citolab/tspci
+
+
+
+
+
+## 2.5.7 (2024-10-10)
+
+**Note:** Version bump only for package @citolab/tspci
+
+
+
+
+
+## [2.5.6](/compare/v2.5.5...v2.5.6) (2024-10-10)
+
+**Note:** Version bump only for package @citolab/tspci
+
+
+
+
+
 ## [2.5.5](/compare/v2.5.4...v2.5.5) (2024-10-10)
 
 **Note:** Version bump only for package @citolab/tspci

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citolab/tspci",
-  "version": "2.5.5",
+  "version": "2.5.16",
   "description": "an opiniated typescript ims-pci builder with tao integration",
   "author": "patrick <patrick.deklein@cito.nl>",
   "repository": "@citolab/tspci",
@@ -43,8 +43,7 @@
     "rollup-plugin-node-globals": "^1.4.0",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-string": "^3.0.0",
-    "rollup-plugin-watch-assets": "^1.0.1",
     "tailwindcss": "^3.4.11"
   },
-  "gitHead": "107b2fde32e7e09f6ac2cac98a6018bce51539c0"
+  "gitHead": "5ff52efe162707ea2a30db62a73411a12db06666"
 }

package/readme.md

@@ -173,7 +173,8 @@ Available Commands
   --dev    -d     Start development server
   --watch  -w     Only watch changes
   --help   -h     Help about commandos
-  --target -t     Build production for platform, could be @citolab/tscpi-${target} or a fully qualified specified npm package name.
+  --target -t     Build production for platform, could be @citolab/tscpi-${target}
+  --targetExt -tx Same as -target but reffering to a fully qualified package (not in @citolab)
   init            Init PCI development environment.
   add --target    Add specific implementation to the PCI.
 

package/src/cli.js

@@ -34,7 +34,6 @@ const watchBuild = (devServer = false, target = "IMS") => {
   if (!fs.existsSync(PACKAGE_DIST_PATH)) {
     fs.mkdirSync(PACKAGE_DIST_PATH);
   }
-
   if (devServer) {
     try {
       if (fs.existsSync(path.join(PACKAGE_ROOT_PATH, "src/index.html"))) {
@@ -186,8 +185,10 @@ const run = async () => {
   const help = args.indexOf("--help") >= 0 || args.indexOf("-h") >= 0;
   const watch = args.indexOf("--watch") >= 0 || args.indexOf("-w") >= 0;
   const dev = args.indexOf("--dev") >= 0 || args.indexOf("-d") >= 0;
-  const target = args.indexOf("--target") >= 0 || args.indexOf("-t") >= 0;
+  const t = args.indexOf("--target") !== -1 ? args.indexOf("--target") : args.indexOf("-t");
+  const tExt = args.indexOf("--targetExt") !== -1 ? args.indexOf("--targetExt") : args.indexOf("-tx");
   const init = args.indexOf("init") >= 0;
+  const targetName = t !== -1 ? `@citolab/tspci-${args[t]}` : tExt !== -1 ? args[tExt] : null;
 
   if (help) {
     console.log(`•\t${chalk.blueBright("--help -h")} list these commands`);
@@ -346,6 +347,9 @@ const run = async () => {
         pciName
       );
       // point to the javascript file
+      const packageJson = path.join(destinationFolder, "package.json");
+      const packageJsonContent = fs.readFileSync(packageJson, "utf8");
+      let packageJsonContentJson = JSON.parse(packageJsonContent);
       packageJsonContentJson.source = "src/index.js";
       const newPackageJsonContent = JSON.stringify(packageJsonContentJson, null, 2);
       fs.writeFileSync(packageJson, newPackageJsonContent);
@@ -373,42 +377,31 @@ const run = async () => {
       return;
     }
     const version = args.indexOf("--next") !== -1 ? "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 = () => {
-      let scriptFile = path.join(
-        path.join(path.join(path.join(NODE_MODULES, `@citolab`), `tspci-${targetname}`), "src"),
-        `init.mjs`
-      );
-      if (!fs.existsSync(scriptFile)) {
-        scriptFile = path.join(path.join(path.join(NODE_MODULES, targetname), "src"), `init.mjs`);
-      }
+      const scriptFile = path.join(path.join(path.join(NODE_MODULES, `${targetName}`), "src"), `init.mjs`);
       let init = false;
       if (fs.existsSync(scriptFile)) {
         // run init() script
         import(`file:///${scriptFile}`).then((script) => {
           if (script.init) {
             init = true;
-            console.log(chalk.green(`Running init script for @citolab/tspci-${targetname}`));
+            console.log(chalk.green(`Running init script for ${targetName}`));
             script.init();
           } else {
             if (!init) {
-              console.log(chalk.red(`No init script found for @citolab/tspci-${targetname}`));
+              console.log(chalk.red(`No init script found for ${targetName}`));
             }
           }
         });
-      } else {
-        console.log(chalk.red(`No init script found. Searched for ${scriptFile}`));
       }
     };
-
-    // 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}`));
+    if (!packageJson.devDependencies || !packageJson.devDependencies[targetName]) {
+      console.log(chalk.white(`Adding ${targetName}`));
       // install @citolab/tspci-${targetname} to devDepencies
-      execSync(`npm install @citolab/tspci-${targetname}@${version} --save-dev`, {
+      execSync(`npm install ${targetName}@${version} --save-dev`, {
         cwd: PACKAGE_ROOT_PATH,
         stdio: [0, 1, 2],
       });
@@ -436,16 +429,11 @@ const run = async () => {
   }
 
   prodBuild().then(() => {
-    if (target) {
-      const targetIndex = args.indexOf("--target");
-      if (args.length <= targetIndex + 1) {
-        console.error("Missing target name. Use tspci --target target");
+    if (t) {
+      if (!targetName) {
+        console.error("Missing target name. Use tspci --target target or tspci --targetExt 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(NODE_MODULES, `${targetName}`), "src"), `createPackage.mjs`);
       import(`file:///${scriptFile}`).then((script) => {
         script.bundle();
       });

package/src/rollup.config.dev.js

@@ -1,28 +1,36 @@
-import watchAssets from 'rollup-plugin-watch-assets';
+import copy from "rollup-plugin-copy";
+import livereload from "rollup-plugin-livereload";
 // PK: not the official npm package, but a copy, needed watch functinoality
 import { liveServer } from "./rollup-plugin-live-server.js";
 
 import path from "path";
 
-const PACKAGE_ROOT_PATH = process.cwd()
-const PACKAGE_DIST_PATH = path.join(PACKAGE_ROOT_PATH, "dist")
+const PACKAGE_ROOT_PATH = process.cwd();
+const PACKAGE_DIST_PATH = path.join(PACKAGE_ROOT_PATH, "dist");
 
 const livesrvr = liveServer({
   root: path.join(PACKAGE_ROOT_PATH),
   mount: [["/", "./dist"]],
   open: true,
   wait: 500,
-  watch: PACKAGE_DIST_PATH
+  watch: PACKAGE_DIST_PATH,
 });
 
-const watchassets = watchAssets({ assets: ['./src/**/*.json',  './src/**/*.svg', './src/**/*.png'] })
+const watchassets = copy({
+  targets: [
+    { src: "./src/**/*.json", dest: "dist" },
+    { src: "./src/**/*.svg", dest: "dist" },
+    { src: "./src/**/*.png", dest: "dist" },
+  ],
+  watch: true, // Enable watching for changes
+});
 
 import rollupConfig from "./rollup.config.js";
 
 const newRollupConfig = {
   ...rollupConfig,
   output: rollupConfig.output.map((output) => ({ ...output, sourcemap: true })),
-  plugins: [...rollupConfig.plugins, livesrvr, watchassets],
+  plugins: [watchassets, livereload(PACKAGE_DIST_PATH), livesrvr],
 };
 
 export default newRollupConfig;