From 960590d041f9f2cc994531fd0f54dd35d6d2722b Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Tue, 23 Jun 2020 09:10:26 +0300 Subject: [PATCH] build fixes Signed-off-by: Jari Kolehmainen --- .gitignore | 1 + Makefile | 13 +++++++++++-- package.json | 17 +++++++++-------- src/common/vars.ts | 2 +- yarn.lock | 9 +-------- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index e5c9f4a9b3..2381ff83b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ dist/ +out/ node_modules/ .DS_Store yarn-error.log diff --git a/Makefile b/Makefile index 995bf2b00c..3913c55667 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,15 @@ download-bins: install-deps: yarn install --frozen-lockfile -dev: install-deps - yarn dev +out/app_vue.js: + yarn dev:renderer:vue + +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 test: yarn test @@ -38,4 +45,6 @@ else endif clean: + rm -rf binaries/client/* rm -rf dist/* + rm -rf out/* diff --git a/package.json b/package.json index a44ceab00b..5084ba9062 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Lens", "description": "Lens - The Kubernetes IDE", "version": "3.5.0-beta.1", - "main": "dist/main.js", + "main": "out/main.js", "copyright": "© 2020, Lakend Labs, Inc.", "license": "MIT", "author": { @@ -11,13 +11,14 @@ "email": "info@lakendlabs.com" }, "scripts": { - "dev": "concurrently 'yarn dev:main' 'yarn dev:renderer'", - "dev-run": "electron --inspect .", + "dev": "concurrently -k 'yarn dev:main --watch' 'yarn dev:renderer --watch'", + "dev-run": "concurrently -k 'yarn dev --watch' '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 --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", + "dev:main": "DEBUG=true yarn compile:main $@", + "dev:renderer": "DEBUG=true yarn compile:renderer $@", + "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'", "compile:main": "webpack --progress --config webpack.main.ts $@", "compile:renderer": "webpack --progress --config webpack.renderer.ts $@", @@ -167,7 +168,6 @@ "@types/proper-lockfile": "^4.1.1", "@types/tar": "^4.0.3", "crypto-js": "^4.0.0", - "electron": "^6.1.12", "electron-promise-ipc": "^2.1.0", "electron-store": "^5.2.0", "electron-updater": "^4.3.1", @@ -257,6 +257,7 @@ "css-element-queries": "^1.2.3", "css-loader": "^3.5.3", "dompurify": "^2.0.11", + "electron": "^6.1.12", "electron-builder": "^22.7.0", "electron-notarize": "^0.3.0", "file-loader": "^6.0.0", diff --git a/src/common/vars.ts b/src/common/vars.ts index 5a47e115b3..353fed396c 100644 --- a/src/common/vars.ts +++ b/src/common/vars.ts @@ -16,7 +16,7 @@ export const buildVersion = process.env.BUILD_VERSION; // Paths export const contextDir = process.cwd(); export const staticDir = path.join(contextDir, "static"); -export const outDir = path.join(contextDir, "dist"); +export const outDir = path.join(contextDir, "out"); export const mainDir = path.join(contextDir, "src/main"); export const rendererDir = path.join(contextDir, "src/renderer"); export const htmlTemplate = path.resolve(rendererDir, "template.html"); diff --git a/yarn.lock b/yarn.lock index 0fa09652da..1622fb37d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3535,7 +3535,7 @@ chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chokidar@^3.0.2, chokidar@^3.4.0: +chokidar@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8" integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ== @@ -4672,13 +4672,6 @@ electron-publish@22.7.0: lazy-val "^1.0.4" mime "^2.4.5" -electron-reload@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/electron-reload/-/electron-reload-1.5.0.tgz#179ab1f6941fcf0ed261c37b16dc465e201348f5" - integrity sha512-L9X6LzsL3Bt2j0eJ4/MBrI9Vt902KvVUtBB7J4qrL1A9sXqC2fE0lpvUAlOThpJYh6zWO1l86U/YiEN9bDURHw== - dependencies: - chokidar "^3.0.2" - electron-store@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-5.2.0.tgz#a15718fc1fa21acfd07af55f9b94f9fa6a536665"