From 1dc39fa98a3a72d16cd21126e5aef123ea3cf99f Mon Sep 17 00:00:00 2001 From: Vandy Liu Date: Mon, 27 Jan 2020 12:13:01 -0800 Subject: [PATCH 1/6] prettier script change --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 78281627d..c223609bd 100644 --- a/package.json +++ b/package.json @@ -287,7 +287,7 @@ "format:ts": "prettier --write src/**/*.{css,ts,tsx}", "format:python": "black src", "check": "npm-run-all check:*", - "check:ts": "prettier --check src/**/*.{css,ts,tsx}", + "check:ts": "prettier --config .prettierrc.yaml --check src/**/*.{css,ts,tsx}", "check:python": "black src --check", "package": "vsce package" }, From c6be6d4f94d4877a8f2604e60e115ffe3557e303 Mon Sep 17 00:00:00 2001 From: Vandy Liu Date: Mon, 27 Jan 2020 13:35:02 -0800 Subject: [PATCH 2/6] updated prettier check script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c223609bd..18ed34dbc 100644 --- a/package.json +++ b/package.json @@ -287,7 +287,7 @@ "format:ts": "prettier --write src/**/*.{css,ts,tsx}", "format:python": "black src", "check": "npm-run-all check:*", - "check:ts": "prettier --config .prettierrc.yaml --check src/**/*.{css,ts,tsx}", + "check:ts": "prettier --config './.prettierrc.yaml' --check src/**/*.{css,ts,tsx}", "check:python": "black src --check", "package": "vsce package" }, From a42cfd44b1b9aa4735b5447164b1ccba296933be Mon Sep 17 00:00:00 2001 From: Vandy Liu Date: Mon, 27 Jan 2020 13:45:45 -0800 Subject: [PATCH 3/6] updated prettier check script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 18ed34dbc..fe09b3b83 100644 --- a/package.json +++ b/package.json @@ -287,7 +287,7 @@ "format:ts": "prettier --write src/**/*.{css,ts,tsx}", "format:python": "black src", "check": "npm-run-all check:*", - "check:ts": "prettier --config './.prettierrc.yaml' --check src/**/*.{css,ts,tsx}", + "check:ts": "prettier --trailing-comma es5 --tab-width 4 --end-of-line lf --print-width 80 --check src/**/*.{css,ts,tsx}", "check:python": "black src --check", "package": "vsce package" }, From 5c3e84e37e3b536dbe1eb0d30902868aa9f9c4dc Mon Sep 17 00:00:00 2001 From: Vandy Liu Date: Mon, 27 Jan 2020 13:53:43 -0800 Subject: [PATCH 4/6] updated prettier check script --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fe09b3b83..b8fb914d5 100644 --- a/package.json +++ b/package.json @@ -284,10 +284,11 @@ "lint:ts": "tslint -c tslint.json src/**/*.{ts,tsx}", "lint:python": "pylint src", "format": "npm-run-all format:*", - "format:ts": "prettier --write src/**/*.{css,ts,tsx}", + "format:ts": "prettier --config .prettierrc.yaml --write src/**/*.{css,ts,tsx}", "format:python": "black src", "check": "npm-run-all check:*", - "check:ts": "prettier --trailing-comma es5 --tab-width 4 --end-of-line lf --print-width 80 --check src/**/*.{css,ts,tsx}", + "check:ts": "prettier --trailing-comma es5 --tab-width 4 --end-of-line auto --print-width 80 --check src/**/*.{css,ts,tsx}", + "check:ts1": "prettier --config .prettierrc.yaml --check src/**/*.{css,ts,tsx}", "check:python": "black src --check", "package": "vsce package" }, From e69b4e646e93976d1dfe2cbaf9745fa04a313c49 Mon Sep 17 00:00:00 2001 From: Vandy Liu Date: Mon, 27 Jan 2020 13:54:18 -0800 Subject: [PATCH 5/6] updated prettier check script --- .prettierrc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierrc.yaml b/.prettierrc.yaml index b8a8009c4..5379f1e00 100644 --- a/.prettierrc.yaml +++ b/.prettierrc.yaml @@ -1,5 +1,5 @@ trailingComma: "es5" tabWidth: 4 semi: true -endOfLine: lf +endOfLine: auto printWidth: 80 \ No newline at end of file From a0b0cb03d3a17f13ae4a5460381a9e995bae0832 Mon Sep 17 00:00:00 2001 From: Vandy Liu Date: Mon, 27 Jan 2020 14:25:34 -0800 Subject: [PATCH 6/6] updated prettier script --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index b8fb914d5..730019a8e 100644 --- a/package.json +++ b/package.json @@ -287,8 +287,7 @@ "format:ts": "prettier --config .prettierrc.yaml --write src/**/*.{css,ts,tsx}", "format:python": "black src", "check": "npm-run-all check:*", - "check:ts": "prettier --trailing-comma es5 --tab-width 4 --end-of-line auto --print-width 80 --check src/**/*.{css,ts,tsx}", - "check:ts1": "prettier --config .prettierrc.yaml --check src/**/*.{css,ts,tsx}", + "check:ts": "prettier --config .prettierrc.yaml --check src/**/*.{css,ts,tsx}", "check:python": "black src --check", "package": "vsce package" },