From 3df70b2491eb2c589d632d3be670d78971103d44 Mon Sep 17 00:00:00 2001 From: Josh Gross Date: Mon, 9 Jan 2023 19:01:50 -0500 Subject: [PATCH] Use a standard format configuration across packages --- .../.prettierignore => .prettierignore | 0 .../.prettierrc.json => .prettierrc.json | 0 actions-expressions/package.json | 4 +++- actions-languageserver/package.json | 8 ++++---- actions-languageservice/.prettierrc.json | 9 --------- actions-languageservice/package.json | 8 ++++---- actions-workflow-parser/.prettierignore | 3 --- actions-workflow-parser/.prettierrc.json | 3 --- actions-workflow-parser/package.json | 2 +- browser-playground/package.json | 4 +++- 10 files changed, 15 insertions(+), 26 deletions(-) rename actions-languageserver/.prettierignore => .prettierignore (100%) rename actions-languageserver/.prettierrc.json => .prettierrc.json (100%) delete mode 100644 actions-languageservice/.prettierrc.json delete mode 100644 actions-workflow-parser/.prettierignore delete mode 100644 actions-workflow-parser/.prettierrc.json diff --git a/actions-languageserver/.prettierignore b/.prettierignore similarity index 100% rename from actions-languageserver/.prettierignore rename to .prettierignore diff --git a/actions-languageserver/.prettierrc.json b/.prettierrc.json similarity index 100% rename from actions-languageserver/.prettierrc.json rename to .prettierrc.json diff --git a/actions-expressions/package.json b/actions-expressions/package.json index 9bf01e7..3c42246 100755 --- a/actions-expressions/package.json +++ b/actions-expressions/package.json @@ -29,6 +29,8 @@ "scripts": { "build": "tsc --build tsconfig.build.json", "clean": "rimraf dist", + "format": "prettier --write '**/*.ts'", + "format-check": "prettier --check '**/*.ts'", "prepublishOnly": "npm run build && npm run test", "test": "NODE_OPTIONS=\"--experimental-vm-modules\" jest", "test-watch": "NODE_OPTIONS=\"--experimental-vm-modules\" jest --watch", @@ -48,4 +50,4 @@ "ts-jest": "^29.0.3", "typescript": "^4.7.4" } -} +} \ No newline at end of file diff --git a/actions-languageserver/package.json b/actions-languageserver/package.json index 2271384..fb66594 100644 --- a/actions-languageserver/package.json +++ b/actions-languageserver/package.json @@ -30,12 +30,12 @@ "scripts": { "build": "tsc --build tsconfig.build.json", "clean": "rimraf dist", + "format": "prettier --write '**/*.ts'", + "format-check": "prettier --check '**/*.ts'", "prepublishOnly": "npm run build && npm run test", "test": "NODE_OPTIONS=\"--experimental-vm-modules\" jest", "test-watch": "NODE_OPTIONS=\"--experimental-vm-modules\" jest --watch", - "watch": "tsc --build tsconfig.build.json --watch", - "prettier": "prettier .", - "prettier-fix": "prettier --write ." + "watch": "tsc --build tsconfig.build.json --watch" }, "dependencies": { "@github/actions-languageservice": "^0.1.76", @@ -60,4 +60,4 @@ "ts-jest": "^29.0.3", "typescript": "^4.8.4" } -} +} \ No newline at end of file diff --git a/actions-languageservice/.prettierrc.json b/actions-languageservice/.prettierrc.json deleted file mode 100644 index e932aad..0000000 --- a/actions-languageservice/.prettierrc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "tabWidth": 2, - "useTabs": false, - "printWidth": 120, - "singleQuote": false, - "bracketSpacing": false, - "trailingComma": "none", - "arrowParens": "avoid" -} diff --git a/actions-languageservice/package.json b/actions-languageservice/package.json index eeff346..5c45ea8 100644 --- a/actions-languageservice/package.json +++ b/actions-languageservice/package.json @@ -30,12 +30,12 @@ "scripts": { "build": "tsc --build tsconfig.build.json", "clean": "rimraf dist", + "format": "prettier --write '**/*.ts'", + "format-check": "prettier --check '**/*.ts'", "prepublishOnly": "npm run build && npm run test", "test": "NODE_OPTIONS=\"--experimental-vm-modules\" jest", "test-watch": "NODE_OPTIONS=\"--experimental-vm-modules\" jest --watch", - "watch": "tsc --build tsconfig.build.json --watch", - "prettier": "prettier .", - "prettier-fix": "prettier --write ." + "watch": "tsc --build tsconfig.build.json --watch" }, "dependencies": { "@github/actions-expressions": "^0.1.76", @@ -59,4 +59,4 @@ "ts-jest": "^29.0.3", "typescript": "^4.8.4" } -} +} \ No newline at end of file diff --git a/actions-workflow-parser/.prettierignore b/actions-workflow-parser/.prettierignore deleted file mode 100644 index d50eb11..0000000 --- a/actions-workflow-parser/.prettierignore +++ /dev/null @@ -1,3 +0,0 @@ -/dist -/node_modules -/src/workflows/workflow-v1.0.json diff --git a/actions-workflow-parser/.prettierrc.json b/actions-workflow-parser/.prettierrc.json deleted file mode 100644 index cce9d3c..0000000 --- a/actions-workflow-parser/.prettierrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "semi": false -} diff --git a/actions-workflow-parser/package.json b/actions-workflow-parser/package.json index dbe0c2f..34098ec 100644 --- a/actions-workflow-parser/package.json +++ b/actions-workflow-parser/package.json @@ -60,4 +60,4 @@ "ts-jest": "^29.0.3", "typescript": "^4.8.4" } -} +} \ No newline at end of file diff --git a/browser-playground/package.json b/browser-playground/package.json index f664383..6e9afa5 100644 --- a/browser-playground/package.json +++ b/browser-playground/package.json @@ -17,6 +17,8 @@ "scripts": { "build": "webpack --mode production", "clean": "rimraf dist", + "format": "prettier --write '**/*.ts'", + "format-check": "prettier --check '**/*.ts'", "start": "webpack-dev-server --mode development --open", "test": "exit 0", "watch": "webpack --watch --mode development --env esbuild" @@ -32,4 +34,4 @@ "webpack-cli": "^5.0.1", "webpack-dev-server": "^4.11.1" } -} +} \ No newline at end of file