From d90d9f3d7f4e628e7df20318e2d998b5e5545a2c Mon Sep 17 00:00:00 2001 From: Ronan Jouchet Date: Fri, 26 Feb 2021 22:41:00 -0500 Subject: [PATCH] Scripts: get rid of `dev-up` and `dev-up-win` scripts They used to be necessary when we did OS-specific stuff in here, but we're no longer, and `foo && bar` is supported by both *nixes and Windows --- docs/development.md | 13 +++++-------- package.json | 4 +--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/docs/development.md b/docs/development.md index 90b24a5..cfd88df 100644 --- a/docs/development.md +++ b/docs/development.md @@ -2,24 +2,21 @@ ## Setup -First, clone the project +First, clone the project: ```bash git clone https://github.com/nativefier/nativefier.git cd nativefier ``` -Install dependencies for both the CLI and the Electron app: +Install dependencies (for both the CLI and the Electron app): ```bash -# Under Linux and macOS: -npm run dev-up - -# Under Windows: -npm run dev-up-win +npm install ``` -Build nativefier: +The above `npm install` will build automatically (through the `prepare` hook). +When you need to re-build Nativefier, ```bash npm run build diff --git a/package.json b/package.json index 22884cb..4097ede 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,6 @@ "build-app-static": "ncp app/src/static/ app/lib/static/ && ncp app/dist/preload.js app/lib/preload.js && ncp app/dist/preload.js.map app/lib/preload.js.map", "build": "npm run clean && tsc --build . app && npm run build-app && npm run build-app-static", "build:watch": "tsc --build . app --watch", - "dev-up": "npm install && cd ./app && npm install && cd ..", - "dev-up-win": "npm install & cd app & npm install & cd ..", "changelog": "./docs/generate-changelog", "ci": "npm run lint && npm test", "clean": "rimraf lib/ app/lib/ app/dist/", @@ -43,7 +41,7 @@ "lint:format": "prettier --write 'src/**/*.js' 'app/src/**/*.js'", "lint": "eslint . --ext .ts", "list-outdated-deps": "npm out; cd app && npm out; true", - "prepare": "cd ./app && npm install && cd .. && npm run build", + "prepare": "cd app && npm install && cd .. && npm run build", "test:integration": "jest --testRegex '.*integration-test.js'", "test:manual": "npm run build && ./docs/manual-test", "test:unit": "jest",