From 84beed39ddc65871e1bcb8e9cad3cdfe6af43975 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Fri, 13 Jan 2023 13:46:34 +0200 Subject: [PATCH] yarn run dev Signed-off-by: Jari Kolehmainen --- nx.json | 15 +++--- package.json | 1 + packages/core/package.json | 1 + packages/extension-api/package.json | 3 +- .../open-lens/build/generate-tray-icons.ts | 6 +-- packages/open-lens/package.json | 17 ++++++- packages/open-lens/yarn.lock | 50 +++++++++++++++++++ 7 files changed, 82 insertions(+), 11 deletions(-) diff --git a/nx.json b/nx.json index be0d20bc85..5ce1d2de8a 100644 --- a/nx.json +++ b/nx.json @@ -4,7 +4,8 @@ "runner": "nx/tasks-runners/default", "options": { "cacheableOperations": [ - "build" + "build", + "prepare:dev" ] } } @@ -13,19 +14,21 @@ "build": { "dependsOn": [ "^build" - ], - "outputs": [ - "{workspaceRoot}/dist" ] }, "build:app": { "dependsOn": [ - "build" + "^build" + ] + }, + "dev": { + "dependsOn": [ + "prepare:dev" ] }, "test:integration": { "dependsOn": [ - "build:app" + "^build:app" ] } } diff --git a/package.json b/package.json index 07059afd4b..113b8e2ab7 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "build:docs": "lerna run --stream build:docs", "clean": "lerna run clean --stream", "clean:node_modules": "lerna clean -y && rm -rf node_modules", + "dev": "lerna run dev --stream", "lint": "lerna run lint --stream", "mkdocs:serve-local": "docker build -t mkdocs-serve-local:latest mkdocs/ && docker run --rm -it -p 8000:8000 -v ${PWD}:/docs mkdocs-serve-local:latest", "mkdocs:verify": "docker build -t mkdocs-serve-local:latest mkdocs/ && docker run --rm -v ${PWD}:/docs mkdocs-serve-local:latest build --strict", diff --git a/packages/core/package.json b/packages/core/package.json index 724efdaa45..2776674153 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -49,6 +49,7 @@ "build": "env NODE_ENV=production yarn run webpack --config webpack/library-bundle.ts", "clean": "rm -rf dist webpack/build/ static/build", "compile:node-fetch": "yarn run webpack --config webpack/node-fetch.ts", + "prepare:dev": "env NODE_ENV=development yarn run webpack --config webpack/library-bundle.ts --progress", "dev": "env NODE_ENV=development yarn run webpack --config webpack/library-bundle.ts --watch", "prepare": "yarn run compile:node-fetch", "test:unit": "func() { jest ${1} --testPathIgnorePatterns integration; }; func", diff --git a/packages/extension-api/package.json b/packages/extension-api/package.json index 82145fc8af..cf0c2b9001 100644 --- a/packages/extension-api/package.json +++ b/packages/extension-api/package.json @@ -18,7 +18,8 @@ "scripts": { "build": "yarn run webpack --config webpack/extensions.ts", "build-docs": "yarn run typedoc", - "clean": "rm -rf dist/" + "clean": "rm -rf dist/", + "prepare:dev": "yarn run build" }, "dependencies": { "@k8slens/open-lens": "^6.4.0-alpha.2" diff --git a/packages/open-lens/build/generate-tray-icons.ts b/packages/open-lens/build/generate-tray-icons.ts index 3e363ad13d..ab1ca3d93e 100644 --- a/packages/open-lens/build/generate-tray-icons.ts +++ b/packages/open-lens/build/generate-tray-icons.ts @@ -10,9 +10,9 @@ import sharp from "sharp"; const size = Number(process.env.OUTPUT_SIZE || "16"); const outputFolder = process.env.OUTPUT_DIR || "./static/build/tray"; -const inputFile = process.env.INPUT_SVG_PATH || path.resolve(__dirname, "../src/renderer/components/icon/logo-lens.svg"); -const noticeFile = process.env.NOTICE_SVG_PATH || path.resolve(__dirname, "../src/renderer/components/icon/notice.svg"); -const spinnerFile = process.env.SPINNER_SVG_PATH || path.resolve(__dirname, "../src/renderer/components/icon/arrow-spinner.svg"); +const inputFile = process.env.INPUT_SVG_PATH || path.resolve(__dirname, "../../core/src/renderer/components/icon/logo-lens.svg"); +const noticeFile = process.env.NOTICE_SVG_PATH || path.resolve(__dirname, "../../core/src/renderer/components/icon/notice.svg"); +const spinnerFile = process.env.SPINNER_SVG_PATH || path.resolve(__dirname, "../../core/src/renderer/components/icon/arrow-spinner.svg"); async function ensureOutputFoler() { await ensureDir(outputFolder); diff --git a/packages/open-lens/package.json b/packages/open-lens/package.json index 8381cc350b..3d4a04105c 100644 --- a/packages/open-lens/package.json +++ b/packages/open-lens/package.json @@ -67,6 +67,16 @@ "{workspaceRoot}/binaries/", "{workspaceRoot}/static/build/" ] + }, + "dev": { + "dependsOn": [ + "^prepare:dev" + ], + "outputs": [ + "{workspaceRoot}/dist/", + "{workspaceRoot}/binaries/", + "{workspaceRoot}/static/build/" + ] } } }, @@ -118,7 +128,7 @@ "hardenedRuntime": true, "gatekeeperAssess": false, "entitlements": "build/entitlements.mac.plist", - "entitlementsInherit": "core/build/entitlements.mac.plist", + "entitlementsInherit": "build/entitlements.mac.plist", "extraResources": [ { "from": "binaries/client/darwin/${arch}/kubectl", @@ -183,10 +193,13 @@ "@swc/jest": "^0.2.24", "@types/byline": "^4.2.33", "@types/chart.js": "^2.9.36", + "@types/cli-progress": "^3.11.0", "@types/color": "^3.0.3", "@types/crypto-js": "^3.1.47", + "@types/gunzip-maybe": "^1.4.0", "@types/lodash": "^4.14.191", "@types/node": "^16.18.6", + "@types/node-fetch": "^2.6.2", "@types/proper-lockfile": "^4.1.2", "@types/react-dom": "^17.0.16", "@types/react-router-dom": "^5.3.3", @@ -194,6 +207,7 @@ "@types/react-window": "^1.8.5", "@types/request-promise-native": "^1.0.18", "@types/tar": "^6.1.3", + "@types/tar-stream": "^2.2.2", "@types/tcp-port-used": "^1.0.1", "@types/url-parse": "^1.4.8", "@types/uuid": "^8.3.4", @@ -201,6 +215,7 @@ "@types/webpack-dev-server": "^4.7.2", "@types/webpack-env": "^1.18.0", "@types/webpack-node-externals": "2.5.3", + "abort-controller": "^3.0.0", "autoprefixer": "^10.4.13", "circular-dependency-plugin": "^5.2.2", "cli-progress": "^3.11.2", diff --git a/packages/open-lens/yarn.lock b/packages/open-lens/yarn.lock index ead85674e3..3a9c7ea843 100644 --- a/packages/open-lens/yarn.lock +++ b/packages/open-lens/yarn.lock @@ -1038,6 +1038,13 @@ dependencies: moment "^2.10.2" +"@types/cli-progress@^3.11.0": + version "3.11.0" + resolved "https://registry.yarnpkg.com/@types/cli-progress/-/cli-progress-3.11.0.tgz#ec79df99b26757c3d1c7170af8422e0fc95eef7e" + integrity sha512-XhXhBv1R/q2ahF3BM7qT5HLzJNlIL0wbcGyZVjqOTqAybAnsLisd7gy1UCyIqpL+5Iv6XhlSyzjLCnI2sIdbCg== + dependencies: + "@types/node" "*" + "@types/color-convert@*": version "2.0.0" resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.0.tgz#8f5ee6b9e863dcbee5703f5a517ffb13d3ea4e22" @@ -1151,6 +1158,13 @@ dependencies: "@types/node" "*" +"@types/gunzip-maybe@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@types/gunzip-maybe/-/gunzip-maybe-1.4.0.tgz#9410fd15ff68eca8907b7b9198e63e2a7c14d511" + integrity sha512-dFP9GrYAR9KhsjTkWJ8q8Gsfql75YIKcg9DuQOj/IrlPzR7W+1zX+cclw1McV82UXAQ+Lpufvgk3e9bC8+HzgA== + dependencies: + "@types/node" "*" + "@types/history@^4.7.11": version "4.7.11" resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64" @@ -1221,6 +1235,14 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== +"@types/node-fetch@^2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da" + integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A== + dependencies: + "@types/node" "*" + form-data "^3.0.0" + "@types/node@*": version "18.11.18" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" @@ -1398,6 +1420,13 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== +"@types/tar-stream@^2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@types/tar-stream/-/tar-stream-2.2.2.tgz#be9d0be9404166e4b114151f93e8442e6ab6fb1d" + integrity sha512-1AX+Yt3icFuU6kxwmPakaiGrJUwG44MpuiqPg4dSolRFk6jmvs4b3IbUol9wKDLIgU76gevn3EwE8y/DkSJCZQ== + dependencies: + "@types/node" "*" + "@types/tar@^6.1.3": version "6.1.3" resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.3.tgz#46a2ce7617950c4852dfd7e9cd41aa8161b9d750" @@ -1644,6 +1673,13 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== +abort-controller@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" @@ -3385,6 +3421,11 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== +event-target-shim@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== + eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -3627,6 +3668,15 @@ form-data@^2.5.0: combined-stream "^1.0.6" mime-types "^2.1.12" +form-data@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" + integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"