From 8565c1a9cee88494be8ee31c347a9e5dfd16966e Mon Sep 17 00:00:00 2001
From: ThaUnknown <6506529+ThaUnknown@users.noreply.github.com>
Date: Sun, 4 Jun 2023 23:28:55 +0200
Subject: [PATCH] fix: env, native deps

---
 package.json   |  8 +++++---
 pnpm-lock.yaml | 10 ++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index a49b2de..693346f 100644
--- a/package.json
+++ b/package.json
@@ -6,9 +6,9 @@
   "main": "build/main.js",
   "homepage": "https://github.com/ThaUnknown/miru#readme",
   "scripts": {
-    "start": "SET NODE_ENV=development & concurrently --kill-others \"npm run web:watch\" \"npm run electron:start\"",
+    "start": "cross-env NODE_ENV=development concurrently --kill-others \"npm run web:watch\" \"npm run electron:start\"",
     "web:watch": "webpack serve",
-    "web:build": "SET NODE_ENV=production & webpack build",
+    "web:build": "cross-env NODE_ENV=production webpack build",
     "electron:start": "electron ./build/main.js",
     "build": "npm run web:build && electron-builder",
     "publish": "npm run web:build && electron-builder -p always"
@@ -16,6 +16,7 @@
   "devDependencies": {
     "concurrently": "^7.6.0",
     "copy-webpack-plugin": "^11.0.0",
+    "cross-env": "^7.0.3",
     "css-loader": "^6.8.1",
     "electron": "23.1.0",
     "electron-builder": "^23.6.0",
@@ -65,7 +66,8 @@
     "appId": "com.github.thaunknown.miru",
     "productName": "Miru",
     "files": [
-      "build/**/*"
+      "build/**/*",
+      "!node_modules/**/*.{mk,a,o,h}"
     ],
     "mac": {
       "artifactName": "${os}-${name}-${version}.${ext}",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 684e51c..3531c95 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,6 +6,7 @@ specifiers:
   browser-event-target-emitter: ^1.0.0
   concurrently: ^7.6.0
   copy-webpack-plugin: ^11.0.0
+  cross-env: ^7.0.3
   css-loader: ^6.8.1
   discord-rpc: 4.0.1
   ebml-iterator: ^1.0.2
@@ -52,6 +53,7 @@ dependencies:
 devDependencies:
   concurrently: 7.6.0
   copy-webpack-plugin: 11.0.0_webpack@5.85.0
+  cross-env: 7.0.3
   css-loader: 6.8.1_webpack@5.85.0
   electron: 23.1.0
   electron-builder: 23.6.0
@@ -1513,6 +1515,14 @@ packages:
       uint8-util: 2.1.9
     dev: false
 
+  /cross-env/7.0.3:
+    resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
+    engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
+    hasBin: true
+    dependencies:
+      cross-spawn: 7.0.3
+    dev: true
+
   /cross-fetch-ponyfill/1.0.3:
     resolution: {integrity: sha512-uOBkDhUAGAbx/FEzNKkOfx3w57H8xReBBXoZvUnOKTI0FW0Xvrj3GrYv2iZXUqlffC1LMGfQzhmBM/ke+6eTDA==}
     dependencies: