Merge pull request #85 from RallyApps/add_version_info

Pass along version info header from package.json
RallyApps · Feb 17, 2018 · b6987cd · b6987cd
2 parents 977118c + a530b12
commit b6987cd
Show file tree

Hide file tree

Showing 9 changed files with 1,848 additions and 313 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,7 @@
-language: node_js
-node_js:
-  - 8.0.0
-notifications:
-  flowdock: 1be3193c10d5c1a9248601124cb2847b
+before_install:
+  - npm i -g [email protected]
+language: node_js
+node_js:
+  - 8.9.4
+notifications:
+  flowdock: 1be3193c10d5c1a9248601124cb2847b
diff --git a/lib/build/index.js b/lib/build/index.js
@@ -64,42 +64,45 @@ let buildDeployFiles = function({appPath, templateData, appFileName, appExternal
   );
 };
 
-let runBuild = (configJson, appPath, callback)=>
-  getScript.getFiles({configJson, appPath,compress:false},
-    function(err, {javascript_files, css_files, remote_javascript_files, local_javascript_files, uncompressed_javascript_files, uncompressed_css_files, css_file_names, html_files, remote_css_files}){
-      if (err) {
-        return callback(err);
-      } else { 
-        configJson.javascript_files = javascript_files;
-        configJson.css_file_names = css_file_names;
-        configJson.css_files = css_files;
-        configJson.uncompressed_css_files = uncompressed_css_files;
-        configJson.remote_javascript_files = remote_javascript_files;
-        configJson.local_javascript_files = local_javascript_files;
-        configJson.uncompressed_javascript_files = uncompressed_javascript_files;
-        configJson.html_files = html_files;
-        configJson.remote_css_files = remote_css_files;
-        return async.forEach(configJson.css, function(c, callback) {
-          let cssPath = pathUtil.resolve(appPath, c);
-          return css.compileInPlace(cssPath, false, callback);
-        }
-        , function(err){
-          if (err) { return callback(err);
-          } else {
-            let options = {
-              appPath,
-              templateData: configJson,
-              appFileName,
-              appDebugFileName,
-              appUncompressedFileName,
-              appExternalFileName
-            };
-            return buildDeployFiles(options, callback);
+let runBuild = (configJson, appPath, callback) => {
+  configModule.getPackageJson(appPath, function(error, packageJson) {
+    getScript.getFiles({configJson, appPath,compress:false},
+      function(err, {javascript_files, css_files, remote_javascript_files, local_javascript_files, uncompressed_javascript_files, uncompressed_css_files, css_file_names, html_files, remote_css_files}){
+        if (err) {
+          return callback(err);
+        } else { 
+          configJson.javascript_files = javascript_files;
+          configJson.css_file_names = css_file_names;
+          configJson.css_files = css_files;
+          configJson.uncompressed_css_files = uncompressed_css_files;
+          configJson.remote_javascript_files = remote_javascript_files;
+          configJson.local_javascript_files = local_javascript_files;
+          configJson.uncompressed_javascript_files = uncompressed_javascript_files;
+          configJson.html_files = html_files;
+          configJson.remote_css_files = remote_css_files;
+          configJson.version = packageJson.version;
+          return async.forEach(configJson.css, function(c, callback) {
+            let cssPath = pathUtil.resolve(appPath, c);
+            return css.compileInPlace(cssPath, false, callback);
           }
-        });
-      }
-  })
-;
+          , function(err){
+            if (err) { return callback(err);
+            } else {
+              let options = {
+                appPath,
+                templateData: configJson,
+                appFileName,
+                appDebugFileName,
+                appUncompressedFileName,
+                appExternalFileName
+              };
+              return buildDeployFiles(options, callback);
+            }
+          });
+        }
+    });
+  });
+}
 
 module.exports = function({path,templates}, callback){
   try {

diff --git a/lib/config.js b/lib/config.js
@@ -4,25 +4,38 @@ let pathUtils = require('path');
 
 let configFileName = 'config.json';
 
-let getConfig = function (path, callback) {
-    let convertToJson = function (error, file) {
-        if (!error) {
-            let config = JSON.parse(file);
-            callback(null, config);
-        } else {
-            callback(error);
-        }
-    };
+let convertToJson = function(callback) {
+  return function (error, file) {
+    if (!error) {
+        let config = JSON.parse(file);
+        callback(null, config);
+    } else {
+        callback(error);
+    }
+  }
+};
 
+let getConfig = function (path, callback) {
     let configPath = pathUtils.join(path, configFileName);
     if (!fs.existsSync(configPath)) {
         console.log('A config.json not found using current directory');
         callback(null, process.cwd());
     } else {
-        fs.readFile(configPath, 'utf-8', convertToJson);
+        fs.readFile(configPath, 'utf-8', convertToJson(callback));
     }
 };
 
+let getPackageJson = function (path, callback) {
+  let packageJsonPath = pathUtils.join(path, "package.json");
+  if (!fs.existsSync(packageJsonPath)) {
+      console.log('A package.json not found using current directory');
+      callback(null, { version: ''});
+  } else {
+      fs.readFile(packageJsonPath, 'utf-8', convertToJson(callback));
+  }
+};
+
+
 let getAppSourceRoot = (path, callback) =>
     getConfig(path, (err, config) => {
         let root = pathUtils.resolve(path);
@@ -34,5 +47,7 @@ let getAppSourceRoot = (path, callback) =>
         callback(null, root);
     });
 
-module.exports = { getConfig, getAppSourceRoot };
+
+
+module.exports = { getConfig, getAppSourceRoot, getPackageJson };
 _.defaults(module.exports, { configFileName });