initial commit (#1013)

DaedalusDock · Jun 30, 2024 · d470e2a · d470e2a
1 parent 27af0b5
commit d470e2a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/tgui/packages/tgui/components/ProgressBar.jsx b/tgui/packages/tgui/components/ProgressBar.jsx
@@ -29,6 +29,7 @@ export const ProgressBar = (props) => {
   // We permit colors to be in hex format, rgb()/rgba() format,
   // a name for a color-<name> class, or a base CSS class.
   const outerProps = computeBoxProps(rest);
+
   const outerClasses = ['ProgressBar', className, computeBoxClassName(rest)];
   const fillStyles = {
     width: clamp01(scaledValue) * 100 + '%',
@@ -38,8 +39,7 @@ export const ProgressBar = (props) => {
     outerClasses.push('ProgressBar--color--' + effectiveColor);
   } else {
     // Otherwise, set styles directly.
-    outerProps.style =
-      (outerProps.style || '') + `borderClor: ${effectiveColor};`;
+    outerProps.style = { ...outerProps.style, borderColor: effectiveColor };
     fillStyles['backgroundColor'] = effectiveColor;
   }
 

diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json
@@ -13,6 +13,7 @@
     "marked": "^4.3.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "tgui-core": "^1.1.2",
     "tgui-dev-server": "workspace:*",
     "tgui-polyfill": "workspace:*"
   }

diff --git a/tgui/tsconfig.json b/tgui/tsconfig.json
@@ -9,7 +9,7 @@
     "jsx": "preserve",
     "lib": ["DOM", "DOM.Iterable", "ESNext", "ScriptHost"],
     "module": "ESNext",
-    "moduleResolution": "Node",
+    "moduleResolution": "Bundler",
     "noEmit": true,
     "resolveJsonModule": true,
     "skipLibCheck": true,

diff --git a/tgui/webpack.config.js b/tgui/webpack.config.js
@@ -59,7 +59,7 @@ module.exports = (env = {}, argv) => {
           ],
         },
         {
-          test: /\.scss$/,
+          test: /\.(s)?css$/,
           use: [
             {
               loader: ExtractCssPlugin.loader,

diff --git a/tgui/yarn.lock b/tgui/yarn.lock
@@ -9573,6 +9573,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"tgui-core@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "tgui-core@npm:1.1.2"
+  peerDependencies:
+    react: ^18.2.0
+    react-dom: ^18.2.0
+  checksum: 10c0/05edc2215daf63bdb126f57aa74e17875784dbe1fadf19f1218dabb17dfffcd63b3c6a1678eb8a5b10b8d325755c1e124f1298350be20af913e9cd0d5a749ec9
+  languageName: node
+  linkType: hard
+
 "tgui-dev-server@workspace:*, tgui-dev-server@workspace:packages/tgui-dev-server":
   version: 0.0.0-use.local
   resolution: "tgui-dev-server@workspace:packages/tgui-dev-server"
@@ -9667,6 +9677,7 @@ __metadata:
     marked: "npm:^4.3.0"
     react: "npm:^18.3.1"
     react-dom: "npm:^18.3.1"
+    tgui-core: "npm:^1.1.2"
     tgui-dev-server: "workspace:*"
     tgui-polyfill: "workspace:*"
   languageName: unknown