From bc16668ff6ede76a9c007207bf6dbbf413a1462b Mon Sep 17 00:00:00 2001 From: Aleksandra Sikora Date: Fri, 29 May 2020 08:39:58 +0200 Subject: [PATCH] console: remove deprecated better-npm-run (#4819) --- console/package-lock.json | 71 ++++++++++++++++++++++++++++----------- console/package.json | 29 ++++------------ 2 files changed, 58 insertions(+), 42 deletions(-) diff --git a/console/package-lock.json b/console/package-lock.json index aed1b5ad54a..e8df35a0294 100644 --- a/console/package-lock.json +++ b/console/package-lock.json @@ -4090,25 +4090,6 @@ "tweetnacl": "^0.14.3" } }, - "better-npm-run": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/better-npm-run/-/better-npm-run-0.1.1.tgz", - "integrity": "sha512-SBBYsUsb6bYcUMF9QUWy39GX5kzD4CoRBP11gx/k5jYkUr4Tr+irAokIeQX5FgfCRz0Q27rt8U0J4D2TlRgQFA==", - "dev": true, - "requires": { - "commander": "^2.9.0", - "dotenv": "^2.0.0", - "object-assign": "^4.0.1" - }, - "dependencies": { - "dotenv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-2.0.0.tgz", - "integrity": "sha1-vXWcNXqqcDZeAclrewvsCKbg2Uk=", - "dev": true - } - } - }, "bfj": { "version": "6.1.2", "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz", @@ -5444,6 +5425,58 @@ } } }, + "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-fetch": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.2.2.tgz", diff --git a/console/package.json b/console/package.json index ea9e9a10958..4f94a9a7eaa 100644 --- a/console/package.json +++ b/console/package.json @@ -12,18 +12,17 @@ "homepage": "https://hasura.io/", "keywords": [], "scripts": { - "start": "concurrently --kill-others \"npm run start-prod\"", - "start-prod": "better-npm-run start-prod", + "start-dev": "node -r dotenv/config ./bin/server.js", + "watch-client": "node -r dotenv/config webpack/webpack-dev-server.js", + "dev": "concurrently --kill-others \"npm run watch-client\" \"npm run start-dev\"", + "start-prod": "cross-env NODE_PATH=./src PORT=8080 NODE_ENV=production node ./bin/server.js", "build": "webpack --progress -p --colors --display-error-details --config webpack/prod.config.js", "server-build": "make server-build", "build-unused": "webpack --verbose --colors --display-error-details --config webpack/prod.config.js --json | webpack-unused -s src", "postinstall": "webpack --display-error-details --config webpack/prod.config.js", - "lint": "eslint -c .eslintrc src --ext .js,.ts,.tsx", - "start-dev": "better-npm-run start-dev", - "watch-client": "better-npm-run watch-client", - "dev": "concurrently --kill-others \"npm run watch-client\" \"npm run start-dev\" ", "cypress": "cypress open", "test": "cypress run --spec 'cypress/integration/**/**/test.ts' --key $CYPRESS_KEY --parallel --record", + "lint": "eslint -c .eslintrc src --ext .js,.ts,.tsx", "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx}\"" }, "lint-staged": { @@ -36,22 +35,6 @@ "git add" ] }, - "betterScripts": { - "start-prod": { - "command": "node ./bin/server.js", - "env": { - "NODE_PATH": "./src", - "NODE_ENV": "production", - "PORT": 8080 - } - }, - "start-dev": { - "command": "node -r dotenv/config ./bin/server.js" - }, - "watch-client": { - "command": "node -r dotenv/config webpack/webpack-dev-server.js" - } - }, "prettier": { "singleQuote": true, "trailingComma": "es5", @@ -188,11 +171,11 @@ "babel-plugin-styled-components": "1.10.7", "babel-plugin-transform-react-remove-prop-types": "0.4.24", "babel-plugin-typecheck": "2.0.1", - "better-npm-run": "0.1.1", "bootstrap-loader": "2.2.0", "bootstrap-sass": "3.4.1", "clean-webpack-plugin": "0.1.19", "concurrently": "3.6.1", + "cross-env": "7.0.2", "css-loader": "3.5.3", "cypress": "4.6.0", "dotenv": "5.0.1",