From 3ce1d0b390261423103106f6867ffb20db63ef3b Mon Sep 17 00:00:00 2001
From: Alex Ruddick <alexrudd0@gmail.com>
Date: Mon, 27 Nov 2023 10:12:56 -0600
Subject: [PATCH] Use cross-env

---
 package-lock.json | 25 +++++++++++++++++++------
 package.json      |  7 ++++---
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8d12b7f..1e3972b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "license": "AGPL-3.0-only",
       "dependencies": {
         "cors": "^2.8.5",
+        "cross-env": "^7.0.3",
         "express": "^4.17.9",
         "flatten-svg": "^0.3.0",
         "optimize-paths": "^1.2.2",
@@ -3144,9 +3145,25 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
+    "node_modules/cross-env": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "dependencies": {
+        "cross-spawn": "^7.0.1"
+      },
+      "bin": {
+        "cross-env": "src/bin/cross-env.js",
+        "cross-env-shell": "src/bin/cross-env-shell.js"
+      },
+      "engines": {
+        "node": ">=10.14",
+        "npm": ">=6",
+        "yarn": ">=1"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
@@ -5090,7 +5107,6 @@
     },
     "node_modules/isexe": {
       "version": "2.0.0",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/istanbul-lib-coverage": {
@@ -6440,7 +6456,6 @@
     },
     "node_modules/path-key": {
       "version": "3.1.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -7213,7 +7228,6 @@
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
@@ -7224,7 +7238,6 @@
     },
     "node_modules/shebang-regex": {
       "version": "3.0.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -7977,6 +7990,7 @@
     },
     "node_modules/wake-lock": {
       "version": "0.2.0",
+      "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
         "bindings": "^1.5.0"
@@ -8032,7 +8046,6 @@
     },
     "node_modules/which": {
       "version": "2.0.2",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
diff --git a/package.json b/package.json
index cb6f1c6..20a6b03 100644
--- a/package.json
+++ b/package.json
@@ -22,14 +22,14 @@
     "prebuild": "npm run lint",
     "lint": "eslint --cache --ext .ts,.tsx src",
     "build": "npm run build:server && npm run build:ui",
-    "build:server": "NODE_OPTIONS='--max-old-space-size=1024' tsc",
+    "build:server": "cross-env NODE_OPTIONS='--max-old-space-size=1024' tsc",
     "build:ui": "node --experimental-modules build.mjs",
     "prepare": "rimraf dist && npm run build",
     "prestart": "npm run build",
     "start": "node cli.js",
     "serve": "npm run build:server && npm start",
-    "dev": "npm run serve & BUILD_MODE=development npm run build:ui",
-    "deploy": "rimraf dist/ui && IS_WEB=1 npm run build:ui && gh-pages --dist dist/ui",
+    "dev": "npm run serve & cross-env BUILD_MODE=development npm run build:ui",
+    "deploy": "rimraf dist/ui && cross-env IS_WEB=1 npm run build:ui && gh-pages --dist dist/ui",
     "test": "jest"
   },
   "author": "Jeremy Rose <nornagon@nornagon.net>",
@@ -68,6 +68,7 @@
   },
   "dependencies": {
     "cors": "^2.8.5",
+    "cross-env": "^7.0.3",
     "express": "^4.17.9",
     "flatten-svg": "^0.3.0",
     "optimize-paths": "^1.2.2",