onejs-core 2.0.19 → 2.0.20

package/definitions/augments.d.ts

@@ -26,6 +26,7 @@ declare global {
     }
 
     const document: DocumentWrapper
+    const onejsDocument: DocumentWrapper
     const setTimeout: (callback: () => void, delay?: number) => number
     const clearTimeout: (id: number) => void
     const setInterval: (callback: () => void, delay?: number) => number

package/dist/index.js

@@ -33,9 +33,12 @@ export function h(type, props, ...children) {
     return element;
 }
 export { emo } from "./styling/index";
-// @ts-ignore
-if (typeof ___document != "undefined") {
+if (typeof globalThis.___document != "undefined") {
     // @ts-ignore
-    globalThis.document = new DocumentWrapper(___document);
+    globalThis.onejsDocument = new DocumentWrapper(globalThis.___document);
+    if (!globalThis.ONEJS_WEBGL) {
+        // @ts-ignore
+        globalThis.document = globalThis.onejsDocument;
+    }
 }
 // puer.$extension(CS.UnityEngine.UIElements.VisualElement, CS.UnityEngine.UIElements.VisualElementExtensions)

package/dist/utils/color-parser.d.ts

@@ -1,5 +1,5 @@
 type float4 = CS.Unity.Mathematics.float4;
-declare var kCSSColorTable: {
+declare const kCSSColorTable: {
     transparent: number[];
     aliceblue: number[];
     antiquewhite: number[];

package/dist/utils/color-parser.js

@@ -27,7 +27,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 */
-var kCSSColorTable = {
+const kCSSColorTable = {
     "transparent": [0, 0, 0, 0], "aliceblue": [240, 248, 255, 1],
     "antiquewhite": [250, 235, 215, 1], "aqua": [0, 255, 255, 1],
     "aquamarine": [127, 255, 212, 1], "azure": [240, 255, 255, 1],

package/index.ts

@@ -1,6 +1,6 @@
 /// <reference path="./definitions/index.d.ts" />
-import { DocumentWrapper } from "./dom/document";
-import { DomWrapper } from "./dom/dom";
+import { DocumentWrapper } from "./dom/document"
+import { DomWrapper } from "./dom/dom"
 
 /**
  * OneJS's own h function. Use this to quickly create elements in jsx-like syntax
@@ -10,29 +10,29 @@ import { DomWrapper } from "./dom/dom";
  * @returns
  */
 export function h(type: any, props: any, ...children: any[]): any {
-    const element = typeof type === "string" ? document.createElement(type) : type;
+    const element = typeof type === "string" ? document.createElement(type) : type
 
     // Assign properties to the element
     for (const [key, value] of Object.entries(props || {})) {
         if (key.startsWith("on") && typeof value === "function") {
-            element.addEventListener(key.substring(2).toLowerCase(), value);
+            element.addEventListener(key.substring(2).toLowerCase(), value)
         } else if (key === "style" && typeof value === "object") {
-            Object.assign(element.style, value);
+            Object.assign(element.style, value)
         } else {
-            element.setAttribute(key, value);
+            element.setAttribute(key, value)
         }
     }
 
     // Append children
     for (const child of children) {
         if (typeof child === "string") {
-            element.appendChild(document.createTextNode(child));
+            element.appendChild(document.createTextNode(child))
         } else {
-            element.appendChild(child);
+            element.appendChild(child)
         }
     }
 
-    return element;
+    return element
 }
 
 export { emo } from "./styling/index"
@@ -46,10 +46,13 @@ declare global {
     const toJsArray: <T>(csArr: CS.System.Array) => T[]
 }
 
-// @ts-ignore
-if (typeof ___document != "undefined") {
+if (typeof globalThis.___document != "undefined") {
     // @ts-ignore
-    globalThis.document = new DocumentWrapper(___document)
+    globalThis.onejsDocument = new DocumentWrapper(globalThis.___document)
+    if (!globalThis.ONEJS_WEBGL) {
+        // @ts-ignore
+        globalThis.document = globalThis.onejsDocument
+    }
 }
 
 // puer.$extension(CS.UnityEngine.UIElements.VisualElement, CS.UnityEngine.UIElements.VisualElementExtensions)

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "onejs-core",
     "description": "The JS part of OneJS, a UI framework and Scripting Engine for Unity.",
-    "version": "2.0.19",
+    "version": "2.0.20",
     "repository": {
         "type": "git",
         "url": "https://github.com/Singtaa/onejs-core"

package/scripts/switch.cjs

@@ -13,9 +13,9 @@ const projectDir = path.resolve(process.cwd(), '..')
 const manifestPath = path.join(projectDir, 'Packages', 'manifest.json')
 
 const backends = [
-    { name: "QuickJS", tgzUrl: "https://github.com/Tencent/puerts/releases/download/Unity_v2.2.1/PuerTS_Quickjs_2.2.1.tgz" },
-    { name: "V8", tgzUrl: "https://github.com/Tencent/puerts/releases/download/Unity_v2.2.1/PuerTS_V8_2.2.1.tgz" },
-    { name: "NodeJS", tgzUrl: "https://github.com/Tencent/puerts/releases/download/Unity_v2.2.1/PuerTS_Nodejs_2.2.1.tgz" }
+    { name: "QuickJS", tgzUrl: "https://github.com/Tencent/puerts/releases/download/Unity_v2.2.2/PuerTS_Quickjs_2.2.2.tgz" },
+    { name: "V8", tgzUrl: "https://github.com/Tencent/puerts/releases/download/Unity_v2.2.2/PuerTS_V8_2.2.2.tgz" },
+    { name: "NodeJS", tgzUrl: "https://github.com/Tencent/puerts/releases/download/Unity_v2.2.2/PuerTS_Nodejs_2.2.2.tgz" }
 ]
 
 const args = process.argv.slice(2)
@@ -64,7 +64,7 @@ async function Process(backend, outputDir) {
         }
         await extractTgz(downloadedPath, outputDir)
 
-        // Safe keep asmdef files
+        // Safe keep asmdef files, et al.
         const onejsDir = await getOneJSUnityDir()
         const a = path.join(onejsDir, 'Puerts/Editor/com.tencent.puerts.core.Editor.asmdef')
         const b = path.join(upmDir, 'Editor/com.tencent.puerts.core.Editor.asmdef')
@@ -72,6 +72,9 @@ async function Process(backend, outputDir) {
         const d = path.join(upmDir, 'Runtime/com.tencent.puerts.core.asmdef')
         await fse.copy(a, b)
         await fse.copy(c, d)
+        const e = path.join(onejsDir, 'Puerts/Runtime/Src/Default/JsEnv.cs')
+        const f = path.join(upmDir, 'Runtime/Src/Default/JsEnv.cs')
+        await fse.copy(e, f)
 
         // Replace OneJS/Puerts with the new one
         const puertsDir = path.join(onejsDir, "Puerts")

package/utils/color-parser.ts

@@ -31,7 +31,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 */
 
-var kCSSColorTable = {
+const kCSSColorTable = {
     "transparent": [0, 0, 0, 0], "aliceblue": [240, 248, 255, 1],
     "antiquewhite": [250, 235, 215, 1], "aqua": [0, 255, 255, 1],
     "aquamarine": [127, 255, 212, 1], "azure": [240, 255, 255, 1],