diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index e8cf878e1..7e38ee8f5 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -13,14 +13,14 @@ jobs: node-version: '20' cache: 'npm' cache-dependency-path: '**/package-lock.json' + - run: just npm-install + - run: just check-format + - run: just vscode deps - run: just vscode lint - - run: just vscode check-format - run: just web install - run: just web lint - - run: just web check-format - run: just test/cy install - run: just test/cy lint - - run: just test/cy check-format diff --git a/extensions/vscode/justfile b/extensions/vscode/justfile index 7fdd3bf23..d1eb732d8 100644 --- a/extensions/vscode/justfile +++ b/extensions/vscode/justfile @@ -114,20 +114,6 @@ lint: npm run lint -format: - #!/usr/bin/env bash - set -eou pipefail - {{ _with_debug }} - - npm run format - -check-format: - #!/usr/bin/env bash - set -eou pipefail - {{ _with_debug }} - - npm run check-format - # Packages the extension. package os="$(just ../../os)" arch="$(just ../../arch)": #!/usr/bin/env bash diff --git a/extensions/vscode/package-lock.json b/extensions/vscode/package-lock.json index a3eb91f61..cbefa9e95 100644 --- a/extensions/vscode/package-lock.json +++ b/extensions/vscode/package-lock.json @@ -29,7 +29,6 @@ "eslint-config-prettier": "^9.1.0", "glob": "^10.3.3", "mocha": "^10.2.0", - "prettier": "3.2.5", "typescript": "^5.2.2" }, "engines": { @@ -2135,21 +2134,6 @@ "node": ">= 0.8.0" } }, - "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", - "dev": true, - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json index 88f1cf05f..773f45b8e 100644 --- a/extensions/vscode/package.json +++ b/extensions/vscode/package.json @@ -449,8 +449,6 @@ "watch": "tsc -watch -p ./", "pretest": "npm run compile", "lint": "eslint src --ext ts", - "format": "prettier . --write", - "check-format": "prettier . --check", "test": "node ./out/test/runTest.js" }, "devDependencies": { @@ -468,7 +466,6 @@ "eslint-config-prettier": "^9.1.0", "glob": "^10.3.3", "mocha": "^10.2.0", - "prettier": "3.2.5", "typescript": "^5.2.2" }, "dependencies": { diff --git a/justfile b/justfile index 2546994cc..48cd175bc 100644 --- a/justfile +++ b/justfile @@ -198,6 +198,17 @@ install: fi fi +npm-install: + #!/usr/bin/env bash + set -eou pipefail + {{ _with_debug }} + + if [ {{ _ci }} = "true" ]; then + npm ci --no-audit --no-fund + else + npm install --no-audit --no-fund + fi + # staticcheck, vet, and format check lint: stub #!/usr/bin/env bash diff --git a/test/cy/justfile b/test/cy/justfile index 948216cdf..b269eadb5 100644 --- a/test/cy/justfile +++ b/test/cy/justfile @@ -46,20 +46,6 @@ lint: npm run lint -format: - #!/usr/bin/env bash - set -eou pipefail - {{ _with_debug }} - - npm run format - -check-format: - #!/usr/bin/env bash - set -eou pipefail - {{ _with_debug }} - - npm run check-format - # Install dependencies install: #!/usr/bin/env bash diff --git a/test/cy/package-lock.json b/test/cy/package-lock.json index d605a6126..81449b42b 100644 --- a/test/cy/package-lock.json +++ b/test/cy/package-lock.json @@ -9,7 +9,6 @@ "eslint": "^8.51.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-cypress": "^2.15.1", - "prettier": "3.2.5", "start-server-and-test": "^2.0.3" } }, @@ -2425,21 +2424,6 @@ "node": ">= 0.8.0" } }, - "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", - "dev": true, - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, "node_modules/pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", diff --git a/test/cy/package.json b/test/cy/package.json index f60e6850e..9cf3541c6 100644 --- a/test/cy/package.json +++ b/test/cy/package.json @@ -3,8 +3,6 @@ "scripts": { "lint": "eslint --ext .js,.ts,.cjs .", "fix": "eslint --ext .js,.ts,.cjs . --fix", - "format": "prettier . --write", - "check-format": "prettier . --check", "init": "just ../../run init ./test/sample-content/fastapi-simple", "start": "just ../../run ui --listen 127.0.0.1:9000 ./test/sample-content/fastapi-simple", "test": "start-server-and-test --expect 200 start http-get://127.0.0.1:9000 run", @@ -22,7 +20,6 @@ "eslint": "^8.51.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-cypress": "^2.15.1", - "prettier": "3.2.5", "start-server-and-test": "^2.0.3" } } diff --git a/web/justfile b/web/justfile index 1be55a9f0..7a2ef5900 100644 --- a/web/justfile +++ b/web/justfile @@ -83,20 +83,6 @@ lint: npm run lint -format: - #!/usr/bin/env bash - set -eou pipefail - {{ _with_debug }} - - npm run format - -check-format: - #!/usr/bin/env bash - set -eou pipefail - {{ _with_debug }} - - npm run check-format - # Launch a local web server instance in production mode. preview: #!/usr/bin/env bash diff --git a/web/package-lock.json b/web/package-lock.json index 9f71b2da8..7704a9939 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -31,7 +31,6 @@ "eslint-plugin-cypress": "^2.14.0", "eslint-plugin-vue": "^9.17.0", "jsdom": "^24.0.0", - "prettier": "3.2.5", "sass": "^1.66.1", "typescript": "^5.0.2", "vite": "^5.0.12", @@ -3560,21 +3559,6 @@ "node": ">= 0.8.0" } }, - "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", - "dev": true, - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, "node_modules/pretty-format": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", diff --git a/web/package.json b/web/package.json index 42cfe2210..2781599b1 100644 --- a/web/package.json +++ b/web/package.json @@ -10,8 +10,6 @@ "preview": "vite preview", "lint": "eslint --ext .js,.ts,.vue,.cjs .", "fix": "eslint --ext .js,.ts,.vue,.cjs . --fix", - "format": "prettier . --write", - "check-format": "prettier . --check", "test": "vitest run", "watch": "vitest" }, @@ -39,7 +37,6 @@ "eslint-plugin-cypress": "^2.14.0", "eslint-plugin-vue": "^9.17.0", "jsdom": "^24.0.0", - "prettier": "3.2.5", "sass": "^1.66.1", "typescript": "^5.0.2", "vite": "^5.0.12",