Revert "XWIKI-23024: Upgrade to Vue 3.x (#4079)"

This reverts commit fdc4d21.

Author: manuelleduc

.gitignore

@@ -72,7 +72,3 @@ xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/res
 .clover
 *~
 **/overlays/*.info
-
-## Node specific
-node_modules/
-dist/

pom.xml

@@ -123,10 +123,10 @@
     <oracle.groupId>com.oracle.database.jdbc</oracle.groupId>
     <oracle.artifactId>ojdbc11</oracle.artifactId>
     <oracle.version>21.17.0.0</oracle.version>
-
+    
     <!-- Versions of Node related tools -->
-    <node.version>v22.14.0</node.version>
-    <npm.version>11.2.0</npm.version>
+    <node.version>v22.13.1</node.version>
+    <npm.version>11.1.0</npm.version>
   </properties>
   <scm>
     <tag>HEAD</tag>
@@ -1187,7 +1187,15 @@
       <dependency>
         <groupId>org.webjars.npm</groupId>
         <artifactId>vue</artifactId>
-        <version>3.5.13</version>
+        <version>2.7.16</version>
+        <exclusions>
+          <!-- Excluded because this dependency is 1) not used at runtime since all out components are pre-compiled 2) 
+          not currently deployable on webjars.org (see https://github.com/webjars/webjars/issues/1976)  -->
+          <exclusion>
+            <groupId>org.webjars.npm</groupId>
+            <artifactId>vue__compiler-sfc</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
     </dependencies>
   </dependencyManagement>

xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/AttachmentIT.java

@@ -80,9 +80,6 @@ class AttachmentIT
     @BeforeAll
     public void setup(TestUtils setup)
     {
-        setup.loginAsSuperAdmin();
-        // Make sure the timezone configuration the default value until XWIKI-21924 is fixed.
-        setup.setPropertyInXWikiPreferences("timezone", "String", "");
         setup.createUser("User2", "pass", "");
         setup.createUserAndLogin("User1", "pass");
     }
@@ -107,7 +104,7 @@ void uploadAttachments(TestUtils setup, TestReference testReference, TestConfigu
         setup.rest().savePage(testReference, "", "");
         Page page = setup.rest().get(testReference);
         // We make the page hidden as we identified some issues specific to hidden pages (see XWIKI-20093).
-        // If it happens that some issues are specific to non-hidden pages, the test will need to be improved to
+        // If it happens that some issues are specific to non-hidden pages, the test will need to be improved to 
         // cover both cases (which will make the execution time of the test suite larger).
         page.setHidden(true);
         setup.rest().save(page);

xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/pom.xml

@@ -32,7 +32,7 @@
   <name>XWiki Platform - Live Data - Macro</name>
   <description>Display dynamic lists of data.</description>
   <properties>
-    <xwiki.jacoco.instructionRatio>0.78</xwiki.jacoco.instructionRatio>
+    <xwiki.jacoco.instructionRatio>0.91</xwiki.jacoco.instructionRatio>
     <!-- Name to display by the Extension Manager -->
     <xwiki.extension.name>Live Data Macro</xwiki.extension.name>
   </properties>
@@ -58,22 +58,6 @@
       <artifactId>xwiki-platform-bridge</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-platform-template-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-platform-uiextension-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-platform-webjars-api</artifactId>
-      <version>${project.version}</version>
-      <scope>runtime</scope>
-    </dependency>
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.xwiki.rendering</groupId>

xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/java/org/xwiki/livedata/internal/LiveDataImportmapUIExtension.java

@@ -1,2 +1 @@
 org.xwiki.livedata.internal.macro.LiveDataMacro
-org.xwiki.livedata.internal.LiveDataImportmapUIExtension

xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/src/main/resources/META-INF/components.txt

@@ -18,19 +18,20 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 /*!
+#set ($liveDataEntry = 'xwiki-livedata.min')
+#set ($liveDataPath = $services.webjars.url('org.xwiki.platform:xwiki-platform-livedata-webjar', $liveDataEntry))
 #set ($paths = {
   'js': {
-    'vue': $services.webjars.url('org.webjars.npm:vue', 'dist/vue.runtime.esm-browser.prod'),
+    'xwiki-livedata': $liveDataPath,
+    'xwiki-livedata-vue': $services.webjars.url('org.xwiki.platform:xwiki-platform-livedata-webjar',
+      'xwiki-livedata-vue.umd.min'),
+    'vue': $services.webjars.url('org.webjars.npm:vue', 'dist/vue.min'),
+    'vue-i18n': $services.webjars.url('org.webjars.npm:vue-i18n', 'dist/vue-i18n.min'),
     'daterangepicker': $services.webjars.url('bootstrap-daterangepicker', 'js/bootstrap-daterangepicker.js')
   },
-  'module': {
-    'xwiki-livedata': $services.webjars.url('org.xwiki.platform:xwiki-platform-livedata-webjar', 'main.es.js')
-  },
   'css': {
     'liveData': $services.webjars.url('org.xwiki.platform:xwiki-platform-livedata-webjar',
-      'xwiki-platform-livedata.css'),
-    'liveDataLess': $services.webjars.url('org.xwiki.platform:xwiki-platform-livedata-webjar',
-      'variables.less', {'evaluate': true}),
+      'xwiki-livedata-vue.umd.min.less', {'evaluate': true}),
     'dateRangePicker': $services.webjars.url('bootstrap-daterangepicker', 'css/bootstrap-daterangepicker.css'),
     'selectize': [
       $services.webjars.url('selectize.js', 'css/selectize.bootstrap3.css'),
@@ -48,67 +49,81 @@
   require.config({
     paths: paths.js,
     map: {
-      "*": {
-        "xwiki-livedata": "xwiki-livedata-with-css",
-        daterangepicker: "daterangepicker-with-css",
-        "xwiki-selectize": "xwiki-selectize-with-css",
-      },
-      "xwiki-livedata-with-css": {
-        "xwiki-livedata": "xwiki-livedata",
+      '*': {
+        'xwiki-livedata-vue': 'xwiki-livedata-vue-with-css',
+        daterangepicker: 'daterangepicker-with-css',
+        'xwiki-selectize': 'xwiki-selectize-with-css'
       },
-      "daterangepicker-with-css": {
-        daterangepicker: "daterangepicker",
+      'xwiki-livedata-vue-with-css': {
+        'xwiki-livedata-vue': 'xwiki-livedata-vue'
       },
-      "xwiki-selectize-with-css": {
-        "xwiki-selectize": "xwiki-selectize",
+      'daterangepicker-with-css': {
+        daterangepicker: 'daterangepicker'
       },
+      'xwiki-selectize-with-css': {
+        'xwiki-selectize': 'xwiki-selectize'
+      }
     },
     config: {
-      "xwiki-livedata-source": {
-        contextPath: paths.contextPath,
-      },
-    },
+      'xwiki-livedata-source': {
+        contextPath: paths.contextPath
+      }
+    }
   });
 
-  function loadCSS(url) {
-    const link = document.createElement("link");
-    link.type = "text/css";
-    link.rel = "stylesheet";
-    link.href = url;
-    document.getElementsByTagName("head")[0].appendChild(link);
-  }
-
-  function loadModule(url) {
-    const script = document.createElement("script");
-    script.type = "module";
-    script.src = url;
-    document.getElementsByTagName("head")[0].appendChild(script);
-  }
-
-  define("loadCSS", function() {
+  define('loadCSS', function() {
+    var loadCSS = function(url) {
+      var link = document.createElement("link");
+      link.type = "text/css";
+      link.rel = "stylesheet";
+      link.href = url;
+      document.getElementsByTagName("head")[0].appendChild(link);
+    };
+  
     return (url) => {
-      const urls = Array.isArray(url) ? url : [url];
+      var urls = Array.isArray(url) ? url : [url];
       urls.forEach(loadCSS);
     };
   });
-
-  define("daterangepicker-with-css", ["loadCSS", "daterangepicker"], function(loadCSS) {
+  
+  define('xwiki-livedata-vue-with-css', ['loadCSS', 'xwiki-livedata-vue'], function(loadCSS) {
+    // Load the CSS for the live data.
+    loadCSS(paths.css.liveData);
+    return arguments[1];
+  });
+  
+  define('daterangepicker-with-css', ['loadCSS', 'daterangepicker'], function(loadCSS) {
     // Load the CSS for the date range picker.
     loadCSS(paths.css.dateRangePicker);
     return arguments[1];
   });
-
-  define("xwiki-selectize-with-css", ["loadCSS", "xwiki-selectize"], function(loadCSS) {
+  
+  define('xwiki-selectize-with-css', ['loadCSS', 'xwiki-selectize'], function(loadCSS) {
     // Load the CSS for the suggest picker.
     loadCSS(paths.css.selectize);
     return arguments[1];
   });
-
-  loadModule(paths.module["xwiki-livedata"]);
-  loadCSS(paths.css.liveData);
-  // Load a small less file with the declarations of a few LESS values that are not exported
-  // elsewhere
-  loadCSS(paths.css.liveDataLess);
+  
+  window.liveDataBaseURL = paths.liveDataBasePath;
+  
+  require(['jquery', 'xwiki-livedata'], function($, LiveData) {
+    $.fn.liveData = function(config) {
+      return this.each(function() {
+        if (!$(this).data('liveData')) {
+          var instanceConfig = $.extend($(this).data('config'), config);
+          $(this).attr('data-config', JSON.stringify(instanceConfig)).data('liveData', LiveData(this));
+        }
+      });
+    };
+  
+    var init = function(event, data) {
+      var container = $((data && data.elements) || document);
+      container.find('.liveData').liveData();
+    };
+  
+    $(document).on('xwiki:dom:updated', init);
+    $(init);
+  });
 
 // End JavaScript-only code.
-}).apply("]]#", $jsontool.serialize([$paths]));
+}).apply(']]#', $jsontool.serialize([$paths]));