From 9ee81763f6209d0716bb92132594247f33644911 Mon Sep 17 00:00:00 2001 From: JackAttack-365 <142643773+jackattack-4@users.noreply.github.com> Date: Thu, 10 Sep 2026 16:59:53 -0700 Subject: [PATCH 1/4] Merge branch 'main' into jackshim415/dev-script-cross-platform --- package-lock.json | 26 ++++++++++++++++++++++++++ package.json | 1 + 2 files changed, 27 insertions(+) diff --git a/package-lock.json b/package-lock.json index 601154c..630cefa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,6 +42,7 @@ "@types/node": "^22.20.0", "@types/react": "^19.2.18", "@types/swagger-ui-express": "^4.1.8", + "cross-env": "^10.1.0", "@typescript-eslint/eslint-plugin": "^8.70.0", "@typescript-eslint/parser": "^8.70.0", "eslint": "^10.10.0", @@ -105,6 +106,13 @@ "node": ">=12" } }, + "node_modules/@epic-web/invariant": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz", + "integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==", + "dev": true, + "license": "MIT" + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.28.2", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.2.tgz", @@ -2154,6 +2162,24 @@ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", "license": "MIT" }, + "node_modules/cross-env": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz", + "integrity": "sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@epic-web/invariant": "^1.0.0", + "cross-spawn": "^7.0.6" + }, + "bin": { + "cross-env": "dist/bin/cross-env.js", + "cross-env-shell": "dist/bin/cross-env-shell.js" + }, + "engines": { + "node": ">=20" + } + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", diff --git a/package.json b/package.json index d5412fd..98fff1d 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "@types/node": "^22.20.0", "@types/react": "^19.2.18", "@types/swagger-ui-express": "^4.1.8", + "cross-env": "^10.1.0", "@typescript-eslint/eslint-plugin": "^8.70.0", "@typescript-eslint/parser": "^8.70.0", "eslint": "^10.10.0", From 168d171b6c9f4d1433b8afbc4bac1318b395c21a Mon Sep 17 00:00:00 2001 From: JackAttack-365 <142643773+jackattack-4@users.noreply.github.com> Date: Thu, 10 Sep 2026 17:02:00 -0700 Subject: [PATCH 2/4] update scripts --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 98fff1d..74ead92 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,9 @@ "description": "", "type": "module", "scripts": { - "dev": "NODE_ENV=development tsx watch src/server.ts", + "dev": "cross-env NODE_ENV=development tsx watch src/server.ts", "build": "tsc", - "start": "node dist/src/server.js --omit=dev", + "start": "cross-env NODE_ENV=production node dist/src/server.js", "test": "tsc", "lint": "eslint .", "format": "prettier --write ." From 06a70621dd2de54c4dcb74b34e85e40514a36bb3 Mon Sep 17 00:00:00 2001 From: JackAttack-365 <142643773+jackattack-4@users.noreply.github.com> Date: Thu, 10 Sep 2026 20:34:32 -0700 Subject: [PATCH 3/4] fix dev --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 74ead92..d8de089 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "cross-env NODE_ENV=development tsx watch src/server.ts", "build": "tsc", - "start": "cross-env NODE_ENV=production node dist/src/server.js", + "start": "NODE_ENV=production node dist/src/server.js", "test": "tsc", "lint": "eslint .", "format": "prettier --write ." From 7f23074089d72901d1d039d51e5065ff17cb3e82 Mon Sep 17 00:00:00 2001 From: JackAttack-365 <142643773+jackattack-4@users.noreply.github.com> Date: Thu, 10 Sep 2026 20:44:10 -0700 Subject: [PATCH 4/4] use cross-env for prod --- package-lock.json | 10 +--------- package.json | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 630cefa..02764bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "compression": "^1.8.1", "cookie-parser": "^1.4.7", "cors": "^2.8.6", + "cross-env": "^10.1.0", "crypto-js": "^4.2.0", "csv-stringify": "^6.8.3", "dotenv": "^17.4.2", @@ -42,7 +43,6 @@ "@types/node": "^22.20.0", "@types/react": "^19.2.18", "@types/swagger-ui-express": "^4.1.8", - "cross-env": "^10.1.0", "@typescript-eslint/eslint-plugin": "^8.70.0", "@typescript-eslint/parser": "^8.70.0", "eslint": "^10.10.0", @@ -110,7 +110,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz", "integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==", - "dev": true, "license": "MIT" }, "node_modules/@esbuild/aix-ppc64": { @@ -2166,7 +2165,6 @@ "version": "10.1.0", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz", "integrity": "sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==", - "dev": true, "license": "MIT", "dependencies": { "@epic-web/invariant": "^1.0.0", @@ -2184,7 +2182,6 @@ "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "dev": true, "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -3338,7 +3335,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, "license": "ISC" }, "node_modules/jiti": { @@ -3759,7 +3755,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -4255,7 +4250,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" @@ -4268,7 +4262,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -4641,7 +4634,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "license": "ISC", "dependencies": { "isexe": "^2.0.0" diff --git a/package.json b/package.json index d8de089..3a35735 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "cross-env NODE_ENV=development tsx watch src/server.ts", "build": "tsc", - "start": "NODE_ENV=production node dist/src/server.js", + "start": "cross-env NODE_ENV=production node dist/src/server.js", "test": "tsc", "lint": "eslint .", "format": "prettier --write ." @@ -23,6 +23,7 @@ "compression": "^1.8.1", "cookie-parser": "^1.4.7", "cors": "^2.8.6", + "cross-env": "^10.1.0", "crypto-js": "^4.2.0", "csv-stringify": "^6.8.3", "dotenv": "^17.4.2", @@ -48,7 +49,6 @@ "@types/node": "^22.20.0", "@types/react": "^19.2.18", "@types/swagger-ui-express": "^4.1.8", - "cross-env": "^10.1.0", "@typescript-eslint/eslint-plugin": "^8.70.0", "@typescript-eslint/parser": "^8.70.0", "eslint": "^10.10.0",