diff --git a/corehq/apps/cloudcare/.eslintrc.js b/corehq/apps/cloudcare/.eslintrc.js
new file mode 100644
index 000000000000..928a1245dbe5
--- /dev/null
+++ b/corehq/apps/cloudcare/.eslintrc.js
@@ -0,0 +1,7 @@
+/* global module */
+// Temporary until weback migration is complete, requirejs is gone, and all of HQ can use the latest ecmaVersion
+module.exports = {
+    "parserOptions": {
+        "ecmaVersion": "latest",
+    },
+};
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/config.js b/corehq/apps/cloudcare/static/cloudcare/js/config.js
index 014c405fa2f0..21cc7ad68263 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/config.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/config.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/config", [
     'jquery',
     'underscore',
@@ -11,7 +10,7 @@ hqDefine("cloudcare/js/config", [
     _,
     ko,
     initialPageData,
-    hqMain
+    hqMain,
 ) {
     $(function () {
         var makeDB = function (list) {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/debugger/debugger.js b/corehq/apps/cloudcare/static/cloudcare/js/debugger/debugger.js
index b371ae004c5b..6f25749e8e59 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/debugger/debugger.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/debugger/debugger.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine('cloudcare/js/debugger/debugger', [
     'jquery',
     'knockout',
@@ -18,7 +17,7 @@ hqDefine('cloudcare/js/debugger/debugger', [
     Clipboard,
     ace,
     kissmetrics,
-    readableForm
+    readableForm,
 ) {
     /**
      * These define tabs that are availabe in the debugger.
@@ -163,7 +162,7 @@ hqDefine('cloudcare/js/debugger/debugger', [
                 username: this.options.username,
                 restoreAs: this.options.restoreAs,
                 domain: this.options.domain,
-            }
+            },
         ).done(function (response) {
             this.formattedQuestionsHtml(response.formattedQuestions);
             readableForm.init();
@@ -190,7 +189,7 @@ hqDefine('cloudcare/js/debugger/debugger', [
                 restoreAs: this.options.restoreAs,
                 domain: this.options.domain,
                 app_id: this.options.appId,
-            }
+            },
         ).done(function (response) {
             this.evalXPath.autocomplete(response.autoCompletableItems);
             this.evalXPath.setRecentXPathQueries(response.recentXPathQueries || []);
@@ -370,7 +369,7 @@ hqDefine('cloudcare/js/debugger/debugger', [
                     query_data: self.options.queryData,
                     debugOutput: self.selectedDebugOption().key,
                 },
-                self.options.sessionType
+                self.options.sessionType,
             ).done(function (response) {
                 var xPathQuery = self.newXPathQuery({
                     status: response.status,
@@ -382,7 +381,7 @@ hqDefine('cloudcare/js/debugger/debugger', [
                 self.recentXPathQueries.unshift(xPathQuery);
                 // Ensure at the maximum we only show 6 queries
                 self.recentXPathQueries(
-                    self.recentXPathQueries.slice(0, 6)
+                    self.recentXPathQueries.slice(0, 6),
                 );
             });
             kissmetrics.track.event('[app-preview] User evaluated XPath');
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
index 0a52f0620d1b..80930f359fc6 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/form_entry/const", [], function () {
     return {
         GROUP_TYPE: 'sub-group',
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
index 3e073f0d7840..38844cae31ad 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/form_entry/entries", [
     'jquery',
     'knockout',
@@ -13,7 +12,8 @@ hqDefine("cloudcare/js/form_entry/entries", [
     'cloudcare/js/form_entry/const',
     'cloudcare/js/form_entry/utils',
     'signature_pad/dist/signature_pad.umd.min',
-    'mapbox.js/dist/mapbox.uncompressed',
+    'leaflet',
+    'mapbox.js/dist/mapbox.standalone.uncompressed',    // provides L.mapbox
     'hqwebapp/js/bootstrap5/knockout_bindings.ko',  // fadeVisible
     'cloudcare/js/formplayer/utils/calendar-picker-translations',   // EthiopianDateEntry
     'select2/dist/js/select2.full.min',
@@ -31,7 +31,7 @@ hqDefine("cloudcare/js/form_entry/entries", [
     constants,
     formEntryUtils,
     SignaturePad,
-    L
+    L,
 ) {
     /**
      * The base Object for all entries. Each entry takes a question object
@@ -895,7 +895,7 @@ hqDefine("cloudcare/js/form_entry/entries", [
                 var changedPicker = $(change.target)[0],
                     newDate = self._calendarInstance.parseDate(
                         self._calendarInstance.local.dateFormat,
-                        changedPicker.value
+                        changedPicker.value,
                     );
 
                 if (newDate && (self.answer() !== self._formatDateForAnswer(newDate.toJSDate()))) {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/errors.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/errors.js
index 694750532c28..203bbbabd8ed 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/errors.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/errors.js
@@ -1,4 +1,4 @@
-'use strict';
+
 hqDefine("cloudcare/js/form_entry/errors", [], function () {
     return {
         GENERIC_ERROR: gettext("Something unexpected went wrong on that request. " +
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index c0f6cf02b1fd..f42de73065e6 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/form_entry/form_ui", [
     'jquery',
     'knockout',
@@ -25,7 +24,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
     constants,
     entries,
     UsersModels,
-    formEntryUtils
+    formEntryUtils,
 ) {
     var groupNum = 0;
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/entries_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/entries_spec.js
index 94aeea199dc1..482df1b1d951 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/entries_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/entries_spec.js
@@ -1,4 +1,3 @@
-'use strict';
 /* eslint-env mocha */
 hqDefine("cloudcare/js/form_entry/spec/entries_spec", [
     "underscore",
@@ -17,7 +16,7 @@ hqDefine("cloudcare/js/form_entry/spec/entries_spec", [
     constants,
     entries,
     formUI,
-    utils
+    utils,
 ) {
     describe('Entries', function () {
         var questionJSON,
@@ -26,14 +25,14 @@ hqDefine("cloudcare/js/form_entry/spec/entries_spec", [
         before(function () {
             initialPageData.register(
                 "has_geocoder_privs",
-                true
+                true,
             );
             initialPageData.register(
                 "toggles_dict",
                 {
                     WEB_APPS_UPLOAD_QUESTIONS: true,
                     WEB_APPS_ANCHORED_SUBMIT: false,
-                }
+                },
             );
         });
 
@@ -224,42 +223,42 @@ hqDefine("cloudcare/js/form_entry/spec/entries_spec", [
 
             // Multiword filter
             assert.isTrue(
-                entries.ComboboxEntry.filter('one three', { text: 'one two three', id: 1 }, constants.COMBOBOX_MULTIWORD)
+                entries.ComboboxEntry.filter('one three', { text: 'one two three', id: 1 }, constants.COMBOBOX_MULTIWORD),
             );
             assert.isFalse(
-                entries.ComboboxEntry.filter('two three', { text: 'one two', id: 1 }, constants.COMBOBOX_MULTIWORD)
+                entries.ComboboxEntry.filter('two three', { text: 'one two', id: 1 }, constants.COMBOBOX_MULTIWORD),
             );
 
             // Fuzzy filter
             assert.isTrue(
-                entries.ComboboxEntry.filter('onet', { text: 'onetwo', id: 1 }, constants.COMBOBOX_FUZZY)
+                entries.ComboboxEntry.filter('onet', { text: 'onetwo', id: 1 }, constants.COMBOBOX_FUZZY),
             );
             assert.isTrue(
-                entries.ComboboxEntry.filter('onet', { text: 'onetwothree', id: 1 }, constants.COMBOBOX_FUZZY)
+                entries.ComboboxEntry.filter('onet', { text: 'onetwothree', id: 1 }, constants.COMBOBOX_FUZZY),
             );
             assert.isFalse(
-                entries.ComboboxEntry.filter('onwt', { text: 'onetwo', id: 1 }, constants.COMBOBOX_FUZZY)
+                entries.ComboboxEntry.filter('onwt', { text: 'onetwo', id: 1 }, constants.COMBOBOX_FUZZY),
             );
             assert.isTrue(
-                entries.ComboboxEntry.filter('OneT', { text: 'onetwo', id: 1 }, constants.COMBOBOX_FUZZY)
+                entries.ComboboxEntry.filter('OneT', { text: 'onetwo', id: 1 }, constants.COMBOBOX_FUZZY),
             );
             assert.isTrue(
-                entries.ComboboxEntry.filter('one tt', { text: 'one', id: 1 }, constants.COMBOBOX_FUZZY)
+                entries.ComboboxEntry.filter('one tt', { text: 'one', id: 1 }, constants.COMBOBOX_FUZZY),
             );
             assert.isTrue(
-                entries.ComboboxEntry.filter('o', { text: 'one', id: 1 }, constants.COMBOBOX_FUZZY)
+                entries.ComboboxEntry.filter('o', { text: 'one', id: 1 }, constants.COMBOBOX_FUZZY),
             );
             assert.isTrue(
-                entries.ComboboxEntry.filter('on', { text: 'on', id: 1 }, constants.COMBOBOX_FUZZY)
+                entries.ComboboxEntry.filter('on', { text: 'on', id: 1 }, constants.COMBOBOX_FUZZY),
             );
             assert.isTrue(
-                entries.ComboboxEntry.filter('three', { text: 'one two three', id: 1 }, constants.COMBOBOX_FUZZY)
+                entries.ComboboxEntry.filter('three', { text: 'one two three', id: 1 }, constants.COMBOBOX_FUZZY),
             );
             assert.isTrue(
-                entries.ComboboxEntry.filter('tree', { text: 'one two three', id: 1 }, constants.COMBOBOX_FUZZY)
+                entries.ComboboxEntry.filter('tree', { text: 'one two three', id: 1 }, constants.COMBOBOX_FUZZY),
             );
             assert.isFalse(
-                entries.ComboboxEntry.filter('thirty', { text: 'one two three', id: 1 }, constants.COMBOBOX_FUZZY)
+                entries.ComboboxEntry.filter('thirty', { text: 'one two three', id: 1 }, constants.COMBOBOX_FUZZY),
             );
         });
 
@@ -430,7 +429,7 @@ hqDefine("cloudcare/js/form_entry/spec/entries_spec", [
                 assert.isTrue(moment.isMoment(res));
                 assert.equal(
                     res.toISOString(),
-                    moment(expected, "YYYY-MM-DD").toISOString()
+                    moment(expected, "YYYY-MM-DD").toISOString(),
                 );
             };
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/fixtures.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/fixtures.js
index 2717c24df38b..9ac4cce2778b 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/fixtures.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/fixtures.js
@@ -1,8 +1,8 @@
-'use strict';
+
 hqDefine("cloudcare/js/form_entry/spec/fixtures", [
     "underscore",
 ], function (
-    _
+    _,
 ) {
     return {
         textJSON: (options = {}) => (_.defaults(options, {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
index e8c82166c0f7..3f67a66e8679 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/form_ui_spec.js
@@ -1,4 +1,3 @@
-'use strict';
 /* eslint-env mocha */
 hqDefine("cloudcare/js/form_entry/spec/form_ui_spec", [
     "underscore",
@@ -13,7 +12,7 @@ hqDefine("cloudcare/js/form_entry/spec/form_ui_spec", [
     initialPageData,
     constants,
     formUI,
-    fixtures
+    fixtures,
 ) {
     describe('Fullform formUI', function () {
         var questionJSON,
@@ -29,7 +28,7 @@ hqDefine("cloudcare/js/form_entry/spec/form_ui_spec", [
                 {
                     WEB_APPS_UPLOAD_QUESTIONS: true,
                     WEB_APPS_ANCHORED_SUBMIT: false,
-                }
+                },
             );
         });
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/integration_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/integration_spec.js
index 10dec1f4d230..bdb0e67a70c6 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/integration_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/integration_spec.js
@@ -1,4 +1,4 @@
-'use strict';
+
 /* eslint-env mocha */
 hqDefine("cloudcare/js/form_entry/spec/integration_spec", [
     "underscore",
@@ -11,7 +11,7 @@ hqDefine("cloudcare/js/form_entry/spec/integration_spec", [
     initialPageData,
     sinon,
     constants,
-    formUI
+    formUI,
 ) {
     describe('Integration', function () {
         var formJSON,
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/main.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/main.js
index 7528fe52fd82..3e0bd58d587d 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/main.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/main.js
@@ -1,18 +1,10 @@
-'use strict';
-hqDefine("cloudcare/js/form_entry/spec/main", [
-    "mocha/js/main",
-], function (
-    hqMocha
-) {
-    hqRequire([
-        "cloudcare/js/form_entry/spec/entries_spec",
-        "cloudcare/js/form_entry/spec/form_ui_spec",
-        "cloudcare/js/form_entry/spec/integration_spec",
-        "cloudcare/js/form_entry/spec/utils_spec",
-        "cloudcare/js/form_entry/spec/web_form_session_spec",
-    ], function () {
-        hqMocha.run();
-    });
+import hqMocha from "mocha/js/main";
+import "commcarehq";
 
-    return 1;
-});
+import "cloudcare/js/form_entry/spec/entries_spec";
+import "cloudcare/js/form_entry/spec/form_ui_spec";
+import "cloudcare/js/form_entry/spec/integration_spec";
+import "cloudcare/js/form_entry/spec/utils_spec";
+import "cloudcare/js/form_entry/spec/web_form_session_spec";
+
+hqMocha.run();
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
index 2327d69f8ea7..740fa0766bef 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/utils_spec.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/form_entry/spec/utils_spec", [
     "hqwebapp/js/initial_page_data",
     "cloudcare/js/form_entry/spec/fixtures",
@@ -8,7 +7,7 @@ hqDefine("cloudcare/js/form_entry/spec/utils_spec", [
     initialPageData,
     fixtures,
     formUI,
-    utils
+    utils,
 ) {
     describe('Formplayer utils', function () {
         it('Should determine if two answers are equal', function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/web_form_session_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/web_form_session_spec.js
index b14c9b08d0fc..201eb233016b 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/web_form_session_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/web_form_session_spec.js
@@ -1,4 +1,3 @@
-'use strict';
 /* eslint-env mocha */
 hqDefine("cloudcare/js/form_entry/spec/web_form_session_spec", [
     "sinon/pkg/sinon",
@@ -19,7 +18,7 @@ hqDefine("cloudcare/js/form_entry/spec/web_form_session_spec", [
     Fixtures,
     taskQueue,
     Utils,
-    webFormSession
+    webFormSession,
 ) {
     describe('WebForm', function () {
         before(function () {
@@ -94,7 +93,7 @@ hqDefine("cloudcare/js/form_entry/spec/web_form_session_spec", [
 
             initialPageData.registerUrl(
                 "report_formplayer_error",
-                "/a/domain/cloudcare/apps/report_formplayer_error"
+                "/a/domain/cloudcare/apps/report_formplayer_error",
             );
 
             beforeEach(function () {
@@ -121,7 +120,7 @@ hqDefine("cloudcare/js/form_entry/spec/web_form_session_spec", [
                         200,
                         { 'Content-Type': 'application/json' },
                         '{ "status": "success", "session_id": "my-session" }',
-                    ]
+                    ],
                 );
 
                 // Setup server constants
@@ -280,7 +279,7 @@ hqDefine("cloudcare/js/form_entry/spec/web_form_session_spec", [
 
             initialPageData.registerUrl(
                 "report_formplayer_error",
-                "/a/domain/cloudcare/apps/report_formplayer_error"
+                "/a/domain/cloudcare/apps/report_formplayer_error",
             );
 
             beforeEach(function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/task_queue.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/task_queue.js
index 2a8671529006..27291136deae 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/task_queue.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/task_queue.js
@@ -1,4 +1,3 @@
-'use strict';
 /*
  * Executes the queue in a FIFO action. When a task is added, it will be immediately
  * executed if the queue was previously empty.
@@ -8,7 +7,7 @@
 hqDefine("cloudcare/js/form_entry/task_queue", [
     'underscore',
 ], function (
-    _
+    _,
 ) {
     var TaskQueue = function () {
         var self = {};
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
index 5739cb2910f1..6db080a40f0e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/utils.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/form_entry/utils", [
     'jquery',
     'knockout',
@@ -21,7 +20,7 @@ hqDefine("cloudcare/js/form_entry/utils", [
     cloudcareUtils,
     UsersModels,
     formEntryConst,
-    errors
+    errors,
 ) {
     var module = {
         resourceMap: undefined,
@@ -57,10 +56,10 @@ hqDefine("cloudcare/js/form_entry/utils", [
      */
     module.initialRender = function (formJSON, resourceMap, $div) {
         var defer = $.Deferred();
-        hqRequire([
-            "cloudcare/js/debugger/debugger",
-            "cloudcare/js/form_entry/form_ui",
-        ], function (Debugger, FormUI) {
+        $.when(
+            import("cloudcare/js/debugger/debugger"),
+            import("cloudcare/js/form_entry/form_ui"),
+        ).done(function (Debugger, FormUI) {
             var form = FormUI.Form(formJSON),
                 $debug = $('#cloudcare-debugger'),
                 CloudCareDebugger = Debugger.CloudCareDebuggerFormEntry,
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js
index e13f019daf84..ea656b51cefd 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/form_entry/web_form_session", [
     'jquery',
     'knockout',
@@ -22,7 +21,7 @@ hqDefine("cloudcare/js/form_entry/web_form_session", [
     formEntryUtils,
     formUI,
     utils,
-    UsersModels
+    UsersModels,
 ) {
     function WebFormSession(params) {
         var self = {};
@@ -151,7 +150,7 @@ hqDefine("cloudcare/js/form_entry/web_form_session", [
                 // use a blob here so that we can set the content type
                 let answerData = new Blob(
                     [JSON.stringify(_.omit(requestParams, "file"))],
-                    {type: 'application/json'}
+                    {type: 'application/json'},
                 );
                 newData.append("answer", answerData);
 
@@ -308,10 +307,8 @@ hqDefine("cloudcare/js/form_entry/web_form_session", [
             $.subscribe('formplayer.' + constants.FORMATTED_QUESTIONS, function (e, callback) {
                 self.getFormattedQuestions(callback);
             });
-            $.subscribe('formplayer.' + constants.DIRTY, function (e) {
-                hqRequire([
-                    "cloudcare/js/formplayer/app",
-                ], function (FormplayerFrontend) {
+            $.subscribe('formplayer.' + constants.DIRTY, function () {
+                import("cloudcare/js/formplayer/app").then(function (FormplayerFrontend) {
                     FormplayerFrontend.trigger('setUnsavedFormInProgress');
                 });
             });
@@ -567,7 +564,7 @@ hqDefine("cloudcare/js/form_entry/web_form_session", [
                         function () {
                             form.isSubmitting(false);
                             return true;
-                        }
+                        },
                     );
                 }, 250);
         };
@@ -622,7 +619,7 @@ hqDefine("cloudcare/js/form_entry/web_form_session", [
     }
 
     function changeLang(lang) {
-        hqRequire(["cloudcare/js/formplayer/menus/controller"], function (menusController) {
+        import("cloudcare/js/formplayer/menus/controller").then(function (menusController) {
             var urlObject = utils.currentUrlToObject();
             urlObject.changeLang = lang;
             menusController.selectMenu(urlObject);
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
index 959b05c5b674..3ada6096b792 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
@@ -1,4 +1,3 @@
-'use strict';
 /**
  * The primary Marionette application managing menu navigation and launching form entry
  */
@@ -43,7 +42,7 @@ hqDefine("cloudcare/js/formplayer/app", [
     ProgressBar,
     UsersModels,
     WebFormSession,
-    TemplateCache
+    TemplateCache,
 ) {
     Marionette.setRenderer(TemplateCache.render);
 
@@ -62,7 +61,7 @@ hqDefine("cloudcare/js/formplayer/app", [
         if (!FormplayerFrontend.regions) {
             FormplayerFrontend.regions = CloudcareUtils.getRegionContainer();
         }
-        hqRequire(["cloudcare/js/formplayer/router"], function (Router) {
+        import("cloudcare/js/formplayer/router").then(function (Router) {
             FormplayerFrontend.router = Router.start();
         });
     });
@@ -87,7 +86,7 @@ hqDefine("cloudcare/js/formplayer/app", [
     };
 
     FormplayerFrontend.showRestoreAs = function (user) {
-        hqRequire(["cloudcare/js/formplayer/users/views"], function (UsersViews) {
+        import("cloudcare/js/formplayer/users/views").then(function (UsersViews) {
             FormplayerFrontend.regions.getRegion('restoreAsBanner').show(
                 UsersViews.RestoreAsBanner({model: user, smallScreen: false}));
             const mobileRegion = FormplayerFrontend.regions.getRegion('mobileRestoreAsBanner');
@@ -315,14 +314,12 @@ hqDefine("cloudcare/js/formplayer/app", [
         var self = this,
             user = UsersModels.setCurrentUser(options);
 
-        hqRequire([
-            "cloudcare/js/formplayer/users/utils",  // restoreAsUser
-        ], function () {
+        import("cloudcare/js/formplayer/users/utils").then(function () {   // restoreAsUser
             user.restoreAs = FormplayerFrontend.getChannel().request('restoreAsUser', user.domain, user.username);
             AppsAPI.primeApps(user.restoreAs, options.apps);
         });
 
-        hqRequire(["cloudcare/js/formplayer/router"], function (Router) {
+        import("cloudcare/js/formplayer/router").then(function (Router) {
             FormplayerFrontend.router = Router.start();
             $.when(AppsAPI.getAppEntities()).done(function (appCollection) {
                 var appId;
@@ -352,11 +349,11 @@ hqDefine("cloudcare/js/formplayer/app", [
         });
 
         if (options.allowedHost) {
-            hqRequire(["cloudcare/js/formplayer/hq_events"], function (HQEvents) {
+            import("cloudcare/js/formplayer/hq_events").then(function (HQEvents) {
                 window.addEventListener(
                     "message",
                     HQEvents.Receiver(options.allowedHost),
-                    false
+                    false,
                 );
             });
         }
@@ -385,24 +382,24 @@ hqDefine("cloudcare/js/formplayer/app", [
                     $('.submit').prop('disabled', false);
                     $('.form-control, .form-select').prop('disabled', false);
                 }
-            }
+            },
         );
 
         window.addEventListener(
             'beforeprint', function () {
                 $('.card, .q').last().addClass('last');
-            }
+            },
         );
 
         window.addEventListener(
             'afterprint', function () {
                 $('.last').removeClass('last');
-            }
+            },
         );
     });
 
     FormplayerFrontend.on('configureDebugger', function () {
-        hqRequire(["cloudcare/js/debugger/debugger"], function (Debugger) {
+        import("cloudcare/js/debugger/debugger").then(function (Debugger) {
             var CloudCareDebugger = Debugger.CloudCareDebuggerMenu,
                 TabIDs = Debugger.TabIDs,
                 user = UsersModels.getCurrentUser(),
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/api.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/api.js
index c1ee0e77fae8..d48a3515cdb5 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/api.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/api.js
@@ -1,4 +1,4 @@
-'use strict';
+
 /**
  * Backbone model and functions for listing and selecting CommCare apps
  */
@@ -9,7 +9,7 @@ hqDefine("cloudcare/js/formplayer/apps/api", [
 ], function (
     $,
     Collections,
-    UsersModels
+    UsersModels,
 ) {
     var appsPromiseByRestoreAs = {};
     var appsByRestoreAs = {};
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/collections.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/collections.js
index 759db1b007e1..5cec5abf36bb 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/collections.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/collections.js
@@ -1,10 +1,10 @@
-'use strict';
+
 hqDefine("cloudcare/js/formplayer/apps/collections", [
     'backbone',
     'cloudcare/js/formplayer/apps/models',
 ], function (
     Backbone,
-    Models
+    Models,
 ) {
     var self = Backbone.Collection.extend({
         url: "appSelects",
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/controller.js
index 3eca02df1590..3e1efc33e6ba 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/controller.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/apps/controller", [
     'jquery',
     'backbone',
@@ -16,7 +15,7 @@ hqDefine("cloudcare/js/formplayer/apps/controller", [
     settingsViews,
     AppsAPI,
     views,
-    UsersModels
+    UsersModels,
 ) {
     return {
         listApps: function () {
@@ -58,15 +57,15 @@ hqDefine("cloudcare/js/formplayer/apps/controller", [
                 ]);
             } else {
                 settings.push(
-                    new Backbone.Model({ slug: slugs.BREAK_LOCKS })
+                    new Backbone.Model({ slug: slugs.BREAK_LOCKS }),
                 );
             }
             settings.push(
-                new Backbone.Model({ slug: slugs.CLEAR_USER_DATA })
+                new Backbone.Model({ slug: slugs.CLEAR_USER_DATA }),
             );
             if (Toggles.toggleEnabled('HIDE_SYNC_BUTTON')) {
                 settings.push(
-                    new Backbone.Model({ slug: slugs.SYNC })
+                    new Backbone.Model({ slug: slugs.SYNC }),
                 );
             }
             collection = new Backbone.Collection(settings);
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/models.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/models.js
index 21a91ab904aa..504a6bbee118 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/models.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/models.js
@@ -1,8 +1,7 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/apps/models", [
     'backbone',
 ], function (
-    Backbone
+    Backbone,
 ) {
     return Backbone.Model.extend({
         urlRoot: "appSelects",
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
index c3464617a299..f3084716ed0f 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/apps/views", [
     'jquery',
     'underscore',
@@ -16,7 +15,7 @@ hqDefine("cloudcare/js/formplayer/apps/views", [
     kissmetrics,
     constants,
     FormplayerFrontend,
-    AppsAPI
+    AppsAPI,
 ) {
     var GridItem = Marionette.View.extend({
         template: _.template($("#row-template").html() || ""),
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
index 69d58703de80..205b7f7d23d8 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/constants.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/constants", [], function () {
     return {
         ALLOWED_SAVED_OPTIONS: ['oneQuestionPerScreen', 'language'],
@@ -8,7 +7,7 @@ hqDefine("cloudcare/js/formplayer/constants", [], function () {
         PREVIEW_APP_ENVIRONMENT: 'preview-app',
         GENERIC_ERROR: gettext(
             'An unexpected error occurred. ' +
-            'Please report an issue if you continue to see this message.'
+            'Please report an issue if you continue to see this message.',
         ),
 
         LayoutStyles: {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/hq_events.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/hq_events.js
index c1665c40db89..abe5ca57d530 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/hq_events.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/hq_events.js
@@ -1,4 +1,3 @@
-'use strict';
 /**
  * hq_events.js
  *
@@ -9,7 +8,7 @@ hqDefine("cloudcare/js/formplayer/hq_events", [
     'cloudcare/js/formplayer/app',
 ], function (
     _,
-    FormplayerFrontend
+    FormplayerFrontend,
 ) {
     var self = {};
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/progress_bar.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/progress_bar.js
index b1436f9ff437..1a8bcd66fc0e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/progress_bar.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/progress_bar.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/layout/views/progress_bar", [
     'jquery',
     'underscore',
@@ -8,7 +7,7 @@ hqDefine("cloudcare/js/formplayer/layout/views/progress_bar", [
     $,
     _,
     Marionette,
-    toggles
+    toggles,
 ) {
     var ProgressView = Marionette.View.extend({
         template: _.template($("#progress-view-template").html() || ""),
@@ -43,7 +42,7 @@ hqDefine("cloudcare/js/formplayer/layout/views/progress_bar", [
             this.progressEl.find('.js-progress-bar').width(progress * 100 + '%');
             if (total > 0 && !(toggles.toggleEnabled('USE_PROMINENT_PROGRESS_BAR'))) {
                 this.progressEl.find('.js-subtext small').text(
-                    gettext('Completed: ') + done + '/' + total
+                    gettext('Completed: ') + done + '/' + total,
                 );
             }
         },
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
index bd9d2ea3cba7..81ba8e623a14 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/layout/views/settings", [
     'jquery',
     'underscore',
@@ -13,7 +12,7 @@ hqDefine("cloudcare/js/formplayer/layout/views/settings", [
     Marionette,
     FormplayerFrontend,
     AppsAPI,
-    UsersModels
+    UsersModels,
 ) {
     var slugs = {
         SET_LANG: 'lang',
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/main.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/main.js
index 8480dfb9ac55..bbd29bb16e45 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/main.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/main.js
@@ -1,14 +1,14 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/main", [
     'jquery',
     'hqwebapp/js/initial_page_data',
     'cloudcare/js/formplayer/app',
     'cloudcare/js/sentry',
+    'commcarehq',
 ], function (
     $,
     initialPageData,
     FormplayerFrontEnd,
-    sentry
+    sentry,
 ) {
     $(function () {
         sentry.initSentry();
@@ -25,7 +25,7 @@ hqDefine("cloudcare/js/formplayer/main", [
             environment: initialPageData.get('environment'),
         };
         FormplayerFrontEnd.getXSRF(options).then(() =>
-            FormplayerFrontEnd.start(options)
+            FormplayerFrontEnd.start(options),
         );
 
         var $menuToggle = $('#commcare-menu-toggle'),
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js
index 1420228e7e28..66e10e885417 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js
@@ -1,4 +1,3 @@
-'use strict';
 /**
  * Backbone model for listing and selecting CommCare menus (modules, forms, and cases)
  */
@@ -72,11 +71,11 @@ hqDefine("cloudcare/js/formplayer/menus/api", [
                     appIDsFromURL: params.appId + ' / ' + params.copyOf,
                     appCollection: appCollection.models.map(
                         appItem => appItem.attributes._id + ' / ' + appItem.attributes.copy_of),
-                }
-                var errorMsg = 'The application could not be found.'
+                };
+                var errorMsg = 'The application could not be found.';
                 if (params.appId) {
                     // Likely due to a link followed from an old build.
-                    errorMsg = errorMsg + ' If you clicked on a link, that link may be outdated.'
+                    errorMsg = errorMsg + ' If you clicked on a link, that link may be outdated.';
                 }
                 if (!params.preview) {
                     // Make sure the user has access to the app
@@ -86,7 +85,7 @@ hqDefine("cloudcare/js/formplayer/menus/api", [
                             gettext(errorMsg),
                             false,
                             true,
-                            additionalSentryData
+                            additionalSentryData,
                         );
                         FormplayerFrontend.trigger('navigateHome');
                         defer.reject();
@@ -117,7 +116,7 @@ hqDefine("cloudcare/js/formplayer/menus/api", [
                                 FormplayerFrontend.trigger(
                                     'showError',
                                     response.exception,
-                                    response.type === 'html'
+                                    response.type === 'html',
                                 );
 
                                 var currentUrl = FormplayerFrontend.getCurrentRoute();
@@ -167,13 +166,13 @@ hqDefine("cloudcare/js/formplayer/menus/api", [
                         if (response.status === 423) {
                             FormplayerFrontend.trigger(
                                 'showError',
-                                errors.LOCK_TIMEOUT_ERROR
+                                errors.LOCK_TIMEOUT_ERROR,
                             );
                         } else if (response.status === 401) {
                             FormplayerFrontend.trigger(
                                 'showError',
                                 formEntryUtils.reloginErrorHtml(),
-                                true
+                                true,
                             );
                         } else if (response.statusText === 'abort') {
                             // do nothing
@@ -181,7 +180,7 @@ hqDefine("cloudcare/js/formplayer/menus/api", [
                             FormplayerFrontend.trigger(
                                 'showError',
                                 gettext('Unable to connect to form playing service. ' +
-                                        'Please report an issue if you continue to see this message.')
+                                        'Please report an issue if you continue to see this message.'),
                             );
                         }
                         var urlObject = formplayerUtils.currentUrlToObject();
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js
index cfb720b6206b..78b63cc70a5f 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js
@@ -1,4 +1,3 @@
-'use strict';
 /**
  *  A menu is implemented as a collection of items. Typically, the user
  *  selects one of these items. The query screen is also implemented as
@@ -19,7 +18,7 @@ hqDefine("cloudcare/js/formplayer/menus/collections", [
     FormplayerFrontend,
     Utils,
     UsersModels,
-    webFormSession
+    webFormSession,
 ) {
     function addBreadcrumb(collection, type, data) {
         Sentry.addBreadcrumb({
@@ -113,12 +112,12 @@ hqDefine("cloudcare/js/formplayer/menus/collections", [
             }
             let sentryData = _.pick(
                 _.pick(response, ["queryKey", "selections"]),
-                _.identity
+                _.identity,
             );
             if (response.locales && !response.tree) {
-                    this.langs = response.locales.slice(1);
-                    webFormSession.applyLangListener();
-                }
+                this.langs = response.locales.slice(1);
+                webFormSession.applyLangListener();
+            }
             if (response.commands) {
                 _.extend(this, _.pick(response, this.commandProperties));
                 addBreadcrumb(this, "menu", _.extend(sentryData, {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
index 9c9d5810e515..e8ac587e75fb 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/menus/controller", [
     'jquery',
     'underscore',
@@ -33,7 +32,7 @@ hqDefine("cloudcare/js/formplayer/menus/controller", [
     Collection,
     menusUtils,
     queryView,
-    views
+    views,
 ) {
     var selectMenu = function (options) {
 
@@ -212,7 +211,7 @@ hqDefine("cloudcare/js/formplayer/menus/controller", [
                     disableDynamicSearch: !sessionStorage.submitPerformed,
                     groupHeaders: queryResponse.groupHeaders,
                     searchOnClear: queryResponse.searchOnClear,
-                }).render()
+                }).render(),
             );
             FormplayerFrontend.regions.getRegion('main').show(menuListView);
         } else if (menuResponse.type === constants.QUERY) {
@@ -226,7 +225,7 @@ hqDefine("cloudcare/js/formplayer/menus/controller", [
                     disableDynamicSearch: true,
                     groupHeaders: menuResponse.groupHeaders,
                     searchOnClear: menuResponse.searchOnClear,
-                }).render()
+                }).render(),
             );
 
             menuData["triggerEmptyCaseList"] = true;
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/utils.js
index 45af883beeb5..010b3c2c4ea3 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/utils.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/menus/utils", [
     'underscore',
     'backbone',
@@ -24,7 +23,7 @@ hqDefine("cloudcare/js/formplayer/menus/utils", [
     UsersModels,
     utils,
     views,
-    gtx
+    gtx,
 ) {
     var recordPosition = function (position) {
         sessionStorage.locationLat = position.coords.latitude;
@@ -35,7 +34,7 @@ hqDefine("cloudcare/js/formplayer/menus/utils", [
 
     var handleLocationRequest = function (optionsFromLastRequest) {
         var success = function (position) {
-            hqRequire(["cloudcare/js/formplayer/menus/controller"], function (MenusController) {
+            import("cloudcare/js/formplayer/menus/controller").then(function (MenusController) {
                 FormplayerFrontend.regions.getRegion('loadingProgress').empty();
                 recordPosition(position);
                 MenusController.selectMenu(optionsFromLastRequest);
@@ -47,7 +46,7 @@ hqDefine("cloudcare/js/formplayer/menus/utils", [
             FormplayerFrontend.trigger('showError',
                 getErrorMessage(err) +
                 "Without access to your location, computations that rely on the here() function will show up blank.",
-                false, false
+                false, false,
             );
         };
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index cdf31c67e43e..9377671c2a9a 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/menus/views", [
     'jquery',
     'underscore',
@@ -16,6 +15,8 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
     'cloudcare/js/formplayer/utils/utils',
     'cloudcare/js/markdown',
     'cloudcare/js/utils',
+    'mapbox-gl/dist/mapbox-gl',
+    'leaflet',
     'leaflet-fullscreen/dist/Leaflet.fullscreen.min',   // adds L.control.fullscreen to L
 ], function (
     $,
@@ -34,7 +35,8 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
     formplayerUtils,
     markdown,
     cloudcareUtils,
-    L
+    mapboxgl,
+    L,
 ) {
     const MenuView = Marionette.View.extend({
         isGrid: function () {
@@ -132,6 +134,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
                 navState: navState,
                 imageUrl: imageUri ? FormplayerFrontend.getChannel().request('resourceMap', imageUri, appId) : "",
                 audioUrl: audioUri ? FormplayerFrontend.getChannel().request('resourceMap', audioUri, appId) : "",
+                badgeText: this.options.model.attributes.badgeText,
                 menuIndex: this.menuIndex,
             };
         },
@@ -873,7 +876,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
             if (this.selectedCaseIds.length > this.maxSelectValue) {
                 let errorMessage = _.template(gettext("You have selected more than the maximum selection limit " +
                     "of <%- value %> . Please uncheck some values to continue."))({ value: this.maxSelectValue });
-                hqRequire(["hqwebapp/js/bootstrap5/alert_user"], function (alertUser) {
+                import("hqwebapp/js/bootstrap5/alert_user").then(function (alertUser) {
                     alertUser.alert_user(errorMessage, 'danger');
                 });
             }
@@ -937,7 +940,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
 
                 const addressIndex = _.findIndex(this.styles, function (style) { return style.displayFormat === constants.FORMAT_ADDRESS; });
                 const popupIndex = _.findIndex(this.styles, function (style) { return style.displayFormat === constants.FORMAT_ADDRESS_POPUP; });
-                L.mapbox.accessToken = token;
+                mapboxgl.accessToken = token;
 
                 const allCoordinates = [];
                 const markers = [];
@@ -1061,7 +1064,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
             const paginateItems = formplayerUtils.paginateOptions(
                 this.options.currentPage,
                 this.options.pageCount,
-                this.options.collection.length
+                this.options.collection.length,
             );
             const casesPerPage = parseInt($.cookie("cases-per-page-limit")) || (this.smallScreenEnabled ? 5 : 10);
             let description = this.options.description;
@@ -1662,10 +1665,10 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
             const persistentMenuContentContainer = $('#persistent-menu-container-content');
             const targetElement = $('#persistent-menu-container')[0];
             targetElement.addEventListener('transitionend', (event) => {
-                    if (this.menuExpanded && event.target === targetElement) {
-                        persistentMenuContentContainer.removeClass('d-none');
-                    }
-                });
+                if (this.menuExpanded && event.target === targetElement) {
+                    persistentMenuContentContainer.removeClass('d-none');
+                }
+            });
         },
         cloudcareNotificationListener: function () {
             const persistentMenuContainer = $('#persistent-menu-container');
@@ -1755,7 +1758,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
                     if (sessionStorage.showPersistentMenu !== 'true') {
                         self.hideMenu();
                     }
-                }
+                },
             );
         },
         templateContext: function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
index cb7ebe596b1e..edbb7d884e72 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/menus/views/query", [
     'jquery',
     'underscore',
@@ -39,7 +38,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
     FormplayerFrontend,
     formplayerConstants,
     Collection,
-    formplayerUtils
+    formplayerUtils,
 ) {
     var separator = hqTempusDominus.getDateRangeSeparator(),
         serverSeparator = "__",
@@ -195,7 +194,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
                         var val = option.val();
                         if (option.length === 1 && domElement.val().indexOf(val) === -1) {
                             domElement.val(
-                                domElement.val().concat(val)
+                                domElement.val().concat(val),
                             ).trigger("change");
                         }
                     } else {
@@ -226,7 +225,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
                 if (!initialPageData.get("has_geocoder_privs")) {
                     $("#" + inputId).addClass('unsupported alert alert-warning');
                     $("#" + inputId).text(gettext(
-                        "Sorry, this input is not supported because your project doesn't have a Geocoder privilege")
+                        "Sorry, this input is not supported because your project doesn't have a Geocoder privilege"),
                     );
                     return true;
                 }
@@ -575,7 +574,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
                         groupKey: child.get('groupKey'),
                         required: child.get('required'),
                     },
-                    childViewOptions
+                    childViewOptions,
                 );
             } else {
                 options = _.extend({model: child}, childViewOptions);
@@ -662,7 +661,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
                     } else {
                         return [item];
                     }
-                }
+                },
             ));
         },
 
@@ -758,7 +757,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
                 "menu:query",
                 self.getAnswers(),
                 self.options.sidebarEnabled,
-                initiatedBy
+                initiatedBy,
             );
 
             if (self.smallScreenEnabled && self.options.sidebarEnabled) {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/middleware.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/middleware.js
index f06635616fff..f0b06732845b 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/middleware.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/middleware.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/middleware", [
     'jquery',
     'underscore',
@@ -8,7 +7,7 @@ hqDefine("cloudcare/js/formplayer/middleware", [
     $,
     _,
     FormplayerFrontend,
-    UsersModels
+    UsersModels,
 ) {
     var clearFormMiddleware = function () {
         FormplayerFrontend.trigger("clearForm");
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/router.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/router.js
index 4bfdf471244c..104515d518d8 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/router.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/router.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/router", [
     'underscore',
     'backbone',
@@ -29,7 +28,7 @@ hqDefine("cloudcare/js/formplayer/router", [
     sessionsController,
     usersController,
     usersModels,
-    AppRouter
+    AppRouter,
 ) {
     var params = {
         appRoutes: {
@@ -125,7 +124,7 @@ hqDefine("cloudcare/js/formplayer/router", [
             // entry if it is a form response.
             menuCollection = menusCollections(
                 response,
-                { parse: true }
+                { parse: true },
             );
             // Need to get URL fragment again since fetch might have updated it
             currentFragment = Backbone.history.getFragment();
@@ -225,7 +224,7 @@ hqDefine("cloudcare/js/formplayer/router", [
                 execute: true,
             },
             // force manual search in split screen case search for workflow compatibility
-            sidebarEnabled ? { forceManualSearch: true } : {}
+            sidebarEnabled ? { forceManualSearch: true } : {},
         );
         urlObject.setQueryData(queryObject);
         utils.setUrlToObject(urlObject);
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/api.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/api.js
index eaa7f78ca264..3f5fc60ec50e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/api.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/api.js
@@ -1,4 +1,3 @@
-'use strict';
 /**
  * Backbone model for listing and selecting FormEntrySessions
  */
@@ -15,7 +14,7 @@ hqDefine("cloudcare/js/formplayer/sessions/api", [
     Collections,
     FormplayerFrontend,
     MenuCollections,
-    UsersModels
+    UsersModels,
 ) {
     var API = {
 
@@ -38,7 +37,7 @@ hqDefine("cloudcare/js/formplayer/sessions/api", [
                         FormplayerFrontend.trigger(
                             'showError',
                             response.exception,
-                            response.type === 'html'
+                            response.type === 'html',
                         );
                         FormplayerFrontend.trigger('navigation:back');
                     } else {
@@ -94,7 +93,7 @@ hqDefine("cloudcare/js/formplayer/sessions/api", [
                             'showError',
                             _.template(gettext("Unable to delete incomplete form '<%- title %>'"))({
                                 title: session.get('title'),
-                            })
+                            }),
                         );
                         window.console.error(xhr.responseJSON.exception);
                     }
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/collections.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/collections.js
index 53c74514aa3f..7e9cc7efbda2 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/collections.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/collections.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/sessions/collections", [
     'backbone',
     'cloudcare/js/formplayer/sessions/models',
@@ -6,7 +5,7 @@ hqDefine("cloudcare/js/formplayer/sessions/collections", [
 ], function (
     Backbone,
     Models,
-    utils
+    utils,
 ) {
     var session = Backbone.Collection.extend({
         model: Models,
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/controller.js
index 07efbc4e8dca..f79b99cb5ca7 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/controller.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/sessions/controller", [
     'jquery',
     'cloudcare/js/formplayer/constants',
@@ -9,7 +8,7 @@ hqDefine("cloudcare/js/formplayer/sessions/controller", [
     $,
     constants,
     FormplayerFrontend,
-    Views
+    Views,
 ) {
     return {
         listSessions: function listSessions(pageNumber, pageSize) {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/models.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/models.js
index e309488ff069..0ecc77222da2 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/models.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/models.js
@@ -1,10 +1,9 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/sessions/models", [
     'backbone',
     'cloudcare/js/formplayer/utils/utils',
 ], function (
     Backbone,
-    utils
+    utils,
 ) {
     return Backbone.Model.extend({
         isNew: function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/views.js
index c7e39a9af472..97d73a461e2e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/views.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/sessions/views", [
     'jquery',
     'underscore',
@@ -17,7 +16,7 @@ hqDefine("cloudcare/js/formplayer/sessions/views", [
     moment,
     FormplayerFrontend,
     UsersModels,
-    utils
+    utils,
 ) {
     var SessionView = Marionette.View.extend({
         tagName: "tr",
@@ -138,10 +137,10 @@ hqDefine("cloudcare/js/formplayer/sessions/views", [
         },
         templateContext: function () {
             var paginationConfig = utils.paginateOptions(
-                    this.options.pageNumber,
-                    this.options.totalPages,
-                    this.collection.totalSessions
-                );
+                this.options.pageNumber,
+                this.options.totalPages,
+                this.collection.totalSessions,
+            );
             return _.extend(paginationConfig, {
                 total: this.collection.totalSessions,
                 totalPages: this.options.totalPages,
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/case_list_pagination_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/case_list_pagination_spec.js
index e778771631a9..882c5ecb7b9e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/case_list_pagination_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/case_list_pagination_spec.js
@@ -1,8 +1,7 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/spec/case_list_pagination_spec", [
     "cloudcare/js/formplayer/utils/utils",
 ], function (
-    paginateItems
+    paginateItems,
 ) {
     describe('#paginateOptions', function () {
         it('Should return paginateOptions', function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/debugger_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/debugger_spec.js
index 9b98239b91bb..d3041da46617 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/debugger_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/debugger_spec.js
@@ -1,11 +1,10 @@
-'use strict';
 /* eslint-env mocha */
 hqDefine("cloudcare/js/formplayer/spec/debugger_spec", [
     "sinon/pkg/sinon",
     "cloudcare/js/debugger/debugger",
 ], function (
     sinon,
-    Debugger
+    Debugger,
 ) {
     describe('Debugger', function () {
         let EvaluateXPath = Debugger.EvaluateXPath,
@@ -71,19 +70,19 @@ hqDefine("cloudcare/js/formplayer/spec/debugger_spec", [
             it('Should handle single values correctly', function () {
                 assert.equal(
                     evalXPath.formatResult("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<result>fun</result>\n"),
-                    'fun'
+                    'fun',
                 );
             });
             it('Should handle the empty string value correctly', function () {
                 assert.equal(
                     evalXPath.formatResult("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<result/>\n"),
-                    ''
+                    '',
                 );
             });
             it('Should handle nested xml correctly', function () {
                 assert.equal(
                     evalXPath.formatResult("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<result>\n  <session>\n    <data/>\n    <context>\n      <deviceid>Formplayer</deviceid>\n      <appversion>Formplayer Version: 2.36</appversion>\n      <username>droberts@dimagi.com</username>\n      <userid>9393007a6921eecd4a9f20eefb5c7a8e</userid>\n    </context>\n    <user>\n      <data>\n        <commcare_first_name/>\n        <commcare_phone_number/>\n        <commcare_last_name/>\n        <commcare_project>openmrs-test</commcare_project>\n        <user_type>standard</user_type>\n      </data>\n    </user>\n  </session>\n</result>\n"),
-                    '  <session>\n    <data/>\n    <context>\n      <deviceid>Formplayer</deviceid>\n      <appversion>Formplayer Version: 2.36</appversion>\n      <username>droberts@dimagi.com</username>\n      <userid>9393007a6921eecd4a9f20eefb5c7a8e</userid>\n    </context>\n    <user>\n      <data>\n        <commcare_first_name/>\n        <commcare_phone_number/>\n        <commcare_last_name/>\n        <commcare_project>openmrs-test</commcare_project>\n        <user_type>standard</user_type>\n      </data>\n    </user>\n  </session>'
+                    '  <session>\n    <data/>\n    <context>\n      <deviceid>Formplayer</deviceid>\n      <appversion>Formplayer Version: 2.36</appversion>\n      <username>droberts@dimagi.com</username>\n      <userid>9393007a6921eecd4a9f20eefb5c7a8e</userid>\n    </context>\n    <user>\n      <data>\n        <commcare_first_name/>\n        <commcare_phone_number/>\n        <commcare_last_name/>\n        <commcare_project>openmrs-test</commcare_project>\n        <user_type>standard</user_type>\n      </data>\n    </user>\n  </session>',
                 );
             });
         });
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fake_formplayer.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fake_formplayer.js
index b1c0f30becdc..38432ed40bd2 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fake_formplayer.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fake_formplayer.js
@@ -1,4 +1,3 @@
-'use strict';
 /**
  * Generates mock formplayer responses. Use as a fake for queryFormplayer.
  *
@@ -17,7 +16,7 @@ hqDefine("cloudcare/js/formplayer/spec/fake_formplayer", [
     "hqwebapp/js/assert_properties",
 ], function (
     _,
-    AssertProperties
+    AssertProperties,
 ) {
     let module = {},
         apps = {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/case_grid_list.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/case_grid_list.js
index 5a88de9f24c1..ca9253273b48 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/case_grid_list.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/case_grid_list.js
@@ -1,8 +1,7 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/spec/fixtures/case_grid_list", [
     "cloudcare/js/formplayer/spec/fake_formplayer",
 ], function (
-    FakeFormplayer
+    FakeFormplayer,
 ) {
     return FakeFormplayer.makeEntitiesResponse({
         "title": "New Adherence Data",
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/case_list.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/case_list.js
index 0ee3025f133e..d2da3a31073e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/case_list.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/case_list.js
@@ -1,8 +1,7 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/spec/fixtures/case_list", [
     "cloudcare/js/formplayer/spec/fake_formplayer",
 ], function (
-    FakeFormplayer
+    FakeFormplayer,
 ) {
     return FakeFormplayer.makeEntitiesResponse({
         "title": "Update a Case",
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/case_tile_list.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/case_tile_list.js
index 5a9a925bd47c..97e6a2a07cb0 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/case_tile_list.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/case_tile_list.js
@@ -1,8 +1,7 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/spec/fixtures/case_tile_list", [
     "cloudcare/js/formplayer/spec/fake_formplayer",
 ], function (
-    FakeFormplayer
+    FakeFormplayer,
 ) {
     return FakeFormplayer.makeEntitiesResponse({
         "title": "Active Patients",
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/menu_list.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/menu_list.js
index a3b8c0719cdb..07e2c20bfdb8 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/menu_list.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/menu_list.js
@@ -1,8 +1,7 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/spec/fixtures/menu_list", [
     "cloudcare/js/formplayer/spec/fake_formplayer",
 ], function (
-    FakeFormplayer
+    FakeFormplayer,
 ) {
     return FakeFormplayer.makeCommandsResponse({
         "title": "Case Tests",
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/split_screen_case_list.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/split_screen_case_list.js
index 4c62da26a99f..49d813b27e5e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/split_screen_case_list.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/fixtures/split_screen_case_list.js
@@ -1,8 +1,7 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/spec/fixtures/split_screen_case_list", [
     "cloudcare/js/formplayer/spec/fake_formplayer",
 ], function (
-    FakeFormplayer
+    FakeFormplayer,
 ) {
     return FakeFormplayer.makeEntitiesResponse({
         "title": "Search All Cases",
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/hq_events_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/hq_events_spec.js
index 491e8eb67ec7..ce52c06d954b 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/hq_events_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/hq_events_spec.js
@@ -1,4 +1,3 @@
-'use strict';
 /* eslint-env mocha */
 hqDefine("cloudcare/js/formplayer/spec/hq_events_spec", [
     "sinon/pkg/sinon",
@@ -7,7 +6,7 @@ hqDefine("cloudcare/js/formplayer/spec/hq_events_spec", [
 ], function (
     sinon,
     FormplayerFrontend,
-    hqEvents
+    hqEvents,
 ) {
     describe('HQ Events', function () {
         describe('Receiver', function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/main.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/main.js
index 842823225548..2824ecf0a486 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/main.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/main.js
@@ -1,24 +1,15 @@
-'use strict';
-hqDefine("cloudcare/js/formplayer/spec/main", [
-    "mocha/js/main",
-], function (
-    hqMocha
-) {
-    hqRequire([
-        "cloudcare/js/formplayer/spec/case_list_pagination_spec",
-        "cloudcare/js/formplayer/spec/debugger_spec",
-        "cloudcare/js/formplayer/spec/hq_events_spec",
-        "cloudcare/js/spec/markdown_spec",
-        "cloudcare/js/formplayer/spec/menu_list_spec",
-        "cloudcare/js/formplayer/spec/query_spec",
-        "cloudcare/js/formplayer/spec/session_middleware_spec",
-        "cloudcare/js/formplayer/spec/split_screen_case_search_spec",
-        "cloudcare/js/formplayer/spec/user_spec",
-        "cloudcare/js/formplayer/spec/utils_spec",
-        "cloudcare/js/spec/utils_spec",
-    ], function () {
-        hqMocha.run();
-    });
+import hqMocha from "mocha/js/main";
 
-    return 1;
-});
+import "cloudcare/js/formplayer/spec/case_list_pagination_spec";
+import "cloudcare/js/formplayer/spec/debugger_spec";
+import "cloudcare/js/formplayer/spec/hq_events_spec";
+import "cloudcare/js/spec/markdown_spec";
+import "cloudcare/js/formplayer/spec/menu_list_spec";
+import "cloudcare/js/formplayer/spec/query_spec";
+import "cloudcare/js/formplayer/spec/session_middleware_spec";
+import "cloudcare/js/formplayer/spec/split_screen_case_search_spec";
+import "cloudcare/js/formplayer/spec/user_spec";
+import "cloudcare/js/formplayer/spec/utils_spec";
+import "cloudcare/js/spec/utils_spec";
+
+hqMocha.run();
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/menu_list_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/menu_list_spec.js
index f80b885b2e43..942a279fc50e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/menu_list_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/menu_list_spec.js
@@ -1,4 +1,3 @@
-'use strict';
 /* eslint-env mocha */
 hqDefine("cloudcare/js/formplayer/spec/menu_list_spec", [
     "sinon/pkg/sinon",
@@ -25,7 +24,7 @@ hqDefine("cloudcare/js/formplayer/spec/menu_list_spec", [
     CaseTileListFixture,
     MenuListFixture,
     Utils,
-    UsersModels
+    UsersModels,
 ) {
     describe('Render a case list', function () {
         before(function () {
@@ -35,7 +34,7 @@ hqDefine("cloudcare/js/formplayer/spec/menu_list_spec", [
                     SPLIT_SCREEN_CASE_SEARCH: false,
                     DYNAMICALLY_UPDATE_SEARCH_RESULTS: false,
                     USE_PROMINENT_PROGRESS_BAR: false,
-                }
+                },
             );
             sinon.stub(Utils, 'getCurrentQueryInputs').callsFake(function () { return {}; });
         });
@@ -155,7 +154,7 @@ hqDefine("cloudcare/js/formplayer/spec/menu_list_spec", [
                         "status": "retry",
                         "url": "http://dummy/sync-db",
                         "type": null,
-                    })
+                    }),
                 );
 
                 // We should show loading bar
@@ -173,13 +172,13 @@ hqDefine("cloudcare/js/formplayer/spec/menu_list_spec", [
                         username: user.username,
                         preserveCache: true,
                         restoreAs: '',
-                    }
+                    },
                 );
                 assert.equal(requests[1].url, user.formplayer_url + '/sync-db');
                 requests[1].respond(
                     200,
                     { "Content-Type": "application/json" },
-                    JSON.stringify(MenuListFixture)
+                    JSON.stringify(MenuListFixture),
                 );
 
                 clock.tick(1); // click 1 forward to ensure that we've fired off the empty progress
@@ -202,7 +201,7 @@ hqDefine("cloudcare/js/formplayer/spec/menu_list_spec", [
                 requests[0].respond(
                     202,
                     { "Content-Type": "application/json" },
-                    '{"exception":"Asynchronous restore under way for asdf","done":9,"total":30,"retryAfter":30,"status":"retry","url":"http://dummy/navigate_menu","type":null}'
+                    '{"exception":"Asynchronous restore under way for asdf","done":9,"total":30,"retryAfter":30,"status":"retry","url":"http://dummy/navigate_menu","type":null}',
                 );
 
                 // We should show loading bar
@@ -217,7 +216,7 @@ hqDefine("cloudcare/js/formplayer/spec/menu_list_spec", [
                 requests[1].respond(
                     200,
                     { "Content-Type": "application/json" },
-                    JSON.stringify(MenuListFixture)
+                    JSON.stringify(MenuListFixture),
                 );
 
                 clock.tick(1); // click 1 forward to ensure that we've fired off the empty progress
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/menu_utils_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/menu_utils_spec.js
index 8fc3867f0c6a..b156dc815c67 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/menu_utils_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/menu_utils_spec.js
@@ -1,8 +1,7 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/spec/menu_utils_spec", [
     "cloudcare/js/formplayer/menus/views/query",
 ], function (
-    view
+    view,
 ) {
     describe('Menu Utils', function () {
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/query_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/query_spec.js
index ab9077909682..ff3e6ec1176c 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/query_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/query_spec.js
@@ -1,4 +1,3 @@
-'use strict';
 /* eslint-env mocha */
 hqDefine("cloudcare/js/formplayer/spec/query_spec", [
     "backbone",
@@ -11,7 +10,7 @@ hqDefine("cloudcare/js/formplayer/spec/query_spec", [
     sinon,
     initialPageData,
     Utils,
-    QueryListView
+    QueryListView,
 ) {
     describe('Query', function () {
         describe('itemset', function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/session_middleware_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/session_middleware_spec.js
index 8d30802790ab..ed7302f13d39 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/session_middleware_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/session_middleware_spec.js
@@ -1,11 +1,10 @@
-'use strict';
 /* eslint-env mocha */
 hqDefine("cloudcare/js/formplayer/spec/session_middleware_spec", [
     "sinon/pkg/sinon",
     "cloudcare/js/formplayer/middleware",
 ], function (
     sinon,
-    Middleware
+    Middleware,
 ) {
     describe('SessionMiddle', function () {
         it('Should call middleware and apis with same arguments', function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/split_screen_case_search_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/split_screen_case_search_spec.js
index 94ec2910e765..113eb759e5fb 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/split_screen_case_search_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/split_screen_case_search_spec.js
@@ -1,4 +1,3 @@
-'use strict';
 /* eslint-env mocha */
 hqDefine("cloudcare/js/formplayer/spec/split_screen_case_search_spec", [
     "underscore",
@@ -25,7 +24,7 @@ hqDefine("cloudcare/js/formplayer/spec/split_screen_case_search_spec", [
     FakeFormplayer,
     splitScreenCaseListResponse,
     Utils,
-    UsersModels
+    UsersModels,
 ) {
     describe('Split Screen Case Search', function () {
         const currentUrl = new Utils.CloudcareUrl({ appId: 'abc123' }),
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/user_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/user_spec.js
index a397e1951e4b..fccc19b92a46 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/user_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/user_spec.js
@@ -1,4 +1,3 @@
-'use strict';
 /* eslint-env mocha */
 hqDefine("cloudcare/js/formplayer/spec/user_spec", [
     "underscore",
@@ -13,7 +12,7 @@ hqDefine("cloudcare/js/formplayer/spec/user_spec", [
     FormplayerFrontend,
     UsersCollections,
     UsersModels,
-    UsersUtils
+    UsersUtils,
 ) {
     describe('User', function () {
         describe('Collection', function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/utils_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/utils_spec.js
index 471f8fcc5a55..3a1d88121399 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/utils_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/utils_spec.js
@@ -1,4 +1,3 @@
-'use strict';
 /* eslint-env mocha */
 hqDefine("cloudcare/js/formplayer/spec/utils_spec", [
     "underscore",
@@ -20,7 +19,7 @@ hqDefine("cloudcare/js/formplayer/spec/utils_spec", [
     API,
     FakeFormplayer,
     UsersModels,
-    Utils
+    Utils,
 ) {
     describe('Utils', function () {
         describe('#displayOptions', function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/collections.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/collections.js
index 95d9fe119e1c..8d7152b2a293 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/collections.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/collections.js
@@ -1,10 +1,9 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/users/collections", [
     'backbone',
     'cloudcare/js/formplayer/users/models',
 ], function (
     Backbone,
-    Models
+    Models,
 ) {
     /**
      * This collection represents a mobile worker user
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/controller.js
index 453e4622f6bd..2ed58d2c86cc 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/controller.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/users/controller", [
     'cloudcare/js/formplayer/users/collections',
     'cloudcare/js/formplayer/app',
@@ -8,7 +7,7 @@ hqDefine("cloudcare/js/formplayer/users/controller", [
     Collections,
     FormplayerFrontend,
     models,
-    views
+    views,
 ) {
     return {
         listUsers: function (page, query) {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/models.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/models.js
index 168ed0c2990f..e3602de3e49e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/models.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/models.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/users/models", [
     "underscore",
     "backbone",
@@ -8,7 +7,7 @@ hqDefine("cloudcare/js/formplayer/users/models", [
     _,
     Backbone,
     kissmetrics,
-    Const
+    Const,
 ) {
     var self = {};
 
@@ -39,7 +38,7 @@ hqDefine("cloudcare/js/formplayer/users/models", [
                 {
                     previousVersion: model.previous('versionInfo'),
                     currentVersion: model.get('versionInfo'),
-                }
+                },
             );
         },
     });
@@ -90,7 +89,7 @@ hqDefine("cloudcare/js/formplayer/users/models", [
 
         var savedDisplayOptions = _.pick(
             self.getSavedDisplayOptions(),
-            Const.ALLOWED_SAVED_OPTIONS
+            Const.ALLOWED_SAVED_OPTIONS,
         );
         userInstance.displayOptions = _.defaults(savedDisplayOptions, {
             singleAppMode: options.singleAppMode,
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/utils.js
index 9eebb1ba1c03..b88fdcce403e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/utils.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/users/utils", [
     'jquery',
     'sentry_browser',
@@ -10,7 +9,7 @@ hqDefine("cloudcare/js/formplayer/users/utils", [
     Sentry,
     initialPageData,
     FormplayerFrontend,
-    UsersModels
+    UsersModels,
 ) {
     var self = {};
     self.Users = {
@@ -29,10 +28,10 @@ hqDefine("cloudcare/js/formplayer/users/utils", [
             $.cookie(
                 self.Users.restoreAsKey(
                     currentUser.domain,
-                    currentUser.username
+                    currentUser.username,
                 ),
                 currentUser.restoreAs,
-                { secure: initialPageData.get('secure_cookies') }
+                { secure: initialPageData.get('secure_cookies') },
             );
         },
         restoreAsKey: function (domain, username) {
@@ -67,7 +66,7 @@ hqDefine("cloudcare/js/formplayer/users/utils", [
     FormplayerFrontend.getChannel().reply('restoreAsUser', function (domain, username) {
         return self.Users.getRestoreAsUser(
             domain,
-            username
+            username,
         );
     });
 
@@ -82,7 +81,7 @@ hqDefine("cloudcare/js/formplayer/users/utils", [
         var user = UsersModels.getCurrentUser();
         self.Users.clearRestoreAsUser(
             user.domain,
-            user.username
+            user.username,
         );
         user.restoreAs = null;
         FormplayerFrontend.showRestoreAs(user);
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js
index 0295ee9e4882..853949aeded9 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/users/views", [
     'jquery',
     'underscore',
@@ -18,7 +17,7 @@ hqDefine("cloudcare/js/formplayer/users/views", [
     FormplayerFrontend,
     formplayerUtils,
     usersModels,
-    usersUtils
+    usersUtils,
 ) {
     /**
      * RestoreAsBanner
@@ -35,9 +34,9 @@ hqDefine("cloudcare/js/formplayer/users/views", [
         },
         getTemplate: function () {
             if (this.model.restoreAs) {
-                const templateId = (this.options.smallScreen || usersModels.getCurrentUser().isAppPreview ?
-                                    "#restore-as-banner-template" :
-                                    "#restore-as-pill-template");
+                const templateId = this.options.smallScreen || usersModels.getCurrentUser().isAppPreview ?
+                    "#restore-as-banner-template" :
+                    "#restore-as-pill-template";
                 return _.template($(templateId).html() || "");
             } else {
                 return _.template("");
@@ -88,7 +87,7 @@ hqDefine("cloudcare/js/formplayer/users/views", [
             formplayerUtils.confirmationModal({
                 title: _.template(gettext('Log in as <%- username %>?'))({username: this.model.get('username')}),
                 message: _.template($('#user-data-template').html())(
-                    { user: this.model.toJSON() }
+                    { user: this.model.toJSON() },
                 ),
                 confirmText: gettext('Log in'),
                 onConfirm: function () {
@@ -97,7 +96,7 @@ hqDefine("cloudcare/js/formplayer/users/views", [
                     var loginAsNextOptions = FormplayerFrontend.getChannel().request('getLoginAsNextOptions');
                     if (loginAsNextOptions) {
                         FormplayerFrontend.trigger("clearLoginAsNextOptions");
-                        hqRequire(["cloudcare/js/formplayer/menus/controller"], function (MenusController) {
+                        import("cloudcare/js/formplayer/menus/controller").then(function (MenusController) {
                             MenusController.selectMenu(loginAsNextOptions);
                         });
                     } else {
@@ -157,7 +156,7 @@ hqDefine("cloudcare/js/formplayer/users/views", [
             const paginationOptions = formplayerUtils.paginateOptions(
                 this.model.get('page') - 1,
                 this.totalPages(),
-                this.collection.total
+                this.collection.total,
             );
             return _.extend(paginationOptions, {
                 isAppPreview: usersModels.getCurrentUser().isAppPreview,
@@ -171,7 +170,7 @@ hqDefine("cloudcare/js/formplayer/users/views", [
             formplayerUtils.navigate(
                 '/restore_as/' +
                 this.model.get('page') + '/' +
-                this.model.get('query')
+                this.model.get('query'),
             );
         },
         totalPages: function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/calendar-picker-translations.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/calendar-picker-translations.js
index 15f4a5c0c99b..af14405f0d91 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/calendar-picker-translations.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/calendar-picker-translations.js
@@ -1,6 +1,7 @@
-'use strict';
 hqDefine('cloudcare/js/formplayer/utils/calendar-picker-translations', [
     'jquery',
+    'calendars/dist/js/jquery.plugin',
+    'calendars/dist/js/jquery.calendars',
     'calendars/dist/js/jquery.calendars.picker',
     'calendars/dist/js/jquery.calendars.ethiopian',
     'calendars/dist/js/jquery.calendars.plus',
@@ -8,7 +9,7 @@ hqDefine('cloudcare/js/formplayer/utils/calendar-picker-translations', [
     'calendars/dist/js/jquery.calendars.picker-am',
     'calendars/dist/js/jquery.calendars.ethiopian-am',
 ], function (
-    $
+    $,
 ) {
     // English
     $.calendarsPicker.regionalOptions[''] = { // Default regional settings - English/US
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
index a90579a22496..1ccfbff694b2 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/formplayer/utils/utils", [
     'jquery',
     'underscore',
@@ -18,7 +17,7 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
     initialPageData,
     toggles,
     constants,
-    AppsAPI
+    AppsAPI,
 ) {
     var Utils = {};
 
@@ -484,7 +483,7 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
             }
         }
 
-        hqRequire(["cloudcare/js/formplayer/app"], function (FormplayerFrontend) {
+        import("cloudcare/js/formplayer/app").then(function (FormplayerFrontend) {
             if (!FormplayerFrontend.syncInterval) {
                 FormplayerFrontend.syncInterval = setInterval(function () {
                     const urlObject = Utils.currentUrlToObject(),
@@ -506,7 +505,7 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
     }
 
     function stopSyncInterval() {
-        hqRequire(["cloudcare/js/formplayer/app"], function (FormplayerFrontend) {
+        import("cloudcare/js/formplayer/app").then(function (FormplayerFrontend) {
             clearInterval(FormplayerFrontend.syncInterval);
             FormplayerFrontend.syncInterval = null;
         });
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/markdown.js b/corehq/apps/cloudcare/static/cloudcare/js/markdown.js
index eef6ffdac11e..dfdd69fd81cb 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/markdown.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/markdown.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine('cloudcare/js/markdown', [
     'jquery',
     'DOMPurify/dist/purify.min',
@@ -12,7 +11,7 @@ hqDefine('cloudcare/js/markdown', [
     markdowner,
     initialPageData,
     HMACCallout,
-    toggles
+    toggles,
 ) {
 
     function updateTarget(tokens, idx, target) {
@@ -65,7 +64,7 @@ hqDefine('cloudcare/js/markdown', [
                     let url = initialPageData.reverse("dialer_view");
                     anchor.attrs[hIndex][1] = url + "?callout_number=" + callout;
                 },
-                "dialer"
+                "dialer",
             ));
         }
 
@@ -79,7 +78,7 @@ hqDefine('cloudcare/js/markdown', [
                     let url = initialPageData.reverse("gaen_otp_view");
                     anchor.attrs[hIndex][1] = url + params;
                 },
-                "gaen_otp"
+                "gaen_otp",
             ));
             addDelegatedClickDispatch('gaen_otp',
                 function (element) {
@@ -94,7 +93,7 @@ hqDefine('cloudcare/js/markdown', [
                 },
                 function () {
                 },
-                "hmac_callout"
+                "hmac_callout",
             ));
             addDelegatedClickDispatch('hmac_callout',
                 function (element) {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/preview_app/dragscroll.js b/corehq/apps/cloudcare/static/cloudcare/js/preview_app/dragscroll.js
index e3747fd1d331..bfdf763bb1e3 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/preview_app/dragscroll.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/preview_app/dragscroll.js
@@ -1,4 +1,3 @@
-'use strict';
 /**
  * NOTE: MONKEYPATCHED to support form clicks and other actions
  *
@@ -38,9 +37,7 @@ hqDefine("cloudcare/js/preview_app/dragscroll", ["jquery"], function ($) {
                     mousedown,
                     cont.md = function (e) {
                         if (!el.hasAttribute('nochilddrag') ||
-                            _document.elementFromPoint(
-                                e.pageX, e.pageY
-                            ) === cont
+                            _document.elementFromPoint(e.pageX, e.pageY) === cont
                         ) {
                             pushed = 1;
                             lastClientX = e.clientX;
@@ -56,11 +53,11 @@ hqDefine("cloudcare/js/preview_app/dragscroll", ["jquery"], function ($) {
                             }
 
                         }
-                    }, 0
+                    }, 0,
                 );
 
                 _window[addEventListener](
-                    mouseup, cont.mu = function () {pushed = 0;}, 0
+                    mouseup, cont.mu = function () {pushed = 0;}, 0,
                 );
 
                 _window[addEventListener](
@@ -72,7 +69,7 @@ hqDefine("cloudcare/js/preview_app/dragscroll", ["jquery"], function ($) {
                             scroller.scrollTop -=
                                 (- lastClientY + (lastClientY = e.clientY));
                         }
-                    }, 0
+                    }, 0,
                 );
             })(dragged[i++]);
         }
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/preview_app/main.js b/corehq/apps/cloudcare/static/cloudcare/js/preview_app/main.js
index 7fe70401c55e..6d01979d1c56 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/preview_app/main.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/preview_app/main.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine("cloudcare/js/preview_app/main", [
     'jquery',
     'underscore',
@@ -6,12 +5,13 @@ hqDefine("cloudcare/js/preview_app/main", [
     'cloudcare/js/sentry',
     'cloudcare/js/preview_app/preview_app',
     'cloudcare/js/preview_app/dragscroll',  // for .dragscroll elements
+    'commcarehq',
 ], function (
     $,
     _,
     initialPageData,
     sentry,
-    previewApp
+    previewApp,
 ) {
     $(function () {
         sentry.initSentry();
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/preview_app/preview_app.js b/corehq/apps/cloudcare/static/cloudcare/js/preview_app/preview_app.js
index dff142d298d6..a6661560c40e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/preview_app/preview_app.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/preview_app/preview_app.js
@@ -1,10 +1,9 @@
-'use strict';
 hqDefine('cloudcare/js/preview_app/preview_app', [
     'jquery',
     'cloudcare/js/formplayer/app',
 ], function (
     $,
-    FormplayerFrontend
+    FormplayerFrontend,
 ) {
     var start = function (options) {
 
@@ -13,9 +12,7 @@ hqDefine('cloudcare/js/preview_app/preview_app', [
             $(this).attr('target', '_parent');
         });
 
-        FormplayerFrontend.getXSRF(options).then(() =>
-            FormplayerFrontend.start(options)
-        );
+        FormplayerFrontend.getXSRF(options).then(() => FormplayerFrontend.start(options));
 
         if (localStorage.getItem("preview-tablet")) {
             FormplayerFrontend.trigger('view:tablet');
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/sentry.js b/corehq/apps/cloudcare/static/cloudcare/js/sentry.js
index fe842c2a84d1..fe449eb96321 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/sentry.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/sentry.js
@@ -1,13 +1,12 @@
-'use strict';
 hqDefine('cloudcare/js/sentry', [
     'hqwebapp/js/initial_page_data',
     'sentry_browser',
     'sentry_captureconsole',    // needed for Sentry.Integrations.CaptureConsole
 ], function (
     initialPageData,
-    Sentry
+    Sentry,
+    SentryCaptureConsole,
 ) {
-
     let initSentry = function () {
         const sentryConfig = initialPageData.get('sentry');
 
@@ -27,7 +26,7 @@ hqDefine('cloudcare/js/sentry', [
                         dom: false,
                         console: false,
                     }),
-                    new Sentry.Integrations.CaptureConsole({
+                    new SentryCaptureConsole.Integrations.CaptureConsole({
                         levels: ["error"],
                     }),
                 ],
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/spec/markdown_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/spec/markdown_spec.js
index 0f6e7f6764b6..63f03b066ab1 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/spec/markdown_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/spec/markdown_spec.js
@@ -1,4 +1,4 @@
-'use strict';
+
 /* eslint-env mocha */
 hqDefine("cloudcare/js/spec/markdown_spec", [
     "sinon/pkg/sinon",
@@ -9,7 +9,7 @@ hqDefine("cloudcare/js/spec/markdown_spec", [
     sinon,
     initialPageData,
     hmacCallout,
-    markdown
+    markdown,
 ) {
     describe('Markdown', function () {
         let render = markdown.render;
@@ -34,21 +34,21 @@ hqDefine("cloudcare/js/spec/markdown_spec", [
             it('should render links with _blank target and underlined text', function () {
                 assert.equal(
                     render("[link](http://example.com)"),
-                    "<p><a href=\"http://example.com\" target=\"_blank\"><u>link</u></a></p>\n"
+                    "<p><a href=\"http://example.com\" target=\"_blank\"><u>link</u></a></p>\n",
                 );
             });
 
             it('should render newlines as breaks', function () {
                 assert.equal(
                     render("line 1\nline 2"),
-                    "<p>line 1<br>\nline 2</p>\n"
+                    "<p>line 1<br>\nline 2</p>\n",
                 );
             });
 
             it('should render encoded newlines as breaks', function () {
                 assert.equal(
                     render("line 1&#10;line 2"),
-                    "<p>line 1<br>\nline 2</p>\n"
+                    "<p>line 1<br>\nline 2</p>\n",
                 );
             });
         });
@@ -70,7 +70,7 @@ hqDefine("cloudcare/js/spec/markdown_spec", [
                 initialPageData.registerUrl('dialer_view', '/dialer');
                 assert.equal(
                     render("[link](tel://1234567890)"),
-                    "<p><a href=\"/dialer?callout_number=1234567890\" target=\"dialer\"><u>link</u></a></p>\n"
+                    "<p><a href=\"/dialer?callout_number=1234567890\" target=\"dialer\"><u>link</u></a></p>\n",
                 );
             });
 
@@ -79,7 +79,7 @@ hqDefine("cloudcare/js/spec/markdown_spec", [
                 initialPageData.registerUrl('gaen_otp_view', '/gaen/');
                 assert.equal(
                     render("[link](cchq://passthrough/gaen_otp/?otp=otp)"),
-                    "<p><a href=\"/gaen/?otp=otp\" target=\"gaen_otp\"><u>link</u></a></p>\n"
+                    "<p><a href=\"/gaen/?otp=otp\" target=\"gaen_otp\"><u>link</u></a></p>\n",
                 );
             });
 
@@ -104,7 +104,7 @@ hqDefine("cloudcare/js/spec/markdown_spec", [
                 initialPageData.register('hmac_root_url', '/hmac/');
                 assert.equal(
                     render("[link](/hmac/to/somewhere/?with=params)"),
-                    "<p><a href=\"/hmac/to/somewhere/?with=params\" target=\"hmac_callout\"><u>link</u></a></p>\n"
+                    "<p><a href=\"/hmac/to/somewhere/?with=params\" target=\"hmac_callout\"><u>link</u></a></p>\n",
                 );
             });
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/spec/utils_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/spec/utils_spec.js
index 79c8a0038bda..08b1a173b8e3 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/spec/utils_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/spec/utils_spec.js
@@ -1,4 +1,3 @@
-'use strict';
 /* eslint-env mocha */
 hqDefine("cloudcare/js/spec/utils_spec", [
     "sinon/pkg/sinon",
@@ -7,7 +6,7 @@ hqDefine("cloudcare/js/spec/utils_spec", [
 ], function (
     sinon,
     constants,
-    utils
+    utils,
 ) {
     describe("Cloudcare Utils", function () {
         describe('Small Screen Listener', function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index 73b32a8519a5..e19dc8250127 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -1,4 +1,3 @@
-'use strict';
 hqDefine('cloudcare/js/utils', [
     'jquery',
     'underscore',
@@ -24,7 +23,7 @@ hqDefine('cloudcare/js/utils', [
     ProgressBar,
     NProgress,
     Sentry,
-    UsersModels
+    UsersModels,
 ) {
     if (!String.prototype.startsWith) {
         String.prototype.startsWith = function (searchString, position) {
@@ -148,14 +147,11 @@ hqDefine('cloudcare/js/utils', [
     };
 
     var showProminentLoading = function () {
-        hqRequire([
-            "cloudcare/js/formplayer/app",
-            "cloudcare/js/formplayer/layout/views/progress_bar",
-        ], function (FormplayerFrontend, ProgressBar) {
+        import("cloudcare/js/formplayer/app").then(function (FormplayerFrontend) {
             setTimeout(function () {
                 const formplayerQueryInProgress = sessionStorage.formplayerQueryInProgress && JSON.parse(sessionStorage.formplayerQueryInProgress);
                 if (formplayerQueryInProgress) {
-                    const progressView = ProgressBar({
+                    const progressView = new ProgressBar({
                         progressMessage: gettext("Loading..."),
                     });
                     if (!FormplayerFrontend.regions) {
@@ -226,7 +222,7 @@ hqDefine('cloudcare/js/utils', [
         if (isError) {
             showError(
                 gettext('Could not clear user data. Please report an issue if this persists.'),
-                $('#cloudcare-notifications')
+                $('#cloudcare-notifications'),
             );
         } else {
             showSuccess(gettext('User data successfully cleared.'), $('#cloudcare-notifications'), 5000);
@@ -238,7 +234,7 @@ hqDefine('cloudcare/js/utils', [
         if (isError) {
             showError(
                 gettext('Error breaking locks. Please report an issue if this persists.'),
-                $('#cloudcare-notifications')
+                $('#cloudcare-notifications'),
             );
         } else {
             showSuccess(message, $('#cloudcare-notifications'), 5000);
@@ -249,7 +245,7 @@ hqDefine('cloudcare/js/utils', [
         if (toggles.toggleEnabled('USE_PROMINENT_PROGRESS_BAR')) {
             $('#breadcrumb-region').css('z-index', '');
             clearInterval(sessionStorage.progressIncrementInterval);
-            hqRequire(["cloudcare/js/formplayer/app"], function (FormplayerFrontend) {
+            import("cloudcare/js/formplayer/app").then(function (FormplayerFrontend) {
                 const progressView = FormplayerFrontend.regions.getRegion('loadingProgress').currentView;
                 if (progressView) {
                     progressView.setProgress(100, 100, 200);
@@ -307,7 +303,7 @@ hqDefine('cloudcare/js/utils', [
             window.console.error(
                 "reportFormplayerErrorToHQ failed hard and there is nowhere " +
                 "else to report this error: " + JSON.stringify(data),
-                e
+                e,
             );
         }
     };
diff --git a/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html b/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
index a207ac8baf27..b1219e828c45 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
@@ -40,7 +40,7 @@
   {% endcompress %}
 {% endblock %}
 
-{% requirejs_main_b5 "cloudcare/js/formplayer/main" %}
+{% js_entry "cloudcare/js/formplayer/main" %}
 
 {% block js %} {{ block.super }}
   {% include "cloudcare/partials/dependencies.html" %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/all_templates.html b/corehq/apps/cloudcare/templates/cloudcare/partials/all_templates.html
index 9a7cf702948c..73db49999267 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/all_templates.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/all_templates.html
@@ -42,7 +42,6 @@
 {% include 'cloudcare/partials/grid_view/single_app.html' %}
 
 {% include 'cloudcare/partials/menu/audio.html' %}
-{% include 'cloudcare/partials/menu/badge.html' %}
 {% include 'cloudcare/partials/menu/breadcrumbs.html' %}
 {% include 'cloudcare/partials/menu/dropdown.html' %}
 {% include 'cloudcare/partials/menu/grid.html' %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/audio.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/audio.html
index b2262a87aef6..1e94e1f9e20d 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/audio.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/audio.html
@@ -2,12 +2,12 @@
   <td class="module-column module-column-icon">
     <% if (imageUrl) { %>
     <div class="module-icon-image badge-container" style="background-image: url('<%- imageUrl %>');">
-      <%= _.template($('#maybe-custom-badge-template').text())(arguments[0]) %>{# maybe-custom-badge-template output is already escaped #}
+      <span id="module-badge" class="badge bg-dark rounded-pill"><%- badgeText %></span>
     </div>
     <% } else { %>
     <div class="module-icon-container badge-container">
       <i class="fa fa-pencil module-icon" aria-hidden="true"></i>
-      <%= _.template($('#maybe-custom-badge-template').text())(arguments[0]) %>{# maybe-custom-badge-template output is already escaped #}
+      <span id="module-badge" class="badge bg-dark rounded-pill"><%- badgeText %></span>
     </div>
     <% } %>
   </td>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/badge.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/badge.html
deleted file mode 100644
index 0698b235ebf5..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/badge.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<script type="text/template" id="maybe-custom-badge-template">
-  <% /*
-  Ensure backwards compatibility with formplayer backend
-  before it added the badgeText field.
-  typeof x !== 'undefined' means "the variable hasn't been defined",
-  and is different from x === undefined.
-  */ %>
-  <% if (typeof badgeText !== 'undefined' && badgeText) { %>
-  <span id="module-badge" class="badge bg-dark rounded-pill"><%- badgeText %></span>
-  <% } %>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/grid_item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/grid_item.html
index 36088398444b..dca4b6324a92 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/grid_item.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/grid_item.html
@@ -2,7 +2,7 @@
   <div>
     <% if (imageUrl) { %>
     <div class="gridicon badge-container" style="background-image: url('<%- imageUrl %>');">
-      <%= _.template($('#maybe-custom-badge-template').text())(arguments[0]) %>{# maybe-custom-badge-template output is already escaped #}
+      <span id="module-badge" class="badge bg-dark rounded-pill"><%- badgeText %></span>
     </div>
     <% } else { %>
     <div class="gridicon gridicon-circle badge-container">
@@ -11,7 +11,7 @@
       <% } else { %>
       <i class="fa fa-folder gridicon-icon" aria-hidden="true"></i>
       <% } %>
-      <%= _.template($('#maybe-custom-badge-template').text())(arguments[0]) %>{# maybe-custom-badge-template output is already escaped #}
+      <span id="module-badge" class="badge bg-dark rounded-pill"><%- badgeText %></span>
     </div>
     <% } %>
     <div class="module-column-name text-center">
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/row.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/row.html
index b8b7c5919b7d..f2f3378e7c02 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/row.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/row.html
@@ -2,7 +2,7 @@
   <td class="module-column module-column-icon">
     <% if (imageUrl) { %>
     <div class="module-icon-image badge-container" style="background-image: url('<%- imageUrl %>');">
-      <%= _.template($('#maybe-custom-badge-template').text())(arguments[0]) %>{# maybe-custom-badge-template output is already escaped #}
+      <span id="module-badge" class="badge bg-dark rounded-pill"><%- badgeText %></span>
     </div>
     <% } else { %>
     <div class="module-icon-container badge-container">
@@ -11,7 +11,7 @@
       <% } else { %>
       <i class="fa fa-folder module-icon" aria-hidden="true"></i>
       <% } %>
-      <%= _.template($('#maybe-custom-badge-template').text())(arguments[0]) %>{# maybe-custom-badge-template output is already escaped #}
+      <span id="module-badge" class="badge bg-dark rounded-pill"><%- badgeText %></span>
     </div>
     <% } %>
   </td>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/preview_app_base.html b/corehq/apps/cloudcare/templates/cloudcare/preview_app_base.html
index 62b81b425b60..ee5d579b4535 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/preview_app_base.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/preview_app_base.html
@@ -2,7 +2,7 @@
 {% load compress %}
 {% load statici18n %}
 
-{% requirejs_main_b5 "cloudcare/js/preview_app/main" %}
+{% js_entry "cloudcare/js/preview_app/main" %}
 
 <!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE }}">
@@ -50,14 +50,14 @@
 
   <script src="{% statici18n LANGUAGE_CODE %}"></script> {# DO NOT COMPRESS #}
 
-  {% include "hqwebapp/partials/requirejs.html" %}
+  {% include "hqwebapp/partials/webpack.html" %}
 
   <style id="list-cell-layout-style"></style>
   <!-- For Formplayer's app preview -->
 
-  {# This is fine as an inline script; it'll be removed once form designer is migrated to RequireJS #}
+  {# This is fine as an inline script; it'll be removed once all of HQ is using webpack #}
   <script>
-    window.USE_REQUIREJS = true;
+    window.USE_WEBPACK = true;
   </script>
 </head>
 <body>
@@ -77,6 +77,7 @@
     {# do not override this block, use initial_page_data template tag to populate #}
   {% endblock %}
 </div>
+{% registerurl 'notifications_service' %}
 <div class="commcarehq-urls" class="d-none">
   {% block registered_urls %}
     {# do not override this block, use registerurl template tag to populate #}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/spec/form_entry/mocha.html b/corehq/apps/cloudcare/templates/cloudcare/spec/form_entry/mocha.html
index 45691d6db14a..f918e608c24b 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/spec/form_entry/mocha.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/spec/form_entry/mocha.html
@@ -1,18 +1,6 @@
 {% extends "mocha/base.html" %}
 {% load hq_shared_tags %}
-
-{% requirejs_main_b5 "cloudcare/js/form_entry/spec/main" %}
-
-{% block stylesheets %}{{ block.super }}
-  <link type="text/css"
-        rel="stylesheet"
-        media="all"
-        href="{% static 'select2/dist/css/select2.min.css' %}" />
-{% endblock %}
-
-{% block dependencies %}
-  {% include "cloudcare/partials/dependencies.html" %}
-{% endblock %}
+{% js_entry "cloudcare/js/form_entry/spec/main" %}
 
 {% block fixtures %}
   <div id="date-entry-ethiopian" />
diff --git a/corehq/apps/cloudcare/templates/cloudcare/spec/mocha.html b/corehq/apps/cloudcare/templates/cloudcare/spec/mocha.html
index 3cedc4fe1f95..157d7cc77ddd 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/spec/mocha.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/spec/mocha.html
@@ -1,11 +1,6 @@
 {% extends "mocha/base.html" %}
 {% load hq_shared_tags %}
-
-{% requirejs_main_b5 "cloudcare/js/formplayer/spec/main" %}
-
-{% block dependencies %}
-  {% include "cloudcare/partials/dependencies.html" %}
-{% endblock %}
+{% js_entry "cloudcare/js/formplayer/spec/main" %}
 
 {% block fixtures %}
   <div id="restore-as-region"></div>
@@ -17,5 +12,4 @@
 
   {% include 'cloudcare/partials/confirmation_modal.html' %}
   {% include 'cloudcare/partials/all_templates.html' %}
-
 {% endblock %}
diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
index 5226f69b1597..6bddfec6de3d 100644
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -72,6 +72,17 @@ module.exports = {
                 },
             },
 
+            {
+                test: /mapbox\.js\/dist\/mapbox/,
+                loader: "exports-loader",
+                options: {
+                    type: "commonjs",
+                    exports: {
+                        syntax: "single",
+                        name: "L",
+                    },
+                },
+            },
             {
                 test: /nvd3\/nv\.d3\.min/,
                 loader: "exports-loader",
@@ -84,7 +95,7 @@ module.exports = {
                 },
             },
             {
-                test: /sentry\.browser/,
+                test: /sentry\/js\/sentry/,
                 loader: "exports-loader",
                 options: {
                     type: "commonjs",