Breaking/tdr 9/handlebars 4 upgrade

views/build/grunt/portableelement.js

@@ -39,6 +39,7 @@ module.exports = function (grunt) {
             searchPattern: '/views/js/picCreator/**/picCreator.json'
         }
     ];
+    const deprecatedTypes = ['PCI', 'PIC'];
 
     grunt.config.merge({
         portableelement: {
@@ -239,8 +240,14 @@ module.exports = function (grunt) {
                 return Promise.resolve([]);
             }
 
+            let deprecationMsg = '';
+
+            if (deprecatedTypes.includes(model.type)) {
+                deprecationMsg = '[DEPRECATED] ';
+            }
+
             subcompilationPromises.push([
-                grunt.log.subhead.bind(null, `${model.type} "${model.id}" found in manifest "${file}" ...`)
+                grunt.log.subhead.bind(null, `${deprecationMsg}${model.type} "${model.id}" found in manifest "${file}" ...`)
             ]);
 
             model.map.forEach(compilMap => {

views/build/moduleWriter.js

@@ -13,7 +13,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2022 (original work) Open Assessment Technologies SA ;
+ * Copyright (c) 2022-2023 (original work) Open Assessment Technologies SA ;
  */
 define([], function () {
     'use strict';
@@ -34,7 +34,7 @@ define([], function () {
     return function moduleWriter(moduleName, compiled) {
         let handlebars = 'handlebars';
         if (isPciRuntime(moduleName)) {
-            handlebars = 'taoQtiItem/portableLib/handlebars';
+            handlebars = 'taoQtiItem/portableLib/handlebars_4';
         }
         return `define('tpl!${moduleName}', ['${handlebars}'], function(hb){ return hb.template(${compiled}); });`;
     };

views/js/portableLib/OAT/util/tpl.js

@@ -16,44 +16,47 @@
  * Copyright (c) 2015 (original work) Open Assessment Technologies SA ;
  *
  */
-define(['taoQtiItem/portableLib/jquery_2_1_1', 'taoQtiItem/portableLib/handlebars'], function($, handlebars){
-
+define([
+    'taoQtiItem/portableLib/jquery_2_1_1',
+    'taoQtiItem/portableLib/handlebars_4'
+], function($, handlebars){
+
     'use strict';
-    
+
     /**
      * Find and compile templates found in the $container
-     * 
+     *
      * @param {jQuery} $container
      * @returns {object}
      */
     function loadTemplates($container){
-        
+
         var templates = {};
         var $templates = $($container.find('[type="text/x-template-manifest"]').html());
         $templates.each(function(){
-            
+
             var $template = $(this),
                 id = $template.data('template-id'),
                 tplSource = $template.html();
-                
+
             if(id && tplSource){
                 templates[id] = handlebars.compile(tplSource);
-            }    
+            }
         });
-        
+
         return templates;
     }
-    
+
     /**
      * Create a template manager object from a JQuery container
-     * 
+     *
      * @param {JQuery} $container
      * @returns {Object}
      */
     return function tpl($container){
-        
+
         var templates = loadTemplates($container);
-        
+
         return {
             exists : function exists(templateId){
                 return (templateId && templates[templateId]);