tgui: prettierx -> prettier, fix dev server (Monkestation#2418)

* Replaces prettierx with the normal prettier

* Fix tgui dev server

.vscode/settings.json

@@ -1,7 +1,9 @@
 {
 	"eslint.nodePath": "./tgui/.yarn/sdks",
-	"eslint.workingDirectories": ["./tgui"],
-	"prettier.prettierPath": "./tgui/.yarn/sdks/prettier/index.js",
+	"eslint.workingDirectories": [
+		"./tgui"
+	],
+	"prettier.prettierPath": "./tgui/.yarn/sdks/prettier/index.cjs",
 	"typescript.tsdk": "./tgui/.yarn/sdks/typescript/lib",
 	"typescript.enablePromptUseWorkspaceTsdk": true,
 	"search.exclude": {
@@ -13,36 +15,50 @@
 	},
 	"files.eol": "\n",
 	"files.insertFinalNewline": true,
-	"git.branchProtection": ["master"],
-	"gitlens.advanced.blame.customArguments": ["-w"],
+	"gitlens.advanced.blame.customArguments": [
+		"-w"
+	],
 	"tgstationTestExplorer.project.resultsType": "json",
 	"[javascript]": {
-		"editor.rulers": [80],
+		"editor.rulers": [
+			80
+		],
 		"editor.defaultFormatter": "esbenp.prettier-vscode",
 		"editor.formatOnSave": true
 	},
 	"[javascriptreact]": {
-		"editor.rulers": [80],
+		"editor.rulers": [
+			80
+		],
 		"editor.defaultFormatter": "esbenp.prettier-vscode",
 		"editor.formatOnSave": true
 	},
 	"[typescript]": {
-		"editor.rulers": [80],
+		"editor.rulers": [
+			80
+		],
 		"editor.defaultFormatter": "esbenp.prettier-vscode",
 		"editor.formatOnSave": true
 	},
 	"[typescriptreact]": {
-		"editor.rulers": [80],
+		"editor.rulers": [
+			80
+		],
 		"editor.defaultFormatter": "esbenp.prettier-vscode",
 		"editor.formatOnSave": true
 	},
 	"[scss]": {
-		"editor.rulers": [80],
+		"editor.rulers": [
+			80
+		],
 		"editor.defaultFormatter": "esbenp.prettier-vscode",
 		"editor.formatOnSave": true
 	},
 	"workbench.editorAssociations": {
 		"*.dmi": "dmiEditor.dmiEditor"
 	},
-	"Lua.diagnostics.enable": false
-}
+	"Lua.diagnostics.enable": false,
+	"git.branchProtection": [
+		"master"
+	]
+}

tgui/.prettierrc.yml

@@ -1,15 +1 @@
-arrowParens: always
-breakLongMethodChains: true
-endOfLine: lf
-importFormatting: oneline
-jsxBracketSameLine: true
-jsxSingleQuote: false
-offsetTernaryExpressions: true
-printWidth: 80
-proseWrap: preserve
-quoteProps: preserve
-semi: true
 singleQuote: true
-tabWidth: 2
-trailingComma: es5
-useTabs: false

tgui/.yarn/sdks/eslint/package.json

@@ -2,5 +2,8 @@
   "name": "eslint",
   "version": "7.32.0-sdk",
   "main": "./lib/api.js",
-  "type": "commonjs"
+  "type": "commonjs",
+  "bin": {
+    "eslint": "./bin/eslint.js"
+  }
 }

tgui/.yarn/sdks/prettier/bin/prettier.cjs

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require prettier/bin/prettier.cjs
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real prettier/bin/prettier.cjs your application uses
+module.exports = absRequire(`prettier/bin/prettier.cjs`);

tgui/.yarn/sdks/prettier/index.js → tgui/.yarn/sdks/prettier/index.cjs

@@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier/index.js
+    // Setup the environment to be able to require prettier
     require(absPnpApiPath).setup();
   }
 }
 
-// Defer to the real prettier/index.js your application uses
-module.exports = absRequire(`prettier/index.js`);
+// Defer to the real prettier your application uses
+module.exports = absRequire(`prettier`);

tgui/.yarn/sdks/prettier/package.json

@@ -1,6 +1,7 @@
 {
   "name": "prettier",
-  "version": "0.19.0-sdk",
-  "main": "./index.js",
-  "type": "commonjs"
+  "version": "3.1.0-sdk",
+  "main": "./index.cjs",
+  "type": "commonjs",
+  "bin": "./bin/prettier.cjs"
 }

tgui/.yarn/sdks/typescript/lib/tsserver.js

@@ -109,6 +109,8 @@ const moduleWrapper = tsserver => {
             str = `zip:${str}`;
           } break;
         }
+      } else {
+        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
       }
     }
 

tgui/.yarn/sdks/typescript/lib/tsserverlibrary.js

@@ -109,6 +109,8 @@ const moduleWrapper = tsserver => {
             str = `zip:${str}`;
           } break;
         }
+      } else {
+        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
       }
     }
 

tgui/.yarn/sdks/typescript/lib/typescript.js

@@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/typescript.js
+    // Setup the environment to be able to require typescript
     require(absPnpApiPath).setup();
   }
 }
 
-// Defer to the real typescript/lib/typescript.js your application uses
-module.exports = absRequire(`typescript/lib/typescript.js`);
+// Defer to the real typescript your application uses
+module.exports = absRequire(`typescript`);

tgui/.yarn/sdks/typescript/package.json

@@ -2,5 +2,9 @@
   "name": "typescript",
   "version": "4.9.4-sdk",
   "main": "./lib/typescript.js",
-  "type": "commonjs"
+  "type": "commonjs",
+  "bin": {
+    "tsc": "./bin/tsc",
+    "tsserver": "./bin/tsserver"
+  }
 }

tgui/package.json

@@ -12,7 +12,7 @@
     "tgui:build": "BROWSERSLIST_IGNORE_OLD_DATA=true webpack",
     "tgui:dev": "node --experimental-modules packages/tgui-dev-server/index.js",
     "tgui:lint": "eslint packages --ext .js,.cjs,.ts,.tsx",
-    "tgui:prettier": "prettierx --check .",
+    "tgui:prettier": "prettier --check .",
     "tgui:sonar": "eslint packages --ext .js,.cjs,.ts,.tsx -c .eslintrc-sonar.yml",
     "tgui:test": "jest --watch",
     "tgui:test-simple": "CI=true jest --color",
@@ -49,7 +49,7 @@
     "jest-circus": "^27.0.6",
     "jsdom": "^16.7.0",
     "mini-css-extract-plugin": "^1.6.2",
-    "prettier": "npm:[email protected].0",
+    "prettier": "^3.1.0",
     "sass": "^1.37.5",
     "sass-loader": "^11.1.1",
     "style-loader": "^2.0.0",

tgui/packages/common/collections.ts

@@ -32,12 +32,12 @@ export const filter =
   };
 
 type MapFunction = {
-  <T, U>(iterateeFn: (value: T, index: number, collection: T[]) => U): (
-    collection: T[]
-  ) => U[];
+  <T, U>(
+    iterateeFn: (value: T, index: number, collection: T[]) => U,
+  ): (collection: T[]) => U[];
 
   <T, U, K extends string | number>(
-    iterateeFn: (value: T, index: K, collection: Record<K, T>) => U
+    iterateeFn: (value: T, index: K, collection: Record<K, T>) => U,
   ): (collection: Record<K, T>) => U[];
 };
 
@@ -75,7 +75,7 @@ export const map: MapFunction =
  */
 export const filterMap = <T, U>(
   collection: T[],
-  iterateeFn: (value: T) => U | undefined
+  iterateeFn: (value: T) => U | undefined,
 ): U[] => {
   const finalCollection: U[] = [];
 
@@ -261,7 +261,7 @@ export const zipWith =
 const binarySearch = <T, U = unknown>(
   getKey: (value: T) => U,
   collection: readonly T[],
-  inserting: T
+  inserting: T,
 ): number => {
   if (collection.length === 0) {
     return 0;

tgui/packages/common/color.ts

@@ -30,7 +30,7 @@ export class Color {
       this.r - this.r * percent,
       this.g - this.g * percent,
       this.b - this.b * percent,
-      this.a
+      this.a,
     );
   }
 
@@ -47,7 +47,7 @@ export class Color {
     return new Color(
       parseInt(hex.substr(1, 2), 16),
       parseInt(hex.substr(3, 2), 16),
-      parseInt(hex.substr(5, 2), 16)
+      parseInt(hex.substr(5, 2), 16),
     );
   }
 
@@ -59,7 +59,7 @@ export class Color {
       (c2.r - c1.r) * n + c1.r,
       (c2.g - c1.g) * n + c1.g,
       (c2.b - c1.b) * n + c1.b,
-      (c2.a - c1.a) * n + c1.a
+      (c2.a - c1.a) * n + c1.a,
     );
   }
 
@@ -102,7 +102,7 @@ export class Color {
 const round = (
   number: number,
   digits = 0,
-  base = Math.pow(10, digits)
+  base = Math.pow(10, digits),
 ): number => {
   return Math.round(base * number) / base;
 };
@@ -222,7 +222,7 @@ export const hsvaToHsla = ({ h, s, v, a }: HsvaColor): HslaColor => {
     s: round(
       hh > 0 && hh < 200
         ? ((s * v) / 100 / (hh <= 100 ? hh : 200 - hh)) * 100
-        : 0
+        : 0,
     ),
     l: round(hh / 2),
     a: round(a, 2),
@@ -386,7 +386,7 @@ export const luminance = (rgb: RgbColor): number => {
 
 export const contrast = (
   foreground: RgbColor,
-  background: RgbColor
+  background: RgbColor,
 ): number => {
   const foreground_luminance = luminance(foreground);
   const background_luminance = luminance(background);

tgui/packages/common/redux.test.ts

@@ -1,4 +1,11 @@
-import { Action, Reducer, applyMiddleware, combineReducers, createAction, createStore } from './redux';
+import {
+  Action,
+  Reducer,
+  applyMiddleware,
+  combineReducers,
+  createAction,
+  createStore,
+} from './redux';
 
 // Dummy Reducer
 const counterReducer: Reducer<number, Action<string>> = (state = 0, action) => {
@@ -31,7 +38,7 @@ describe('Redux implementation tests', () => {
   test('createStore with applyMiddleware works', () => {
     const store = createStore(
       counterReducer,
-      applyMiddleware(loggingMiddleware)
+      applyMiddleware(loggingMiddleware),
     );
     expect(store.getState()).toBe(0);
   });