From 6503bab1aaa27ff43175d069413630a420093be0 Mon Sep 17 00:00:00 2001
From: Andrey Meshkov <am@adguard.com>
Date: Wed, 15 Apr 2020 15:41:48 +0300
Subject: [PATCH] *: added cross-env to npm scripts

---
 client/package-lock.json | 52 ++++++++++++++++++++++++++++++++++++++++
 client/package.json      | 11 +++++----
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 0e43676f..0f020587 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -3522,6 +3522,58 @@
         "gud": "^1.0.0"
       }
     },
+    "cross-env": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.2.tgz",
+      "integrity": "sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.1"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.2",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz",
+          "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "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,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
     "cross-spawn": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
diff --git a/client/package.json b/client/package.json
index 4ee1c1c3..daa3ab38 100644
--- a/client/package.json
+++ b/client/package.json
@@ -3,9 +3,9 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js",
-    "watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch",
-    "build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js",
+    "build-dev": "cross-env NODE_ENV=development webpack --config webpack.dev.js",
+    "watch": "cross-env NODE_ENV=development webpack --config webpack.dev.js --watch",
+    "build-prod": "cross-env NODE_ENV=production webpack --config webpack.prod.js",
     "lint": "eslint client/"
   },
   "dependencies": {
@@ -49,6 +49,7 @@
     "clean-webpack-plugin": "^0.1.19",
     "compression-webpack-plugin": "^1.1.11",
     "copy-webpack-plugin": "^4.6.0",
+    "cross-env": "^7.0.2",
     "css-loader": "^2.1.1",
     "eslint": "^4.19.1",
     "eslint-config-airbnb-base": "^12.1.0",
@@ -70,11 +71,11 @@
     "style-loader": "^0.21.0",
     "stylelint": "^9.10.1",
     "stylelint-webpack-plugin": "0.10.4",
+    "svg-url-loader": "^2.3.2",
     "uglifyjs-webpack-plugin": "^1.2.7",
     "url-loader": "^1.0.1",
     "webpack": "3.8.1",
     "webpack-dev-server": "^3.1.14",
-    "webpack-merge": "^4.1.3",
-    "svg-url-loader": "^2.3.2"
+    "webpack-merge": "^4.1.3"
   }
 }