Merge branch 'main' into feat/encrypt-using-password-hash

Author: hlxid

.gitignore

@@ -19,13 +19,11 @@ node_modules/
 # Coverage reports by jest
 coverage
 
-# Dashboard bundle config
-nodecg-io-core/dashboard/dist
-!nodecg-io-core/dashboard/esbuild.config.js
+# Dashboard bundle output from esbuild
+dist/
 
-# Debug service bundle config
-services/nodecg-io-debug/dashboard/dist
-!services/nodecg-io-debug/esbuild.config.js
+# Esbuild config
+!utils/nodecg-io-esbuild/esbuild.config.js
 
 # Editor configuration
 .idea/
@@ -36,9 +34,6 @@ services/nodecg-io-debug/dashboard/dist
 !/.vscode/tasks.json
 !/.vscode/settings.json
 
-# Lerna temporary files
-package.json.lerna_backup
-
 # Configuration of prettier and ESLint
 !.eslintrc.js
 !.prettierrc.js
@@ -49,9 +44,6 @@ package.json.lerna_backup
 # Documentation
 docs/
 
-# lerna debug
-lerna-debug.log
-
 # nodecg-io-cli install details. Created when installing development version using nodecg-io install.
 install.json
 

jest.config.mjs

@@ -23,8 +23,6 @@ function hasJestConfig(pkg) {
 
 projects = packages.filter((pkg) => hasJestConfig(pkg)).map((v) => `<rootDir>/${path.relative(cwd(), v.dir)}`);
 
-console.log(projects);
-
 /** @type {import('@jest/types').Config.InitialOptions} */
 const config = {
     projects,

nodecg-io-core/dashboard/package.json

@@ -13,14 +13,15 @@
         "directory": "nodecg-io-core/dashboard"
     },
     "scripts": {
-        "clean": "node esbuild.config.js --clean",
-        "build": "node esbuild.config.js",
-        "rebuild": "node esbuild.config.js --rebuild",
-        "watch": "node esbuild.config.js --watch"
+        "build": "nodecg-io-esbuild --monaco",
+        "clean": "npm run build -- --clean",
+        "rebuild": "npm run build -- --rebuild",
+        "watch": "npm run -- --watch"
     },
     "devDependencies": {
         "esbuild": "^0.16.12",
         "monaco-editor": "^0.38.0",
+        "nodecg-io-esbuild": "^1.0.0",
         "@nodecg/types": "^2.1.11",
         "typescript": "^5.1.6"
     },