From 597d81d8874b6e5464953a7be0083941c1b98d64 Mon Sep 17 00:00:00 2001 From: Jenny Schweers Date: Wed, 15 Jan 2025 11:42:39 -0500 Subject: [PATCH] Removed hqwebapp/js/django from commcarehq.js This module was implemented for requirejs and is not needed for webpack. --- .../apps/hqwebapp/static/hqwebapp/js/bootstrap3/commcarehq.js | 2 -- .../apps/hqwebapp/static/hqwebapp/js/bootstrap5/commcarehq.js | 2 -- .../javascript/hqwebapp/js/commcarehq.js.diff.txt | 4 +--- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/commcarehq.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/commcarehq.js index 483ebb98d2dc..15bab4504e66 100644 --- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/commcarehq.js +++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/commcarehq.js @@ -5,7 +5,5 @@ ko.mapping = mapping; import 'bootstrap'; -import 'hqwebapp/js/django'; - import 'hqwebapp/js/bootstrap3/common'; import 'hqwebapp/js/bootstrap3/base_main'; diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/commcarehq.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/commcarehq.js index 4b704dfbae12..2e4b526bf23c 100644 --- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/commcarehq.js +++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/commcarehq.js @@ -5,7 +5,5 @@ ko.mapping = mapping; import 'bootstrap5'; -import 'hqwebapp/js/django'; - import 'hqwebapp/js/bootstrap5/common'; import 'hqwebapp/js/bootstrap5/base_main'; diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/commcarehq.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/commcarehq.js.diff.txt index 546b935bda0a..b99d1648c508 100644 --- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/commcarehq.js.diff.txt +++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/commcarehq.js.diff.txt @@ -1,6 +1,6 @@ --- +++ -@@ -1,11 +1,11 @@ +@@ -1,9 +1,9 @@ -// Core requirements for Bootstrap 3 Webpack Entry Modules +// Core requirements for Bootstrap 5 Webpack Entry Modules import ko from 'knockout'; @@ -10,8 +10,6 @@ -import 'bootstrap'; +import 'bootstrap5'; - import 'hqwebapp/js/django'; - -import 'hqwebapp/js/bootstrap3/common'; -import 'hqwebapp/js/bootstrap3/base_main'; +import 'hqwebapp/js/bootstrap5/common';