@ixon-cdk/core 1.2.0-next.0 → 1.2.0-next.2

package/meta-files.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const path = require('path');
+const { globSync } = require('glob');
 const { debounce, uniq } = require('lodash');
 const rimraf = require('rimraf');
 
@@ -23,12 +24,10 @@ module.exports = {
     );
     paths.forEach((_path) => {
       const globFilePath = _path.replaceAll('\\', '/');
-      require('glob')
-        .sync(globFilePath)
-        .forEach((file) => {
-          const fileName = file.slice(inputDir.length + 1);
-          _copyFileNameFromToSync(fileName, inputDir, outputDir);
-        });
+      globSync(globFilePath).forEach(file => {
+        const fileName = file.slice(inputDir.length + 1);
+        _copyFileNameFromToSync(fileName, inputDir, outputDir);
+      });
     });
   },
   watchAssets(assets, inputDir, outputDir) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ixon-cdk/core",
-  "version": "1.2.0-next.0",
+  "version": "1.2.0-next.2",
   "description": "",
   "main": "index.js",
   "author": "",
@@ -8,18 +8,18 @@
   "dependencies": {
     "app-root-dir": "^1.0.2",
     "archiver": "^5.3.1",
-    "axios": "^0.26.1",
+    "axios": "^1.3.4",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
     "cors": "^2.8.5",
     "crypto-js": "^4.1.1",
-    "express": "^4.17.3",
-    "glob": "^8.0.1",
+    "express": "^4.18.2",
+    "glob": "^9.2.1",
     "livereload": "^0.9.3",
     "lodash": "^4.17.21",
     "opener": "^1.5.2",
     "prompts": "^2.4.2",
-    "rimraf": "^3.0.2",
-    "yargs": "^17.4.1"
+    "rimraf": "^4.3.1",
+    "yargs": "^17.7.1"
   }
 }

package/template/template.service.js

@@ -184,6 +184,11 @@ module.exports = class TemplateService {
         if (_result) {
           variantIdx = _result.variantIdx;
         }
+
+        if (variantIdx === undefined) {
+          logErrorMessage("No variant selected");
+          process.exit(1);
+        }
       }
 
       schema = this._interpolateSchema(schema, context);
@@ -194,6 +199,23 @@ module.exports = class TemplateService {
         moduleNames.forEach((name) => ensureModule(name));
       }
 
+      // optionally install types
+      if (/typescript/i.test(schema.variants[variantIdx].name)) {
+        ensureModule('@ixon-cdk/types');
+      }
+
+      // install dependencies
+      if (variantIdx !== null) {
+        const deps = schema.variants[variantIdx].dependencies;
+        const devDeps = schema.variants[variantIdx].devDependencies;
+        if (!!deps) {
+          Object.keys(deps).forEach(name => ensureModule(name, deps[name], false));
+        }
+        if (!!devDeps) {
+          Object.keys(devDeps).forEach(name => ensureModule(name, devDeps[name]));
+        }
+      }
+
       const componentRoot = this._configSrv.getNewComponentRoot();
 
       schema.files.forEach((file) => {

package/utils.js

@@ -1,10 +1,16 @@
 const fs = require('fs');
 const path = require('path');
 const chalk = require('chalk');
+const { globSync } = require('glob');
 const flow = require('lodash/flow');
 const camelCase = require('lodash/camelCase');
 const upperFirst = require('lodash/upperFirst');
 
+function dirContains(dir, globPattern) {
+  const files = globSync(path.join(dir, globPattern));
+  return !!files.length;
+}
+
 function getArgv() {
   const remain = process.argv.slice(2);
   const { argv } = require('yargs/yargs')(remain).version(false);
@@ -45,19 +51,17 @@ function moduleExists(moduleName) {
   return exists;
 }
 
-function ensureModule(moduleName) {
-  if (!moduleName.startsWith('@ixon-cdk/')) {
-    logErrorMessage('Cannot install this module.');
-    return;
-  }
+function ensureModule(moduleName, moduleVersion = null, dev = true) {
   if (!moduleExists(moduleName)) {
-    console.log(`Installing package '${moduleName}'...`);
     if (moduleName.startsWith('@ixon-cdk/')) {
       const cdkVersion = require('./package.json').version;
-      require('child_process').execSync(`npm install --save-dev ${moduleName}@${cdkVersion}`);
-    } else {
-      require('child_process').execSync(`npm install --save-dev ${moduleName}`);
+      moduleVersion = cdkVersion;
     }
+    const v = !!moduleVersion ? '@' + moduleVersion : '';
+    console.log(`Installing package '${moduleName}${v}...`);
+    require('child_process').execSync(
+      `npm install --save${dev ? '-dev' : ''} ${moduleName}${v}`,
+    );
   }
 }
 
@@ -122,6 +126,7 @@ async function getFiles(dir) {
 }
 
 module.exports = {
+  dirContains,
   getArgv,
   getRootDir,
   logErrorMessage,