Add support for adapt_framework -> grunt server-build:dev

plugins/content/config/model.schema

@@ -47,10 +47,10 @@
           "required": true,
           "default": "easeOutQuart",
           "title": "Hide Easing",
-          "inputType": { 
-            "type": "Select", 
+          "inputType": {
+            "type": "Select",
             "options": [
-              "easeInSine", 
+              "easeInSine",
               "easeOutSine",
               "easeInOutSine",
               "easeInQuad",
@@ -89,10 +89,10 @@
           "required": true,
           "default": "easeInQuart",
           "title": "Hide Easing",
-          "inputType": { 
-            "type": "Select", 
+          "inputType": {
+            "type": "Select",
             "options": [
-              "easeInSine", 
+              "easeInSine",
               "easeOutSine",
               "easeInOutSine",
               "easeInQuad",
@@ -135,6 +135,15 @@
           "validators": ["required", "number"]
         }
       }
+    },
+    "_generateSourcemap": {
+      "type": "bool",
+      "default": "false",
+      "isSetting": true,
+      "inputType": {"type": "Boolean", "options": [true, false]},
+      "validators": [],
+      "title": "Generate sourcemap",
+      "help": "Creates a JavaScript sourcemap for the output code - useful for debugging (in browsers that support it)."
     }
   }
 }

plugins/output/adapt/index.js

@@ -24,35 +24,35 @@ var OutputPlugin = require('../../../lib/outputmanager').OutputPlugin,
     version = require('../../../version'),
     logger = require('../../../lib/logger');
 
-function AdaptOutput () {
+function AdaptOutput() {
 }
 
 util.inherits(AdaptOutput, OutputPlugin);
 
-AdaptOutput.prototype.publish = function (courseId, isPreview, request, response, next) {
-    var self = this;
-    var user = usermanager.getCurrentUser(),
-      tenantId = user.tenant._id,
-      outputJson = {},
-      isRebuildRequired = false,
-      themeName = Constants.Defaults.ThemeName;
-      menuName = Constants.Defaults.MenuName;
+AdaptOutput.prototype.publish = function(courseId, isPreview, request, response, next) {
+  var self = this;
+  var user = usermanager.getCurrentUser(),
+    tenantId = user.tenant._id,
+    outputJson = {},
+    isRebuildRequired = false,
+    themeName = Constants.Defaults.ThemeName;
+  menuName = Constants.Defaults.MenuName;
 
-    var resultObject = {};
+  var resultObject = {};
 
-    var FRAMEWORK_ROOT_FOLDER = path.join(configuration.tempDir, configuration.getConfig('masterTenantID'), Constants.Folders.Framework);
+  var FRAMEWORK_ROOT_FOLDER = path.join(configuration.tempDir, configuration.getConfig('masterTenantID'), Constants.Folders.Framework);
 
-    async.series([
+  async.series([
       function(callback) {
         self.getCourseJSON(tenantId, courseId, function(err, data) {
-            if (err) {
-              return callback(err);
-            }
+          if (err) {
+            return callback(err);
+          }
 
-            // Store off the retrieved collections
-            outputJson = data;
+          // Store off the retrieved collections
+          outputJson = data;
 
-            callback(null);
+          callback(null);
         });
       },
       function(callback) {
@@ -119,7 +119,7 @@ AdaptOutput.prototype.publish = function (courseId, isPreview, request, response
         });
       },
       function(callback) {
-        var assetsFolder = path.join(FRAMEWORK_ROOT_FOLDER, Constants.Folders.AllCourses, tenantId, courseId, 
+        var assetsFolder = path.join(FRAMEWORK_ROOT_FOLDER, Constants.Folders.AllCourses, tenantId, courseId,
           Constants.Folders.Build, Constants.Folders.Course, outputJson['config']._defaultLanguage, Constants.Folders.Assets);
 
         self.writeCourseAssets(tenantId, courseId, assetsFolder, outputJson, function(err, modifiedJson) {
@@ -143,51 +143,54 @@ AdaptOutput.prototype.publish = function (courseId, isPreview, request, response
         });
       },
       function(callback) {
-        fs.exists(path.join(FRAMEWORK_ROOT_FOLDER, Constants.Folders.AllCourses, tenantId, courseId, Constants.Folders.Build, Constants.Filenames.Main), function (exists) {
+        fs.exists(path.join(FRAMEWORK_ROOT_FOLDER, Constants.Folders.AllCourses, tenantId, courseId, Constants.Folders.Build, Constants.Filenames.Main), function(exists) {
           if (!exists || isRebuildRequired) {
             logger.log('info', '3.1. Ensuring framework build exists');
 
             var args = [];
             var outputFolder = path.join(Constants.Folders.AllCourses, tenantId, courseId);
-            
+
             // Append the 'build' folder to later versions of the framework
             if (semver.gte(semver.clean(version.adapt_framework), semver.clean('2.0.0'))) {
               outputFolder = path.join(outputFolder, Constants.Folders.Build);
             }
-            
+
             args.push('--outputdir=' + outputFolder);
             args.push('--theme=' + themeName);
             args.push('--menu=' + menuName);
 
             logger.log('info', '3.2. Using theme: ' + themeName);
             logger.log('info', '3.3. Using menu: ' + menuName);
 
-            logger.log('info', 'grunt server-build ' + args.join(' '));
-
-            child = exec('grunt server-build ' + args.join(' '), {cwd: path.join(FRAMEWORK_ROOT_FOLDER)},
-              function (error, stdout, stderr) {
-                if (error !== null) {
-                  logger.log('error', 'exec error: ' + error);
-                  logger.log('error', 'stdout error: ' + stdout);
-                  resultObject.success = true;
-                  return callback(error, 'Error building framework');
-                }
-
-                if (stdout.length != 0) {
-                  logger.log('info', 'stdout: ' + stdout);
-                  resultObject.success = true;
-                  return callback(null, 'Framework built OK');
-                }
-
-                if (stderr.length != 0) {                  
-                  logger.log('error', 'stderr: ' + stderr);
-                  resultObject.success = false;
-                  return callback(stderr, 'Error (stderr) building framework!');
-                }
-
-                resultObject.success = true;
-                return callback(null, 'Framework built');  
-            });
+            var generateSourcemap = outputJson.config._generateSourcemap;
+            var buildMode = generateSourcemap === true ? 'dev' : 'prod';
+
+            logger.log('info', 'grunt server-build:' + buildMode + ' ' + args.join(' '));
+
+            child = exec('grunt server-build:' + buildMode + ' ' + args.join(' '), {cwd: path.join(FRAMEWORK_ROOT_FOLDER)},
+                      function(error, stdout, stderr) {
+                        if (error !== null) {
+                          logger.log('error', 'exec error: ' + error);
+                          logger.log('error', 'stdout error: ' + stdout);
+                          resultObject.success = true;
+                          return callback(error, 'Error building framework');
+                        }
+
+                        if (stdout.length != 0) {
+                          logger.log('info', 'stdout: ' + stdout);
+                          resultObject.success = true;
+                          return callback(null, 'Framework built OK');
+                        }
+
+                        if (stderr.length != 0) {
+                          logger.log('error', 'stderr: ' + stderr);
+                          resultObject.success = false;
+                          return callback(stderr, 'Error (stderr) building framework!');
+                        }
+
+                        resultObject.success = true;
+                        return callback(null, 'Framework built');
+                      });
           } else {
             resultObject.success = true;
             callback(null, 'Framework already built, nothing to do')
@@ -215,29 +218,29 @@ AdaptOutput.prototype.publish = function (courseId, isPreview, request, response
           archive.pipe(output);
 
           archive.bulk([
-            { expand: true, cwd: path.join(FRAMEWORK_ROOT_FOLDER, Constants.Folders.AllCourses, tenantId, courseId, Constants.Folders.Build), src: ['**/*'] }
-          ]).finalize(); 
+            { expand: true, cwd: path.join(FRAMEWORK_ROOT_FOLDER, Constants.Folders.AllCourses, tenantId, courseId, Constants.Folders.Build), src: ['**/*'] },
+          ]).finalize();
 
         } else {
           // No download required -- skip this step
           callback();
-        }        
-      }   
+        }
+      },
     ], function(err) {
 
       if (err) {
         logger.log('error', err);
         return next(err);
       }
 
-      
+
       return next(null, resultObject);
-    });   
+    });
 
 };
 /**
  * Module exports
  *
  */
 
-exports = module.exports = AdaptOutput;
+exports = module.exports = AdaptOutput;