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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gloww/gloww",
-  "version": "20.0.0-beta.49",
+  "version": "20.0.0-beta.50",
   "peerDependencies": {
     "@angular/animations": "^20.0.0",
     "@angular/cdk": "^20.0.0",