@eui/cli 21.0.0-next.46 → 21.0.0-next.47

package/bin/scripts/inject-config-app.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const build = require('../../lib/app-utils/build');
+const common = require('../../lib/app-utils/common');
 
 Promise.resolve()
   .then(() => {
-    return build.injectAppConfig();
+    return common.injectAppConfig();
   })
   .catch((e) => {
     console.error(e);

package/lib/app-utils/build.js

@@ -1,10 +1,9 @@
-// TODO v21 - app prebuild for config injection from eUI tools
-
 const path = require('path');
 const childProcess = require('child_process');
 const execSync = childProcess.execSync;
 
 const utils = require('../utils');
+const common = require('./common'); 
 
 module.exports.run = () => {
   let {
@@ -33,7 +32,7 @@ module.exports.run = () => {
   return Promise.resolve()
     .then(() => {
       if (configEnvTarget) {
-        return injectAppConfig();
+        return common.injectAppConfig();
       }
     })
 
@@ -44,12 +43,6 @@ module.exports.run = () => {
       }
     })
 
-    .then(() => {
-      if (!skipLint) {
-        utils.logSuccess();
-      }
-    })
-
     .then(() => {
       if (!skipLint) {
         utils.logSuccess();
@@ -132,52 +125,8 @@ module.exports.run = () => {
       }
     })
 
-
-
-
     .catch((e) => {
       throw e;
     });
 };
 
-
-const injectAppConfig = module.exports.injectAppConfig = () => {
-  return Promise.resolve()
-    .then(() => {
-      let { configEnvTarget } = utils.getArgs();
-
-      if (!configEnvTarget) {
-        throw new Error('configEnvTarget not provided as argument');
-      }
-
-      // set default if not envTarget provided
-      let envFilePath = path.join(process.cwd(), 'src/assets/config', `env-json-config.json`);
-
-      utils.logInfo(`Executing configuration replacement for : ${configEnvTarget} environment`);
-
-      let envOpenidPrefix = 'env-json-config-';
-      let openidConfigAssetsFolder = 'assets/config';
-
-      envFilePath = path.join(process.cwd(), `src/${openidConfigAssetsFolder}`, `${envOpenidPrefix}${configEnvTarget}.json`);
-
-      if (!utils.isFileExists(envFilePath)) {
-        utils.logError(`Cannot find environment config to inject : `);
-        utils.logError(`${envFilePath} missing...`);
-        return;
-      }
-
-      let rootTargetFolder = 'src';
-      let replacedFile;
-
-      replacedFile = `${rootTargetFolder}/assets/env-json-config.json`;
-
-      utils.logInfo(`Replacing default ${replacedFile} file by ${envFilePath} content`);
-      utils.copy(envFilePath, path.join(process.cwd(), `${replacedFile}`));
-
-      utils.logSuccess();
-    })
-
-    .catch((e) => {
-      throw e;
-    });
-}

package/lib/app-utils/common.js

@@ -0,0 +1,43 @@
+const path = require('path');
+const utils = require('../utils');
+
+module.exports.injectAppConfig = () => {
+  return Promise.resolve()
+    .then(() => {
+      let { configEnvTarget } = utils.getArgs();
+
+      if (!configEnvTarget) {
+        throw new Error('configEnvTarget not provided as argument');
+      }
+
+      // set default if not envTarget provided
+      let envFilePath = path.join(process.cwd(), 'src/assets/config', `env-json-config.json`);
+
+      utils.logInfo(`Executing configuration replacement for : ${configEnvTarget} environment`);
+
+      let envOpenidPrefix = 'env-json-config-';
+      let openidConfigAssetsFolder = 'assets/config';
+
+      envFilePath = path.join(process.cwd(), `src/${openidConfigAssetsFolder}`, `${envOpenidPrefix}${configEnvTarget}.json`);
+
+      if (!utils.isFileExists(envFilePath)) {
+        utils.logError(`Cannot find environment config to inject : `);
+        utils.logError(`${envFilePath} missing...`);
+        return;
+      }
+
+      let rootTargetFolder = 'src';
+      let replacedFile;
+
+      replacedFile = `${rootTargetFolder}/assets/env-json-config.json`;
+
+      utils.logInfo(`Replacing default ${replacedFile} file by ${envFilePath} content`);
+      utils.copy(envFilePath, path.join(process.cwd(), `${replacedFile}`));
+
+      utils.logSuccess();
+    })
+
+    .catch((e) => {
+      throw e;
+    });
+}

package/lib/app-utils/serve.js

@@ -5,6 +5,7 @@ const childProcess = require('child_process');
 const execSync = childProcess.execSync;
 
 const utils = require('../utils');
+const common = require('./common'); 
 
 module.exports.run = () => {
 
@@ -15,10 +16,11 @@ module.exports.run = () => {
   const prjName = 'app';
 
   return Promise.resolve()
-    // .then(() => {
-    //   return preBuildUtils.projects.preBuild(prj, configuration, false, configEnvTarget);
-    // })
-
+    .then(() => {
+      if (configEnvTarget) {
+        return common.injectAppConfig();
+      }
+    })
 
     // trigger ng serve with parameters provided
     .then(() => {

package/lib/skeletons/_angular/base/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-next.46",
+    "version": "21.0.0-next.47",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -13,13 +13,13 @@
         "build-dev": "eui-cli build-app --configuration=development --configEnvTarget=dev",
         "build-prod": "eui-cli build-app --configuration=production-optimized --configEnvTarget=prod",
         "build-prod-skip-test": "eui-cli build-app --configuration=production-optimized --configEnvTarget=prod --skipTest",
-        "build-prod-stats": "eui-cli build-app --configuration=production-optimized --configEnvTarget=prod --statsJson",
+        "build-prod-stats": "eui-cli build-app --configuration=production-optimized --configEnvTarget=prod",
         "app:build": "eui-cli build-app",
         "app:inject-config": "eui-cli inject-config-app"
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "21.0.0-next.46"
+        "@eui/deps-base": "21.0.0-next.47"
     },
     "devDependencies": {
         "npm-run-all": "4.1.5",

package/lib/skeletons/_angular/base/src/app/shared/testing/router.mock.ts

@@ -1,5 +1,5 @@
 import { NavigationEnd } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 export class RouterMock {
     routerState = { root: '' };
@@ -8,11 +8,4 @@ export class RouterMock {
         observer.next(this.navigationEnd);
         observer.complete();
     });
-
-    constructor() {}
-
-    createUrlTree() {}
-
-    serializeUrl() {}
-
-}
+}

package/lib/skeletons/_angular/base-mobile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-next.46",
+    "version": "21.0.0-next.47",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",

package/lib/skeletons/_angular/options/pnpm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-next.46",
+    "version": "21.0.0-next.47",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -46,17 +46,17 @@
         "pikaday": "1.8.2",
         "lodash-es": "4.17.21",
         "localforage": "1.10.0",
-        "@eui/base": "21.0.0-next.46",
-        "@eui/core": "21.0.0-next.46",
-        "@eui/styles": "21.0.0-next.46",
-        "@eui/components": "21.0.0-next.46",
-        "@eui/ecl": "21.0.0-next.46"
+        "@eui/base": "21.0.0-next.47",
+        "@eui/core": "21.0.0-next.47",
+        "@eui/styles": "21.0.0-next.47",
+        "@eui/components": "21.0.0-next.47",
+        "@eui/ecl": "21.0.0-next.47"
     },
     "devDependencies": {
         "@angular/build": "21.0.1",
         "@angular/compiler-cli": "21.0.1",
         "@angular/cli": "21.0.1",
-        "@eui/cli": "21.0.0-next.46",
+        "@eui/cli": "21.0.0-next.47",
         "ng-packagr": "21.0.0",
         "typescript": "5.9.2",
         "npm-run-all": "4.1.5",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/cli",
-    "version": "21.0.0-next.46",
+    "version": "21.0.0-next.47",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator & tools",