Switches to use prettier-tslint

.vscode/settings.json

@@ -5,29 +5,15 @@
         "**/out": true
     },
     "files.trimTrailingWhitespace": true,
-    "search.exclude": {
-        "**/node_modules": true,
-        "**/out": true
-    },
     "postcssSorting.config": {
         "order": ["custom-properties", "dollar-variables", "declarations", "at-rules", "rules"],
         "properties-order": "alphabetical",
         "unspecified-properties-position": "bottom"
     },
-    "tslint.autoFixOnSave": [
-        "curly",
-        "eofline",
-        "linebreak-style",
-        "trailing-comma",
-        "no-consecutive-blank-lines",
-        "no-irregular-whitespace",
-        "object-literal-key-quotes",
-        "one-line",
-        "ordered-imports",
-        "prefer-method-signature",
-        "prettiest",
-        "quotemark",
-        "whitespace"
-    ],
-    "typescript.tsdk": "./node_modules/typescript/lib" // we want to use the TS server from our node_modules folder to control its version
+    "prettier.requireConfig": true,
+    "prettier.tslintIntegration": true,
+    "search.exclude": {
+        "**/node_modules": true,
+        "**/out": true
+    }
 }

package-lock.json

@@ -27,9 +27,9 @@
             "dev": true
         },
         "@types/node": {
-            "version": "7.0.67",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.67.tgz",
-            "integrity": "sha512-DUioEWBd0NG30G1/wI0amNN/sSJ/xuX4/YWm4nNa+bUU6swuS7CF+sH/nifu+SPy5BFqRzQEyEWvi9zIDVP+Lw==",
+            "version": "7.0.69",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.69.tgz",
+            "integrity": "sha512-S5NC8HV6HnRipg8nC0j30TPl7ktXjRTKqgyINLNe8K/64UJUI8Lq0sRopXC0hProsV2F5ibj8IqPkl1xpGggrw==",
             "dev": true
         },
         "@types/tmp": {
@@ -8334,11 +8334,174 @@
             "dev": true
         },
         "prettier": {
-            "version": "1.14.0",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.14.0.tgz",
-            "integrity": "sha512-KtQ2EGaUwf2EyDfp1fxyEb0PqGKakVm0WyXwDt6u+cAoxbO2Z2CwKvOe3+b4+F2IlO9lYHi1kqFuRM70ddBnow==",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.14.1.tgz",
+            "integrity": "sha512-agYa+T9AyTDl4Rl2nWubBqhdLACY7+09BEtSTTT7gR5NDt+iQgAnbkKbbX6wExEaxExfbs5rHr94xExn9ULm4A==",
             "dev": true
         },
+        "prettier-tslint": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/prettier-tslint/-/prettier-tslint-0.4.0.tgz",
+            "integrity": "sha512-KdKNKXfflS5atPwzs+CFHuKZm+XsOMfambcPHvFMCJX4GwCA/7TRkCdI13CxaNOqbuYMM06MbQcvYSolEpKdww==",
+            "dev": true,
+            "requires": {
+                "chalk": "^2.4.0",
+                "globby": "^8.0.1",
+                "ignore": "^3.3.7",
+                "require-relative": "^0.8.7",
+                "tslint": "^5.9.1",
+                "yargs": "^11.0.0"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+                    "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+                    "dev": true
+                },
+                "ansi-styles": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+                    "dev": true,
+                    "requires": {
+                        "color-convert": "^1.9.0"
+                    }
+                },
+                "camelcase": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+                    "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+                    "dev": true
+                },
+                "chalk": {
+                    "version": "2.4.1",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+                    "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-styles": "^3.2.1",
+                        "escape-string-regexp": "^1.0.5",
+                        "supports-color": "^5.3.0"
+                    }
+                },
+                "cliui": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+                    "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+                    "dev": true,
+                    "requires": {
+                        "string-width": "^2.1.1",
+                        "strip-ansi": "^4.0.0",
+                        "wrap-ansi": "^2.0.0"
+                    }
+                },
+                "execa": {
+                    "version": "0.7.0",
+                    "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+                    "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+                    "dev": true,
+                    "requires": {
+                        "cross-spawn": "^5.0.1",
+                        "get-stream": "^3.0.0",
+                        "is-stream": "^1.1.0",
+                        "npm-run-path": "^2.0.0",
+                        "p-finally": "^1.0.0",
+                        "signal-exit": "^3.0.0",
+                        "strip-eof": "^1.0.0"
+                    }
+                },
+                "find-up": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+                    "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+                    "dev": true,
+                    "requires": {
+                        "locate-path": "^2.0.0"
+                    }
+                },
+                "is-fullwidth-code-point": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+                    "dev": true
+                },
+                "os-locale": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+                    "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+                    "dev": true,
+                    "requires": {
+                        "execa": "^0.7.0",
+                        "lcid": "^1.0.0",
+                        "mem": "^1.1.0"
+                    }
+                },
+                "string-width": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+                    "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+                    "dev": true,
+                    "requires": {
+                        "is-fullwidth-code-point": "^2.0.0",
+                        "strip-ansi": "^4.0.0"
+                    }
+                },
+                "strip-ansi": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+                    "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^3.0.0"
+                    }
+                },
+                "supports-color": {
+                    "version": "5.4.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^3.0.0"
+                    }
+                },
+                "which-module": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+                    "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+                    "dev": true
+                },
+                "yargs": {
+                    "version": "11.1.0",
+                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
+                    "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
+                    "dev": true,
+                    "requires": {
+                        "cliui": "^4.0.0",
+                        "decamelize": "^1.1.1",
+                        "find-up": "^2.1.0",
+                        "get-caller-file": "^1.0.1",
+                        "os-locale": "^2.0.0",
+                        "require-directory": "^2.1.1",
+                        "require-main-filename": "^1.0.1",
+                        "set-blocking": "^2.0.0",
+                        "string-width": "^2.0.0",
+                        "which-module": "^2.0.0",
+                        "y18n": "^3.2.1",
+                        "yargs-parser": "^9.0.2"
+                    }
+                },
+                "yargs-parser": {
+                    "version": "9.0.2",
+                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
+                    "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
+                    "dev": true,
+                    "requires": {
+                        "camelcase": "^4.1.0"
+                    }
+                }
+            }
+        },
         "pretty-error": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
@@ -8932,6 +9095,12 @@
             "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
             "dev": true
         },
+        "require-relative": {
+            "version": "0.8.7",
+            "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz",
+            "integrity": "sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=",
+            "dev": true
+        },
         "requires-port": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -9920,9 +10089,9 @@
             }
         },
         "style-loader": {
-            "version": "0.21.0",
-            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.21.0.tgz",
-            "integrity": "sha512-T+UNsAcl3Yg+BsPKs1vd22Fr8sVT+CJMtzqc6LEw9bbJZb43lm9GoeIfUcDEefBSWC0BhYbcdupV1GtI4DGzxg==",
+            "version": "0.22.1",
+            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.22.1.tgz",
+            "integrity": "sha512-WXUrLeinPIR1Oat3PfCDro7qTniwNTJqGqv1KcQiL3JR5PzrVLTyNsd9wTsPXG/qNCJ7lzR2NY/QDjFsP7nuSQ==",
             "dev": true,
             "requires": {
                 "loader-utils": "^1.1.0",

package.json

@@ -3560,7 +3560,7 @@
     },
     "devDependencies": {
         "@types/clipboardy": "1.1.0",
-        "@types/node": "7.0.67",
+        "@types/node": "8.10.24",
         "@types/tmp": "0.0.33",
         "clean-webpack-plugin": "0.1.19",
         "css-loader": "1.0.0",
@@ -3570,9 +3570,10 @@
         "imagemin-webpack-plugin": "2.2.0",
         "mini-css-extract-plugin": "0.4.1",
         "node-sass": "4.9.2",
-        "prettier": "1.14.0",
+        "prettier": "1.14.1",
+        "prettier-tslint": "0.4.0",
         "sass-loader": "7.1.0",
-        "style-loader": "0.21.0",
+        "style-loader": "0.22.1",
         "tslint": "5.11.0",
         "tslint-loader": "3.6.0",
         "tslint-prettiest": "0.0.1",