hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

build fixes

Browse Source 
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2020-06-23 09:10:26 +03:00
parent 4d6bb47bcd
commit 960590d041
5 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
dist/ dist/
out/
node_modules/ node_modules/
.DS_Store .DS_Store
yarn-error.log yarn-error.log

13
Makefile
View File

@ -12,8 +12,15 @@ download-bins:
install-deps: install-deps:
yarn install --frozen-lockfile yarn install --frozen-lockfile
dev: install-deps out/app_vue.js:
yarn dev 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: test:
yarn test yarn test
@ -38,4 +45,6 @@ else
endif endif
clean: clean:
rm -rf binaries/client/*
rm -rf dist/* rm -rf dist/*
rm -rf out/*

17
package.json
View File

@ -3,7 +3,7 @@
"productName": "Lens", "productName": "Lens",
"description": "Lens - The Kubernetes IDE", "description": "Lens - The Kubernetes IDE",
"version": "3.5.0-beta.1", "version": "3.5.0-beta.1",
"main": "dist/main.js", "main": "out/main.js",
"copyright": "© 2020, Lakend Labs, Inc.", "copyright": "© 2020, Lakend Labs, Inc.",
"license": "MIT", "license": "MIT",
"author": { "author": {
@ -11,13 +11,14 @@
"email": "info@lakendlabs.com" "email": "info@lakendlabs.com"
}, },
"scripts": { "scripts": {
"dev": "concurrently 'yarn dev:main' 'yarn dev:renderer'", "dev": "concurrently -k 'yarn dev:main --watch' 'yarn dev:renderer --watch'",
"dev-run": "electron --inspect .", "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-test": "yarn test --watch",
"dev:main": "DEBUG=true yarn compile:main --watch $@", "dev:main": "DEBUG=true yarn compile:main $@",
"dev:renderer": "DEBUG=true yarn compile:renderer --watch $@", "dev:renderer": "DEBUG=true yarn compile:renderer $@",
"dev:renderer:react": "yarn dev:renderer --config-name react", "dev:renderer:react": "yarn dev:renderer --config-name react $@",
"dev:renderer:vue": "yarn dev:renderer --config-name vue", "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": "yarn download-bins && concurrently 'yarn i18n:compile' 'yarn compile:main -p' 'yarn compile:renderer -p'",
"compile:main": "webpack --progress --config webpack.main.ts $@", "compile:main": "webpack --progress --config webpack.main.ts $@",
"compile:renderer": "webpack --progress --config webpack.renderer.ts $@", "compile:renderer": "webpack --progress --config webpack.renderer.ts $@",
@ -167,7 +168,6 @@
"@types/proper-lockfile": "^4.1.1", "@types/proper-lockfile": "^4.1.1",
"@types/tar": "^4.0.3", "@types/tar": "^4.0.3",
"crypto-js": "^4.0.0", "crypto-js": "^4.0.0",
"electron": "^6.1.12",
"electron-promise-ipc": "^2.1.0", "electron-promise-ipc": "^2.1.0",
"electron-store": "^5.2.0", "electron-store": "^5.2.0",
"electron-updater": "^4.3.1", "electron-updater": "^4.3.1",
@ -257,6 +257,7 @@
"css-element-queries": "^1.2.3", "css-element-queries": "^1.2.3",
"css-loader": "^3.5.3", "css-loader": "^3.5.3",
"dompurify": "^2.0.11", "dompurify": "^2.0.11",
"electron": "^6.1.12",
"electron-builder": "^22.7.0", "electron-builder": "^22.7.0",
"electron-notarize": "^0.3.0", "electron-notarize": "^0.3.0",
"file-loader": "^6.0.0", "file-loader": "^6.0.0",

2
src/common/vars.ts
View File

@ -16,7 +16,7 @@ export const buildVersion = process.env.BUILD_VERSION;
// Paths // Paths
export const contextDir = process.cwd(); export const contextDir = process.cwd();
export const staticDir = path.join(contextDir, "static"); 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 mainDir = path.join(contextDir, "src/main");
export const rendererDir = path.join(contextDir, "src/renderer"); export const rendererDir = path.join(contextDir, "src/renderer");
export const htmlTemplate = path.resolve(rendererDir, "template.html"); export const htmlTemplate = path.resolve(rendererDir, "template.html");

9
yarn.lock
View File

@ -3535,7 +3535,7 @@ chokidar@^2.1.8:
optionalDependencies: optionalDependencies:
fsevents "^1.2.7" fsevents "^1.2.7"
chokidar@^3.0.2, chokidar@^3.4.0: chokidar@^3.4.0:
version "3.4.0" version "3.4.0"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ== integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
@ -4672,13 +4672,6 @@ electron-publish@22.7.0:
lazy-val "^1.0.4" lazy-val "^1.0.4"
mime "^2.4.5" 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: electron-store@^5.2.0:
version "5.2.0" version "5.2.0"
resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-5.2.0.tgz#a15718fc1fa21acfd07af55f9b94f9fa6a536665" resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-5.2.0.tgz#a15718fc1fa21acfd07af55f9b94f9fa6a536665"