@ixon-cdk/core 1.2.0-next.6 → 1.2.0-next.7

package/api/auth.service.js

@@ -5,10 +5,11 @@ const httpRequest = require('../http-request');
 module.exports = class AuthService extends ApiBaseService {
   logIn(credentials) {
     const c = credentials;
+    const expiresIn = 2592000; // 30 days
     return httpRequest({
       method: 'POST',
       url: `${this._getApiBaseUrl()}/access-tokens`,
-      data: { expiresIn: 86400 },
+      data: { expiresIn },
       headers: {
         ...this._getApiDefaultHeaders(),
         'User-Agent': 'ComponentDevKit',

package/config/config.service.js

@@ -8,7 +8,7 @@ module.exports = class ConfigService {
 
   constructor(configFile) {
     // When the CDK is part of a larger project workspace it may be desirable to have a more explicit config-file name. Therefore, unless
-    // a specific config file path was defined in the contructor, we'll first try to find `cdk.config.json`, before falling back to the
+    // a specific config file path was defined in the constructor, we'll first try to find `cdk.config.json`, before falling back to the
     // default file name `config.json`.
     if (configFile !== undefined) {
       this._path = path.join(getRootDir(), configFile);
@@ -23,8 +23,21 @@ module.exports = class ConfigService {
     let config;
 
     if (!fs.existsSync(this._path)) {
-      logErrorMessage('No config file.');
-      process.exit(1);
+      this._path = path.join(getRootDir(), 'cdk.config.json');
+      fs.writeFileSync(
+        this._path,
+        `${JSON.stringify(
+          {
+            $schema: './node_modules/@ixon-cdk/core/config/schema.json',
+            prefix: 'pct',
+            components: {},
+          },
+          null,
+          2,
+        )}\n`,
+        { encoding: 'utf-8' },
+      );
+      logFileCrudMessage('CREATE', 'cdk.config.json');
     }
 
     try {
@@ -88,6 +101,6 @@ module.exports = class ConfigService {
       encoding: 'utf8',
       flag: 'w',
     });
-    logFileCrudMessage('UPDATE', 'config.json');
+    logFileCrudMessage('UPDATE', path.basename(this._path));
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ixon-cdk/core",
-  "version": "1.2.0-next.6",
+  "version": "1.2.0-next.7",
   "description": "",
   "main": "index.js",
   "author": "",

package/template/template.service.js

@@ -205,6 +205,16 @@ module.exports = class TemplateService {
       }
 
       // install dependencies
+      if (!!schema.dependencies) {
+        Object.keys(schema.dependencies).forEach(name =>
+          ensureModule(name, schema.dependencies[name], false),
+        );
+      }
+      if (!!schema.devDependencies) {
+        Object.keys(schema.devDependencies).forEach(name =>
+          ensureModule(name, schema.devDependencies[name]),
+        );
+      }
       if (variantIdx !== null) {
         const deps = schema.variants[variantIdx].dependencies;
         const devDeps = schema.variants[variantIdx].devDependencies;
@@ -332,15 +342,21 @@ module.exports = class TemplateService {
   _discover() {
     const dir = path.dirname(require.resolve('@ixon-cdk/templates'));
     const files = fs.readdirSync(dir);
-    files.forEach((file) => {
-      if (fs.lstatSync(path.join(dir, file)).isDirectory()) {
-        const schemaFile = path.join(dir, file, 'schema.json');
-        if (fs.existsSync(schemaFile)) {
-          const schema = JSON.parse(fs.readFileSync(schemaFile));
-          this._schemas = { ...this._schemas, [file]: schema };
+    const tail = ['iframe-wrapper'];
+    files
+      .sort((a, b) => {
+        if (tail.includes(a)) return 1;
+        return tail.includes(b) ? -1 : 0;
+      })
+      .forEach(file => {
+        if (fs.lstatSync(path.join(dir, file)).isDirectory()) {
+          const schemaFile = path.join(dir, file, 'schema.json');
+          if (fs.existsSync(schemaFile)) {
+            const schema = JSON.parse(fs.readFileSync(schemaFile));
+            this._schemas = { ...this._schemas, [file]: schema };
+          }
         }
-      }
-    });
+      });
   }
 
   /**