Merge pull request #33992 from dimagi/bmb/b5-datepicker-fontawesome

[B5] Add successor to datetimepicker and newest font awesome

corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js

@@ -15,6 +15,9 @@ requirejs.config({
         "datatables.fixedColumns": "datatables.net-fixedcolumns/js/dataTables.fixedColumns.min",
         "datatables.fixedColumns.bootstrap": "datatables.net-fixedcolumns/js/dataTables.fixedColumns.min",
         "datatables.bootstrap": "datatables.net-bs5/js/dataTables.bootstrap5.min",
+        "popper": "@popperjs/core/dist/umd/popper.min",
+        "tempus-dominus": "eonasdan/tempus-dominus/dist/js/tempus-dominus.min",
+        "datepicker": "@eonasdan/tempus-dominus/dist/js/jQuery-provider.min",  // import this if you need jquery plugin of tempus-dominus
     },
     shim: {
         "ace-builds/src-min-noconflict/ace": { exports: "ace" },
@@ -37,6 +40,9 @@ requirejs.config({
         "hqwebapp/js/lib/modernizr": {
             exports: 'Modernizr',
         },
+        "datepicker": {
+            deps: ['popper', 'tempus-dominus'],
+        },
     },
     packages: [{
         name: 'moment',

corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/core_stylesheets.html

@@ -2,10 +2,10 @@
 {% load hq_shared_tags %}
 
 {% compress css %}
-  <link type="text/less"
+  <link type="text/css"
         rel="stylesheet"
         media="all"
-        href="{% static 'font-awesome/less/font-awesome.less' %}" />
+        href="{% static '@fortawesome/fontawesome-free/css/all.min.css' %}" />
   <link type="text/less"
         rel="stylesheet"
         media="all"

corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/includes/core_stylesheets.html.diff.txt

@@ -20,10 +20,10 @@
 -          rel="stylesheet"
 -          media="all"
 -          href="{% static 'hqwebapp/less/style.less' %}" />
-+  <link type="text/less"
++  <link type="text/css"
 +        rel="stylesheet"
 +        media="all"
-+        href="{% static 'font-awesome/less/font-awesome.less' %}" />
++        href="{% static '@fortawesome/fontawesome-free/css/all.min.css' %}" />
 +  <link type="text/less"
 +        rel="stylesheet"
 +        media="all"

corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/requirejs_config.js.diff.txt

@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -2,21 +2,26 @@
+@@ -2,21 +2,29 @@
  requirejs.config({
      baseUrl: '/static/',
      paths: {
@@ -19,6 +19,9 @@
 +        "datatables.fixedColumns": "datatables.net-fixedcolumns/js/dataTables.fixedColumns.min",
 +        "datatables.fixedColumns.bootstrap": "datatables.net-fixedcolumns/js/dataTables.fixedColumns.min",
 +        "datatables.bootstrap": "datatables.net-bs5/js/dataTables.bootstrap5.min",
++        "popper": "@popperjs/core/dist/umd/popper.min",
++        "tempus-dominus": "eonasdan/tempus-dominus/dist/js/tempus-dominus.min",
++        "datepicker": "@eonasdan/tempus-dominus/dist/js/jQuery-provider.min",  // import this if you need jquery plugin of tempus-dominus
      },
      shim: {
          "ace-builds/src-min-noconflict/ace": { exports: "ace" },
@@ -31,7 +34,17 @@
          "jquery.rmi/jquery.rmi": {
              deps: ['jquery', 'knockout', 'underscore'],
              exports: 'RMI',
-@@ -44,7 +49,7 @@
+@@ -32,6 +40,9 @@
+         "hqwebapp/js/lib/modernizr": {
+             exports: 'Modernizr',
+         },
++        "datepicker": {
++            deps: ['popper', 'tempus-dominus'],
++        },
+     },
+     packages: [{
+         name: 'moment',
+@@ -44,7 +55,7 @@
          },
      },
 

package.json

@@ -12,8 +12,11 @@
         "@ckeditor/ckeditor5-horizontal-line": "^40.1.0",
         "@ckeditor/ckeditor5-html-support": "^40.1.0",
         "@ckeditor/ckeditor5-restricted-editing": "^40.1.0",
+        "@eonasdan/tempus-dominus": "npm:@eonasdan/tempus-dominus#6.9.4",
+        "@fortawesome/fontawesome-free": "npm:@fortawesome/fontawesome-free#6.5.1",
         "@mapbox/mapbox-gl-draw": "1.4.1",
         "@mapbox/mapbox-gl-geocoder": "5.0.1",
+        "@popperjs/core": "npm:@popperjs/core#2.11.6",
         "At.js": "millerdev/At.js#master",
         "Caret.js": "INTELOGIE/Caret.js#0.3.1",
         "DOMPurify": "npm:dompurify#2.3.6",

yarn.lock

@@ -353,6 +353,11 @@
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
+"@eonasdan/tempus-dominus@npm:@eonasdan/tempus-dominus#6.9.4":
+  version "6.9.4"
+  resolved "https://registry.yarnpkg.com/@eonasdan/tempus-dominus/-/tempus-dominus-6.9.4.tgz#cf3c9d223e38df2eaf18368927634bdd140c554f"
+  integrity sha512-zbGHdHCxjIuUN+31iTbsHhmrZuAalCdmuN3yf56P764Ko/tpOdWJUxr5yiBD5mvXoVcBxkGBtKCyDPL+bROABg==
+
 "@eslint/eslintrc@^1.2.3":
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz#fcaa2bcef39e13d6e9e7f6271f4cc7cae1174886"
@@ -368,6 +373,11 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@fortawesome/fontawesome-free@npm:@fortawesome/fontawesome-free#6.5.1":
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz#55cc8410abf1003b726324661ce5b0d1c10de258"
+  integrity sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==
+
 "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
@@ -684,6 +694,11 @@
     read-package-json-fast "^2.0.3"
     which "^2.0.2"
 
+"@popperjs/core@npm:@popperjs/core#2.11.6":
+  version "2.11.8"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
+  integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
+
 "@sindresorhus/is@^4.0.0":
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"