Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
8411c5e
SolidOS/solid-ui#769 Import design system and primitive styles
NoelDeMartin May 29, 2026
d7f9a78
Merge pull request #409 from NoelDeMartin/769-design-system-header-ac…
NoelDeMartin Jun 2, 2026
ca9be75
SolidOS/solid-ui#780 Migrate solid-ui imports
NoelDeMartin Jun 9, 2026
ca8e0b6
Bump @babel/plugin-transform-runtime from 7.29.0 to 7.29.7
dependabot[bot] Jun 2, 2026
9bc157a
Bump webpack from 5.107.1 to 5.107.2
dependabot[bot] Jun 2, 2026
f245606
Bump eslint from 10.4.0 to 10.4.1
dependabot[bot] Jun 2, 2026
de024da
Bump @babel/preset-env from 7.29.5 to 7.29.7
dependabot[bot] Jun 2, 2026
329d66c
fix/login in solid-ui
bourgeoa Jun 4, 2026
49492ed
2.2.2
bourgeoa Jun 4, 2026
d5f1a9a
Bump terser-webpack-plugin from 5.6.0 to 5.6.1
dependabot[bot] Jun 8, 2026
3d2ead7
Bump webpack-cli from 7.0.2 to 7.0.3
dependabot[bot] Jun 8, 2026
c176a81
Bump @typescript-eslint/parser from 8.59.3 to 8.60.1
dependabot[bot] Jun 8, 2026
9a72371
Bump shell-quote in the npm_and_yarn group across 1 directory
dependabot[bot] Jun 9, 2026
0585566
Merge pull request #419 from NoelDeMartin/780-vite
NoelDeMartin Jun 15, 2026
bb389b2
update CI to include staging
bourgeoa Jun 20, 2026
8235682
update solidos dependencies test/dev and patch-package
bourgeoa Jun 20, 2026
7f04e3d
2.2.3-0
bourgeoa Jun 20, 2026
9facf13
Merge pull request #429 from SolidOS/npmDev
bourgeoa Jun 20, 2026
d00fb21
automate update solidos dependencies on staging
bourgeoa Jun 21, 2026
4925588
2.2.3-0
bourgeoa Jun 21, 2026
5706053
2.2.3-1
bourgeoa Jun 21, 2026
f221b60
Merge remote-tracking branch 'origin/staging' into solidosDependencies
bourgeoa Jun 21, 2026
aaa41a8
solid-panes@latest
bourgeoa Jun 21, 2026
aebd3c9
remove if staging
bourgeoa Jun 21, 2026
3b35869
add patch-package
bourgeoa Jun 21, 2026
e4182be
chore: update solidos dependencies to latest compatible versions
github-actions[bot] Jun 21, 2026
b0d6dea
2.2.3-2
bourgeoa Jun 21, 2026
e0b74e9
Merge branch 'solidosDependencies' of https://github.com/solidos/mash…
bourgeoa Jun 21, 2026
0adb858
chore: update solidos dependencies (dev: solid-logic@4.0.8-0 solid-ui…
github-actions[bot] Jun 21, 2026
539d13e
update solid-ui@dev
bourgeoa Jun 21, 2026
ef917ea
Merge branch 'solidosDependencies' of https://github.com/solidos/mash…
bourgeoa Jun 21, 2026
7543d0b
add permissions
bourgeoa Jun 21, 2026
97d0d81
chore: update solidos dependencies (dev: solid-logic@4.0.8-0 solid-ui…
github-actions[bot] Jun 21, 2026
1401712
add solid-panes to solidosDependencies
bourgeoa Jun 21, 2026
100b6c9
2.2.3-3
bourgeoa Jun 21, 2026
d98f714
Merge branch 'solidosDependencies' of https://github.com/solidos/mash…
bourgeoa Jun 21, 2026
32631ba
chore: update solidos dependencies (dev: solid-logic@4.0.8-0 solid-ui…
github-actions[bot] Jun 21, 2026
1ce24c0
Merge pull request #430 from SolidOS/solidosDependencies
bourgeoa Jun 21, 2026
84f5504
#439 turn on chunking
SharonStrats Jun 24, 2026
f6f4301
deleted font from here since we add it to solid-ui
timea-solid Jul 1, 2026
ed2f5d0
chore: update solidos dependencies (dev: solid-logic@4.0.8-1 solid-ui…
github-actions[bot] Jul 1, 2026
451521b
Merge pull request #440 from SharonStrats/feat/chunking
bourgeoa Jul 1, 2026
0d8acf8
chore: update solidos dependencies (dev: solid-logic@4.0.8-1 solid-ui…
github-actions[bot] Jul 1, 2026
7a4a6c0
SolidOS/solid-panes#709 Remove legacy header
NoelDeMartin Jul 1, 2026
7787189
Merge pull request #443 from NoelDeMartin/solid-panes-header
NoelDeMartin Jul 3, 2026
100f190
fix browser style
timea-solid Jul 3, 2026
bc5a308
fix dev server start
timea-solid Jul 3, 2026
123f5f6
merge staging
timea-solid Jul 3, 2026
2316a72
package-lock.json
bourgeoa Jul 3, 2026
e4a299f
chore: update solidos dependencies (dev: solid-logic@4.0.8-1 solid-ui…
github-actions[bot] Jul 3, 2026
5bd0038
chore: update solidos dependencies (dev: solid-logic@4.0.8-1 solid-ui…
github-actions[bot] Jul 3, 2026
1f8732b
for CI test
bourgeoa Jul 3, 2026
6feca17
Merge branch 'font' of https://github.com/solidos/mashlib into font
bourgeoa Jul 3, 2026
937a674
add missing types
bourgeoa Jul 3, 2026
2d0252a
chore: update solidos dependencies (dev: solid-logic@4.0.8-1 solid-ui…
github-actions[bot] Jul 3, 2026
473192e
Merge pull request #441 from SolidOS/font
bourgeoa Jul 3, 2026
d07e9bf
remove font from dark theme too
timea-solid Jul 3, 2026
d895402
remove footer according to new design
timea-solid Jul 3, 2026
469dc4d
remove left side menu
timea-solid Jul 3, 2026
2a2c3a2
Merge pull request #444 from SolidOS/browseStyle
NoelDeMartin Jul 6, 2026
25c5b32
chore: update solidos dependencies (dev: solid-logic@4.0.8-1 solid-ui…
github-actions[bot] Jul 6, 2026
0c89b2f
#445 Fix auth in browse.html and browse-test.html
NoelDeMartin Jul 6, 2026
62a8c70
chore: update solidos dependencies (dev: solid-logic@4.0.8-1 solid-ui…
github-actions[bot] Jul 13, 2026
86d6b5f
Merge pull request #447 from SolidOS/newLayout
timea-solid Jul 21, 2026
c1a7966
chore: update solidos dependencies (dev: solid-logic@4.0.8-1 solid-ui…
github-actions[bot] Jul 21, 2026
4c894b2
import only the theme drom solid-ui
timea-solid Jul 24, 2026
f94f783
chore: update solidos dependencies (dev: solid-logic@4.0.8-1 solid-ui…
github-actions[bot] Jul 24, 2026
06c3fdd
update aliases
timea-solid Jul 24, 2026
4f858cc
Merge branch 'staging' of https://github.com/solidos/mashlib into sta…
timea-solid Jul 24, 2026
a62a6b4
more extension for local dev
timea-solid Jul 24, 2026
d5576e4
remove dashboard, navbar and header menu do not need it
timea-solid Jul 31, 2026
572ac08
chore: update solidos dependencies (dev: solid-logic@4.0.8-2 solid-ui…
github-actions[bot] Jul 31, 2026
f50912b
move webawesome
SharonStrats Jul 31, 2026
b0a47f1
update version
SharonStrats Jul 31, 2026
bdf9ebb
Merge pull request #455 from SolidOS/fix/webawesome
timea-solid Jul 31, 2026
3b66f01
chore: update solidos dependencies (dev: solid-logic@4.0.8-2 solid-ui…
github-actions[bot] Jul 31, 2026
bd14c12
Merge pull request #454 from SolidOS/navbar
timea-solid Jul 31, 2026
e2be96b
workspaceAlias added to web awesome
timea-solid Jul 31, 2026
0df0ace
Merge pull request #456 from SolidOS/addingAlias
SharonStrats Jul 31, 2026
681f044
chore: update solidos dependencies (dev: solid-logic@4.0.8-2 solid-ui…
github-actions[bot] Jul 31, 2026
7136565
update SolidOS dependencies
bourgeoa Aug 20, 2026
133a432
3.0.0-0
bourgeoa Aug 20, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,20 @@ on:
push:
branches:
- main
- staging
pull_request:
branches:
- main
- staging
workflow_dispatch:

jobs:
update-deps:
uses: SolidOS/solidos/.github/workflows/update-solidos-deps.yml@main
secrets: inherit

build:
needs: update-deps
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -68,6 +75,9 @@ jobs:

npm-publish-dev:
needs: build
permissions:
id-token: write
contents: read
uses: SolidOS/solidos/.github/workflows/publish-prerelease.yml@main
with:
node_version: 22
Expand Down
4,566 changes: 3,242 additions & 1,324 deletions package-lock.json

Large diffs are not rendered by default.

22 changes: 16 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mashlib",
"version": "2.2.1",
"version": "3.0.0-0",
"description": "Data mashup library",
"main": "dist/mashlib.js",
"files": [
Expand Down Expand Up @@ -54,11 +54,12 @@
},
"homepage": "https://github.com/solidos/mashlib",
"dependencies": {
"pane-registry": "^3.1.1",
"rdflib": "^2.3.9",
"solid-logic": "^4.0.7",
"solid-panes": "^4.4.1",
"solid-ui": "^3.1.1"
"pane-registry": "^5.0.0-0",
"patch-package": "^8.0.1",
"rdflib": "2.4.0",
"solid-logic": "^6.0.0-0",
"solid-panes": "^5.0.0-0",
"solid-ui": "^5.0.0-0"
},
"overrides": {
"rdflib": "$rdflib",
Expand All @@ -72,6 +73,7 @@
"@babel/plugin-transform-runtime": "^7.29.0",
"@babel/preset-env": "^7.29.5",
"@babel/preset-typescript": "^7.28.5",
"@types/node": "^24.13.2",
"@typescript-eslint/parser": "^8.59.3",
"babel-loader": "^10.1.1",
"bundlesize2": "^0.0.35",
Expand All @@ -85,11 +87,19 @@
"node-polyfill-webpack-plugin": "^4.1.0",
"terser-webpack-plugin": "^5.6.0",
"typescript": "^6.0.3",
"undici-types": "^7.18.2",
"url-loader": "^4.1.1",
"webpack": "^5.106.2",
"webpack-cli": "^7.0.2",
"webpack-dev-server": "^5.2.4"
},
"solidosDependencies": [
"rdflib",
"solid-logic",
"solid-ui",
"pane-registry",
"solid-panes"
],
"bundlesize": [
{
"path": "./dist/*.min.js",
Expand Down
86 changes: 26 additions & 60 deletions src/databrowser.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,70 +34,36 @@
</script>
</head>
<body id="PageBody" data-app-shell="databrowser">
<solid-ui-provider>
<!-- Skip-navigation link (accessibility) -->
<a href="#MainContent" class="skip-link">Skip to main content</a>

<!-- Skip-navigation link (accessibility) -->
<a href="#MainContent" class="skip-link">Skip to main content</a>
<!-- Header — populated by solid-panes createHeader(), plus responsive menu toggle -->

<!-- Header — populated by solid-panes createHeader(), plus responsive menu toggle -->
<solid-ui-header id="mainSolidUiHeader" theme="" layout="" brand-link="/">
<span slot="title"></span>
</solid-ui-header>
<!--
<header id="PageHeader" role="banner">
<div class="page-header-inner">
<button id="MenuToggleBtn" class="menu-toggle" aria-controls="NavMenu" aria-expanded="false" hidden>
<span class="sr-only">Menu</span>
</button>
</div>
</header
-->
<!-- Main content area — single visible region at a time -->
<div class="app-main" tabindex="-1" aria-live="polite">
<div class="app-shell">

<!-- Main content area — single visible region at a time -->
<div class="app-main" tabindex="-1" aria-live="polite">
<div class="app-shell">
<aside id="NavMenu" class="app-nav" aria-label="Application menu" hidden>
<div id="NavMenuContent" class="menu-content"></div>
</aside>
<main id="MainContent" class="app-view">
<!--
Outline view: the primary RDF-subject browser.
JS appends property-table <div>s (not <tr>s) here.
-->
<table
id="OutlineView"
class="outline-view"
aria-label="Resource browser"
>
<!--
solid-panes navbar and pane content are injected here by
OutlineManager.GotoSubject / propertyTable / outlineExpand.
Each subject block is a <article class="subject-block">.
-->
</table>

<main id="MainContent" class="app-view">
<!--
Outline view: the primary RDF-subject browser.
JS appends property-table <div>s (not <tr>s) here.
-->
<table
id="OutlineView"
class="outline-view"
aria-label="Resource browser"
>
<!--
Pane icon tray (nav) and pane content are injected here by
OutlineManager.GotoSubject / propertyTable / outlineExpand.
Each subject block is a <article class="subject-block">.
-->
</table>

<!--
Global Dashboard: preferences, profile, contacts, etc.
Hidden by default; toggled by showDashboard / closeDashboard.
-->
<section
id="GlobalDashboard"
class="global-dashboard"
aria-label="Dashboard"
hidden
>
<!-- globalAppTabs appends tab widget here -->
</section>
</main> <!-- .app-view -->
</div> <!-- .app-shell -->
</main> <!-- .app-view -->
</div> <!-- .app-shell -->

<div id="MenuOverlay" class="menu-overlay" hidden aria-hidden="true"></div>
</div>

<!-- Footer — populated by solid-ui initFooter() -->
<footer id="PageFooter" role="contentinfo">
<!-- solid-ui injects: "Powered by Solid" link -->
</footer>
</solid-ui-provider>
</body>
</html>
7 changes: 2 additions & 5 deletions src/globals.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
// AI generated as a solution to cannot find SolidLogic
// Must be imported BEFORE solid-ui / solid-panes.
// Their prebuilt bundles treat `solid-logic` (and `rdflib`) as UMD externals
// with `root: "SolidLogic"` / `root: "$rdf"`, so the globals must exist on
// `window` at module-evaluation time, not after all imports have run.
import * as $rdf from 'rdflib'
import * as SolidLogic from 'solid-logic'
import * as UI from 'solid-ui'

const w: any = window
w.$rdf = $rdf
w.SolidLogic = SolidLogic
w.UI = UI
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import './globals'
import * as $rdf from 'rdflib'
import * as SolidLogic from 'solid-logic'
import type { RenderEnvironment } from 'pane-registry'
import'solid-ui/components/header'
import * as panes from 'solid-panes'
import { layout } from './layout'
import { theme } from './theme'
import versionInfo from './versionInfo'
import './styles/mash.css'
import 'solid-ui/components/provider'

const global: any = window
global.panes = panes
Expand Down
14 changes: 6 additions & 8 deletions src/styles/mash.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/*
@import "solid-ui/theme.css";

/*
** ------SolidOS Styles------
**
*/
Expand Down Expand Up @@ -40,8 +42,7 @@ body {
color: inherit;
}

#PageHeader,
#mainSolidUiHeader {
solid-panes-header, #PageHeader {
position: fixed;
top: 0;
left: 0;
Expand All @@ -50,10 +51,6 @@ body {
background: var(--color-header-row-bg);
}

#mainSolidUiHeader {
display: block;
}

#MainContent {
flex: 1 1 auto;
min-height: 0;
Expand Down Expand Up @@ -1644,6 +1641,7 @@ label:focus-visible {

/* Generated by AI */
@media screen and (max-width: 768px) {
solid-panes-header,
#PageHeader,
#PageFooter {
width: 100%;
Expand Down Expand Up @@ -1675,4 +1673,4 @@ html[data-layout="mobile"] #MainContent {
overscroll-behavior: x contain;
}

/* END of Generated by AI */
/* END of Generated by AI */
2 changes: 0 additions & 2 deletions src/styles/themes/dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ html[data-theme="dark"] {
--color-sort-arrow: #555;

/* Typography */
--font-family-base: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
--font-family-ui: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
--font-size-base: 100%;
--font-size-strong: 120%;
--font-weight-normal: normal;
Expand Down
2 changes: 0 additions & 2 deletions src/styles/themes/light.css
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,6 @@
--color-pending-edit: #bbb;

/* Typography */
--font-family-base: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
--font-family-ui: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
--font-size-base-old: 100%;
--font-size-base: 1rem; /* 16px */
--font-size-strong: 120%;
Expand Down
Loading
Loading