fix various import issues

package-lock.json

@@ -54,7 +54,7 @@
         "merge-stream": "^2.0.0",
         "method-override": "^3.0.0",
         "moment": "^2.29.4",
-        "moment-recur": "^1.0.7",
+        "moment-recur": "git://github.com/HabitRPG/moment-recur.git#d3e8e6da0806f13b74dd2e4d7d9053e6a63db119",
         "mongoose": "^7.8.3",
         "morgan": "^1.10.0",
         "nconf": "^0.12.1",
@@ -15457,9 +15457,10 @@
       }
     },
     "node_modules/moment-recur": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/moment-recur/-/moment-recur-1.0.7.tgz",
-      "integrity": "sha512-jpBQn6H62gCnEYjtYdLfK/VdPZHEXo1t8RrVItHVVS67SRvByyJBNBa3WQSGTe+8H0smcYO/79FYTA9LGMVdQw==",
+      "version": "1.0.8",
+      "resolved": "git+ssh://git@github.com/HabitRPG/moment-recur.git#d3e8e6da0806f13b74dd2e4d7d9053e6a63db119",
+      "integrity": "sha512-LaqXV3izeVQjG0EKAEQQWdneMiff5JR6oBKcfgl0uFOTeaFzLKG62psk7r2VE7RTBdhYigt6KNaLZR7GdWPEIA==",
+      "license": "Unlicense",
       "dependencies": {
         "moment": "<3.0.0"
       }

package.json

@@ -49,7 +49,7 @@
     "merge-stream": "^2.0.0",
     "method-override": "^3.0.0",
     "moment": "^2.29.4",
-    "moment-recur": "^1.0.7",
+    "moment-recur": "git://github.com/HabitRPG/moment-recur.git#d3e8e6da0806f13b74dd2e4d7d9053e6a63db119",
     "mongoose": "^7.8.3",
     "morgan": "^1.10.0",
     "nconf": "^0.12.1",

website/client/package.json

@@ -30,7 +30,6 @@
     "jquery": "^3.7.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
-    "moment-locales-webpack-plugin": "^1.2.0",
     "nconf": "^0.12.1",
     "sass": "^1.63.4",
     "sinon": "^17.0.1",
@@ -38,8 +37,8 @@
     "timers-browserify": "^2.0.12",
     "uuid": "^9.0.1",
     "validator": "^13.9.0",
-    "vite": "^4.0.11",
-    "vite-plugin-vue2": "^2.0.3",
+    "vite": "^6.0.0",
+    "@vitejs/plugin-vue2": "^2.3.3",
     "vue": "^2.7.10",
     "vue-fragment": "^1.6.0",
     "vue-mugen-scroll": "^0.2.6",

website/client/src/assets/scss/bootstrap.scss

@@ -2,7 +2,7 @@
 $grid-gutter-width: 24px;
 
 // Bootstrap and its default variables
-@import 'node_modules/bootstrap/scss/bootstrap';
+@import '~/bootstrap/scss/bootstrap';
 
 // Bootstrap Vue styles
-@import 'node_modules/bootstrap-vue/dist/bootstrap-vue';
+@import '~/bootstrap-vue/dist/bootstrap-vue';

website/client/src/mixins/externalLinks.js

@@ -12,7 +12,6 @@ export function isTrustedDomain (linkUrl, trustedDomains) {
   return trustedDomains.some(domain => parsedURL.hostname.includes(domain.hostname));
 }
 
-console.log(import.meta);
 const TRUSTED_DOMAINS = import.meta.env.TRUSTED_DOMAINS.split(',')
   .map(u => (u === 'localhost' ? new URL('http://localhost') : new URL(u)));
 

website/client/src/pages/user-main.vue

@@ -95,6 +95,9 @@
 
 <style lang='scss'>
   @import '@/assets/scss/colors.scss';
+  @import '~/intro.js/minified/introjs.min.css';
+  @import '~/axios-progress-bar/dist/nprogress.css';
+
 
   .modal-backdrop {
     opacity: .9 !important;
@@ -389,6 +392,3 @@ export default {
   },
 };
 </script>
-
-  <style src="intro.js/minified/introjs.min.css"></style>
-  <style src="axios-progress-bar/dist/nprogress.css"></style>

website/client/vite.config.mjs

@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import path from 'path';
 import { defineConfig } from 'vite'
-import { createVuePlugin as vue } from 'vite-plugin-vue2'
+import vue from '@vitejs/plugin-vue2'
 import { fileURLToPath } from 'node:url'
 
 const configFile = path.join(path.resolve(__dirname, '../../config.json'));
@@ -39,7 +39,6 @@ envVars
     envObject[`import.meta.env.${key}`] = `'${nconf.get(key)}'`;
   });
 
-  console.log(envObject);
 // https://vitejs.dev/config/
 export default defineConfig({
   define: envObject,
@@ -51,16 +50,16 @@ export default defineConfig({
       extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
     },
     plugins: [
-      vue({
-        template: {
-          compilerOptions: {
-            compatConfig: {
-              MODE: 2,
-            }
-          }
-        }
-      })
+      vue()
     ],
+    optimizeDeps: {
+      include: ['moment-recur']
+    },
+    build: {
+      commonjsOptions: {
+        include: [/moment-recur/, /node_modules/]
+      }
+    },
     base: '/',
     server: {
       headers: { 'Cache-Control': 'no-store' },

website/common/script/cron.js

@@ -7,7 +7,7 @@
 import defaults from 'lodash/defaults';
 import invert from 'lodash/invert';
 import moment from 'moment';
-import 'moment-recur';
+import 'moment-recur/moment-recur.js';
 
 export const DAY_MAPPING = {
   0: 'su',