diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 43cad88f6a..1180655a0a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,7 +55,6 @@ jobs: - run: yarn run test:unit name: Run tests - shell: bash if: ${{ matrix.type == 'unit' }} - name: Install integration test dependencies @@ -76,5 +75,4 @@ jobs: - run: yarn run test:integration name: Run Windows integration tests - shell: bash if: ${{ runner.os == 'Windows' && matrix.type == 'smoke' }} diff --git a/package.json b/package.json index 82a52a0dc2..32c5d341ae 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,8 @@ }, "devDependencies": { "adr": "^1.4.3", - "lerna": "^6.4.1" + "cross-env": "^7.0.3", + "lerna": "^6.4.1", + "rimraf": "^4.1.2" } } diff --git a/packages/core/package.json b/packages/core/package.json index 23936f27a7..60531c1432 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -50,10 +50,10 @@ "license": "MIT", "author": "OpenLens Authors ", "scripts": { - "build": "env NODE_ENV=production yarn run webpack --config webpack/library-bundle.ts", - "clean": "rm -rf dist static/build", - "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", + "build": "cross-env NODE_ENV=production yarn run webpack --config webpack/library-bundle.ts", + "clean": "rimraf dist static/build", + "prepare:dev": "cross-env NODE_ENV=development yarn run webpack --config webpack/library-bundle.ts --progress", + "dev": "cross-env NODE_ENV=development yarn run webpack --config webpack/library-bundle.ts --watch", "test:unit": "jest --testPathIgnorePatterns integration", "test:watch": "func() { jest ${1} --watch --testPathIgnorePatterns integration; }; func", "lint": "PROD=true yarn run eslint --ext js,ts,tsx --max-warnings=0 .", diff --git a/packages/ensure-binaries/package.json b/packages/ensure-binaries/package.json index c7e209c4ce..181a69e12b 100644 --- a/packages/ensure-binaries/package.json +++ b/packages/ensure-binaries/package.json @@ -5,7 +5,7 @@ "main": "dist/index.mjs", "license": "MIT", "scripts": { - "clean": "rm -rf dist/", + "clean": "rimraf dist/", "build": "swc ./src/index.ts -o ./dist/index.mjs", "prepare:dev": "npm run build" }, diff --git a/packages/extension-api/package.json b/packages/extension-api/package.json index 58b39dd9a2..540f072875 100644 --- a/packages/extension-api/package.json +++ b/packages/extension-api/package.json @@ -22,7 +22,7 @@ "scripts": { "build": "yarn run webpack --config webpack/extensions.ts", "build:docs": "yarn run typedoc", - "clean": "rm -rf dist/", + "clean": "rimraf dist/", "prepare:dev": "yarn run build" }, "dependencies": { diff --git a/packages/node-fetch/package.json b/packages/node-fetch/package.json index 7a9e3ebc00..6aad104369 100644 --- a/packages/node-fetch/package.json +++ b/packages/node-fetch/package.json @@ -14,7 +14,7 @@ "dist" ], "scripts": { - "clean": "rm -rf dist/", + "clean": "rimraf dist/", "build": "webpack --config webpack.ts", "lint": "exit 0", "prepare": "npm run build", diff --git a/packages/open-lens/package.json b/packages/open-lens/package.json index 140d0dd67a..e6f97f90a5 100644 --- a/packages/open-lens/package.json +++ b/packages/open-lens/package.json @@ -18,21 +18,21 @@ "license": "MIT", "author": "OpenLens Authors ", "scripts": { - "clean": "rm -rf binaries/ dist/ static/build", + "clean": "rimraf binaries/ dist/ static/build", "build": "npm run compile", "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": "rm -rf node_modules/win-ca/pem", + "prebuild:app:win32": "rimraf node_modules/win-ca/pem", "build:dir": "npm run compile && electron-builder --dir", - "compile": "env NODE_ENV=production webpack --config webpack/webpack.ts --progress", + "compile": "cross-env NODE_ENV=production webpack --config webpack/webpack.ts --progress", "postcompile": "npm run build:tray-icons && npm run download:binaries", - "predev": "rm -rf static/build/ && npm run build:tray-icons && npm run download:binaries", + "predev": "rimraf static/build/ && npm run build:tray-icons && npm run download:binaries", "dev": "concurrently -i -k \"yarn run dev-run -C\" yarn:dev:*", "dev-run": "nodemon --watch ./static/build/main.js --exec \"electron --remote-debugging-port=9223 --inspect .\"", - "dev:main": "env NODE_ENV=development webpack --config webpack/main.ts --progress --watch", - "dev:renderer": "env NODE_ENV=development ts-node ./webpack/dev-server.ts", + "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 --detectOpenHandles --forceExit --modulePaths=[\"/integration/\"];", "build:tray-icons": "ts-node build/generate-tray-icons.ts", "download:binaries": "npm exec -- @k8slens/ensure-binaries --package $INIT_CWD/package.json --base-dir $INIT_CWD/binaries/client" diff --git a/packages/release-tool/package.json b/packages/release-tool/package.json index 44c2a6e38b..111119632a 100644 --- a/packages/release-tool/package.json +++ b/packages/release-tool/package.json @@ -6,7 +6,7 @@ "license": "MIT", "private": true, "scripts": { - "clean": "rm -rf dist/", + "clean": "rimraf dist/", "build": "swc ./src/index.ts -o ./dist/index.mjs", "create-release-pr": "node ./dist/index.mjs" }, diff --git a/packages/semver/package.json b/packages/semver/package.json index b9caa31469..e7070eb4dc 100644 --- a/packages/semver/package.json +++ b/packages/semver/package.json @@ -6,7 +6,7 @@ "license": "MIT", "private": true, "scripts": { - "clean": "rm -rf dist/", + "clean": "rimraf dist/", "build": "swc ./src/index.ts -o ./dist/index.mjs" }, "dependencies": { diff --git a/yarn.lock b/yarn.lock index 86b1715c31..27adff4986 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1818,7 +1818,14 @@ cosmiconfig@^7.0.0: path-type "^4.0.0" yaml "^1.10.0" -cross-spawn@^7.0.3: +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + +cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -4341,6 +4348,11 @@ rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" +rimraf@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-4.1.2.tgz#20dfbc98083bdfaa28b01183162885ef213dbf7c" + integrity sha512-BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ== + run-async@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"