@gloww/gloww 20.0.0-beta.49 → 20.0.0-beta.51

package/compute-version.js

@@ -13,21 +13,41 @@ const argv = yargs
   .alias('help', 'h')
   .argv;
 
-let packagejsonfile = `${process.cwd()}/package.json`
-let distPath = `${process.cwd()}/${argv.path}`;
-let versionFilePath = path.join(`${process.cwd()}/${argv.path}/version.json`);
-const appVersion = require(packagejsonfile).version;
-
-if (argv.project) {
-  packagejsonfile = `${process.cwd()}/projects/${argv.project}/package.json`
-  distPath = path.join(`${process.cwd()}/${argv.path}/${argv.project}`);
-  versionFilePath = path.join(`${process.cwd()}/${argv.path}/${argv.project}/version.json`);
-  console.log(packagejsonfile);
-  console.log(versionFilePath);
-}
-
-console.log(`packagejsonfile: ${packagejsonfile}`);
-var appVersionPrj = appVersion;
+let packagejsonfile = `${process.cwd()}/package.json`
+let distPath = path.isAbsolute(argv.path) ? argv.path : path.join(process.cwd(), argv.path);
+let versionFilePath = path.join(distPath, 'version.json');
+const appVersion = require(packagejsonfile).version;
+
+if (argv.project) {
+  packagejsonfile = `${process.cwd()}/projects/${argv.project}/package.json`
+  const baseDistPath = path.isAbsolute(argv.path) ? argv.path : path.join(process.cwd(), argv.path);
+  distPath = path.join(baseDistPath, argv.project);
+  versionFilePath = path.join(distPath, 'version.json');
+  console.log(packagejsonfile);
+  console.log(versionFilePath);
+}
+
+const mainBundleEs5Regexp = /^main-es5.?([A-Za-z0-9]*)?(\.bundle)?.js$/;
+const mainBundleRegexp = /^main.?([A-Za-z0-9]*)?(\.bundle)?.js$/;
+const mainRegexp = /^main.?([A-Za-z0-9]*)?(\.bundle)?.js$/;
+
+function getBuildOutputPath(basePath) {
+  const browserPath = path.join(basePath, 'browser');
+  if (fs.existsSync(browserPath)) {
+    const browserFiles = fs.readdirSync(browserPath);
+    if (browserFiles.some(f => mainBundleRegexp.test(f) || mainBundleEs5Regexp.test(f) || mainRegexp.test(f))) {
+      return browserPath;
+    }
+  }
+
+  return basePath;
+}
+
+distPath = getBuildOutputPath(distPath);
+versionFilePath = path.join(distPath, 'version.json');
+
+console.log(`packagejsonfile: ${packagejsonfile}`);
+var appVersionPrj = appVersion;
 try {
   appVersionPrj = require(packagejsonfile).version;//require('./../package.json').version;
 } catch { }
@@ -43,16 +63,11 @@ console.log(`dist Path: ${distPath}`);
 // our version.json will be in the dist folder
 console.log(`versionFilePath: ${versionFilePath}`);
 
-let mainHash = '';
-let mainBundleEs5File = '';
-
-// RegExp to find main.bundle.js, even if it doesn't include a hash in it's name (dev build)
-let mainBundleEs5Regexp = /^main-es5.?([A-Za-z0-9]*)?(\.bundle)?.js$/;
-let mainBundleRegexp = /^main.?([A-Za-z0-9]*)?(\.bundle)?.js$/;
-let mainRegexp = /^main.?([A-Za-z0-9]*)?(\.bundle)?.js$/;
-
-// read the dist folder files and find the one we're looking for
-readDir(distPath)
+let mainHash = '';
+let mainBundleEs5File = '';
+
+// read the dist folder files and find the one we're looking for
+readDir(distPath)
   .then(files => {
     mainBundleFile = files.find(f => mainBundleRegexp.test(f));
     mainBundleEs5File = files.find(f => mainBundleEs5Regexp.test(f));

package/fesm2022/gloww-gloww.mjs

@@ -2573,11 +2573,11 @@ class UserMenuComponent {
         });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.18", ngImport: i0, type: UserMenuComponent, deps: [{ token: AuthenticationService }, { token: i1$2.MatDialog }, { token: i2.Router }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.18", type: UserMenuComponent, isStandalone: true, selector: "gloww-user-menu", inputs: { size: "size", imageUser: "imageUser", loginpage: "loginpage" }, ngImport: i0, template: "@if (connected) {\n  <div>\n    <span (click)=\"toggleMenuUser()\">\n      @if (imageUser) {\n        <img [src]=\"imageUser\" style=\"height:40px;float:left; padding-left:20px\" />\n      }\n      @if (!imageUser) {\n        <i [ngClass]=\"'fal fa-user '+size\" style=\"float:left; padding-left:10px\">\n          <!--[size]=\"size\"-->\n        </i>\n      }\n    </span>\n    @if (showMenuUser) {\n      <div class=\"menuUser\">\n        <ul class=\"menuSec\" style=\"border: solid lightgrey;\">\n          <li (click)=\"ChangePassword()\">\n            <i class=\"fal fa-key-skeleton\"></i>Change Password\n          </li>\n          @if (oAuthProviders && oAuthProviders.length) {\n            <li (click)=\"Configuration()\">\n              <i class=\"fal fa-tools\"></i>Configuration\n            </li>\n          }\n          <li (click)=\"Logout()\">\n            <i class=\"fal fa-sign-out\"></i>D\u00E9connexion\n          </li>\n        </ul>\n      </div>\n    }\n  </div>\n}\n@if (!connected && loginpage) {\n  <div>\n    <span style=\"height:40px;float:left; padding-left:20px\" [routerLink]=\"loginpage\">Connexion</span>\n  </div>\n}\n", styles: [".menuUser{position:relative}.menuUser ul{text-align:left;position:absolute;top:30px;left:-115px;width:150px;padding:10px;z-index:20;background-color:#fff;font-size:13px;color:#000}.menuUser ul li{height:30px;list-style-type:none}.menuUser ul li i{padding-right:10px;height:30px}ul.menuSec li{cursor:pointer}\n"], dependencies: [{ kind: "directive", type: NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: RouterLink, selector: "[routerLink]", inputs: ["target", "queryParams", "fragment", "queryParamsHandling", "state", "info", "relativeTo", "preserveFragment", "skipLocationChange", "replaceUrl", "routerLink"] }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.18", type: UserMenuComponent, isStandalone: true, selector: "gloww-user-menu", inputs: { size: "size", imageUser: "imageUser", loginpage: "loginpage" }, ngImport: i0, template: "@if (connected) {\n  <div>\n    <span (click)=\"toggleMenuUser()\">\n      @if (imageUser) {\n        <img [src]=\"imageUser\" style=\"height:40px;float:left; padding-left:20px\" />\n      }\n      @if (!imageUser) {\n        <i [ngClass]=\"'fal fa-user '+size\" style=\"float:left; padding-left:10px\">\n          <!--[size]=\"size\"-->\n        </i>\n      }\n    </span>\n    @if (showMenuUser) {\n      <div class=\"menuUser\">\n        <ul class=\"menuSec\" style=\"border: solid lightgrey;\">\n          <li (click)=\"ChangePassword()\">\n            <i class=\"fal fa-key-skeleton\"></i>Change Password\n          </li>\n          @if (oAuthProviders && oAuthProviders.length) {\n            <li (click)=\"Configuration()\">\n              <i class=\"fal fa-tools\"></i>Configuration\n            </li>\n          }\n          <li (click)=\"Logout()\">\n            <i class=\"fal fa-sign-out\"></i>D\u00E9connexion\n          </li>\n        </ul>\n      </div>\n    }\n  </div>\n}\n@if (!connected && loginpage) {\n  <div>\n    <span class=\"user-menu-disabled user-menu-link\" [routerLink]=\"loginpage\" title=\"Connexion\">\n      <i [ngClass]=\"'fal fa-user '+size\"></i>\n    </span>\n  </div>\n}\n@if (!connected && !loginpage) {\n  <div>\n    <span class=\"user-menu-disabled\" title=\"Utilisateur non connect\u00E9\">\n      <i [ngClass]=\"'fal fa-user '+size\"></i>\n    </span>\n  </div>\n}\n", styles: [".menuUser{position:relative}.user-menu-disabled{float:left;padding-left:10px;color:#b0b0b0;cursor:default;opacity:.65}.user-menu-link{cursor:pointer}.menuUser ul{text-align:left;position:absolute;top:30px;left:-115px;width:150px;padding:10px;z-index:20;background-color:#fff;font-size:13px;color:#000}.menuUser ul li{height:30px;list-style-type:none}.menuUser ul li i{padding-right:10px;height:30px}ul.menuSec li{cursor:pointer}\n"], dependencies: [{ kind: "directive", type: NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: RouterLink, selector: "[routerLink]", inputs: ["target", "queryParams", "fragment", "queryParamsHandling", "state", "info", "relativeTo", "preserveFragment", "skipLocationChange", "replaceUrl", "routerLink"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.18", ngImport: i0, type: UserMenuComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'gloww-user-menu', imports: [NgClass, RouterLink], template: "@if (connected) {\n  <div>\n    <span (click)=\"toggleMenuUser()\">\n      @if (imageUser) {\n        <img [src]=\"imageUser\" style=\"height:40px;float:left; padding-left:20px\" />\n      }\n      @if (!imageUser) {\n        <i [ngClass]=\"'fal fa-user '+size\" style=\"float:left; padding-left:10px\">\n          <!--[size]=\"size\"-->\n        </i>\n      }\n    </span>\n    @if (showMenuUser) {\n      <div class=\"menuUser\">\n        <ul class=\"menuSec\" style=\"border: solid lightgrey;\">\n          <li (click)=\"ChangePassword()\">\n            <i class=\"fal fa-key-skeleton\"></i>Change Password\n          </li>\n          @if (oAuthProviders && oAuthProviders.length) {\n            <li (click)=\"Configuration()\">\n              <i class=\"fal fa-tools\"></i>Configuration\n            </li>\n          }\n          <li (click)=\"Logout()\">\n            <i class=\"fal fa-sign-out\"></i>D\u00E9connexion\n          </li>\n        </ul>\n      </div>\n    }\n  </div>\n}\n@if (!connected && loginpage) {\n  <div>\n    <span style=\"height:40px;float:left; padding-left:20px\" [routerLink]=\"loginpage\">Connexion</span>\n  </div>\n}\n", styles: [".menuUser{position:relative}.menuUser ul{text-align:left;position:absolute;top:30px;left:-115px;width:150px;padding:10px;z-index:20;background-color:#fff;font-size:13px;color:#000}.menuUser ul li{height:30px;list-style-type:none}.menuUser ul li i{padding-right:10px;height:30px}ul.menuSec li{cursor:pointer}\n"] }]
+            args: [{ selector: 'gloww-user-menu', imports: [NgClass, RouterLink], template: "@if (connected) {\n  <div>\n    <span (click)=\"toggleMenuUser()\">\n      @if (imageUser) {\n        <img [src]=\"imageUser\" style=\"height:40px;float:left; padding-left:20px\" />\n      }\n      @if (!imageUser) {\n        <i [ngClass]=\"'fal fa-user '+size\" style=\"float:left; padding-left:10px\">\n          <!--[size]=\"size\"-->\n        </i>\n      }\n    </span>\n    @if (showMenuUser) {\n      <div class=\"menuUser\">\n        <ul class=\"menuSec\" style=\"border: solid lightgrey;\">\n          <li (click)=\"ChangePassword()\">\n            <i class=\"fal fa-key-skeleton\"></i>Change Password\n          </li>\n          @if (oAuthProviders && oAuthProviders.length) {\n            <li (click)=\"Configuration()\">\n              <i class=\"fal fa-tools\"></i>Configuration\n            </li>\n          }\n          <li (click)=\"Logout()\">\n            <i class=\"fal fa-sign-out\"></i>D\u00E9connexion\n          </li>\n        </ul>\n      </div>\n    }\n  </div>\n}\n@if (!connected && loginpage) {\n  <div>\n    <span class=\"user-menu-disabled user-menu-link\" [routerLink]=\"loginpage\" title=\"Connexion\">\n      <i [ngClass]=\"'fal fa-user '+size\"></i>\n    </span>\n  </div>\n}\n@if (!connected && !loginpage) {\n  <div>\n    <span class=\"user-menu-disabled\" title=\"Utilisateur non connect\u00E9\">\n      <i [ngClass]=\"'fal fa-user '+size\"></i>\n    </span>\n  </div>\n}\n", styles: [".menuUser{position:relative}.user-menu-disabled{float:left;padding-left:10px;color:#b0b0b0;cursor:default;opacity:.65}.user-menu-link{cursor:pointer}.menuUser ul{text-align:left;position:absolute;top:30px;left:-115px;width:150px;padding:10px;z-index:20;background-color:#fff;font-size:13px;color:#000}.menuUser ul li{height:30px;list-style-type:none}.menuUser ul li i{padding-right:10px;height:30px}ul.menuSec li{cursor:pointer}\n"] }]
         }], ctorParameters: () => [{ type: AuthenticationService }, { type: i1$2.MatDialog }, { type: i2.Router }], propDecorators: { size: [{
                 type: Input
             }], imageUser: [{