Merge pull request #123 from Service-Soft/dev

Release 2.5.4

Author: tim-fabian

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "monux-cli",
-    "version": "2.5.3",
+    "version": "2.5.4",
     "license": "MIT",
     "main": "index.js",
     "engines": {

package.json

@@ -223,7 +223,7 @@ export class AddAngularWebsiteCommand extends BaseAddCommand<AddAngularWebsiteCo
             files: [
                 'src/main.ts',
                 'src/main.server.ts',
-                'server.ts'
+                'src/server.ts'
             ],
             include: [
                 'src/**/*.spec.ts',

src/commands/add/add-angular-website/add-angular-website.command.ts

@@ -296,7 +296,7 @@ export class AddAngularCommand extends BaseAddCommand<AddAngularConfiguration> {
             files: [
                 'src/main.ts',
                 'src/main.server.ts',
-                'server.ts'
+                'src/server.ts'
             ],
             include: [
                 'src/**/*.spec.ts',

src/commands/add/add-angular/add-angular.command.ts

@@ -4,6 +4,7 @@ import { DockerUtilities } from '../../../docker';
 import { FsUtilities, QuestionsFor } from '../../../encapsulation';
 import { DefaultEnvKeys, EnvUtilities } from '../../../env';
 import { EslintUtilities } from '../../../eslint';
+import { TsUtilities } from '../../../ts';
 import { TsConfigUtilities } from '../../../tsconfig';
 import { OmitStrict } from '../../../types';
 import { generatePlaceholderPassword, getPath, Path, toKebabCase, toPascalCase } from '../../../utilities';
@@ -197,6 +198,11 @@ export class AddZibriCommand extends BaseAddCommand<AddZibriConfiguration> {
             'dataSources: [DbDataSource]',
             `dataSources: [${toPascalCase(databaseName)}DataSource]`
         );
+        await FsUtilities.replaceInFile(
+            getPath(root, 'src', 'index.ts'),
+            'createDefaultData(DbDataSource);',
+            `createDefaultData(${toPascalCase(databaseName)}DataSource);`
+        );
 
         const environmentModel: Path = getPath(root, 'src', 'environment', ENVIRONMENT_MODEL_TS_FILE_NAME);
 
@@ -289,6 +295,10 @@ export class AddZibriCommand extends BaseAddCommand<AddZibriConfiguration> {
             '\'zibri@zibri.de\'',
             `environment.${DefaultEnvKeys.defaultUserEmail(config.name)}`
         );
+        await TsUtilities.addImportStatements(
+            createDefaultDataTs,
+            [{ defaultImport: false, element: 'environment', path: './environment/environment' }]
+        );
     }
 
     private async setupTsConfig(projectName: string): Promise<void> {
@@ -306,7 +316,9 @@ export class AddZibriCommand extends BaseAddCommand<AddZibriConfiguration> {
                     sourceMap: undefined,
                     skipLibCheck: undefined,
                     noImplicitAny: undefined,
-                    noFallthroughCasesInSwitch: undefined
+                    noFallthroughCasesInSwitch: undefined,
+                    module: undefined,
+                    moduleResolution: undefined
                 }
             }
         );

src/commands/add/add-zibri/add-zibri.command.ts

@@ -37,7 +37,7 @@ type ZibriCliOptions<T extends ZibriCliCommands>
  */
 export abstract class ZibriUtilities {
 
-    private static readonly CLI_VERSION: string = '2.1.1';
+    private static readonly CLI_VERSION: string = '2.1.2';
 
     /**
      * Runs a zibri cli command inside the provided directory.