diff --git a/.github/workflows/uix-deploy-prod.yml b/.github/workflows/uix-deploy-prod.yml index 61ee5b4..804be4c 100644 --- a/.github/workflows/uix-deploy-prod.yml +++ b/.github/workflows/uix-deploy-prod.yml @@ -27,5 +27,5 @@ jobs: - name: Setup Deno uses: "denoland/setup-deno@v1" - name: Deploy UIX App - run: "deno run --importmap https://dev.cdn.unyt.org/importmap.json -Aqr https://dev.cdn.unyt.org/uix/run.ts --stage prod --detach " + run: "deno run --importmap https://dev.cdn.unyt.org/uix1/importmap.json -Aqr https://dev.cdn.unyt.org/uix1/run.ts --stage prod --detach " needs: test diff --git a/common/components/MainPage.tsx b/common/components/MainPage.tsx index 55b8a08..8cbda44 100644 --- a/common/components/MainPage.tsx +++ b/common/components/MainPage.tsx @@ -1,9 +1,11 @@ -import { UIX } from "uix"; +import { template } from "uix/html/template.ts"; +import { Component } from "uix/components/Component.ts"; + import { spawnThreads, spawnThread } from "unyt_core/threads/threads.ts"; import { always, map } from "unyt_core/functions.ts"; import type { AddressData } from "common/TOR-Worker.ts"; -@UIX.template(function(this: MainPage) { +@template(function(this: MainPage) { return
this.calculatingAddress?'hidden':'')}>

Create TOR Address

@@ -31,7 +33,7 @@ import type { AddressData } from "common/TOR-Worker.ts";
}) -export class MainPage extends UIX.BaseComponent { +export class MainPage extends Component { // reference properties for input values @property piDigits = 5; diff --git a/deno.json b/deno.json index 9f6b078..92c3884 100644 --- a/deno.json +++ b/deno.json @@ -1,41 +1,11 @@ { - "imports": { - "unyt/": "https://cdn.unyt.org/uix-components/", - "unyt_core": "https://dev.cdn.unyt.org/unyt_core/datex.ts", - "uix": "https://dev.cdn.unyt.org/uix/uix.ts", - "unyt_core/": "https://dev.cdn.unyt.org/unyt_core/", - "uix/": "https://dev.cdn.unyt.org/uix/", - "uix_std/": "https://dev.cdn.unyt.org/uix/uix_std/", - "unyt_tests/": "https://dev.cdn.unyt.org/unyt_tests/", - "unyt_web/": "https://dev.cdn.unyt.org/unyt_web/", - "unyt_node/": "https://dev.cdn.unyt.org/unyt_node/", - "unyt_cli/": "https://dev.cdn.unyt.org/unyt_cli/", - "supranet/": "https://portal.unyt.org/ts_module_resolver/", - "uix/jsx-runtime": "https://dev.cdn.unyt.org/uix/jsx-runtime/jsx.ts", - "backend/": "./backend/", - "common/": "./common/", - "frontend/": "./frontend/" - }, + "_publicImportMap": "./importmap.json", + "importMap": "./.datex-cache/importmap.lock.json", "compilerOptions": { - "module": "esnext", - "target": "es2022", - "noImplicitOverride": true, - "removeComments": true, - "preserveConstEnums": true, - "esModuleInterop": true, - "experimentalDecorators": true, - "emitDecoratorMetadata": true, "jsx": "react-jsx", "jsxImportSource": "uix", "lib": [ - "deno.window", - "dom", - "esnext" + "deno.window" ] - }, - "tasks": { - "run": "uix", - "run-dev": "uix -wr", - "run-uixdev": "deno run -Aqr http://localhost:4200/run.ts -wr --import-map importmap.uixdev.json" } } \ No newline at end of file diff --git a/frontend/entrypoint.tsx b/frontend/entrypoint.tsx index 93b4024..b36c837 100644 --- a/frontend/entrypoint.tsx +++ b/frontend/entrypoint.tsx @@ -1,6 +1,6 @@ -import { UIX } from "uix/uix.ts"; import { MainPage } from "../common/components/MainPage.tsx"; +import { Entrypoint } from "uix/html/entrypoints.ts"; export default { '/': -} satisfies UIX.Entrypoint; +} satisfies Entrypoint; diff --git a/importmap.json b/importmap.json new file mode 100644 index 0000000..2001c4d --- /dev/null +++ b/importmap.json @@ -0,0 +1,12 @@ +{ + "imports": { + "datex-core-legacy": "https://dev.cdn.unyt.org/unyt_core/datex.ts", + "datex-core-legacy/": "https://dev.cdn.unyt.org/unyt_core/", + "unyt_core": "https://dev.cdn.unyt.org/unyt_core/datex.ts", + "unyt_core/": "https://dev.cdn.unyt.org/unyt_core/", + "uix": "https://dev.cdn.unyt.org/uix1/uix.ts", + "uix/": "https://dev.cdn.unyt.org/uix1/src/", + "uix/jsx-runtime": "https://dev.cdn.unyt.org/uix1/src/jsx-runtime/jsx.ts", + "unyt-tests/": "https://dev.cdn.unyt.org/unyt_tests/" + } +} \ No newline at end of file