v2.2.1 Game UIs

Author: CreepGin

Documentation.pdf

@@ -1 +1,2 @@
-@tailwind utilities;
+@import "./comps/base.css";
+@tailwind utilities;

Misc Assets/Scripting Assets/input.css.txt

@@ -4,19 +4,23 @@
         "switch": "node node_modules/onejs-core/scripts/switch.cjs"
     },
     "devDependencies": {
+        "chokidar": "^4.0.3",
+        "chokidar-cli": "^3.0.0",
         "esbuild": "^0.20.0",
         "fs-extra": "^11.2.0",
         "postcss": "^8.4.38",
         "postcss-cli": "^11.0.0",
+        "postcss-import": "^16.1.0",
         "rimraf": "^5.0.7",
         "tailwindcss": "^3.4.17",
         "tar": "^7.2.0",
         "tiny-glob": "^0.2.9",
         "xml2js": "^0.6.2"
     },
     "dependencies": {
-        "onejs-core": "^1.0.38",
-        "onejs-preact": "^1.0.6",
+        "onejs-core": "^2.0.0",
+        "onejs-preact": "^2.0.0",
+        "tailwind-merge": "^2.6.0",
         "css-flatten": "^2.0.0",
         "css-simple-parser": "^3.0.0"
     }

Misc Assets/Scripting Assets/package.json.txt

@@ -1,24 +1,15 @@
 const tailwindcss = require('tailwindcss')
-const ussTransformPlugin = require('onejs-core/scripts/uss-transform-plugin.cjs')
-const cleanupPlugin = require('onejs-core/scripts/postcss-cleanup-plugin.cjs')
-
-// Custom logging plugin
-const loggingPlugin = {
-    postcssPlugin: 'postcss-logging-plugin',
-    Once(root, { result }) {
-        process.stdout.write('\x1Bc');
-        console.log('[tailwindcss] compiler started...')
-    },
-    OnceExit(root, { result }) {
-        console.log('[tailwindcss] watching...')
-    }
-};
+const ussTransformPlugin = require('onejs-core/scripts/postcss/uss-transform-plugin.cjs')
+const cleanupPlugin = require('onejs-core/scripts/postcss/cleanup-plugin.cjs')
+const optionalImportPlugin = require('onejs-core/scripts/postcss/optional-import-plugin.cjs')
+const loggingPlugin = require('onejs-core/scripts/postcss/tailwind-logging-plugin.cjs')
 
 module.exports = {
     plugins: [
-        loggingPlugin,
+        loggingPlugin(),
+        optionalImportPlugin(),
         tailwindcss('./tailwind.config.js'),
         ussTransformPlugin(),
-        cleanupPlugin({ remove: ["line-height:", "display:grid", ".items-baseline"] })
+        cleanupPlugin({ remove: ["line-height:", ".grid"] })
     ]
 }

Misc Assets/Scripting Assets/postcss.config.js.txt

@@ -42,14 +42,7 @@
         {
             "label": "tailwind",
             "type": "shell",
-            "command": "npx",
-            "args": [
-                "postcss",
-                "input.css",
-                "-o",
-                "../Assets/tailwind.uss",
-                "--watch"
-            ],
+            "command": "npx postcss input.css -o ../Assets/tailwind.uss --watch",
             "isBackground": true,
             "problemMatcher": {
                 "pattern": [

Misc Assets/Scripting Assets/tasks.json.txt

@@ -2,6 +2,7 @@
     "compilerOptions": {
         "baseUrl": ".",
         "paths": {
+            "@/*": ["*"],
             "onejs": [ "node_modules/onejs-core" ],
             "onejs/*": [ "node_modules/onejs-core/*" ],
             "preact": [ "node_modules/onejs-preact", "node_modules/preact" ],

Misc Assets/Scripting Assets/tsconfig.json.txt

@@ -36,7 +36,7 @@ public class Bundler : MonoBehaviour {
         public string[] ignoreList = new string[] { "@outputs/tsc", "node_modules", "tmp" };
 
         ScriptEngine _engine;
-        string _onejsVersion = "2.1.15";
+        string _onejsVersion = "2.2.1";
 
         void Awake() {
             _engine = GetComponent<ScriptEngine>();

Runtime/Engine/Bundler.cs

@@ -93,7 +93,7 @@ MonoBehaviour:
   basePath: '@outputs/esbuild/'
   port: 8080
   miscSettings:
-    styleSheetRefreshDelay: 0.1
+    styleSheetRefreshDelay: 0.25
 --- !u!114 &2637249758932584858
 MonoBehaviour:
   m_ObjectHideFlags: 0

ScriptEngine.prefab

@@ -1,6 +1,6 @@
 {
     "name": "com.singtaa.onejs",
-    "version": "2.1.15",
+    "version": "2.2.1",
     "displayName": "OneJS",
     "description": "OneJS brings JavaScript and many beloved web techs to Unity, seamlessly integrating with UI Toolkit without the need for a browser or webview.",
     "unity": "2022.3",