diff --git a/.nxignore b/.nxignore index 885f2fc229..e05139bcf1 100644 --- a/.nxignore +++ b/.nxignore @@ -1,3 +1,7 @@ +open-lens/dist +open-lens/static/build +open-lens/static/webpack +open-lens/binaries packages/**/dist packages/**/static/build packages/**/build/webpack diff --git a/nx.json b/nx.json index 761328ca0a..3950ff391f 100644 --- a/nx.json +++ b/nx.json @@ -15,24 +15,29 @@ "^build" ] }, + "build:app": { + "dependsOn": [ + "^build" + ] + }, + "test:integration": { + "dependsOn": [ + "^build" + ] + }, "build:docs": { "dependsOn": [ "^build" ] }, - "dev": { - "dependsOn": [ - "prepare:dev" - ] - }, "lint": { "dependsOn": [ - "^prepare:test" + "^build" ] }, "test:unit": { "dependsOn": [ - "^prepare:test" + "^build" ] } } diff --git a/open-lens/package.json b/open-lens/package.json index b00f95824d..7d013644ce 100644 --- a/open-lens/package.json +++ b/open-lens/package.json @@ -19,15 +19,12 @@ "author": "OpenLens Authors ", "scripts": { "clean": "rimraf binaries/ dist/ static/build", - "build": "npm run compile", + "build": "cross-env NODE_ENV=production webpack --config webpack/webpack.ts --progress", "postbuild": "npm run build:tray-icons && npm run download:binaries", "build:app": "electron-builder --publish onTag", "prebuild:app": "run-script-os", "prebuild:app:default": "exit 0", "prebuild:app:win32": "rimraf node_modules/win-ca/pem", - "build:dir": "npm run compile && electron-builder --dir", - "compile": "cross-env NODE_ENV=production webpack --config webpack/webpack.ts --progress", - "postcompile": "npm run build:tray-icons && npm run download:binaries", "start": "concurrently -i -k \"npm run dev-run -C\" npm:dev:*", "dev-run": "nodemon --watch ./static/build/main.js --exec \"electron --remote-debugging-port=9223 --inspect .\"", "dev:main": "cross-env NODE_ENV=development webpack --config webpack/main.ts --progress --watch", diff --git a/package.json b/package.json index 48f8c96b30..1532110699 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "clean": "lerna run clean --stream", "clean:node_modules": "lerna clean -y && rimraf node_modules", "dev": "cross-env NODE_ENV=development lerna run build --stream --skip-nx-cache", - "postdev": "lerna watch -- lerna run build --stream --scope \\$LERNA_PACKAGE_NAME", - "prestart-dev": "cd ./open-lens && rimraf static/build/ && npm run build:tray-icons && npm run download:binaries", + "postdev": "lerna watch -- lerna run build --stream --include-dependents --scope \\$LERNA_PACKAGE_NAME", + "prestart-dev": "cd ./open-lens && npm run build:tray-icons && npm run download:binaries", "start-dev": "lerna run start", "lint": "lerna run lint --stream --no-bail", "lint:fix": "lerna run lint:fix --stream", diff --git a/packages/core/package.json b/packages/core/package.json index 58218169ce..dafbf4bda0 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -102,18 +102,6 @@ ], "runtime": "@side/jest-runtime" }, - "nx": { - "targets": { - "build": { - "dependsOn": [ - "^build" - ], - "outputs": [ - "{workspaceRoot}/static/build/" - ] - } - } - }, "dependencies": { "@astronautlabs/jsonpath": "^1.1.0", "@hapi/call": "^9.0.1",