move to prettier

Author: jxn-30

.download.js

@@ -1,27 +1,6 @@
 const fs = require('fs/promises');
 const path = require('path');
 const jsdom = require('jsdom');
-const { js: beautifyJs, css: beautifyCss } = require('js-beautify');
-
-const BEAUTIFIER_OPTIONS = {
-    indent_size: '4',
-    indent_char: ' ',
-    max_preserve_newlines: '1',
-    preserve_newlines: true,
-    keep_array_indentation: true,
-    break_chained_methods: true,
-    indent_scripts: 'normal',
-    brace_style: 'collapse',
-    space_before_conditional: true,
-    unescape_strings: false,
-    jslint_happy: true,
-    end_with_newline: false,
-    wrap_line_length: '110',
-    indent_inner_html: true,
-    comma_first: false,
-    e4x: false,
-    indent_empty_lines: false,
-};
 
 const PATH = path.resolve(__dirname);
 
@@ -48,23 +27,21 @@ fetch(GAME)
         return files;
     })
     .then(async ({ js, css }) => ({
-        js: await fetch(`${GAME}${js}`)
-            .then(res => res.text())
-            .then(js => beautifyJs(js, BEAUTIFIER_OPTIONS)),
-        css: await fetch(`${GAME}${css}`)
-            .then(res => res.text())
-            .then(css => beautifyCss(css, BEAUTIFIER_OPTIONS)),
+        js: await fetch(`${GAME}${js}`).then(res => res.text()),
+        css: await fetch(`${GAME}${css}`).then(res => res.text()),
         jsPath: js,
         cssPath: css,
     }))
-    .then(({ js, css, jsPath, cssPath }) => Promise.all([
-        fs
-            .writeFile(path.resolve(PATH, 'application.js' + suffix), js)
-            .then(() => jsPath),
-        fs
-            .writeFile(path.resolve(PATH, 'application.css' + suffix), css)
-            .then(() => cssPath),
-    ]))
+    .then(({ js, css, jsPath, cssPath }) =>
+        Promise.all([
+            fs
+                .writeFile(path.resolve(PATH, `application${suffix}.js`), js)
+                .then(() => jsPath),
+            fs
+                .writeFile(path.resolve(PATH, `application${suffix}.css`), css)
+                .then(() => cssPath),
+        ])
+    )
     .then(([jsPath, cssPath]) =>
         fs
             .readFile(path.resolve(PATH, 'README.md'))
@@ -77,12 +54,6 @@ fetch(GAME)
                 /<!--\s*automated\s-->(.|\n)*?<!--\s*\/automated\s*-->/,
                 `
 <!-- automated -->
-## Beautify options
-Tool: [js-beautify](https://github.com/beautify-web/js-beautify)
-\`\`\`json
-${JSON.stringify(BEAUTIFIER_OPTIONS, null, 4)}
-\`\`\`
-
 ## JS
 | Attribute | Value |
 | --------- | ----- |
@@ -96,6 +67,11 @@ ${JSON.stringify(BEAUTIFIER_OPTIONS, null, 4)}
 | File      | [${cssPath.replace(/^\/assets\//, '')}](${GAME}${cssPath}) |
 | Server    | ${GAME} |
 | Time      | ${timestamp} |
+
+## Pretty-print
+Tool: [prettier](https://prettier.io)
+Options: [.prettierrc.json](./.prettierrc.json)
+
 <!-- /automated -->
 `.trim()
             )

.github/workflows/download.yml

@@ -4,7 +4,7 @@ on:
     workflow_dispatch:
     schedule:
         - cron: '0 8-18/2 * * 1-5' # At minute 0 past every 2nd hour from 8 through 18 on every day-of-week from Monday through Friday.
-        - cron: '0 0 * * *'        # Every day at midnight
+        - cron: '0 0 * * *' # Every day at midnight
 
 jobs:
     download:
@@ -51,6 +51,10 @@ jobs:
               run: |
                   yarn download
 
+            - name: Run prettier
+              run: |
+                  yarn prettier:write
+
             - name: Show changes
               run: |
                   git status
@@ -59,8 +63,8 @@ jobs:
             - name: Create diff to mx version
               run: |
                   set -e
-                  git --no-pager diff --no-index application.js application.js.alt | tee alt_js.diff || true
-                  git --no-pager diff --no-index application.css application.css.alt |tee alt_css.diff || true
+                  git --no-pager diff --no-index application.js application.alt.js | tee alt_js.diff || true
+                  git --no-pager diff --no-index application.css application.alt.css |tee alt_css.diff || true
                   exit 0
 
             - name: Check if there are changes

.gitignore

@@ -6,5 +6,5 @@
 
 node_modules/*
 
-application.js.alt
-application.css.alt
+application.alt.js
+application.alt.css

.prettierignore

@@ -0,0 +1,4 @@
+.yarn/
+node_modules/
+.pnp*
+.idea/

.prettierrc.json

@@ -0,0 +1,9 @@
+{
+    "arrowParens": "avoid",
+    "endOfLine": "lf",
+    "quoteProps": "consistent",
+    "singleQuote": true,
+    "tabWidth": 4,
+    "trailingComma": "es5",
+    "experimentalTernaries": true
+}

README.md

@@ -1,42 +1,28 @@
 # LSSD
+
 Für mich und andere Entwickler eine kleine Übersicht der Einsätze aller Spiele sowie der js und css datei :)
 
 <!-- automated -->
-## Beautify options
-Tool: [js-beautify](https://github.com/beautify-web/js-beautify)
-```json
-{
-    "indent_size": "4",
-    "indent_char": " ",
-    "max_preserve_newlines": "1",
-    "preserve_newlines": true,
-    "keep_array_indentation": true,
-    "break_chained_methods": true,
-    "indent_scripts": "normal",
-    "brace_style": "collapse",
-    "space_before_conditional": true,
-    "unescape_strings": false,
-    "jslint_happy": true,
-    "end_with_newline": false,
-    "wrap_line_length": "110",
-    "indent_inner_html": true,
-    "comma_first": false,
-    "e4x": false,
-    "indent_empty_lines": false
-}
-```
 
 ## JS
-| Attribute | Value |
-| --------- | ----- |
+
+| Attribute | Value                                                                                                                                |
+| --------- | ------------------------------------------------------------------------------------------------------------------------------------ |
 | File      | [application-afffe98eeaf9f638e2789c09e91a3a60.js](https://missionchief.co.uk/assets/application-afffe98eeaf9f638e2789c09e91a3a60.js) |
-| Server    | https://missionchief.co.uk |
-| Time      | 2025-01-19T23:42:32.921Z |
+| Server    | https://missionchief.co.uk                                                                                                           |
+| Time      | 2025-01-19T23:54:12.822Z                                                                                                             |
 
 ## CSS
-| Attribute | Value |
-| --------- | ----- |
+
+| Attribute | Value                                                                                                                                  |
+| --------- | -------------------------------------------------------------------------------------------------------------------------------------- |
 | File      | [application-f5c2974eb24c1122f61b11891d93c7ba.css](https://missionchief.co.uk/assets/application-f5c2974eb24c1122f61b11891d93c7ba.css) |
-| Server    | https://missionchief.co.uk |
-| Time      | 2025-01-19T23:42:32.921Z |
+| Server    | https://missionchief.co.uk                                                                                                             |
+| Time      | 2025-01-19T23:54:12.822Z                                                                                                               |
+
+## Pretty-print
+
+Tool: [prettier](https://prettier.io)
+Options: [.prettierrc.json](./.prettierrc.json)
+
 <!-- /automated -->