Merge remote-tracking branch 'origin/master'

helpers/app-auth/package.json

@@ -17,7 +17,6 @@
     "svelte-i18n": "^4.0.0",
     "@nextgraph-monorepo/common": "workspace:*",
     "@nextgraph-monorepo/app-api-web": "workspace:*",
-    "@nextgraph-monorepo/wasm-tools-auth": "workspace:*",
     "remote-web-streams": "^0.2.0"
   },
   "devDependencies": {

helpers/net-auth/package.json

@@ -16,7 +16,6 @@
     "@tailwindcss/typography": "^0.5.13",
     "svelte-i18n": "^4.0.0",
     "@nextgraph-monorepo/common": "workspace:*",
-    "@nextgraph-monorepo/wasm-tools-auth": "workspace:*",
     "async-proxy": "^0.4.1",
     "remote-web-streams": "^0.2.0"
   },

helpers/nextgraph-react/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "nextgraph-react",
-  "version": "0.1.1-alpha.3",
-  "description": "A React library for LDO and NextGraph",
+  "name": "@ng-org/auth-react",
+  "version": "0.1.2-alpha.1",
+  "description": "React Auth library for LDO and NextGraph",
   "type": "module",
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -42,10 +42,10 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@ldo/connected": "^1.0.0-alpha.15",
-    "@ldo/connected-nextgraph": "^1.0.0-alpha.15",
-    "nextgraphweb": "^0.1.1-alpha.4",
-    "@ldo/react": "^1.0.0-alpha.15",
+    "@ldo/connected": "1.0.0-alpha.15",
+    "@ldo/connected-nextgraph": "1.0.0-alpha.15",
+    "@ng-org/web": "0.1.2-alpha.1",
+    "@ldo/react": "1.0.0-alpha.15",
     "@rdfjs/data-model": "^1.2.0",
     "cross-fetch": "^3.1.6"
   },

helpers/nextgraph-react/src/createBrowserNGReactMethods.tsx

@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useMemo, useState } from "react";
 import type { FunctionComponent, PropsWithChildren } from "react";
 import { NextGraphAuthContext, useNextGraphAuth } from "./NextGraphAuthContext.js";
 
-import {default as ng, init} from "nextgraphweb";
+import {ng, init} from "@ng-org/web";
 
 import type { ConnectedLdoDataset, ConnectedPlugin } from "@ldo/connected";
 import type { NextGraphConnectedPlugin, NextGraphConnectedContext } from "@ldo/connected-nextgraph";

helpers/nextgraph-react/src/createNextGraphAuthMethods.tsx

@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useMemo, useState } from "react";
 import type { FunctionComponent, PropsWithChildren } from "react";
 import { NextGraphAuthContext, useNextGraphAuth } from "./NextGraphAuthContext.js";
 import type { NextGraphConnectedContext } from "@ldo/connected-nextgraph";
-import {default as ng, init} from "nextgraphweb";
+import {ng, init} from "@ng-org/web";
 
 /**
  * Creates special react methods specific to the NextGraph Auth

ng-app/package.json

@@ -8,6 +8,8 @@
     "webdev": "shx cp index-web.html index.html && cross-env NG_APP_WEB=1 NG_PUBLIC_DEV=1 TAURI_DEBUG=1 vite",
     "webbuild": "shx cp index-web.html index.html && cross-env NG_APP_WEB=1 vite build && shx rm -f ./dist-web/assets/*.svg && tar --exclude .DS_Store -zcvf dist-web.tar.gz dist-web",
     "webfilebuild": "shx cp index-web.html index.html && cross-env NG_APP_WEB=1 NG_APP_FILE=1 vite build && node prepare-app-file.cjs && shx rm -rf ./dist-file/assets && tar --exclude .DS_Store -zcvf dist-file.tar.gz dist-file",
+    "webfilebuilddev": "shx cp index-web.html index.html && cross-env NG_DEV=1 NG_APP_WEB=1 NG_APP_FILE=1 vite build && node prepare-app-file.cjs && shx rm -rf ./dist-file/assets && tar --exclude .DS_Store -zcvf dist-file.tar.gz dist-file",
+    "webfilebuilddev3": "shx cp index-web.html index.html && cross-env NG_DEV3=1 NG_APP_WEB=1 NG_APP_FILE=1 vite build && node prepare-app-file.cjs && shx rm -rf ./dist-file/assets && tar --exclude .DS_Store -zcvf dist-file.tar.gz dist-file",
     "webfilebuilddebug": "shx cp index-web.html index.html && cross-env NG_APP_WEB=1 NG_APP_FILE=1 TAURI_DEBUG=1 vite build -m debug",
     "build": "shx cp index-native.html index.html && vite build && shx rm -f ./dist/assets/*.svg",
     "buildfile": "shx cp index-native.html index.html && cross-env NG_APP_FILE=1 vite build && shx rm -rf ./dist/assets && tar --exclude .DS_Store -zcvf dist.tar.gz dist",

ng-app/src/routes/WalletCreate.svelte

@@ -210,9 +210,9 @@
     ? "http://localhost:14403/#/?b="
     : import.meta.env.NG_DEV
       ? "http://localhost:1421/bootstrap.html#/?b="
+      : import.meta.env.NG_DEV3
+        ? "http://127.0.0.1:3033/bootstrap/#/?b="
         : `https://${redirect_server}/bootstrap/#/?b=`;
-  // to test ngnet
-  //const bootstrap_redirect = "http://127.0.0.1:3033/bootstrap/#/?b=";
 
   async function bootstrap() {
     //console.log(await ng.client_info());

pnpm-lock.yaml

@@ -170,9 +170,6 @@ importers:
       '@nextgraph-monorepo/common':
         specifier: workspace:*
         version: link:../../common
-      '@nextgraph-monorepo/wasm-tools-auth':
-        specifier: workspace:*
-        version: link:../wasm-tools/pkg
       '@tailwindcss/typography':
         specifier: ^0.5.13
         version: 0.5.16(tailwindcss@3.4.17)
@@ -246,9 +243,6 @@ importers:
       '@nextgraph-monorepo/common':
         specifier: workspace:*
         version: link:../../common
-      '@nextgraph-monorepo/wasm-tools-auth':
-        specifier: workspace:*
-        version: link:../wasm-tools/pkg
       '@tailwindcss/typography':
         specifier: ^0.5.13
         version: 0.5.16(tailwindcss@3.4.17)
@@ -348,23 +342,23 @@ importers:
   helpers/nextgraph-react:
     dependencies:
       '@ldo/connected':
-        specifier: ^1.0.0-alpha.15
-        version: 1.0.0-alpha.28
+        specifier: 1.0.0-alpha.15
+        version: 1.0.0-alpha.15
       '@ldo/connected-nextgraph':
-        specifier: ^1.0.0-alpha.15
-        version: 1.0.0-alpha.28
+        specifier: 1.0.0-alpha.15
+        version: 1.0.0-alpha.15
       '@ldo/react':
-        specifier: ^1.0.0-alpha.15
-        version: 1.0.0-alpha.28
+        specifier: 1.0.0-alpha.15
+        version: 1.0.0-alpha.15
+      '@ng-org/web':
+        specifier: 0.1.2-alpha.1
+        version: 0.1.2-alpha.1
       '@rdfjs/data-model':
         specifier: ^1.2.0
         version: 1.3.4
       cross-fetch:
         specifier: ^3.1.6
         version: 3.2.0
-      nextgraphweb:
-        specifier: ^0.1.1-alpha.4
-        version: 0.1.1-alpha.4
     devDependencies:
       '@babel/core':
         specifier: ^7.26.10
@@ -502,8 +496,6 @@ importers:
         specifier: ^2.2.1
         version: 2.2.1(svelte@3.59.2)(vite@4.5.9(@types/node@18.19.76)(sass@1.85.0))
 
-  helpers/wasm-tools/pkg: {}
-
   ng-app:
     dependencies:
       '@automerge/automerge':
@@ -2021,11 +2013,11 @@ packages:
   '@jridgewell/trace-mapping@0.3.29':
     resolution: {integrity: sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==}
 
-  '@ldo/connected-nextgraph@1.0.0-alpha.28':
-    resolution: {integrity: sha512-EFkm944rL9gFY3NJ5RBR2a9F1WF87A/zK9j8Q40nVF4qU6Mi4svy26GjElGZdMZmpc4Q0eTBqOmuCuf9wQzbNQ==}
+  '@ldo/connected-nextgraph@1.0.0-alpha.15':
+    resolution: {integrity: sha512-NBnUqk7l5BbsVx1kb/rWRcLx4xpstpRFJIV6BLMDTL7Rv+t3MQRwzGQvdvGPgUgQa1TKkcY3rPpochsNzH+cYg==}
 
-  '@ldo/connected@1.0.0-alpha.28':
-    resolution: {integrity: sha512-T7gRGtf+pb5uV0dv0zL0S84TjOJALcMnJ23kt9MZe49CP6ZpO44gzgjEOkDvuTQf9T6R/NS1JFVDGazaN48q+g==}
+  '@ldo/connected@1.0.0-alpha.15':
+    resolution: {integrity: sha512-B+L8HDozIiuufmqWBrOGwJOkpsrhtPUuibaEhFjM8kO9NHP0hJxxPBMdRYxGVgL5AOla0YOVfUk075KKtVhIjA==}
 
   '@ldo/dataset@1.0.0-alpha.28':
     resolution: {integrity: sha512-pxhAig41HczKyjnfnT+wgBhVBFqTHVVhv0ijWSuUEortYDrnXDTGWKZp+KV9ORrIUQ1AObfbOhl8cH4fncJfVw==}
@@ -2039,8 +2031,8 @@ packages:
   '@ldo/rdf-utils@1.0.0-alpha.28':
     resolution: {integrity: sha512-qNhUeVdX0GSGd0sl3PDLiWsZufmJgy3PcGhYna96BmU7S/b9A/82vDeHWJ+hTMV+2s6ywdwyUY4xIoG8ODN36w==}
 
-  '@ldo/react@1.0.0-alpha.28':
-    resolution: {integrity: sha512-yawM3/m6kK1WRtAQSP9Yn5tC2zNUtFKojucgVdlF0jvwPhhXymgIBXNUBf0VpMAv6MkkCt4AwLOU51XMmrZhyA==}
+  '@ldo/react@1.0.0-alpha.15':
+    resolution: {integrity: sha512-KPruUI4zTLWtmwNjzeeRbQD+qA8RojGEVyFbGa+RH1dfrVXnOpUkGHXvJJiVWqiL4DS9y5c3m12uyVTS3GAcuA==}
 
   '@ldo/subscribable-dataset@1.0.0-alpha.28':
     resolution: {integrity: sha512-QFZbSOEXSgQt4bj5piCSoeJbMXhmeFAqA6CDoMPZgHmnA3pU5AlunznHt4iBs3w6SJj0ue2lynQn7b7ZXgh7Lg==}
@@ -2198,6 +2190,9 @@ packages:
       '@milkdown/prose': ^7.2.0
       '@milkdown/transformer': ^7.2.0
 
+  '@ng-org/web@0.1.2-alpha.1':
+    resolution: {integrity: sha512-V2OSaEvuGFJZMAF1Yof6Rr45mQ/Ezhq6A9oea+v7RVsTmvQHHObK7JAf4LS/JWiXDD6GX0NOTRtfSQZYLgIHAw==}
+
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -4211,9 +4206,6 @@ packages:
   next-tick@1.1.0:
     resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
 
-  nextgraphweb@0.1.1-alpha.4:
-    resolution: {integrity: sha512-2vX7+VAx7pp+iJG/KrzWJhzwgur04WdZegkjAOQHCSpVa5Q+3CYN+Jyo3A+BHjpXJmr/jWyVZRJr/K/lRXhnfg==}
-
   node-addon-api@7.1.1:
     resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
 
@@ -6528,21 +6520,22 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.0
 
-  '@ldo/connected-nextgraph@1.0.0-alpha.28':
+  '@ldo/connected-nextgraph@1.0.0-alpha.15':
     dependencies:
-      '@ldo/connected': 1.0.0-alpha.28
+      '@ldo/connected': 1.0.0-alpha.15
       '@ldo/dataset': 1.0.0-alpha.28
       '@ldo/ldo': 1.0.0-alpha.28
       '@ldo/rdf-utils': 1.0.0-alpha.28
       '@solid-notifications/subscription': 0.1.2
       cross-fetch: 3.2.0
+      http-link-header: 1.1.3
       ws: 8.18.3
     transitivePeerDependencies:
       - bufferutil
       - encoding
       - utf-8-validate
 
-  '@ldo/connected@1.0.0-alpha.28':
+  '@ldo/connected@1.0.0-alpha.15':
     dependencies:
       '@ldo/dataset': 1.0.0-alpha.28
       '@ldo/ldo': 1.0.0-alpha.28
@@ -6581,13 +6574,14 @@ snapshots:
       n3: 1.26.0
       rdf-string: 1.6.3
 
-  '@ldo/react@1.0.0-alpha.28':
+  '@ldo/react@1.0.0-alpha.15':
     dependencies:
-      '@ldo/connected': 1.0.0-alpha.28
+      '@ldo/connected': 1.0.0-alpha.15
       '@ldo/jsonld-dataset-proxy': 1.0.0-alpha.28
       '@ldo/ldo': 1.0.0-alpha.28
       '@ldo/rdf-utils': 1.0.0-alpha.28
       '@ldo/subscribable-dataset': 1.0.0-alpha.28
+      '@rdfjs/data-model': 1.3.4
       cross-fetch: 3.2.0
     transitivePeerDependencies:
       - encoding
@@ -6892,6 +6886,10 @@ snapshots:
       nanoid: 5.1.0
       tslib: 2.8.1
 
+  '@ng-org/web@0.1.2-alpha.1':
+    dependencies:
+      async-proxy: 0.4.1
+
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
       '@nodelib/fs.stat': 2.0.5
@@ -9212,11 +9210,6 @@ snapshots:
 
   next-tick@1.1.0: {}
 
-  nextgraphweb@0.1.1-alpha.4:
-    dependencies:
-      async-proxy: 0.4.1
-      remote-web-streams: 0.2.0
-
   node-addon-api@7.1.1:
     optional: true