Way smaller git updates

Binary enforcing


oop forgot


Rebuilt yarn.lock

.gitattributes

@@ -1,10 +1,16 @@
-# dmm map merger hook
-# needs additional setup, see tools/mapmerge/install.txt
-# *.dmm merge=merge-dmm
-
-# dmi icon merger hook
-# needs additional setup, see tools/dmitool/merging.txt
-*.dmi merge=merge-dmi
-
-# force changelog merging to use union
-html/changelog.html merge=union
+## Enforce binary mode
+*.dll binary
+*.exe binary
+*.so binary
+*.zip binary
+
+# dmm map merger hook
+# needs additional setup, see tools/mapmerge/install.txt
+# *.dmm merge=merge-dmm
+
+# dmi icon merger hook
+# needs additional setup, see tools/dmitool/merging.txt
+*.dmi merge=merge-dmi
+
+# force changelog merging to use union
+html/changelog.html merge=union

tgui/.gitattributes

@@ -15,8 +15,8 @@
 yarn.lock text eol=lf
 bin/tgui text eol=lf
 
-## Treat bundles as binary and ignore them during conflicts
-*.bundle.* binary merge=tgui-merge-bundle
-*.chunk.* binary merge=tgui-merge-bundle
+## Treat bundles as binary
+*.bundle.* binary
+*.chunk.* binary
 .yarn/releases/**/* binary
 .yarn/plugins/**/* binary

tgui/.yarn/sdks/eslint/bin/eslint.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
+const { existsSync } = require(`fs`);
+const { createRequire, createRequireFromPath } = require(`module`);
+const { resolve } = require(`path`);
 
-const relPnpApiPath = "../../../../.pnp.cjs";
+const relPnpApiPath = '../../../../.pnp.cjs';
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
 const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
@@ -17,4 +17,4 @@ if (existsSync(absPnpApiPath)) {
 }
 
 // Defer to the real eslint/bin/eslint.js your application uses
-module.exports = absRequire(`eslint/bin/eslint.js`);
+module.exports = absRequire(`eslint`);

tools/ci/install_build_deps.sh

@@ -6,7 +6,7 @@ source _build_dependencies.sh
 source ~/.nvm/nvm.sh
 nvm install $NODE_VERSION
 nvm use $NODE_VERSION
-npm install --global yarn
+npm install --location=global yarn
 
 pip install --user PyYaml -q
 pip install --user beautifulsoup4 -q