diff --git a/Makefile b/Makefile index 3913c55667..5341642275 100644 --- a/Makefile +++ b/Makefile @@ -12,15 +12,12 @@ download-bins: install-deps: yarn install --frozen-lockfile -out/app_vue.js: - yarn dev:renderer:vue +compile-dev: + yarn compile:main --cache + yarn compile:renderer --cache -out/app_react.js: - yarn dev:renderer:react - -dev: install-deps out/app_vue.js out/app_react.js - yarn dev:main - yarn dev-run-renderer --watch -k +dev: install-deps compile-dev + yarn dev # run electron and watch files test: yarn test diff --git a/README.md b/README.md index 8e62151a1d..cc80d5586f 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,17 @@ Download a pre-built package from the [releases](https://github.com/lensapp/lens * `make dev` - builds and starts the app * `make test` - run tests +## Development (advanced) + +Allows faster separately re-run some of involved processes: + +1. `yarn dev:main` compiles electron's main process and watch files +1. `yarn dev:renderer:vue` compiles electron's renderer vue-part +1. `yarn dev:renderer:react` compiles electron's renderer react-part +1. `yarn dev-run` when all files compiled run this command to open the app + +Alternatively to compile both render parts in single command use `yarn dev:renderer` + ## Contributing Bug reports and pull requests are welcome on GitHub at https://github.com/lensapp/lens. diff --git a/package.json b/package.json index 7bed8806cc..7f2bc1a292 100644 --- a/package.json +++ b/package.json @@ -11,12 +11,10 @@ "email": "info@lakendlabs.com" }, "scripts": { - "dev": "concurrently -k 'yarn dev:main --watch' 'yarn dev:renderer --watch'", + "dev": "concurrently -k 'yarn dev-run' 'yarn dev:main' 'yarn dev:renderer:react' 'yarn dev:renderer:vue'", "dev-run": "electron --inspect .", - "dev-run-renderer": "concurrently -k 'yarn dev:renderer --watch' 'electron --inspect .'", - "dev-test": "yarn test --watch", - "dev:main": "DEBUG=true yarn compile:main $@", - "dev:renderer": "DEBUG=true yarn compile:renderer $@", + "dev:main": "DEBUG=true yarn compile:main --watch $@", + "dev:renderer": "DEBUG=true yarn compile:renderer --watch $@", "dev:renderer:react": "yarn dev:renderer --config-name react $@", "dev:renderer:vue": "yarn dev:renderer --config-name vue $@", "compile": "yarn download-bins && concurrently 'yarn i18n:compile' 'yarn compile:main -p' 'yarn compile:renderer -p'", diff --git a/tsconfig.json b/tsconfig.json index 783d32fda4..c3f018fb86 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "baseUrl": ".", - "outDir": "./dist", + "outDir": "./out", "jsx": "react", "target": "ES2017", "module": "ESNext",