diff --git a/.github/workflows/daily-alpha.yml b/.github/workflows/daily-alpha.yml index 9eee0d6dd0..6b5fbf38e8 100644 --- a/.github/workflows/daily-alpha.yml +++ b/.github/workflows/daily-alpha.yml @@ -23,13 +23,13 @@ jobs: run: | npm install sudo apt-get install -y ripgrep - cd packages/bump-version-for-cron && npm run build env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Bump version id: version run: | - node packages/bump-version-for-cron/dist/index.js --path packages/core/package.json + npm run --workspace @k8slens/bump-version-for-cron build + npm run --workspace @k8slens/bump-version-for-cron bump -- --path packages/core/package.json - name: Check if branch already exists id: check-branch run: git ls-remote --exit-code --tags origin v${{ steps.version.outputs.VERSION }} @@ -77,7 +77,7 @@ jobs: - uses: actions/checkout@v3 with: ref: v${{ needs.create_release.outputs.version }} - - name: Use Node.js ${{ env.NODE_VERSION }} + - name: Use Node.js 16.x uses: actions/setup-node@v3 with: node-version: "16.x" diff --git a/package-lock.json b/package-lock.json index 15f068cbb6..23e118c815 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30335,16 +30335,6 @@ "queue-microtask": "^1.2.2" } }, - "node_modules/run-script-os": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz", - "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==", - "dev": true, - "bin": { - "run-os": "index.js", - "run-script-os": "index.js" - } - }, "node_modules/rxjs": { "version": "7.8.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", @@ -34801,16 +34791,12 @@ "arg": "^5.0.2", "semver": "^7.3.8" }, - "bin": { - "bump-version-for-cron": "dist/index.js" - }, "devDependencies": { "@swc/cli": "^0.1.62", "@swc/core": "^1.3.44", "@types/node": "^16.18.11", "@types/semver": "^7.3.13", - "rimraf": "^4.4.1", - "run-script-os": "^1.1.6" + "rimraf": "^4.4.1" } }, "packages/bump-version-for-cron/node_modules/@types/node": { @@ -35114,9 +35100,6 @@ "tar-stream": "^3.0.0", "zod": "^3.20.6" }, - "bin": { - "ensure-binaries": "dist/index.js" - }, "devDependencies": { "@swc/cli": "^0.1.62", "@swc/core": "^1.3.44", @@ -35125,8 +35108,7 @@ "@types/node": "^16.18.11", "@types/semver": "^7.3.13", "@types/tar-stream": "^2.2.2", - "rimraf": "^4.4.1", - "run-script-os": "^1.1.6" + "rimraf": "^4.4.1" } }, "packages/ensure-binaries/node_modules/@types/node": { @@ -35432,17 +35414,13 @@ "rimraf": "^4.4.1", "sharp": "^0.31.3" }, - "bin": { - "generate-tray-icons": "dist/index.js" - }, "devDependencies": { "@swc/cli": "^0.1.62", "@swc/core": "^1.3.44", "@types/jsdom": "^20.0.1", "@types/node": "^18.11.18", "@types/sharp": "^0.31.1", - "rimraf": "^4.4.1", - "run-script-os": "^1.1.6" + "rimraf": "^4.4.1" } }, "packages/generate-tray-icons/node_modules/color": { @@ -35995,7 +35973,6 @@ "react-refresh-typescript": "^2.0.7", "react-select": "^5.7.0", "rimraf": "^4.4.1", - "run-script-os": "^1.1.6", "style-loader": "^3.3.1", "tailwindcss": "^3.3.1", "ts-loader": "^9.4.2", @@ -36110,17 +36087,13 @@ "inquirer": "^9.1.4", "semver": "^7.3.8" }, - "bin": { - "create-release-pr": "dist/index.js" - }, "devDependencies": { "@swc/cli": "^0.1.62", "@swc/core": "^1.3.44", "@types/inquirer": "^9.0.3", "@types/node": "^16.18.11", "@types/semver": "^7.3.13", - "rimraf": "^4.4.1", - "run-script-os": "^1.1.6" + "rimraf": "^4.4.1" } }, "packages/release-tool/node_modules/@types/node": { diff --git a/package.json b/package.json index 2f9a957217..626ae24cb7 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "test:unit:watch": "jest --watch", "test:integration": "lerna run --stream test:integration --no-bail", "bump-version": "lerna version --no-git-tag-version --no-push", - "precreate-release-pr": "cd packages/release-tool && npm run build", - "create-release-pr": "node packages/release-tool/dist/index.js" + "precreate-release-pr": "npm run --workspace @k8slens/release-tool build", + "create-release-pr": "npm run --workspace @k8slens/release-tool create" }, "overrides": { "underscore": "^1.12.1", diff --git a/packages/bump-version-for-cron/package.json b/packages/bump-version-for-cron/package.json index 05def58859..3cd2aae137 100644 --- a/packages/bump-version-for-cron/package.json +++ b/packages/bump-version-for-cron/package.json @@ -6,12 +6,9 @@ "scripts": { "clean": "rimraf dist/", "build": "swc ./src/index.ts -d ./dist", - "postbuild": "run-script-os", - "postbuild:windows": "", - "postbuild:nix": "chmod u+x ./dist/index.js" + "bump": "./dist/index.js" }, "type": "module", - "bin": "./dist/index.js", "files": [ "dist" ], @@ -29,7 +26,6 @@ "@swc/core": "^1.3.44", "@types/node": "^16.18.11", "@types/semver": "^7.3.13", - "rimraf": "^4.4.1", - "run-script-os": "^1.1.6" + "rimraf": "^4.4.1" } } diff --git a/packages/ensure-binaries/package.json b/packages/ensure-binaries/package.json index 1cf5828442..1911641b91 100644 --- a/packages/ensure-binaries/package.json +++ b/packages/ensure-binaries/package.json @@ -7,12 +7,7 @@ "scripts": { "clean": "rimraf dist/", "build": "swc ./src/index.ts -d ./dist/", - "postbuild": "run-script-os", - "postbuild:windows": "", - "postbuild:nix": "chmod u+x ./dist/index.js" - }, - "bin": { - "ensure-binaries": "./dist/index.js" + "ensure": "./dist/index.js" }, "type": "module", "files": [ @@ -39,7 +34,6 @@ "@types/node": "^16.18.11", "@types/semver": "^7.3.13", "@types/tar-stream": "^2.2.2", - "rimraf": "^4.4.1", - "run-script-os": "^1.1.6" + "rimraf": "^4.4.1" } } diff --git a/packages/generate-tray-icons/package.json b/packages/generate-tray-icons/package.json index 8161c37661..125f061c06 100644 --- a/packages/generate-tray-icons/package.json +++ b/packages/generate-tray-icons/package.json @@ -6,12 +6,7 @@ "scripts": { "clean": "rimraf dist/", "build": "swc ./src/index.ts -d ./dist/", - "postbuild": "run-script-os", - "postbuild:windows": "", - "postbuild:nix": "chmod u+x ./dist/index.js" - }, - "bin": { - "generate-tray-icons": "./dist/index.js" + "generate": "./dist/index.js" }, "files": [ "dist" @@ -28,8 +23,7 @@ "@types/jsdom": "^20.0.1", "@types/node": "^18.11.18", "@types/sharp": "^0.31.1", - "rimraf": "^4.4.1", - "run-script-os": "^1.1.6" + "rimraf": "^4.4.1" }, "dependencies": { "arg": "^5.0.2", diff --git a/packages/open-lens/package.json b/packages/open-lens/package.json index cf65676edf..7d22b70d21 100644 --- a/packages/open-lens/package.json +++ b/packages/open-lens/package.json @@ -33,8 +33,8 @@ "dev:main": "cross-env NODE_ENV=development webpack --config webpack/main.ts --progress --watch", "dev:renderer": "cross-env NODE_ENV=development ts-node ./webpack/dev-server.ts", "test:integration": "jest -xyz --runInBand --modulePaths=[\"/integration/\"];", - "build:tray-icons": "generate-tray-icons --output ./static/build/tray --input ../../node_modules/@k8slens/core/src/renderer/components/icon/logo-lens.svg --notice-icon ../../node_modules/@k8slens/core/src/renderer/components/icon/notice.svg --spinner-icon ../../node_modules/@k8slens/core/src/renderer/components/icon/arrow-spinner.svg", - "download:binaries": "ensure-binaries --package ./package.json --base-dir ./binaries/client", + "build:tray-icons": "npm run --workspace @k8slens/generate-tray-icons generate -- --output ./static/build/tray --input ../../node_modules/@k8slens/core/src/renderer/components/icon/logo-lens.svg --notice-icon ../../node_modules/@k8slens/core/src/renderer/components/icon/notice.svg --spinner-icon ../../node_modules/@k8slens/core/src/renderer/components/icon/arrow-spinner.svg", + "download:binaries": "npm run --workspace @k8slens/ensure-binaries ensure -- --package ./package.json --base-dir ./binaries/client", "postinstall": "electron-rebuild" }, "config": { @@ -262,7 +262,6 @@ "react-refresh-typescript": "^2.0.7", "react-select": "^5.7.0", "rimraf": "^4.4.1", - "run-script-os": "^1.1.6", "style-loader": "^3.3.1", "tailwindcss": "^3.3.1", "ts-loader": "^9.4.2", diff --git a/packages/release-tool/package.json b/packages/release-tool/package.json index 4ed5c2b185..c2be8c8928 100644 --- a/packages/release-tool/package.json +++ b/packages/release-tool/package.json @@ -8,12 +8,7 @@ "scripts": { "clean": "rimraf dist/", "build": "swc ./src/index.ts -d ./dist", - "postbuild": "run-script-os", - "postbuild:windows": "", - "postbuild:nix": "chmod u+x ./dist/index.js" - }, - "bin": { - "create-release-pr": "./dist/index.js" + "create": "./dist/index.js" }, "type": "module", "devDependencies": { @@ -22,8 +17,7 @@ "@types/inquirer": "^9.0.3", "@types/node": "^16.18.11", "@types/semver": "^7.3.13", - "rimraf": "^4.4.1", - "run-script-os": "^1.1.6" + "rimraf": "^4.4.1" }, "dependencies": { "chalk": "^5.2.0", diff --git a/packages/technical-features/messaging/electron/main/package.json b/packages/technical-features/messaging/electron/main/package.json index d11e1aeef3..a9a28f403e 100644 --- a/packages/technical-features/messaging/electron/main/package.json +++ b/packages/technical-features/messaging/electron/main/package.json @@ -34,9 +34,9 @@ "@k8slens/application": "^6.5.0-alpha.0", "@k8slens/feature-core": "^6.5.0-alpha.0", "@k8slens/messaging": "^1.0.0-alpha.1", + "@ogre-tools/fp": "^15.1.2", "@ogre-tools/injectable": "^15.3.1", "@ogre-tools/injectable-extension-for-auto-registration": "^15.3.0", - "@ogre-tools/fp": "^15.1.2", "electron": "^22.3.3", "lodash": "^4.17.21" },