From cb2205b0c3e6584eb2014362bf61e35674bc9126 Mon Sep 17 00:00:00 2001
From: f-w <fred.wen@gov.bc.ca>
Date: Wed, 11 Dec 2024 14:19:18 -0800
Subject: [PATCH] fix jQuery import

---
 client/package-lock.json | 42 ++++++++++++++++++++++++++++++++++++++++
 client/package.json      |  7 ++++---
 client/src/App.vue       |  2 --
 client/vite.config.js    |  9 +++++++++
 4 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 75cff99ff..99619a372 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -20,6 +20,7 @@
       "devDependencies": {
         "@eslint/js": "^9.14.0",
         "@json-editor/json-editor": "^2.10.1",
+        "@rollup/plugin-inject": "^5.0.5",
         "@tsconfig/node22": "^22.0.0",
         "@types/node": "^22.9.0",
         "@vitejs/plugin-vue": "^5.1.4",
@@ -730,6 +731,28 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@rollup/plugin-inject": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-inject/-/plugin-inject-5.0.5.tgz",
+      "integrity": "sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.30.3"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@rollup/pluginutils": {
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.3.tgz",
@@ -771,6 +794,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -783,6 +807,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -795,6 +820,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -807,6 +833,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -819,6 +846,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -831,6 +859,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -843,6 +872,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -855,6 +885,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -867,6 +898,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -879,6 +911,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -891,6 +924,7 @@
       "cpu": [
         "loong64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -903,6 +937,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -915,6 +950,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -927,6 +963,7 @@
       "cpu": [
         "s390x"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -939,6 +976,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -951,6 +989,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -963,6 +1002,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -975,6 +1015,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -987,6 +1028,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
diff --git a/client/package.json b/client/package.json
index 752edfe08..c250a432c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -17,12 +17,13 @@
     "iframe-resizer": "^4.3.1",
     "roboto-fontface": "*",
     "vue": "^3.4.31",
-    "webfontloader": "^1.0.0",
-    "vuetify": "^3.6.14"
+    "vuetify": "^3.6.14",
+    "webfontloader": "^1.0.0"
   },
   "devDependencies": {
-    "@json-editor/json-editor": "^2.10.1",
     "@eslint/js": "^9.14.0",
+    "@json-editor/json-editor": "^2.10.1",
+    "@rollup/plugin-inject": "^5.0.5",
     "@tsconfig/node22": "^22.0.0",
     "@types/node": "^22.9.0",
     "@vitejs/plugin-vue": "^5.1.4",
diff --git a/client/src/App.vue b/client/src/App.vue
index a73a3f043..b3505b25f 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -78,8 +78,6 @@
 </template>
 <script>
 import Login from './components/login';
-import jquery from 'jquery';
-window.$ = window.jQuery = jquery;
 
 export default {
   name: 'app',
diff --git a/client/vite.config.js b/client/vite.config.js
index b61806b4b..5fc58c98d 100644
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -6,6 +6,7 @@ import vuetify, { transformAssetUrls } from 'vite-plugin-vuetify';
 
 // Utilities
 import { NestFactory } from '@nestjs/core';
+import inject from '@rollup/plugin-inject';
 import ejs from 'ejs';
 import { globSync } from 'fast-glob';
 import fs from 'fs';
@@ -60,6 +61,11 @@ export default async ({ mode }) => {
         },
       }),
       DynamicPublicDirectory(['node_modules/iframe-resizer/js']),
+      inject({
+        jQuery: 'jquery',
+        $: 'jquery',
+        include: [],
+      }),
     ],
     define: {
       'process.env': {},
@@ -83,6 +89,9 @@ export default async ({ mode }) => {
         },
       },
     },
+    optimizeDeps: {
+      include: ['jquery'],
+    },
   };
 
   if (mode === 'development') {