merged main

Author: SharonStrats

.babelrc

@@ -0,0 +1,16 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

.eslintignore

@@ -7,28 +7,27 @@ on:
   pull_request:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
-  test:
+  build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version:
-          - 12.x
-          - 14.x
-          - 15.x
+        node-version: [22, 24]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm ci
       - run: npm test
+      - run: npm run build
       - run: npm run doc
       - name: Save build
-        if: matrix.node-version == '14.x'
-        uses: actions/upload-artifact@v2
+        if: matrix.node-version == 22
+        uses: actions/upload-artifact@v7
         with:
           name: build
           path: |
@@ -37,52 +36,58 @@ jobs:
           retention-days: 1
 
   gh-pages:
-    needs: test
+    needs: build
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v8
         with:
           name: build
-      - run: rm .gitignore
-      - uses: peaceiris/actions-gh-pages@v3
+      - uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: .
 
-  npm-publish-build:
-    needs: test
+  dependabot:
+    name: 'Dependabot'
+    needs: build # After the E2E and build jobs, if one of them fails, it won't merge the PR.
     runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' && github.event_name == 'pull_request'}} # Detect that the PR author is dependabot
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
-      - uses: actions/download-artifact@v2
-        with:
-          name: build
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 14.x
-      - uses: rlespinasse/github-slug-action@v3.x
-      - name: Append commit hash to package version
-        run: 'sed -i -E "s/(\"version\": *\"[^\"]+)/\1-${GITHUB_SHA_SHORT}/" package.json'
-      - name: Disable pre- and post-publish actions
-        run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
-      - uses: JS-DevTools/npm-publish@v1
-        with:
-          token: ${{ secrets.NPM_TOKEN }}
-          tag: ${{ env.GITHUB_REF_SLUG }}
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL" # Use Github CLI to merge automatically the PR
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} 
+
+  npm-publish-dev:
+    needs: build
+    uses: SolidOS/solidos/.github/workflows/publish-prerelease.yml@main
+    with:
+      node_version: 22
+
   npm-publish-latest:
-    needs: test
+    needs: [build]
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
+    permissions:
+      id-token: write  # Required for OIDC
+      contents: read
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v8
         with:
           name: build
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v6
         with:
-          node-version: 14.x
+          node-version: 22
+          registry-url: 'https://registry.npmjs.org'
+      - name: Update npm to latest (required for OIDC)
+        run: npm install -g npm@latest
       - name: Disable pre- and post-publish actions
         run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
-      - uses: JS-DevTools/npm-publish@v1
-        with:
-          token: ${{ secrets.NPM_TOKEN }}
-          tag: latest
+      - name: Publish to npm
+        if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
+        run: npm publish --tag latest

.eslintrc

@@ -5,5 +5,7 @@ src/versionInfo.ts
 .idea
 .vscode
 coverage
-Documentation/api
+docs/api
 examples/storybook
+.history/
+docs/form-examples/solid-ui.js

.github/dependabot.yml

@@ -1 +1 @@
-v12.7.0
+v22.22.0

.github/workflows/ci.yml

@@ -1,23 +1,42 @@
-module.exports = {
-  stories: [
-    "../src/**/*.stories.@(js|jsx|ts|tsx|mdx)"
-  ],
+export default {
+  stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
+
   addons: [
-    "@storybook/addon-links",
-    "@storybook/addon-essentials"
+    '@storybook/addon-links',
+    '@storybook/addon-essentials',
+    '@storybook/addon-mdx-gfm',
+    '@storybook/addon-webpack5-compiler-swc'
   ],
+
+  framework: {
+    name: '@storybook/html-webpack5',
+    options: {}
+  },
+
+  docs: {
+    autodocs: true
+  },
   webpackFinal: async (config) => {
-    config.externals = {
-      'fs': 'null',
-      'node-uuid': 'null',
-      'node-fetch': 'fetch',
-      'isomorphic-fetch': 'fetch',
-      'xmldom': 'window',
-      'text-encoding': 'TextEncoder',
-      'whatwg-url': 'window',
-      '@trust/webcrypto': 'crypto'
+    // For Storybook, we DON'T externalize rdflib and solid-logic
+    // Instead, we let webpack bundle them from node_modules
+
+    // Handle Node.js modules for browser
+    config.resolve.fallback = {
+      ...config.resolve.fallback,
+      path: false,
+      fs: false,
+      crypto: false,
+      stream: false,
+      util: false,
+      buffer: false
     }
-    // Return the altered config
-    return config;
-  },
-};
+
+    // Alias $rdf to rdflib for solid-logic compatibility
+    config.resolve.alias = {
+      ...config.resolve.alias,
+      $rdf: 'rdflib'
+    }
+
+    return config
+  }
+}

.gitignore

@@ -1,4 +1,11 @@
+// For backward compatibility, provide rdflib and solid-logic as globals
+import * as rdflib from 'rdflib'
+import * as solidLogic from 'solid-logic'
 
-export const parameters = {
-  actions: { argTypesRegex: "^on[A-Z].*" },
-}
+// Some legacy code might expect these as globals
+if (typeof window !== 'undefined') {
+  window.$rdf = rdflib
+  window.SolidLogic = solidLogic
+}
+
+export const parameters = {}