Breaking/tao 4814 atomic bundles

manifest.php

@@ -33,11 +33,11 @@
     'label' => 'Test-taker core extension',
 	'description' => 'TAO TestTaker extension',
     'license' => 'GPL-2.0',
-    'version' => '3.11.4',
+    'version' => '4.0.0',
 	'author' => 'Open Assessment Technologies, CRP Henri Tudor',
 	'requires' => array(
-	    'tao' => '>=19.23.0',
-	    'taoBackOffice' => '>=1.3.0'
+	    'tao' => '>=21.0.0',
+	    'taoBackOffice' => '>=3.0.0'
     ),
 	'models' => array(
 		'http://www.tao.lu/Ontologies/TAOSubject.rdf'

scripts/update/Updater.php

@@ -95,7 +95,7 @@ public function update($initialVersion)
             $extension->setConfig('csvImporterCallbacks', $config);
             $this->setVersion('3.11.0');
         }
-        $this->skip('3.11.0', '3.11.4');
+        $this->skip('3.11.0', '4.0.0');
 
     }
 }

views/build/grunt/bundle.js

@@ -1,50 +1,43 @@
-module.exports = function(grunt) { 
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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) 2014-2018 (original work) Open Assessment Technologies SA;
+ */
 
-    var requirejs   = grunt.config('requirejs') || {};
-    var clean       = grunt.config('clean') || {};
-    var copy        = grunt.config('copy') || {};
+/**
+ * configure the extension bundles
+ * @author Bertrand Chevrier <bertrand@taotesting.com>
+ */
+module.exports = function(grunt) {
+    'use strict';
 
-    var root        = grunt.option('root');
-    var libs        = grunt.option('mainlibs');
-    var ext         = require(root + '/tao/views/build/tasks/helpers/extensions')(grunt, root);
-    var out         = 'output';
-
-    /**
-     * Remove bundled and bundling files
-     */
-    clean.taotesttakerbundle = [out];
-
-    /**
-     * Compile tao files into a bundle 
-     */
-    requirejs.taotesttakerbundle = {
-        options: {
-            baseUrl : '../js',
-            dir : out,
-            mainConfigFile : './config/requirejs.build.js',
-            paths : { 'taoTestTaker' : root + '/taoTestTaker/views/js' },
-            modules : [{
-                name: 'taoTestTaker/controller/routes',
-                include : ext.getExtensionsControllers(['taoTestTaker']),
-                exclude : ['mathJax'].concat(libs)
-            }]
+    grunt.config.merge({
+        bundle : {
+            taotesttaker : {
+                options : {
+                    extension : 'taoTestTaker',
+                    outputDir : 'loader',
+                    bundles : [{
+                        name : 'taoTestTaker',
+                        default : true
+                    }]
+                }
+            }
         }
-    };
-
-    /**
-     * copy the bundles to the right place
-     */
-    copy.taotesttakerbundle = {
-        files: [
-            { src: [out + '/taoTestTaker/controller/routes.js'],  dest: root + '/taoTestTaker/views/js/controllers.min.js' },
-            { src: [out + '/taoTestTaker/controller/routes.js.map'],  dest: root + '/taoTestTaker/views/js/controllers.min.js.map' }
-        ]
-    };
-
-    grunt.config('clean', clean);
-    grunt.config('requirejs', requirejs);
-    grunt.config('copy', copy);
+    });
 
     // bundle task
-    grunt.registerTask('taotesttakerbundle', ['clean:taotesttakerbundle', 'requirejs:taotesttakerbundle', 'copy:taotesttakerbundle']);
+    grunt.registerTask('taotesttakerbundle', ['bundle:taotesttaker']);
 };